Prefactor PaymentParameters for blinded recipients#2258

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 7 commits into from
May 8, 2023
Merged

Prefactor PaymentParameters for blinded recipients #2258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
06eeefc
Groundwork for refactoring PaymentParams::Hints to ::Payee
valentinewallace Apr 26, 2023
cea78f5
Error if clear hints are provided for blinded PaymentParams
valentinewallace Apr 29, 2023
7f49f6b
Move payee node id from top level PaymentParams to Payee::Clear
valentinewallace Apr 29, 2023
6d62b62
Error if BOLT 11 features are provided for blinded payment params
valentinewallace Apr 29, 2023
91dc767
Move BOLT11 features from top level PaymentParams to Payee::Clear
valentinewallace May 3, 2023
746f25a
Add BOLT 12 features to PaymentParams
valentinewallace May 3, 2023
d56672c
Move final_cltv_expiry_delta from PaymentParams to Payee::Clear
valentinewallace Apr 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion fuzz/src/router.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -300,7 +300,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
let final_cltv_expiry_delta = slice_to_be32(get_slice!(4));
let route_params = RouteParameters {
payment_params: PaymentParameters::from_node_id(*target, final_cltv_expiry_delta)
.with_route_hints(last_hops.clone()),
.with_route_hints(last_hops.clone()).unwrap(),
final_value_msat,
};
let _ = find_route(&our_pubkey, &route_params, &net_graph,
Expand Down
4 changes: 2 additions & 2 deletions lightning-invoice/src/payment.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -152,9 +152,9 @@ fn pay_invoice_using_amount<P: Deref>(
let mut payment_params = PaymentParameters::from_node_id(invoice.recover_payee_pub_key(),
invoice.min_final_cltv_expiry_delta() as u32)
.with_expiry_time(expiry_time_from_unix_epoch(invoice).as_secs())
.with_route_hints(invoice.route_hints());
.with_route_hints(invoice.route_hints()).unwrap();
if let Some(features) = invoice.features() {
payment_params = payment_params.with_features(features.clone());
payment_params = payment_params.with_bolt11_features(features.clone()).unwrap();
}
let route_params = RouteParameters {
payment_params,
Expand Down
8 changes: 4 additions & 4 deletions lightning-invoice/src/utils.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -838,8 +838,8 @@ mod test {

let payment_params = PaymentParameters::from_node_id(invoice.recover_payee_pub_key(),
invoice.min_final_cltv_expiry_delta() as u32)
.with_features(invoice.features().unwrap().clone())
.with_route_hints(invoice.route_hints());
.with_bolt11_features(invoice.features().unwrap().clone()).unwrap()
.with_route_hints(invoice.route_hints()).unwrap();
let route_params = RouteParameters {
payment_params,
final_value_msat: invoice.amount_milli_satoshis().unwrap(),
Expand DownExpand Up@@ -1294,8 +1294,8 @@ mod test {

let payment_params = PaymentParameters::from_node_id(invoice.recover_payee_pub_key(),
invoice.min_final_cltv_expiry_delta() as u32)
.with_features(invoice.features().unwrap().clone())
.with_route_hints(invoice.route_hints());
.with_bolt11_features(invoice.features().unwrap().clone()).unwrap()
.with_route_hints(invoice.route_hints()).unwrap();
let params = RouteParameters {
payment_params,
final_value_msat: invoice.amount_milli_satoshis().unwrap(),
Expand Down
10 changes: 6 additions & 4 deletions lightning/src/ln/channelmanager.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,7 @@ use crate::ln::features::{ChannelFeatures, ChannelTypeFeatures, InitFeatures, No
#[cfg(any(feature = "_test_utils", test))]
use crate::ln::features::InvoiceFeatures;
use crate::routing::gossip::NetworkGraph;
use crate::routing::router::{BlindedTail, DefaultRouter, InFlightHtlcs, Path, PaymentParameters, Route, RouteHop, RouteParameters, Router};
use crate::routing::router::{BlindedTail, DefaultRouter, InFlightHtlcs, Path, Payee, PaymentParameters, Route, RouteHop, RouteParameters, Router};
use crate::routing::scoring::ProbabilisticScorer;
use crate::ln::msgs;
use crate::ln::onion_utils;
Expand DownExpand Up@@ -7061,8 +7061,10 @@ impl Readable for HTLCSource {
return Err(DecodeError::InvalidValue);
}
if let Some(params) = payment_params.as_mut() {
if params.final_cltv_expiry_delta == 0 {
params.final_cltv_expiry_delta = path.final_cltv_expiry_delta().ok_or(DecodeError::InvalidValue)?;
if let Payee::Clear { ref mut final_cltv_expiry_delta, .. } = params.payee {
if final_cltv_expiry_delta == &0 {
*final_cltv_expiry_delta = path.final_cltv_expiry_delta().ok_or(DecodeError::InvalidValue)?;
}
}
}
Ok(HTLCSource::OutboundRoute {
Expand DownExpand Up@@ -9180,7 +9182,7 @@ pub mod bench {
macro_rules! send_payment {
($node_a: expr, $node_b: expr) => {
let payment_params = PaymentParameters::from_node_id($node_b.get_our_node_id(), TEST_FINAL_CLTV)
.with_features($node_b.invoice_features());
.with_bolt11_features($node_b.invoice_features()).unwrap();
let mut payment_preimage = PaymentPreimage([0; 32]);
payment_preimage.0[0..8].copy_from_slice(&payment_count.to_le_bytes());
payment_count += 1;
Expand Down
9 changes: 9 additions & 0 deletions lightning/src/ln/features.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -532,6 +532,14 @@ impl InvoiceFeatures {
}
}

impl Bolt12InvoiceFeatures {
/// Converts `Bolt12InvoiceFeatures` to `Features<C>`. Only known `Bolt12InvoiceFeatures` relevant
/// to context `C` are included in the result.
pub(crate) fn to_context<C: sealed::Context>(&self) -> Features<C> {
self.to_context_internal()
}
}

Comment thread
valentinewallace marked this conversation as resolved.
impl ChannelTypeFeatures {
// Maps the relevant `InitFeatures` to `ChannelTypeFeatures`. Any unknown features to
// `ChannelTypeFeatures` are not included in the result.
Expand DownExpand Up@@ -791,6 +799,7 @@ impl_feature_len_prefixed_write!(InitFeatures);
impl_feature_len_prefixed_write!(ChannelFeatures);
impl_feature_len_prefixed_write!(NodeFeatures);
impl_feature_len_prefixed_write!(InvoiceFeatures);
impl_feature_len_prefixed_write!(Bolt12InvoiceFeatures);
impl_feature_len_prefixed_write!(BlindedHopFeatures);

// Some features only appear inside of TLVs, so they don't have a length prefix when serialized.
Expand Down
6 changes: 3 additions & 3 deletions lightning/src/ln/functional_test_utils.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1723,7 +1723,7 @@ macro_rules! get_route {
macro_rules! get_route_and_payment_hash {
($send_node: expr, $recv_node: expr, $recv_value: expr) => {{
let payment_params = $crate::routing::router::PaymentParameters::from_node_id($recv_node.node.get_our_node_id(), TEST_FINAL_CLTV)
.with_features($recv_node.node.invoice_features());
.with_bolt11_features($recv_node.node.invoice_features()).unwrap();
$crate::get_route_and_payment_hash!($send_node, $recv_node, payment_params, $recv_value)
}};
($send_node: expr, $recv_node: expr, $payment_params: expr, $recv_value: expr) => {{
Expand DownExpand Up@@ -2272,7 +2272,7 @@ pub const TEST_FINAL_CLTV: u32 = 70;

pub fn route_payment<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route: &[&Node<'a, 'b, 'c>], recv_value: u64) -> (PaymentPreimage, PaymentHash, PaymentSecret) {
let payment_params = PaymentParameters::from_node_id(expected_route.last().unwrap().node.get_our_node_id(), TEST_FINAL_CLTV)
.with_features(expected_route.last().unwrap().node.invoice_features());
.with_bolt11_features(expected_route.last().unwrap().node.invoice_features()).unwrap();
let route = get_route(origin_node, &payment_params, recv_value).unwrap();
assert_eq!(route.paths.len(), 1);
assert_eq!(route.paths[0].hops.len(), expected_route.len());
Expand All@@ -2286,7 +2286,7 @@ pub fn route_payment<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route:

pub fn route_over_limit<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route: &[&Node<'a, 'b, 'c>], recv_value: u64) {
let payment_params = PaymentParameters::from_node_id(expected_route.last().unwrap().node.get_our_node_id(), TEST_FINAL_CLTV)
.with_features(expected_route.last().unwrap().node.invoice_features());
.with_bolt11_features(expected_route.last().unwrap().node.invoice_features()).unwrap();
let network_graph = origin_node.network_graph.read_only();
let scorer = test_utils::TestScorer::new();
let seed = [0u8; 32];
Expand Down
20 changes: 10 additions & 10 deletions lightning/src/ln/functional_tests.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1829,7 +1829,7 @@ fn test_channel_reserve_holding_cell_htlcs() {
// attempt to send amt_msat > their_max_htlc_value_in_flight_msat
{
let payment_params = PaymentParameters::from_node_id(nodes[2].node.get_our_node_id(), TEST_FINAL_CLTV)
.with_features(nodes[2].node.invoice_features()).with_max_channel_saturation_power_of_half(0);
.with_bolt11_features(nodes[2].node.invoice_features()).unwrap().with_max_channel_saturation_power_of_half(0);
let (mut route, our_payment_hash, _, our_payment_secret) = get_route_and_payment_hash!(nodes[0], nodes[2], payment_params, recv_value_0);
route.paths[0].hops.last_mut().unwrap().fee_msat += 1;
assert!(route.paths[0].hops.iter().rev().skip(1).all(|h| h.fee_msat == feemsat));
Expand All@@ -1856,7 +1856,7 @@ fn test_channel_reserve_holding_cell_htlcs() {
}

let payment_params = PaymentParameters::from_node_id(nodes[2].node.get_our_node_id(), TEST_FINAL_CLTV)
.with_features(nodes[2].node.invoice_features()).with_max_channel_saturation_power_of_half(0);
.with_bolt11_features(nodes[2].node.invoice_features()).unwrap().with_max_channel_saturation_power_of_half(0);
let route = get_route!(nodes[0], payment_params, recv_value_0).unwrap();
let (payment_preimage, ..) = send_along_route(&nodes[0], route, &[&nodes[1], &nodes[2]], recv_value_0);
claim_payment(&nodes[0], &[&nodes[1], &nodes[2]], payment_preimage);
Expand DownExpand Up@@ -4795,7 +4795,7 @@ fn test_duplicate_payment_hash_one_failure_one_success() {
// script push size limit so that the below script length checks match
// ACCEPTED_HTLC_SCRIPT_WEIGHT.
let payment_params = PaymentParameters::from_node_id(nodes[3].node.get_our_node_id(), TEST_FINAL_CLTV - 40)
.with_features(nodes[3].node.invoice_features());
.with_bolt11_features(nodes[3].node.invoice_features()).unwrap();
let (route, _, _, _) = get_route_and_payment_hash!(nodes[0], nodes[3], payment_params, 800_000);
send_along_route_with_secret(&nodes[0], route, &[&[&nodes[1], &nodes[2], &nodes[3]]], 800_000, duplicate_payment_hash, payment_secret);

Expand DownExpand Up@@ -6101,7 +6101,7 @@ fn test_update_add_htlc_bolt2_sender_cltv_expiry_too_high() {
let _chan = create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 1000000, 0);

let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), 0)
.with_features(nodes[1].node.invoice_features());
.with_bolt11_features(nodes[1].node.invoice_features()).unwrap();
let (mut route, our_payment_hash, _, our_payment_secret) = get_route_and_payment_hash!(nodes[0], nodes[1], payment_params, 100000000);
route.paths[0].hops.last_mut().unwrap().cltv_expiry_delta = 500000001;
unwrap_send_err!(nodes[0].node.send_payment_with_route(&route, our_payment_hash,
Expand DownExpand Up@@ -7043,7 +7043,7 @@ fn test_check_htlc_underpaying() {

let scorer = test_utils::TestScorer::new();
let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), TEST_FINAL_CLTV).with_features(nodes[1].node.invoice_features());
let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), TEST_FINAL_CLTV).with_bolt11_features(nodes[1].node.invoice_features()).unwrap();
let route = get_route(&nodes[0].node.get_our_node_id(), &payment_params, &nodes[0].network_graph.read_only(), None, 10_000, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
let (_, our_payment_hash, _) = get_payment_preimage_hash!(nodes[0]);
let our_payment_secret = nodes[1].node.create_inbound_payment_for_hash(our_payment_hash, Some(100_000), 7200, None).unwrap();
Expand DownExpand Up@@ -7189,7 +7189,7 @@ fn test_bump_penalty_txn_on_revoked_commitment() {

let payment_preimage = route_payment(&nodes[0], &vec!(&nodes[1])[..], 3000000).0;
let payment_params = PaymentParameters::from_node_id(nodes[0].node.get_our_node_id(), 30)
.with_features(nodes[0].node.invoice_features());
.with_bolt11_features(nodes[0].node.invoice_features()).unwrap();
let (route,_, _, _) = get_route_and_payment_hash!(nodes[1], nodes[0], payment_params, 3000000);
send_along_route(&nodes[1], route, &vec!(&nodes[0])[..], 3000000);

Expand DownExpand Up@@ -7294,13 +7294,13 @@ fn test_bump_penalty_txn_on_revoked_htlcs() {

let chan = create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 1000000, 59000000);
// Lock HTLC in both directions (using a slightly lower CLTV delay to provide timely RBF bumps)
let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), 50).with_features(nodes[1].node.invoice_features());
let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), 50).with_bolt11_features(nodes[1].node.invoice_features()).unwrap();
let scorer = test_utils::TestScorer::new();
let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
let route = get_route(&nodes[0].node.get_our_node_id(), &payment_params, &nodes[0].network_graph.read_only(), None,
3_000_000, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
let payment_preimage = send_along_route(&nodes[0], route, &[&nodes[1]], 3_000_000).0;
let payment_params = PaymentParameters::from_node_id(nodes[0].node.get_our_node_id(), 50).with_features(nodes[0].node.invoice_features());
let payment_params = PaymentParameters::from_node_id(nodes[0].node.get_our_node_id(), 50).with_bolt11_features(nodes[0].node.invoice_features()).unwrap();
let route = get_route(&nodes[1].node.get_our_node_id(), &payment_params, &nodes[1].network_graph.read_only(), None,
3_000_000, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
send_along_route(&nodes[1], route, &[&nodes[0]], 3_000_000);
Expand DownExpand Up@@ -9300,7 +9300,7 @@ fn do_test_dup_htlc_second_rejected(test_for_second_fail_panic: bool) {
let _chan = create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 100000, 10001);

let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), TEST_FINAL_CLTV)
.with_features(nodes[1].node.invoice_features());
.with_bolt11_features(nodes[1].node.invoice_features()).unwrap();
let route = get_route!(nodes[0], payment_params, 10_000).unwrap();

let (our_payment_preimage, our_payment_hash, our_payment_secret) = get_payment_preimage_hash!(&nodes[1]);
Expand DownExpand Up@@ -9409,7 +9409,7 @@ fn test_inconsistent_mpp_params() {
let chan_2_3 =create_announced_chan_between_nodes_with_value(&nodes, 2, 3, 100_000, 0);

let payment_params = PaymentParameters::from_node_id(nodes[3].node.get_our_node_id(), TEST_FINAL_CLTV)
.with_features(nodes[3].node.invoice_features());
.with_bolt11_features(nodes[3].node.invoice_features()).unwrap();
let mut route = get_route!(nodes[0], payment_params, 15_000_000).unwrap();
assert_eq!(route.paths.len(), 2);
route.paths.sort_by(|path_a, _| {
Expand Down
10 changes: 5 additions & 5 deletions lightning/src/ln/onion_route_tests.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -714,8 +714,8 @@ fn do_test_onion_failure_stale_channel_update(announced_channel: bool) {
htlc_minimum_msat: None,
}])];
let payment_params = PaymentParameters::from_node_id(*channel_to_update_counterparty, TEST_FINAL_CLTV)
.with_features(nodes[2].node.invoice_features())
.with_route_hints(hop_hints);
.with_bolt11_features(nodes[2].node.invoice_features()).unwrap()
.with_route_hints(hop_hints).unwrap();
get_route_and_payment_hash!(nodes[0], nodes[2], payment_params, PAYMENT_AMT)
};
send_along_route_with_secret(&nodes[0], route.clone(), &[&[&nodes[1], &nodes[2]]], PAYMENT_AMT,
Expand DownExpand Up@@ -861,7 +861,7 @@ fn test_always_create_tlv_format_onion_payloads() {
create_announced_chan_between_nodes(&nodes, 1, 2);

let payment_params = PaymentParameters::from_node_id(nodes[2].node.get_our_node_id(), TEST_FINAL_CLTV)
.with_features(InvoiceFeatures::empty());
.with_bolt11_features(InvoiceFeatures::empty()).unwrap();
let (route, _payment_hash, _payment_preimage, _payment_secret) = get_route_and_payment_hash!(nodes[0], nodes[2], payment_params, 40000);

let hops = &route.paths[0].hops;
Expand DownExpand Up@@ -963,7 +963,7 @@ macro_rules! get_phantom_route {
let phantom_pubkey = $nodes[1].keys_manager.get_node_id(Recipient::PhantomNode).unwrap();
let phantom_route_hint = $nodes[1].node.get_phantom_route_hints();
let payment_params = PaymentParameters::from_node_id(phantom_pubkey, TEST_FINAL_CLTV)
.with_features($nodes[1].node.invoice_features())
.with_bolt11_features($nodes[1].node.invoice_features()).unwrap()
.with_route_hints(vec![RouteHint(vec![
RouteHintHop {
src_node_id: $nodes[0].node.get_our_node_id(),
Expand All@@ -987,7 +987,7 @@ macro_rules! get_phantom_route {
htlc_minimum_msat: None,
htlc_maximum_msat: None,
}
])]);
])]).unwrap();
let scorer = test_utils::TestScorer::new();
let network_graph = $nodes[0].network_graph.read_only();
(get_route(
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Prefactor PaymentParameters for blinded recipients#2258

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

from

May 8, 2023
 Merged


Prefactor PaymentParameters for blinded recipients
#2258
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
06eeefc

Groundwork for refactoring PaymentParams::Hints to ::Payee


valentinewallace Apr 26, 2023
cea78f5

Error if clear hints are provided for blinded PaymentParams


valentinewallace Apr 29, 2023
7f49f6b

Move payee node id from top level PaymentParams to Payee::Clear


valentinewallace Apr 29, 2023
6d62b62

Error if BOLT 11 features are provided for blinded payment params


valentinewallace Apr 29, 2023
91dc767

Move BOLT11 features from top level PaymentParams to Payee::Clear


valentinewallace May 3, 2023
746f25a

Add BOLT 12 features to PaymentParams


valentinewallace May 3, 2023
d56672c

Move final_cltv_expiry_delta from PaymentParams to Payee::Clear


valentinewallace Apr 27, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
fuzz/src/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -300,7 +300,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 let final_cltv_expiry_delta = slice_to_be32(get_slice!(4));
 let route_params = RouteParameters {
 payment_params: PaymentParameters::from_node_id(*target, final_cltv_expiry_delta)
 .with_route_hints(last_hops.clone()),
 .with_route_hints(last_hops.clone()).unwrap(),
 final_value_msat,
 };
 let _ = find_route(&our_pubkey, &route_params, &net_graph,
Expand Down

4 changes: 2 additions & 2 deletions
lightning-invoice/src/payment.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -152,9 +152,9 @@ fn pay_invoice_using_amount<P: Deref>(
	let mut payment_params = PaymentParameters::from_node_id(invoice.recover_payee_pub_key(),
 invoice.min_final_cltv_expiry_delta() as u32)
 .with_expiry_time(expiry_time_from_unix_epoch(invoice).as_secs())
 .with_route_hints(invoice.route_hints());
 .with_route_hints(invoice.route_hints()).unwrap();
	if let Some(features) = invoice.features() {
 payment_params = payment_params.with_features(features.clone());
 payment_params = payment_params.with_bolt11_features(features.clone()).unwrap();
	}
	let route_params = RouteParameters {
 payment_params,
Expand Down

8 changes: 4 additions & 4 deletions
lightning-invoice/src/utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -838,8 +838,8 @@ mod test {

 let payment_params = PaymentParameters::from_node_id(invoice.recover_payee_pub_key(),
 invoice.min_final_cltv_expiry_delta() as u32)
 .with_features(invoice.features().unwrap().clone())
 .with_route_hints(invoice.route_hints());
 .with_bolt11_features(invoice.features().unwrap().clone()).unwrap()
 .with_route_hints(invoice.route_hints()).unwrap();
 let route_params = RouteParameters {
 payment_params,
 final_value_msat: invoice.amount_milli_satoshis().unwrap(),
Expand DownExpand Up@@ -1294,8 +1294,8 @@ mod test {

 let payment_params = PaymentParameters::from_node_id(invoice.recover_payee_pub_key(),
 invoice.min_final_cltv_expiry_delta() as u32)
 .with_features(invoice.features().unwrap().clone())
 .with_route_hints(invoice.route_hints());
 .with_bolt11_features(invoice.features().unwrap().clone()).unwrap()
 .with_route_hints(invoice.route_hints()).unwrap();
 let params = RouteParameters {
 payment_params,
 final_value_msat: invoice.amount_milli_satoshis().unwrap(),
Expand Down

10 changes: 6 additions & 4 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,7 @@ use crate::ln::features::{ChannelFeatures, ChannelTypeFeatures, InitFeatures, No
#[cfg(any(feature = "_test_utils", test))]
use crate::ln::features::InvoiceFeatures;
use crate::routing::gossip::NetworkGraph;
use crate::routing::router::{BlindedTail, DefaultRouter, InFlightHtlcs, Path, PaymentParameters, Route, RouteHop, RouteParameters, Router};
use crate::routing::router::{BlindedTail, DefaultRouter, InFlightHtlcs, Path, Payee, PaymentParameters, Route, RouteHop, RouteParameters, Router};
use crate::routing::scoring::ProbabilisticScorer;
use crate::ln::msgs;
use crate::ln::onion_utils;
Expand DownExpand Up@@ -7061,8 +7061,10 @@ impl Readable for HTLCSource {
 return Err(DecodeError::InvalidValue);
 }
 if let Some(params) = payment_params.as_mut() {
 if params.final_cltv_expiry_delta == 0 {
 params.final_cltv_expiry_delta = path.final_cltv_expiry_delta().ok_or(DecodeError::InvalidValue)?;
 if let Payee::Clear { ref mut final_cltv_expiry_delta, .. } = params.payee {
 if final_cltv_expiry_delta == &0 {
 *final_cltv_expiry_delta = path.final_cltv_expiry_delta().ok_or(DecodeError::InvalidValue)?;
 }
 }
 }
 Ok(HTLCSource::OutboundRoute {
Expand DownExpand Up@@ -9180,7 +9182,7 @@ pub mod bench {
 macro_rules! send_payment {
 ($node_a: expr, $node_b: expr) => {
 let payment_params = PaymentParameters::from_node_id($node_b.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features($node_b.invoice_features());
 .with_bolt11_features($node_b.invoice_features()).unwrap();
 let mut payment_preimage = PaymentPreimage([0; 32]);
 payment_preimage.0[0..8].copy_from_slice(&payment_count.to_le_bytes());
 payment_count += 1;
Expand Down

9 changes: 9 additions & 0 deletions
lightning/src/ln/features.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -532,6 +532,14 @@ impl InvoiceFeatures {
	}
}

impl Bolt12InvoiceFeatures {
	/// Converts `Bolt12InvoiceFeatures` to `Features<C>`. Only known `Bolt12InvoiceFeatures` relevant
	/// to context `C` are included in the result.
	pub(crate) fn to_context<C: sealed::Context>(&self) -> Features<C> {
 self.to_context_internal()
	}
}

Comment thread
valentinewallace marked this conversation as resolved.

impl ChannelTypeFeatures {
	// Maps the relevant `InitFeatures` to `ChannelTypeFeatures`. Any unknown features to
	// `ChannelTypeFeatures` are not included in the result.
Expand DownExpand Up@@ -791,6 +799,7 @@ impl_feature_len_prefixed_write!(InitFeatures);
impl_feature_len_prefixed_write!(ChannelFeatures);
impl_feature_len_prefixed_write!(NodeFeatures);
impl_feature_len_prefixed_write!(InvoiceFeatures);
impl_feature_len_prefixed_write!(Bolt12InvoiceFeatures);
impl_feature_len_prefixed_write!(BlindedHopFeatures);

// Some features only appear inside of TLVs, so they don't have a length prefix when serialized.
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1723,7 +1723,7 @@ macro_rules! get_route {
macro_rules! get_route_and_payment_hash {
	($send_node: expr, $recv_node: expr, $recv_value: expr) => {{
 let payment_params = $crate::routing::router::PaymentParameters::from_node_id($recv_node.node.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features($recv_node.node.invoice_features());
 .with_bolt11_features($recv_node.node.invoice_features()).unwrap();
 $crate::get_route_and_payment_hash!($send_node, $recv_node, payment_params, $recv_value)
	}};
	($send_node: expr, $recv_node: expr, $payment_params: expr, $recv_value: expr) => {{
Expand DownExpand Up@@ -2272,7 +2272,7 @@ pub const TEST_FINAL_CLTV: u32 = 70;

pub fn route_payment<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route: &[&Node<'a, 'b, 'c>], recv_value: u64) -> (PaymentPreimage, PaymentHash, PaymentSecret) {
	let payment_params = PaymentParameters::from_node_id(expected_route.last().unwrap().node.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features(expected_route.last().unwrap().node.invoice_features());
 .with_bolt11_features(expected_route.last().unwrap().node.invoice_features()).unwrap();
	let route = get_route(origin_node, &payment_params, recv_value).unwrap();
	assert_eq!(route.paths.len(), 1);
	assert_eq!(route.paths[0].hops.len(), expected_route.len());
Expand All@@ -2286,7 +2286,7 @@ pub fn route_payment<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route:

pub fn route_over_limit<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route: &[&Node<'a, 'b, 'c>], recv_value: u64) {
	let payment_params = PaymentParameters::from_node_id(expected_route.last().unwrap().node.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features(expected_route.last().unwrap().node.invoice_features());
 .with_bolt11_features(expected_route.last().unwrap().node.invoice_features()).unwrap();
	let network_graph = origin_node.network_graph.read_only();
	let scorer = test_utils::TestScorer::new();
	let seed = [0u8; 32];
Expand Down

20 changes: 10 additions & 10 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1829,7 +1829,7 @@ fn test_channel_reserve_holding_cell_htlcs() {
	// attempt to send amt_msat > their_max_htlc_value_in_flight_msat
	{
 let payment_params = PaymentParameters::from_node_id(nodes[2].node.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features(nodes[2].node.invoice_features()).with_max_channel_saturation_power_of_half(0);
 .with_bolt11_features(nodes[2].node.invoice_features()).unwrap().with_max_channel_saturation_power_of_half(0);
 let (mut route, our_payment_hash, _, our_payment_secret) = get_route_and_payment_hash!(nodes[0], nodes[2], payment_params, recv_value_0);
 route.paths[0].hops.last_mut().unwrap().fee_msat += 1;
 assert!(route.paths[0].hops.iter().rev().skip(1).all(|h| h.fee_msat == feemsat));
Expand All@@ -1856,7 +1856,7 @@ fn test_channel_reserve_holding_cell_htlcs() {
 }

 let payment_params = PaymentParameters::from_node_id(nodes[2].node.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features(nodes[2].node.invoice_features()).with_max_channel_saturation_power_of_half(0);
 .with_bolt11_features(nodes[2].node.invoice_features()).unwrap().with_max_channel_saturation_power_of_half(0);
 let route = get_route!(nodes[0], payment_params, recv_value_0).unwrap();
 let (payment_preimage, ..) = send_along_route(&nodes[0], route, &[&nodes[1], &nodes[2]], recv_value_0);
 claim_payment(&nodes[0], &[&nodes[1], &nodes[2]], payment_preimage);
Expand DownExpand Up@@ -4795,7 +4795,7 @@ fn test_duplicate_payment_hash_one_failure_one_success() {
	// script push size limit so that the below script length checks match
	// ACCEPTED_HTLC_SCRIPT_WEIGHT.
	let payment_params = PaymentParameters::from_node_id(nodes[3].node.get_our_node_id(), TEST_FINAL_CLTV - 40)
 .with_features(nodes[3].node.invoice_features());
 .with_bolt11_features(nodes[3].node.invoice_features()).unwrap();
	let (route, _, _, _) = get_route_and_payment_hash!(nodes[0], nodes[3], payment_params, 800_000);
	send_along_route_with_secret(&nodes[0], route, &[&[&nodes[1], &nodes[2], &nodes[3]]], 800_000, duplicate_payment_hash, payment_secret);

Expand DownExpand Up@@ -6101,7 +6101,7 @@ fn test_update_add_htlc_bolt2_sender_cltv_expiry_too_high() {
	let _chan = create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 1000000, 0);

	let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), 0)
 .with_features(nodes[1].node.invoice_features());
 .with_bolt11_features(nodes[1].node.invoice_features()).unwrap();
	let (mut route, our_payment_hash, _, our_payment_secret) = get_route_and_payment_hash!(nodes[0], nodes[1], payment_params, 100000000);
	route.paths[0].hops.last_mut().unwrap().cltv_expiry_delta = 500000001;
	unwrap_send_err!(nodes[0].node.send_payment_with_route(&route, our_payment_hash,
Expand DownExpand Up@@ -7043,7 +7043,7 @@ fn test_check_htlc_underpaying() {

	let scorer = test_utils::TestScorer::new();
	let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
	let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), TEST_FINAL_CLTV).with_features(nodes[1].node.invoice_features());
	let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), TEST_FINAL_CLTV).with_bolt11_features(nodes[1].node.invoice_features()).unwrap();
	let route = get_route(&nodes[0].node.get_our_node_id(), &payment_params, &nodes[0].network_graph.read_only(), None, 10_000, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
	let (_, our_payment_hash, _) = get_payment_preimage_hash!(nodes[0]);
	let our_payment_secret = nodes[1].node.create_inbound_payment_for_hash(our_payment_hash, Some(100_000), 7200, None).unwrap();
Expand DownExpand Up@@ -7189,7 +7189,7 @@ fn test_bump_penalty_txn_on_revoked_commitment() {

	let payment_preimage = route_payment(&nodes[0], &vec!(&nodes[1])[..], 3000000).0;
	let payment_params = PaymentParameters::from_node_id(nodes[0].node.get_our_node_id(), 30)
 .with_features(nodes[0].node.invoice_features());
 .with_bolt11_features(nodes[0].node.invoice_features()).unwrap();
	let (route,_, _, _) = get_route_and_payment_hash!(nodes[1], nodes[0], payment_params, 3000000);
	send_along_route(&nodes[1], route, &vec!(&nodes[0])[..], 3000000);

Expand DownExpand Up@@ -7294,13 +7294,13 @@ fn test_bump_penalty_txn_on_revoked_htlcs() {

	let chan = create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 1000000, 59000000);
	// Lock HTLC in both directions (using a slightly lower CLTV delay to provide timely RBF bumps)
	let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), 50).with_features(nodes[1].node.invoice_features());
	let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), 50).with_bolt11_features(nodes[1].node.invoice_features()).unwrap();
	let scorer = test_utils::TestScorer::new();
	let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
	let route = get_route(&nodes[0].node.get_our_node_id(), &payment_params, &nodes[0].network_graph.read_only(), None,
 3_000_000, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
	let payment_preimage = send_along_route(&nodes[0], route, &[&nodes[1]], 3_000_000).0;
	let payment_params = PaymentParameters::from_node_id(nodes[0].node.get_our_node_id(), 50).with_features(nodes[0].node.invoice_features());
	let payment_params = PaymentParameters::from_node_id(nodes[0].node.get_our_node_id(), 50).with_bolt11_features(nodes[0].node.invoice_features()).unwrap();
	let route = get_route(&nodes[1].node.get_our_node_id(), &payment_params, &nodes[1].network_graph.read_only(), None,
 3_000_000, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
	send_along_route(&nodes[1], route, &[&nodes[0]], 3_000_000);
Expand DownExpand Up@@ -9300,7 +9300,7 @@ fn do_test_dup_htlc_second_rejected(test_for_second_fail_panic: bool) {
	let _chan = create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 100000, 10001);

	let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features(nodes[1].node.invoice_features());
 .with_bolt11_features(nodes[1].node.invoice_features()).unwrap();
	let route = get_route!(nodes[0], payment_params, 10_000).unwrap();

	let (our_payment_preimage, our_payment_hash, our_payment_secret) = get_payment_preimage_hash!(&nodes[1]);
Expand DownExpand Up@@ -9409,7 +9409,7 @@ fn test_inconsistent_mpp_params() {
	let chan_2_3 =create_announced_chan_between_nodes_with_value(&nodes, 2, 3, 100_000, 0);

	let payment_params = PaymentParameters::from_node_id(nodes[3].node.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features(nodes[3].node.invoice_features());
 .with_bolt11_features(nodes[3].node.invoice_features()).unwrap();
	let mut route = get_route!(nodes[0], payment_params, 15_000_000).unwrap();
	assert_eq!(route.paths.len(), 2);
	route.paths.sort_by(|path_a, _| {
Expand Down

10 changes: 5 additions & 5 deletions
lightning/src/ln/onion_route_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -714,8 +714,8 @@ fn do_test_onion_failure_stale_channel_update(announced_channel: bool) {
 htlc_minimum_msat: None,
 }])];
 let payment_params = PaymentParameters::from_node_id(*channel_to_update_counterparty, TEST_FINAL_CLTV)
 .with_features(nodes[2].node.invoice_features())
 .with_route_hints(hop_hints);
 .with_bolt11_features(nodes[2].node.invoice_features()).unwrap()
 .with_route_hints(hop_hints).unwrap();
 get_route_and_payment_hash!(nodes[0], nodes[2], payment_params, PAYMENT_AMT)
	};
	send_along_route_with_secret(&nodes[0], route.clone(), &[&[&nodes[1], &nodes[2]]], PAYMENT_AMT,
Expand DownExpand Up@@ -861,7 +861,7 @@ fn test_always_create_tlv_format_onion_payloads() {
	create_announced_chan_between_nodes(&nodes, 1, 2);

	let payment_params = PaymentParameters::from_node_id(nodes[2].node.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features(InvoiceFeatures::empty());
 .with_bolt11_features(InvoiceFeatures::empty()).unwrap();
	let (route, _payment_hash, _payment_preimage, _payment_secret) = get_route_and_payment_hash!(nodes[0], nodes[2], payment_params, 40000);

	let hops = &route.paths[0].hops;
Expand DownExpand Up@@ -963,7 +963,7 @@ macro_rules! get_phantom_route {
 let phantom_pubkey = $nodes[1].keys_manager.get_node_id(Recipient::PhantomNode).unwrap();
 let phantom_route_hint = $nodes[1].node.get_phantom_route_hints();
 let payment_params = PaymentParameters::from_node_id(phantom_pubkey, TEST_FINAL_CLTV)
 .with_features($nodes[1].node.invoice_features())
 .with_bolt11_features($nodes[1].node.invoice_features()).unwrap()
 .with_route_hints(vec![RouteHint(vec![
 RouteHintHop {
 src_node_id: $nodes[0].node.get_our_node_id(),
Expand All@@ -987,7 +987,7 @@ macro_rules! get_phantom_route {
 htlc_minimum_msat: None,
 htlc_maximum_msat: None,
 }
 ])]);
 ])]).unwrap();
 let scorer = test_utils::TestScorer::new();
 let network_graph = $nodes[0].network_graph.read_only();
 (get_route(
Expand Down
Loading

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

Skip to content
Prefactor PaymentParameters for blinded recipients#2258

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

from

May 8, 2023
 Merged


Prefactor PaymentParameters for blinded recipients
#2258
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
06eeefc

Groundwork for refactoring PaymentParams::Hints to ::Payee


valentinewallace Apr 26, 2023
cea78f5

Error if clear hints are provided for blinded PaymentParams


valentinewallace Apr 29, 2023
7f49f6b

Move payee node id from top level PaymentParams to Payee::Clear


valentinewallace Apr 29, 2023
6d62b62

Error if BOLT 11 features are provided for blinded payment params


valentinewallace Apr 29, 2023
91dc767

Move BOLT11 features from top level PaymentParams to Payee::Clear


valentinewallace May 3, 2023
746f25a

Add BOLT 12 features to PaymentParams


valentinewallace May 3, 2023
d56672c

Move final_cltv_expiry_delta from PaymentParams to Payee::Clear


valentinewallace Apr 27, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
fuzz/src/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -300,7 +300,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 let final_cltv_expiry_delta = slice_to_be32(get_slice!(4));
 let route_params = RouteParameters {
 payment_params: PaymentParameters::from_node_id(*target, final_cltv_expiry_delta)
 .with_route_hints(last_hops.clone()),
 .with_route_hints(last_hops.clone()).unwrap(),
 final_value_msat,
 };
 let _ = find_route(&our_pubkey, &route_params, &net_graph,
Expand Down

4 changes: 2 additions & 2 deletions
lightning-invoice/src/payment.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -152,9 +152,9 @@ fn pay_invoice_using_amount<P: Deref>(
	let mut payment_params = PaymentParameters::from_node_id(invoice.recover_payee_pub_key(),
 invoice.min_final_cltv_expiry_delta() as u32)
 .with_expiry_time(expiry_time_from_unix_epoch(invoice).as_secs())
 .with_route_hints(invoice.route_hints());
 .with_route_hints(invoice.route_hints()).unwrap();
	if let Some(features) = invoice.features() {
 payment_params = payment_params.with_features(features.clone());
 payment_params = payment_params.with_bolt11_features(features.clone()).unwrap();
	}
	let route_params = RouteParameters {
 payment_params,
Expand Down

8 changes: 4 additions & 4 deletions
lightning-invoice/src/utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -838,8 +838,8 @@ mod test {

 let payment_params = PaymentParameters::from_node_id(invoice.recover_payee_pub_key(),
 invoice.min_final_cltv_expiry_delta() as u32)
 .with_features(invoice.features().unwrap().clone())
 .with_route_hints(invoice.route_hints());
 .with_bolt11_features(invoice.features().unwrap().clone()).unwrap()
 .with_route_hints(invoice.route_hints()).unwrap();
 let route_params = RouteParameters {
 payment_params,
 final_value_msat: invoice.amount_milli_satoshis().unwrap(),
Expand DownExpand Up@@ -1294,8 +1294,8 @@ mod test {

 let payment_params = PaymentParameters::from_node_id(invoice.recover_payee_pub_key(),
 invoice.min_final_cltv_expiry_delta() as u32)
 .with_features(invoice.features().unwrap().clone())
 .with_route_hints(invoice.route_hints());
 .with_bolt11_features(invoice.features().unwrap().clone()).unwrap()
 .with_route_hints(invoice.route_hints()).unwrap();
 let params = RouteParameters {
 payment_params,
 final_value_msat: invoice.amount_milli_satoshis().unwrap(),
Expand Down

10 changes: 6 additions & 4 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,7 @@ use crate::ln::features::{ChannelFeatures, ChannelTypeFeatures, InitFeatures, No
#[cfg(any(feature = "_test_utils", test))]
use crate::ln::features::InvoiceFeatures;
use crate::routing::gossip::NetworkGraph;
use crate::routing::router::{BlindedTail, DefaultRouter, InFlightHtlcs, Path, PaymentParameters, Route, RouteHop, RouteParameters, Router};
use crate::routing::router::{BlindedTail, DefaultRouter, InFlightHtlcs, Path, Payee, PaymentParameters, Route, RouteHop, RouteParameters, Router};
use crate::routing::scoring::ProbabilisticScorer;
use crate::ln::msgs;
use crate::ln::onion_utils;
Expand DownExpand Up@@ -7061,8 +7061,10 @@ impl Readable for HTLCSource {
 return Err(DecodeError::InvalidValue);
 }
 if let Some(params) = payment_params.as_mut() {
 if params.final_cltv_expiry_delta == 0 {
 params.final_cltv_expiry_delta = path.final_cltv_expiry_delta().ok_or(DecodeError::InvalidValue)?;
 if let Payee::Clear { ref mut final_cltv_expiry_delta, .. } = params.payee {
 if final_cltv_expiry_delta == &0 {
 *final_cltv_expiry_delta = path.final_cltv_expiry_delta().ok_or(DecodeError::InvalidValue)?;
 }
 }
 }
 Ok(HTLCSource::OutboundRoute {
Expand DownExpand Up@@ -9180,7 +9182,7 @@ pub mod bench {
 macro_rules! send_payment {
 ($node_a: expr, $node_b: expr) => {
 let payment_params = PaymentParameters::from_node_id($node_b.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features($node_b.invoice_features());
 .with_bolt11_features($node_b.invoice_features()).unwrap();
 let mut payment_preimage = PaymentPreimage([0; 32]);
 payment_preimage.0[0..8].copy_from_slice(&payment_count.to_le_bytes());
 payment_count += 1;
Expand Down

9 changes: 9 additions & 0 deletions
lightning/src/ln/features.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -532,6 +532,14 @@ impl InvoiceFeatures {
	}
}

impl Bolt12InvoiceFeatures {
	/// Converts `Bolt12InvoiceFeatures` to `Features<C>`. Only known `Bolt12InvoiceFeatures` relevant
	/// to context `C` are included in the result.
	pub(crate) fn to_context<C: sealed::Context>(&self) -> Features<C> {
 self.to_context_internal()
	}
}

Comment thread
valentinewallace marked this conversation as resolved.

impl ChannelTypeFeatures {
	// Maps the relevant `InitFeatures` to `ChannelTypeFeatures`. Any unknown features to
	// `ChannelTypeFeatures` are not included in the result.
Expand DownExpand Up@@ -791,6 +799,7 @@ impl_feature_len_prefixed_write!(InitFeatures);
impl_feature_len_prefixed_write!(ChannelFeatures);
impl_feature_len_prefixed_write!(NodeFeatures);
impl_feature_len_prefixed_write!(InvoiceFeatures);
impl_feature_len_prefixed_write!(Bolt12InvoiceFeatures);
impl_feature_len_prefixed_write!(BlindedHopFeatures);

// Some features only appear inside of TLVs, so they don't have a length prefix when serialized.
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1723,7 +1723,7 @@ macro_rules! get_route {
macro_rules! get_route_and_payment_hash {
	($send_node: expr, $recv_node: expr, $recv_value: expr) => {{
 let payment_params = $crate::routing::router::PaymentParameters::from_node_id($recv_node.node.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features($recv_node.node.invoice_features());
 .with_bolt11_features($recv_node.node.invoice_features()).unwrap();
 $crate::get_route_and_payment_hash!($send_node, $recv_node, payment_params, $recv_value)
	}};
	($send_node: expr, $recv_node: expr, $payment_params: expr, $recv_value: expr) => {{
Expand DownExpand Up@@ -2272,7 +2272,7 @@ pub const TEST_FINAL_CLTV: u32 = 70;

pub fn route_payment<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route: &[&Node<'a, 'b, 'c>], recv_value: u64) -> (PaymentPreimage, PaymentHash, PaymentSecret) {
	let payment_params = PaymentParameters::from_node_id(expected_route.last().unwrap().node.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features(expected_route.last().unwrap().node.invoice_features());
 .with_bolt11_features(expected_route.last().unwrap().node.invoice_features()).unwrap();
	let route = get_route(origin_node, &payment_params, recv_value).unwrap();
	assert_eq!(route.paths.len(), 1);
	assert_eq!(route.paths[0].hops.len(), expected_route.len());
Expand All@@ -2286,7 +2286,7 @@ pub fn route_payment<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route:

pub fn route_over_limit<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route: &[&Node<'a, 'b, 'c>], recv_value: u64) {
	let payment_params = PaymentParameters::from_node_id(expected_route.last().unwrap().node.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features(expected_route.last().unwrap().node.invoice_features());
 .with_bolt11_features(expected_route.last().unwrap().node.invoice_features()).unwrap();
	let network_graph = origin_node.network_graph.read_only();
	let scorer = test_utils::TestScorer::new();
	let seed = [0u8; 32];
Expand Down

20 changes: 10 additions & 10 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1829,7 +1829,7 @@ fn test_channel_reserve_holding_cell_htlcs() {
	// attempt to send amt_msat > their_max_htlc_value_in_flight_msat
	{
 let payment_params = PaymentParameters::from_node_id(nodes[2].node.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features(nodes[2].node.invoice_features()).with_max_channel_saturation_power_of_half(0);
 .with_bolt11_features(nodes[2].node.invoice_features()).unwrap().with_max_channel_saturation_power_of_half(0);
 let (mut route, our_payment_hash, _, our_payment_secret) = get_route_and_payment_hash!(nodes[0], nodes[2], payment_params, recv_value_0);
 route.paths[0].hops.last_mut().unwrap().fee_msat += 1;
 assert!(route.paths[0].hops.iter().rev().skip(1).all(|h| h.fee_msat == feemsat));
Expand All@@ -1856,7 +1856,7 @@ fn test_channel_reserve_holding_cell_htlcs() {
 }

 let payment_params = PaymentParameters::from_node_id(nodes[2].node.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features(nodes[2].node.invoice_features()).with_max_channel_saturation_power_of_half(0);
 .with_bolt11_features(nodes[2].node.invoice_features()).unwrap().with_max_channel_saturation_power_of_half(0);
 let route = get_route!(nodes[0], payment_params, recv_value_0).unwrap();
 let (payment_preimage, ..) = send_along_route(&nodes[0], route, &[&nodes[1], &nodes[2]], recv_value_0);
 claim_payment(&nodes[0], &[&nodes[1], &nodes[2]], payment_preimage);
Expand DownExpand Up@@ -4795,7 +4795,7 @@ fn test_duplicate_payment_hash_one_failure_one_success() {
	// script push size limit so that the below script length checks match
	// ACCEPTED_HTLC_SCRIPT_WEIGHT.
	let payment_params = PaymentParameters::from_node_id(nodes[3].node.get_our_node_id(), TEST_FINAL_CLTV - 40)
 .with_features(nodes[3].node.invoice_features());
 .with_bolt11_features(nodes[3].node.invoice_features()).unwrap();
	let (route, _, _, _) = get_route_and_payment_hash!(nodes[0], nodes[3], payment_params, 800_000);
	send_along_route_with_secret(&nodes[0], route, &[&[&nodes[1], &nodes[2], &nodes[3]]], 800_000, duplicate_payment_hash, payment_secret);

Expand DownExpand Up@@ -6101,7 +6101,7 @@ fn test_update_add_htlc_bolt2_sender_cltv_expiry_too_high() {
	let _chan = create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 1000000, 0);

	let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), 0)
 .with_features(nodes[1].node.invoice_features());
 .with_bolt11_features(nodes[1].node.invoice_features()).unwrap();
	let (mut route, our_payment_hash, _, our_payment_secret) = get_route_and_payment_hash!(nodes[0], nodes[1], payment_params, 100000000);
	route.paths[0].hops.last_mut().unwrap().cltv_expiry_delta = 500000001;
	unwrap_send_err!(nodes[0].node.send_payment_with_route(&route, our_payment_hash,
Expand DownExpand Up@@ -7043,7 +7043,7 @@ fn test_check_htlc_underpaying() {

	let scorer = test_utils::TestScorer::new();
	let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
	let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), TEST_FINAL_CLTV).with_features(nodes[1].node.invoice_features());
	let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), TEST_FINAL_CLTV).with_bolt11_features(nodes[1].node.invoice_features()).unwrap();
	let route = get_route(&nodes[0].node.get_our_node_id(), &payment_params, &nodes[0].network_graph.read_only(), None, 10_000, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
	let (_, our_payment_hash, _) = get_payment_preimage_hash!(nodes[0]);
	let our_payment_secret = nodes[1].node.create_inbound_payment_for_hash(our_payment_hash, Some(100_000), 7200, None).unwrap();
Expand DownExpand Up@@ -7189,7 +7189,7 @@ fn test_bump_penalty_txn_on_revoked_commitment() {

	let payment_preimage = route_payment(&nodes[0], &vec!(&nodes[1])[..], 3000000).0;
	let payment_params = PaymentParameters::from_node_id(nodes[0].node.get_our_node_id(), 30)
 .with_features(nodes[0].node.invoice_features());
 .with_bolt11_features(nodes[0].node.invoice_features()).unwrap();
	let (route,_, _, _) = get_route_and_payment_hash!(nodes[1], nodes[0], payment_params, 3000000);
	send_along_route(&nodes[1], route, &vec!(&nodes[0])[..], 3000000);

Expand DownExpand Up@@ -7294,13 +7294,13 @@ fn test_bump_penalty_txn_on_revoked_htlcs() {

	let chan = create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 1000000, 59000000);
	// Lock HTLC in both directions (using a slightly lower CLTV delay to provide timely RBF bumps)
	let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), 50).with_features(nodes[1].node.invoice_features());
	let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), 50).with_bolt11_features(nodes[1].node.invoice_features()).unwrap();
	let scorer = test_utils::TestScorer::new();
	let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
	let route = get_route(&nodes[0].node.get_our_node_id(), &payment_params, &nodes[0].network_graph.read_only(), None,
 3_000_000, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
	let payment_preimage = send_along_route(&nodes[0], route, &[&nodes[1]], 3_000_000).0;
	let payment_params = PaymentParameters::from_node_id(nodes[0].node.get_our_node_id(), 50).with_features(nodes[0].node.invoice_features());
	let payment_params = PaymentParameters::from_node_id(nodes[0].node.get_our_node_id(), 50).with_bolt11_features(nodes[0].node.invoice_features()).unwrap();
	let route = get_route(&nodes[1].node.get_our_node_id(), &payment_params, &nodes[1].network_graph.read_only(), None,
 3_000_000, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
	send_along_route(&nodes[1], route, &[&nodes[0]], 3_000_000);
Expand DownExpand Up@@ -9300,7 +9300,7 @@ fn do_test_dup_htlc_second_rejected(test_for_second_fail_panic: bool) {
	let _chan = create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 100000, 10001);

	let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features(nodes[1].node.invoice_features());
 .with_bolt11_features(nodes[1].node.invoice_features()).unwrap();
	let route = get_route!(nodes[0], payment_params, 10_000).unwrap();

	let (our_payment_preimage, our_payment_hash, our_payment_secret) = get_payment_preimage_hash!(&nodes[1]);
Expand DownExpand Up@@ -9409,7 +9409,7 @@ fn test_inconsistent_mpp_params() {
	let chan_2_3 =create_announced_chan_between_nodes_with_value(&nodes, 2, 3, 100_000, 0);

	let payment_params = PaymentParameters::from_node_id(nodes[3].node.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features(nodes[3].node.invoice_features());
 .with_bolt11_features(nodes[3].node.invoice_features()).unwrap();
	let mut route = get_route!(nodes[0], payment_params, 15_000_000).unwrap();
	assert_eq!(route.paths.len(), 2);
	route.paths.sort_by(|path_a, _| {
Expand Down

10 changes: 5 additions & 5 deletions
lightning/src/ln/onion_route_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -714,8 +714,8 @@ fn do_test_onion_failure_stale_channel_update(announced_channel: bool) {
 htlc_minimum_msat: None,
 }])];
 let payment_params = PaymentParameters::from_node_id(*channel_to_update_counterparty, TEST_FINAL_CLTV)
 .with_features(nodes[2].node.invoice_features())
 .with_route_hints(hop_hints);
 .with_bolt11_features(nodes[2].node.invoice_features()).unwrap()
 .with_route_hints(hop_hints).unwrap();
 get_route_and_payment_hash!(nodes[0], nodes[2], payment_params, PAYMENT_AMT)
	};
	send_along_route_with_secret(&nodes[0], route.clone(), &[&[&nodes[1], &nodes[2]]], PAYMENT_AMT,
Expand DownExpand Up@@ -861,7 +861,7 @@ fn test_always_create_tlv_format_onion_payloads() {
	create_announced_chan_between_nodes(&nodes, 1, 2);

	let payment_params = PaymentParameters::from_node_id(nodes[2].node.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features(InvoiceFeatures::empty());
 .with_bolt11_features(InvoiceFeatures::empty()).unwrap();
	let (route, _payment_hash, _payment_preimage, _payment_secret) = get_route_and_payment_hash!(nodes[0], nodes[2], payment_params, 40000);

	let hops = &route.paths[0].hops;
Expand DownExpand Up@@ -963,7 +963,7 @@ macro_rules! get_phantom_route {
 let phantom_pubkey = $nodes[1].keys_manager.get_node_id(Recipient::PhantomNode).unwrap();
 let phantom_route_hint = $nodes[1].node.get_phantom_route_hints();
 let payment_params = PaymentParameters::from_node_id(phantom_pubkey, TEST_FINAL_CLTV)
 .with_features($nodes[1].node.invoice_features())
 .with_bolt11_features($nodes[1].node.invoice_features()).unwrap()
 .with_route_hints(vec![RouteHint(vec![
 RouteHintHop {
 src_node_id: $nodes[0].node.get_our_node_id(),
Expand All@@ -987,7 +987,7 @@ macro_rules! get_phantom_route {
 htlc_minimum_msat: None,
 htlc_maximum_msat: None,
 }
 ])]);
 ])]).unwrap();
 let scorer = test_utils::TestScorer::new();
 let network_graph = $nodes[0].network_graph.read_only();
 (get_route(
Expand Down
Loading

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

Skip to content
Prefactor PaymentParameters for blinded recipients#2258

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

from

May 8, 2023
 Merged


Prefactor PaymentParameters for blinded recipients
#2258
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
06eeefc

Groundwork for refactoring PaymentParams::Hints to ::Payee


valentinewallace Apr 26, 2023
cea78f5

Error if clear hints are provided for blinded PaymentParams


valentinewallace Apr 29, 2023
7f49f6b

Move payee node id from top level PaymentParams to Payee::Clear


valentinewallace Apr 29, 2023
6d62b62

Error if BOLT 11 features are provided for blinded payment params


valentinewallace Apr 29, 2023
91dc767

Move BOLT11 features from top level PaymentParams to Payee::Clear


valentinewallace May 3, 2023
746f25a

Add BOLT 12 features to PaymentParams


valentinewallace May 3, 2023
d56672c

Move final_cltv_expiry_delta from PaymentParams to Payee::Clear


valentinewallace Apr 27, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
fuzz/src/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -300,7 +300,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 let final_cltv_expiry_delta = slice_to_be32(get_slice!(4));
 let route_params = RouteParameters {
 payment_params: PaymentParameters::from_node_id(*target, final_cltv_expiry_delta)
 .with_route_hints(last_hops.clone()),
 .with_route_hints(last_hops.clone()).unwrap(),
 final_value_msat,
 };
 let _ = find_route(&our_pubkey, &route_params, &net_graph,
Expand Down

4 changes: 2 additions & 2 deletions
lightning-invoice/src/payment.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -152,9 +152,9 @@ fn pay_invoice_using_amount<P: Deref>(
	let mut payment_params = PaymentParameters::from_node_id(invoice.recover_payee_pub_key(),
 invoice.min_final_cltv_expiry_delta() as u32)
 .with_expiry_time(expiry_time_from_unix_epoch(invoice).as_secs())
 .with_route_hints(invoice.route_hints());
 .with_route_hints(invoice.route_hints()).unwrap();
	if let Some(features) = invoice.features() {
 payment_params = payment_params.with_features(features.clone());
 payment_params = payment_params.with_bolt11_features(features.clone()).unwrap();
	}
	let route_params = RouteParameters {
 payment_params,
Expand Down

8 changes: 4 additions & 4 deletions
lightning-invoice/src/utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -838,8 +838,8 @@ mod test {

 let payment_params = PaymentParameters::from_node_id(invoice.recover_payee_pub_key(),
 invoice.min_final_cltv_expiry_delta() as u32)
 .with_features(invoice.features().unwrap().clone())
 .with_route_hints(invoice.route_hints());
 .with_bolt11_features(invoice.features().unwrap().clone()).unwrap()
 .with_route_hints(invoice.route_hints()).unwrap();
 let route_params = RouteParameters {
 payment_params,
 final_value_msat: invoice.amount_milli_satoshis().unwrap(),
Expand DownExpand Up@@ -1294,8 +1294,8 @@ mod test {

 let payment_params = PaymentParameters::from_node_id(invoice.recover_payee_pub_key(),
 invoice.min_final_cltv_expiry_delta() as u32)
 .with_features(invoice.features().unwrap().clone())
 .with_route_hints(invoice.route_hints());
 .with_bolt11_features(invoice.features().unwrap().clone()).unwrap()
 .with_route_hints(invoice.route_hints()).unwrap();
 let params = RouteParameters {
 payment_params,
 final_value_msat: invoice.amount_milli_satoshis().unwrap(),
Expand Down

10 changes: 6 additions & 4 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,7 @@ use crate::ln::features::{ChannelFeatures, ChannelTypeFeatures, InitFeatures, No
#[cfg(any(feature = "_test_utils", test))]
use crate::ln::features::InvoiceFeatures;
use crate::routing::gossip::NetworkGraph;
use crate::routing::router::{BlindedTail, DefaultRouter, InFlightHtlcs, Path, PaymentParameters, Route, RouteHop, RouteParameters, Router};
use crate::routing::router::{BlindedTail, DefaultRouter, InFlightHtlcs, Path, Payee, PaymentParameters, Route, RouteHop, RouteParameters, Router};
use crate::routing::scoring::ProbabilisticScorer;
use crate::ln::msgs;
use crate::ln::onion_utils;
Expand DownExpand Up@@ -7061,8 +7061,10 @@ impl Readable for HTLCSource {
 return Err(DecodeError::InvalidValue);
 }
 if let Some(params) = payment_params.as_mut() {
 if params.final_cltv_expiry_delta == 0 {
 params.final_cltv_expiry_delta = path.final_cltv_expiry_delta().ok_or(DecodeError::InvalidValue)?;
 if let Payee::Clear { ref mut final_cltv_expiry_delta, .. } = params.payee {
 if final_cltv_expiry_delta == &0 {
 *final_cltv_expiry_delta = path.final_cltv_expiry_delta().ok_or(DecodeError::InvalidValue)?;
 }
 }
 }
 Ok(HTLCSource::OutboundRoute {
Expand DownExpand Up@@ -9180,7 +9182,7 @@ pub mod bench {
 macro_rules! send_payment {
 ($node_a: expr, $node_b: expr) => {
 let payment_params = PaymentParameters::from_node_id($node_b.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features($node_b.invoice_features());
 .with_bolt11_features($node_b.invoice_features()).unwrap();
 let mut payment_preimage = PaymentPreimage([0; 32]);
 payment_preimage.0[0..8].copy_from_slice(&payment_count.to_le_bytes());
 payment_count += 1;
Expand Down

9 changes: 9 additions & 0 deletions
lightning/src/ln/features.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -532,6 +532,14 @@ impl InvoiceFeatures {
	}
}

impl Bolt12InvoiceFeatures {
	/// Converts `Bolt12InvoiceFeatures` to `Features<C>`. Only known `Bolt12InvoiceFeatures` relevant
	/// to context `C` are included in the result.
	pub(crate) fn to_context<C: sealed::Context>(&self) -> Features<C> {
 self.to_context_internal()
	}
}

Comment thread
valentinewallace marked this conversation as resolved.

impl ChannelTypeFeatures {
	// Maps the relevant `InitFeatures` to `ChannelTypeFeatures`. Any unknown features to
	// `ChannelTypeFeatures` are not included in the result.
Expand DownExpand Up@@ -791,6 +799,7 @@ impl_feature_len_prefixed_write!(InitFeatures);
impl_feature_len_prefixed_write!(ChannelFeatures);
impl_feature_len_prefixed_write!(NodeFeatures);
impl_feature_len_prefixed_write!(InvoiceFeatures);
impl_feature_len_prefixed_write!(Bolt12InvoiceFeatures);
impl_feature_len_prefixed_write!(BlindedHopFeatures);

// Some features only appear inside of TLVs, so they don't have a length prefix when serialized.
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1723,7 +1723,7 @@ macro_rules! get_route {
macro_rules! get_route_and_payment_hash {
	($send_node: expr, $recv_node: expr, $recv_value: expr) => {{
 let payment_params = $crate::routing::router::PaymentParameters::from_node_id($recv_node.node.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features($recv_node.node.invoice_features());
 .with_bolt11_features($recv_node.node.invoice_features()).unwrap();
 $crate::get_route_and_payment_hash!($send_node, $recv_node, payment_params, $recv_value)
	}};
	($send_node: expr, $recv_node: expr, $payment_params: expr, $recv_value: expr) => {{
Expand DownExpand Up@@ -2272,7 +2272,7 @@ pub const TEST_FINAL_CLTV: u32 = 70;

pub fn route_payment<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route: &[&Node<'a, 'b, 'c>], recv_value: u64) -> (PaymentPreimage, PaymentHash, PaymentSecret) {
	let payment_params = PaymentParameters::from_node_id(expected_route.last().unwrap().node.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features(expected_route.last().unwrap().node.invoice_features());
 .with_bolt11_features(expected_route.last().unwrap().node.invoice_features()).unwrap();
	let route = get_route(origin_node, &payment_params, recv_value).unwrap();
	assert_eq!(route.paths.len(), 1);
	assert_eq!(route.paths[0].hops.len(), expected_route.len());
Expand All@@ -2286,7 +2286,7 @@ pub fn route_payment<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route:

pub fn route_over_limit<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route: &[&Node<'a, 'b, 'c>], recv_value: u64) {
	let payment_params = PaymentParameters::from_node_id(expected_route.last().unwrap().node.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features(expected_route.last().unwrap().node.invoice_features());
 .with_bolt11_features(expected_route.last().unwrap().node.invoice_features()).unwrap();
	let network_graph = origin_node.network_graph.read_only();
	let scorer = test_utils::TestScorer::new();
	let seed = [0u8; 32];
Expand Down

20 changes: 10 additions & 10 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1829,7 +1829,7 @@ fn test_channel_reserve_holding_cell_htlcs() {
	// attempt to send amt_msat > their_max_htlc_value_in_flight_msat
	{
 let payment_params = PaymentParameters::from_node_id(nodes[2].node.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features(nodes[2].node.invoice_features()).with_max_channel_saturation_power_of_half(0);
 .with_bolt11_features(nodes[2].node.invoice_features()).unwrap().with_max_channel_saturation_power_of_half(0);
 let (mut route, our_payment_hash, _, our_payment_secret) = get_route_and_payment_hash!(nodes[0], nodes[2], payment_params, recv_value_0);
 route.paths[0].hops.last_mut().unwrap().fee_msat += 1;
 assert!(route.paths[0].hops.iter().rev().skip(1).all(|h| h.fee_msat == feemsat));
Expand All@@ -1856,7 +1856,7 @@ fn test_channel_reserve_holding_cell_htlcs() {
 }

 let payment_params = PaymentParameters::from_node_id(nodes[2].node.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features(nodes[2].node.invoice_features()).with_max_channel_saturation_power_of_half(0);
 .with_bolt11_features(nodes[2].node.invoice_features()).unwrap().with_max_channel_saturation_power_of_half(0);
 let route = get_route!(nodes[0], payment_params, recv_value_0).unwrap();
 let (payment_preimage, ..) = send_along_route(&nodes[0], route, &[&nodes[1], &nodes[2]], recv_value_0);
 claim_payment(&nodes[0], &[&nodes[1], &nodes[2]], payment_preimage);
Expand DownExpand Up@@ -4795,7 +4795,7 @@ fn test_duplicate_payment_hash_one_failure_one_success() {
	// script push size limit so that the below script length checks match
	// ACCEPTED_HTLC_SCRIPT_WEIGHT.
	let payment_params = PaymentParameters::from_node_id(nodes[3].node.get_our_node_id(), TEST_FINAL_CLTV - 40)
 .with_features(nodes[3].node.invoice_features());
 .with_bolt11_features(nodes[3].node.invoice_features()).unwrap();
	let (route, _, _, _) = get_route_and_payment_hash!(nodes[0], nodes[3], payment_params, 800_000);
	send_along_route_with_secret(&nodes[0], route, &[&[&nodes[1], &nodes[2], &nodes[3]]], 800_000, duplicate_payment_hash, payment_secret);

Expand DownExpand Up@@ -6101,7 +6101,7 @@ fn test_update_add_htlc_bolt2_sender_cltv_expiry_too_high() {
	let _chan = create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 1000000, 0);

	let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), 0)
 .with_features(nodes[1].node.invoice_features());
 .with_bolt11_features(nodes[1].node.invoice_features()).unwrap();
	let (mut route, our_payment_hash, _, our_payment_secret) = get_route_and_payment_hash!(nodes[0], nodes[1], payment_params, 100000000);
	route.paths[0].hops.last_mut().unwrap().cltv_expiry_delta = 500000001;
	unwrap_send_err!(nodes[0].node.send_payment_with_route(&route, our_payment_hash,
Expand DownExpand Up@@ -7043,7 +7043,7 @@ fn test_check_htlc_underpaying() {

	let scorer = test_utils::TestScorer::new();
	let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
	let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), TEST_FINAL_CLTV).with_features(nodes[1].node.invoice_features());
	let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), TEST_FINAL_CLTV).with_bolt11_features(nodes[1].node.invoice_features()).unwrap();
	let route = get_route(&nodes[0].node.get_our_node_id(), &payment_params, &nodes[0].network_graph.read_only(), None, 10_000, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
	let (_, our_payment_hash, _) = get_payment_preimage_hash!(nodes[0]);
	let our_payment_secret = nodes[1].node.create_inbound_payment_for_hash(our_payment_hash, Some(100_000), 7200, None).unwrap();
Expand DownExpand Up@@ -7189,7 +7189,7 @@ fn test_bump_penalty_txn_on_revoked_commitment() {

	let payment_preimage = route_payment(&nodes[0], &vec!(&nodes[1])[..], 3000000).0;
	let payment_params = PaymentParameters::from_node_id(nodes[0].node.get_our_node_id(), 30)
 .with_features(nodes[0].node.invoice_features());
 .with_bolt11_features(nodes[0].node.invoice_features()).unwrap();
	let (route,_, _, _) = get_route_and_payment_hash!(nodes[1], nodes[0], payment_params, 3000000);
	send_along_route(&nodes[1], route, &vec!(&nodes[0])[..], 3000000);

Expand DownExpand Up@@ -7294,13 +7294,13 @@ fn test_bump_penalty_txn_on_revoked_htlcs() {

	let chan = create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 1000000, 59000000);
	// Lock HTLC in both directions (using a slightly lower CLTV delay to provide timely RBF bumps)
	let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), 50).with_features(nodes[1].node.invoice_features());
	let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), 50).with_bolt11_features(nodes[1].node.invoice_features()).unwrap();
	let scorer = test_utils::TestScorer::new();
	let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
	let route = get_route(&nodes[0].node.get_our_node_id(), &payment_params, &nodes[0].network_graph.read_only(), None,
 3_000_000, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
	let payment_preimage = send_along_route(&nodes[0], route, &[&nodes[1]], 3_000_000).0;
	let payment_params = PaymentParameters::from_node_id(nodes[0].node.get_our_node_id(), 50).with_features(nodes[0].node.invoice_features());
	let payment_params = PaymentParameters::from_node_id(nodes[0].node.get_our_node_id(), 50).with_bolt11_features(nodes[0].node.invoice_features()).unwrap();
	let route = get_route(&nodes[1].node.get_our_node_id(), &payment_params, &nodes[1].network_graph.read_only(), None,
 3_000_000, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
	send_along_route(&nodes[1], route, &[&nodes[0]], 3_000_000);
Expand DownExpand Up@@ -9300,7 +9300,7 @@ fn do_test_dup_htlc_second_rejected(test_for_second_fail_panic: bool) {
	let _chan = create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 100000, 10001);

	let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features(nodes[1].node.invoice_features());
 .with_bolt11_features(nodes[1].node.invoice_features()).unwrap();
	let route = get_route!(nodes[0], payment_params, 10_000).unwrap();

	let (our_payment_preimage, our_payment_hash, our_payment_secret) = get_payment_preimage_hash!(&nodes[1]);
Expand DownExpand Up@@ -9409,7 +9409,7 @@ fn test_inconsistent_mpp_params() {
	let chan_2_3 =create_announced_chan_between_nodes_with_value(&nodes, 2, 3, 100_000, 0);

	let payment_params = PaymentParameters::from_node_id(nodes[3].node.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features(nodes[3].node.invoice_features());
 .with_bolt11_features(nodes[3].node.invoice_features()).unwrap();
	let mut route = get_route!(nodes[0], payment_params, 15_000_000).unwrap();
	assert_eq!(route.paths.len(), 2);
	route.paths.sort_by(|path_a, _| {
Expand Down

10 changes: 5 additions & 5 deletions
lightning/src/ln/onion_route_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -714,8 +714,8 @@ fn do_test_onion_failure_stale_channel_update(announced_channel: bool) {
 htlc_minimum_msat: None,
 }])];
 let payment_params = PaymentParameters::from_node_id(*channel_to_update_counterparty, TEST_FINAL_CLTV)
 .with_features(nodes[2].node.invoice_features())
 .with_route_hints(hop_hints);
 .with_bolt11_features(nodes[2].node.invoice_features()).unwrap()
 .with_route_hints(hop_hints).unwrap();
 get_route_and_payment_hash!(nodes[0], nodes[2], payment_params, PAYMENT_AMT)
	};
	send_along_route_with_secret(&nodes[0], route.clone(), &[&[&nodes[1], &nodes[2]]], PAYMENT_AMT,
Expand DownExpand Up@@ -861,7 +861,7 @@ fn test_always_create_tlv_format_onion_payloads() {
	create_announced_chan_between_nodes(&nodes, 1, 2);

	let payment_params = PaymentParameters::from_node_id(nodes[2].node.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features(InvoiceFeatures::empty());
 .with_bolt11_features(InvoiceFeatures::empty()).unwrap();
	let (route, _payment_hash, _payment_preimage, _payment_secret) = get_route_and_payment_hash!(nodes[0], nodes[2], payment_params, 40000);

	let hops = &route.paths[0].hops;
Expand DownExpand Up@@ -963,7 +963,7 @@ macro_rules! get_phantom_route {
 let phantom_pubkey = $nodes[1].keys_manager.get_node_id(Recipient::PhantomNode).unwrap();
 let phantom_route_hint = $nodes[1].node.get_phantom_route_hints();
 let payment_params = PaymentParameters::from_node_id(phantom_pubkey, TEST_FINAL_CLTV)
 .with_features($nodes[1].node.invoice_features())
 .with_bolt11_features($nodes[1].node.invoice_features()).unwrap()
 .with_route_hints(vec![RouteHint(vec![
 RouteHintHop {
 src_node_id: $nodes[0].node.get_our_node_id(),
Expand All@@ -987,7 +987,7 @@ macro_rules! get_phantom_route {
 htlc_minimum_msat: None,
 htlc_maximum_msat: None,
 }
 ])]);
 ])]).unwrap();
 let scorer = test_utils::TestScorer::new();
 let network_graph = $nodes[0].network_graph.read_only();
 (get_route(
Expand Down
Loading

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

Skip to content
Prefactor PaymentParameters for blinded recipients#2258

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

from

May 8, 2023
 Merged


Prefactor PaymentParameters for blinded recipients
#2258
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
06eeefc

Groundwork for refactoring PaymentParams::Hints to ::Payee


valentinewallace Apr 26, 2023
cea78f5

Error if clear hints are provided for blinded PaymentParams


valentinewallace Apr 29, 2023
7f49f6b

Move payee node id from top level PaymentParams to Payee::Clear


valentinewallace Apr 29, 2023
6d62b62

Error if BOLT 11 features are provided for blinded payment params


valentinewallace Apr 29, 2023
91dc767

Move BOLT11 features from top level PaymentParams to Payee::Clear


valentinewallace May 3, 2023
746f25a

Add BOLT 12 features to PaymentParams


valentinewallace May 3, 2023
d56672c

Move final_cltv_expiry_delta from PaymentParams to Payee::Clear


valentinewallace Apr 27, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
fuzz/src/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -300,7 +300,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 let final_cltv_expiry_delta = slice_to_be32(get_slice!(4));
 let route_params = RouteParameters {
 payment_params: PaymentParameters::from_node_id(*target, final_cltv_expiry_delta)
 .with_route_hints(last_hops.clone()),
 .with_route_hints(last_hops.clone()).unwrap(),
 final_value_msat,
 };
 let _ = find_route(&our_pubkey, &route_params, &net_graph,
Expand Down

4 changes: 2 additions & 2 deletions
lightning-invoice/src/payment.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -152,9 +152,9 @@ fn pay_invoice_using_amount<P: Deref>(
	let mut payment_params = PaymentParameters::from_node_id(invoice.recover_payee_pub_key(),
 invoice.min_final_cltv_expiry_delta() as u32)
 .with_expiry_time(expiry_time_from_unix_epoch(invoice).as_secs())
 .with_route_hints(invoice.route_hints());
 .with_route_hints(invoice.route_hints()).unwrap();
	if let Some(features) = invoice.features() {
 payment_params = payment_params.with_features(features.clone());
 payment_params = payment_params.with_bolt11_features(features.clone()).unwrap();
	}
	let route_params = RouteParameters {
 payment_params,
Expand Down

8 changes: 4 additions & 4 deletions
lightning-invoice/src/utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -838,8 +838,8 @@ mod test {

 let payment_params = PaymentParameters::from_node_id(invoice.recover_payee_pub_key(),
 invoice.min_final_cltv_expiry_delta() as u32)
 .with_features(invoice.features().unwrap().clone())
 .with_route_hints(invoice.route_hints());
 .with_bolt11_features(invoice.features().unwrap().clone()).unwrap()
 .with_route_hints(invoice.route_hints()).unwrap();
 let route_params = RouteParameters {
 payment_params,
 final_value_msat: invoice.amount_milli_satoshis().unwrap(),
Expand DownExpand Up@@ -1294,8 +1294,8 @@ mod test {

 let payment_params = PaymentParameters::from_node_id(invoice.recover_payee_pub_key(),
 invoice.min_final_cltv_expiry_delta() as u32)
 .with_features(invoice.features().unwrap().clone())
 .with_route_hints(invoice.route_hints());
 .with_bolt11_features(invoice.features().unwrap().clone()).unwrap()
 .with_route_hints(invoice.route_hints()).unwrap();
 let params = RouteParameters {
 payment_params,
 final_value_msat: invoice.amount_milli_satoshis().unwrap(),
Expand Down

10 changes: 6 additions & 4 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,7 @@ use crate::ln::features::{ChannelFeatures, ChannelTypeFeatures, InitFeatures, No
#[cfg(any(feature = "_test_utils", test))]
use crate::ln::features::InvoiceFeatures;
use crate::routing::gossip::NetworkGraph;
use crate::routing::router::{BlindedTail, DefaultRouter, InFlightHtlcs, Path, PaymentParameters, Route, RouteHop, RouteParameters, Router};
use crate::routing::router::{BlindedTail, DefaultRouter, InFlightHtlcs, Path, Payee, PaymentParameters, Route, RouteHop, RouteParameters, Router};
use crate::routing::scoring::ProbabilisticScorer;
use crate::ln::msgs;
use crate::ln::onion_utils;
Expand DownExpand Up@@ -7061,8 +7061,10 @@ impl Readable for HTLCSource {
 return Err(DecodeError::InvalidValue);
 }
 if let Some(params) = payment_params.as_mut() {
 if params.final_cltv_expiry_delta == 0 {
 params.final_cltv_expiry_delta = path.final_cltv_expiry_delta().ok_or(DecodeError::InvalidValue)?;
 if let Payee::Clear { ref mut final_cltv_expiry_delta, .. } = params.payee {
 if final_cltv_expiry_delta == &0 {
 *final_cltv_expiry_delta = path.final_cltv_expiry_delta().ok_or(DecodeError::InvalidValue)?;
 }
 }
 }
 Ok(HTLCSource::OutboundRoute {
Expand DownExpand Up@@ -9180,7 +9182,7 @@ pub mod bench {
 macro_rules! send_payment {
 ($node_a: expr, $node_b: expr) => {
 let payment_params = PaymentParameters::from_node_id($node_b.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features($node_b.invoice_features());
 .with_bolt11_features($node_b.invoice_features()).unwrap();
 let mut payment_preimage = PaymentPreimage([0; 32]);
 payment_preimage.0[0..8].copy_from_slice(&payment_count.to_le_bytes());
 payment_count += 1;
Expand Down

9 changes: 9 additions & 0 deletions
lightning/src/ln/features.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -532,6 +532,14 @@ impl InvoiceFeatures {
	}
}

impl Bolt12InvoiceFeatures {
	/// Converts `Bolt12InvoiceFeatures` to `Features<C>`. Only known `Bolt12InvoiceFeatures` relevant
	/// to context `C` are included in the result.
	pub(crate) fn to_context<C: sealed::Context>(&self) -> Features<C> {
 self.to_context_internal()
	}
}

Comment thread
valentinewallace marked this conversation as resolved.

impl ChannelTypeFeatures {
	// Maps the relevant `InitFeatures` to `ChannelTypeFeatures`. Any unknown features to
	// `ChannelTypeFeatures` are not included in the result.
Expand DownExpand Up@@ -791,6 +799,7 @@ impl_feature_len_prefixed_write!(InitFeatures);
impl_feature_len_prefixed_write!(ChannelFeatures);
impl_feature_len_prefixed_write!(NodeFeatures);
impl_feature_len_prefixed_write!(InvoiceFeatures);
impl_feature_len_prefixed_write!(Bolt12InvoiceFeatures);
impl_feature_len_prefixed_write!(BlindedHopFeatures);

// Some features only appear inside of TLVs, so they don't have a length prefix when serialized.
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1723,7 +1723,7 @@ macro_rules! get_route {
macro_rules! get_route_and_payment_hash {
	($send_node: expr, $recv_node: expr, $recv_value: expr) => {{
 let payment_params = $crate::routing::router::PaymentParameters::from_node_id($recv_node.node.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features($recv_node.node.invoice_features());
 .with_bolt11_features($recv_node.node.invoice_features()).unwrap();
 $crate::get_route_and_payment_hash!($send_node, $recv_node, payment_params, $recv_value)
	}};
	($send_node: expr, $recv_node: expr, $payment_params: expr, $recv_value: expr) => {{
Expand DownExpand Up@@ -2272,7 +2272,7 @@ pub const TEST_FINAL_CLTV: u32 = 70;

pub fn route_payment<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route: &[&Node<'a, 'b, 'c>], recv_value: u64) -> (PaymentPreimage, PaymentHash, PaymentSecret) {
	let payment_params = PaymentParameters::from_node_id(expected_route.last().unwrap().node.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features(expected_route.last().unwrap().node.invoice_features());
 .with_bolt11_features(expected_route.last().unwrap().node.invoice_features()).unwrap();
	let route = get_route(origin_node, &payment_params, recv_value).unwrap();
	assert_eq!(route.paths.len(), 1);
	assert_eq!(route.paths[0].hops.len(), expected_route.len());
Expand All@@ -2286,7 +2286,7 @@ pub fn route_payment<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route:

pub fn route_over_limit<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route: &[&Node<'a, 'b, 'c>], recv_value: u64) {
	let payment_params = PaymentParameters::from_node_id(expected_route.last().unwrap().node.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features(expected_route.last().unwrap().node.invoice_features());
 .with_bolt11_features(expected_route.last().unwrap().node.invoice_features()).unwrap();
	let network_graph = origin_node.network_graph.read_only();
	let scorer = test_utils::TestScorer::new();
	let seed = [0u8; 32];
Expand Down

20 changes: 10 additions & 10 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1829,7 +1829,7 @@ fn test_channel_reserve_holding_cell_htlcs() {
	// attempt to send amt_msat > their_max_htlc_value_in_flight_msat
	{
 let payment_params = PaymentParameters::from_node_id(nodes[2].node.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features(nodes[2].node.invoice_features()).with_max_channel_saturation_power_of_half(0);
 .with_bolt11_features(nodes[2].node.invoice_features()).unwrap().with_max_channel_saturation_power_of_half(0);
 let (mut route, our_payment_hash, _, our_payment_secret) = get_route_and_payment_hash!(nodes[0], nodes[2], payment_params, recv_value_0);
 route.paths[0].hops.last_mut().unwrap().fee_msat += 1;
 assert!(route.paths[0].hops.iter().rev().skip(1).all(|h| h.fee_msat == feemsat));
Expand All@@ -1856,7 +1856,7 @@ fn test_channel_reserve_holding_cell_htlcs() {
 }

 let payment_params = PaymentParameters::from_node_id(nodes[2].node.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features(nodes[2].node.invoice_features()).with_max_channel_saturation_power_of_half(0);
 .with_bolt11_features(nodes[2].node.invoice_features()).unwrap().with_max_channel_saturation_power_of_half(0);
 let route = get_route!(nodes[0], payment_params, recv_value_0).unwrap();
 let (payment_preimage, ..) = send_along_route(&nodes[0], route, &[&nodes[1], &nodes[2]], recv_value_0);
 claim_payment(&nodes[0], &[&nodes[1], &nodes[2]], payment_preimage);
Expand DownExpand Up@@ -4795,7 +4795,7 @@ fn test_duplicate_payment_hash_one_failure_one_success() {
	// script push size limit so that the below script length checks match
	// ACCEPTED_HTLC_SCRIPT_WEIGHT.
	let payment_params = PaymentParameters::from_node_id(nodes[3].node.get_our_node_id(), TEST_FINAL_CLTV - 40)
 .with_features(nodes[3].node.invoice_features());
 .with_bolt11_features(nodes[3].node.invoice_features()).unwrap();
	let (route, _, _, _) = get_route_and_payment_hash!(nodes[0], nodes[3], payment_params, 800_000);
	send_along_route_with_secret(&nodes[0], route, &[&[&nodes[1], &nodes[2], &nodes[3]]], 800_000, duplicate_payment_hash, payment_secret);

Expand DownExpand Up@@ -6101,7 +6101,7 @@ fn test_update_add_htlc_bolt2_sender_cltv_expiry_too_high() {
	let _chan = create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 1000000, 0);

	let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), 0)
 .with_features(nodes[1].node.invoice_features());
 .with_bolt11_features(nodes[1].node.invoice_features()).unwrap();
	let (mut route, our_payment_hash, _, our_payment_secret) = get_route_and_payment_hash!(nodes[0], nodes[1], payment_params, 100000000);
	route.paths[0].hops.last_mut().unwrap().cltv_expiry_delta = 500000001;
	unwrap_send_err!(nodes[0].node.send_payment_with_route(&route, our_payment_hash,
Expand DownExpand Up@@ -7043,7 +7043,7 @@ fn test_check_htlc_underpaying() {

	let scorer = test_utils::TestScorer::new();
	let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
	let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), TEST_FINAL_CLTV).with_features(nodes[1].node.invoice_features());
	let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), TEST_FINAL_CLTV).with_bolt11_features(nodes[1].node.invoice_features()).unwrap();
	let route = get_route(&nodes[0].node.get_our_node_id(), &payment_params, &nodes[0].network_graph.read_only(), None, 10_000, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
	let (_, our_payment_hash, _) = get_payment_preimage_hash!(nodes[0]);
	let our_payment_secret = nodes[1].node.create_inbound_payment_for_hash(our_payment_hash, Some(100_000), 7200, None).unwrap();
Expand DownExpand Up@@ -7189,7 +7189,7 @@ fn test_bump_penalty_txn_on_revoked_commitment() {

	let payment_preimage = route_payment(&nodes[0], &vec!(&nodes[1])[..], 3000000).0;
	let payment_params = PaymentParameters::from_node_id(nodes[0].node.get_our_node_id(), 30)
 .with_features(nodes[0].node.invoice_features());
 .with_bolt11_features(nodes[0].node.invoice_features()).unwrap();
	let (route,_, _, _) = get_route_and_payment_hash!(nodes[1], nodes[0], payment_params, 3000000);
	send_along_route(&nodes[1], route, &vec!(&nodes[0])[..], 3000000);

Expand DownExpand Up@@ -7294,13 +7294,13 @@ fn test_bump_penalty_txn_on_revoked_htlcs() {

	let chan = create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 1000000, 59000000);
	// Lock HTLC in both directions (using a slightly lower CLTV delay to provide timely RBF bumps)
	let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), 50).with_features(nodes[1].node.invoice_features());
	let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), 50).with_bolt11_features(nodes[1].node.invoice_features()).unwrap();
	let scorer = test_utils::TestScorer::new();
	let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
	let route = get_route(&nodes[0].node.get_our_node_id(), &payment_params, &nodes[0].network_graph.read_only(), None,
 3_000_000, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
	let payment_preimage = send_along_route(&nodes[0], route, &[&nodes[1]], 3_000_000).0;
	let payment_params = PaymentParameters::from_node_id(nodes[0].node.get_our_node_id(), 50).with_features(nodes[0].node.invoice_features());
	let payment_params = PaymentParameters::from_node_id(nodes[0].node.get_our_node_id(), 50).with_bolt11_features(nodes[0].node.invoice_features()).unwrap();
	let route = get_route(&nodes[1].node.get_our_node_id(), &payment_params, &nodes[1].network_graph.read_only(), None,
 3_000_000, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
	send_along_route(&nodes[1], route, &[&nodes[0]], 3_000_000);
Expand DownExpand Up@@ -9300,7 +9300,7 @@ fn do_test_dup_htlc_second_rejected(test_for_second_fail_panic: bool) {
	let _chan = create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 100000, 10001);

	let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features(nodes[1].node.invoice_features());
 .with_bolt11_features(nodes[1].node.invoice_features()).unwrap();
	let route = get_route!(nodes[0], payment_params, 10_000).unwrap();

	let (our_payment_preimage, our_payment_hash, our_payment_secret) = get_payment_preimage_hash!(&nodes[1]);
Expand DownExpand Up@@ -9409,7 +9409,7 @@ fn test_inconsistent_mpp_params() {
	let chan_2_3 =create_announced_chan_between_nodes_with_value(&nodes, 2, 3, 100_000, 0);

	let payment_params = PaymentParameters::from_node_id(nodes[3].node.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features(nodes[3].node.invoice_features());
 .with_bolt11_features(nodes[3].node.invoice_features()).unwrap();
	let mut route = get_route!(nodes[0], payment_params, 15_000_000).unwrap();
	assert_eq!(route.paths.len(), 2);
	route.paths.sort_by(|path_a, _| {
Expand Down

10 changes: 5 additions & 5 deletions
lightning/src/ln/onion_route_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -714,8 +714,8 @@ fn do_test_onion_failure_stale_channel_update(announced_channel: bool) {
 htlc_minimum_msat: None,
 }])];
 let payment_params = PaymentParameters::from_node_id(*channel_to_update_counterparty, TEST_FINAL_CLTV)
 .with_features(nodes[2].node.invoice_features())
 .with_route_hints(hop_hints);
 .with_bolt11_features(nodes[2].node.invoice_features()).unwrap()
 .with_route_hints(hop_hints).unwrap();
 get_route_and_payment_hash!(nodes[0], nodes[2], payment_params, PAYMENT_AMT)
	};
	send_along_route_with_secret(&nodes[0], route.clone(), &[&[&nodes[1], &nodes[2]]], PAYMENT_AMT,
Expand DownExpand Up@@ -861,7 +861,7 @@ fn test_always_create_tlv_format_onion_payloads() {
	create_announced_chan_between_nodes(&nodes, 1, 2);

	let payment_params = PaymentParameters::from_node_id(nodes[2].node.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features(InvoiceFeatures::empty());
 .with_bolt11_features(InvoiceFeatures::empty()).unwrap();
	let (route, _payment_hash, _payment_preimage, _payment_secret) = get_route_and_payment_hash!(nodes[0], nodes[2], payment_params, 40000);

	let hops = &route.paths[0].hops;
Expand DownExpand Up@@ -963,7 +963,7 @@ macro_rules! get_phantom_route {
 let phantom_pubkey = $nodes[1].keys_manager.get_node_id(Recipient::PhantomNode).unwrap();
 let phantom_route_hint = $nodes[1].node.get_phantom_route_hints();
 let payment_params = PaymentParameters::from_node_id(phantom_pubkey, TEST_FINAL_CLTV)
 .with_features($nodes[1].node.invoice_features())
 .with_bolt11_features($nodes[1].node.invoice_features()).unwrap()
 .with_route_hints(vec![RouteHint(vec![
 RouteHintHop {
 src_node_id: $nodes[0].node.get_our_node_id(),
Expand All@@ -987,7 +987,7 @@ macro_rules! get_phantom_route {
 htlc_minimum_msat: None,
 htlc_maximum_msat: None,
 }
 ])]);
 ])]).unwrap();
 let scorer = test_utils::TestScorer::new();
 let network_graph = $nodes[0].network_graph.read_only();
 (get_route(
Expand Down
Loading

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

Skip to content
Prefactor PaymentParameters for blinded recipients#2258

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

from

May 8, 2023
 Merged


Prefactor PaymentParameters for blinded recipients
#2258
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
06eeefc

Groundwork for refactoring PaymentParams::Hints to ::Payee


valentinewallace Apr 26, 2023
cea78f5

Error if clear hints are provided for blinded PaymentParams


valentinewallace Apr 29, 2023
7f49f6b

Move payee node id from top level PaymentParams to Payee::Clear


valentinewallace Apr 29, 2023
6d62b62

Error if BOLT 11 features are provided for blinded payment params


valentinewallace Apr 29, 2023
91dc767

Move BOLT11 features from top level PaymentParams to Payee::Clear


valentinewallace May 3, 2023
746f25a

Add BOLT 12 features to PaymentParams


valentinewallace May 3, 2023
d56672c

Move final_cltv_expiry_delta from PaymentParams to Payee::Clear


valentinewallace Apr 27, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
fuzz/src/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -300,7 +300,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 let final_cltv_expiry_delta = slice_to_be32(get_slice!(4));
 let route_params = RouteParameters {
 payment_params: PaymentParameters::from_node_id(*target, final_cltv_expiry_delta)
 .with_route_hints(last_hops.clone()),
 .with_route_hints(last_hops.clone()).unwrap(),
 final_value_msat,
 };
 let _ = find_route(&our_pubkey, &route_params, &net_graph,
Expand Down

4 changes: 2 additions & 2 deletions
lightning-invoice/src/payment.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -152,9 +152,9 @@ fn pay_invoice_using_amount<P: Deref>(
	let mut payment_params = PaymentParameters::from_node_id(invoice.recover_payee_pub_key(),
 invoice.min_final_cltv_expiry_delta() as u32)
 .with_expiry_time(expiry_time_from_unix_epoch(invoice).as_secs())
 .with_route_hints(invoice.route_hints());
 .with_route_hints(invoice.route_hints()).unwrap();
	if let Some(features) = invoice.features() {
 payment_params = payment_params.with_features(features.clone());
 payment_params = payment_params.with_bolt11_features(features.clone()).unwrap();
	}
	let route_params = RouteParameters {
 payment_params,
Expand Down

8 changes: 4 additions & 4 deletions
lightning-invoice/src/utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -838,8 +838,8 @@ mod test {

 let payment_params = PaymentParameters::from_node_id(invoice.recover_payee_pub_key(),
 invoice.min_final_cltv_expiry_delta() as u32)
 .with_features(invoice.features().unwrap().clone())
 .with_route_hints(invoice.route_hints());
 .with_bolt11_features(invoice.features().unwrap().clone()).unwrap()
 .with_route_hints(invoice.route_hints()).unwrap();
 let route_params = RouteParameters {
 payment_params,
 final_value_msat: invoice.amount_milli_satoshis().unwrap(),
Expand DownExpand Up@@ -1294,8 +1294,8 @@ mod test {

 let payment_params = PaymentParameters::from_node_id(invoice.recover_payee_pub_key(),
 invoice.min_final_cltv_expiry_delta() as u32)
 .with_features(invoice.features().unwrap().clone())
 .with_route_hints(invoice.route_hints());
 .with_bolt11_features(invoice.features().unwrap().clone()).unwrap()
 .with_route_hints(invoice.route_hints()).unwrap();
 let params = RouteParameters {
 payment_params,
 final_value_msat: invoice.amount_milli_satoshis().unwrap(),
Expand Down

10 changes: 6 additions & 4 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,7 @@ use crate::ln::features::{ChannelFeatures, ChannelTypeFeatures, InitFeatures, No
#[cfg(any(feature = "_test_utils", test))]
use crate::ln::features::InvoiceFeatures;
use crate::routing::gossip::NetworkGraph;
use crate::routing::router::{BlindedTail, DefaultRouter, InFlightHtlcs, Path, PaymentParameters, Route, RouteHop, RouteParameters, Router};
use crate::routing::router::{BlindedTail, DefaultRouter, InFlightHtlcs, Path, Payee, PaymentParameters, Route, RouteHop, RouteParameters, Router};
use crate::routing::scoring::ProbabilisticScorer;
use crate::ln::msgs;
use crate::ln::onion_utils;
Expand DownExpand Up@@ -7061,8 +7061,10 @@ impl Readable for HTLCSource {
 return Err(DecodeError::InvalidValue);
 }
 if let Some(params) = payment_params.as_mut() {
 if params.final_cltv_expiry_delta == 0 {
 params.final_cltv_expiry_delta = path.final_cltv_expiry_delta().ok_or(DecodeError::InvalidValue)?;
 if let Payee::Clear { ref mut final_cltv_expiry_delta, .. } = params.payee {
 if final_cltv_expiry_delta == &0 {
 *final_cltv_expiry_delta = path.final_cltv_expiry_delta().ok_or(DecodeError::InvalidValue)?;
 }
 }
 }
 Ok(HTLCSource::OutboundRoute {
Expand DownExpand Up@@ -9180,7 +9182,7 @@ pub mod bench {
 macro_rules! send_payment {
 ($node_a: expr, $node_b: expr) => {
 let payment_params = PaymentParameters::from_node_id($node_b.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features($node_b.invoice_features());
 .with_bolt11_features($node_b.invoice_features()).unwrap();
 let mut payment_preimage = PaymentPreimage([0; 32]);
 payment_preimage.0[0..8].copy_from_slice(&payment_count.to_le_bytes());
 payment_count += 1;
Expand Down

9 changes: 9 additions & 0 deletions
lightning/src/ln/features.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -532,6 +532,14 @@ impl InvoiceFeatures {
	}
}

impl Bolt12InvoiceFeatures {
	/// Converts `Bolt12InvoiceFeatures` to `Features<C>`. Only known `Bolt12InvoiceFeatures` relevant
	/// to context `C` are included in the result.
	pub(crate) fn to_context<C: sealed::Context>(&self) -> Features<C> {
 self.to_context_internal()
	}
}

Comment thread
valentinewallace marked this conversation as resolved.

impl ChannelTypeFeatures {
	// Maps the relevant `InitFeatures` to `ChannelTypeFeatures`. Any unknown features to
	// `ChannelTypeFeatures` are not included in the result.
Expand DownExpand Up@@ -791,6 +799,7 @@ impl_feature_len_prefixed_write!(InitFeatures);
impl_feature_len_prefixed_write!(ChannelFeatures);
impl_feature_len_prefixed_write!(NodeFeatures);
impl_feature_len_prefixed_write!(InvoiceFeatures);
impl_feature_len_prefixed_write!(Bolt12InvoiceFeatures);
impl_feature_len_prefixed_write!(BlindedHopFeatures);

// Some features only appear inside of TLVs, so they don't have a length prefix when serialized.
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1723,7 +1723,7 @@ macro_rules! get_route {
macro_rules! get_route_and_payment_hash {
	($send_node: expr, $recv_node: expr, $recv_value: expr) => {{
 let payment_params = $crate::routing::router::PaymentParameters::from_node_id($recv_node.node.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features($recv_node.node.invoice_features());
 .with_bolt11_features($recv_node.node.invoice_features()).unwrap();
 $crate::get_route_and_payment_hash!($send_node, $recv_node, payment_params, $recv_value)
	}};
	($send_node: expr, $recv_node: expr, $payment_params: expr, $recv_value: expr) => {{
Expand DownExpand Up@@ -2272,7 +2272,7 @@ pub const TEST_FINAL_CLTV: u32 = 70;

pub fn route_payment<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route: &[&Node<'a, 'b, 'c>], recv_value: u64) -> (PaymentPreimage, PaymentHash, PaymentSecret) {
	let payment_params = PaymentParameters::from_node_id(expected_route.last().unwrap().node.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features(expected_route.last().unwrap().node.invoice_features());
 .with_bolt11_features(expected_route.last().unwrap().node.invoice_features()).unwrap();
	let route = get_route(origin_node, &payment_params, recv_value).unwrap();
	assert_eq!(route.paths.len(), 1);
	assert_eq!(route.paths[0].hops.len(), expected_route.len());
Expand All@@ -2286,7 +2286,7 @@ pub fn route_payment<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route:

pub fn route_over_limit<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route: &[&Node<'a, 'b, 'c>], recv_value: u64) {
	let payment_params = PaymentParameters::from_node_id(expected_route.last().unwrap().node.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features(expected_route.last().unwrap().node.invoice_features());
 .with_bolt11_features(expected_route.last().unwrap().node.invoice_features()).unwrap();
	let network_graph = origin_node.network_graph.read_only();
	let scorer = test_utils::TestScorer::new();
	let seed = [0u8; 32];
Expand Down

20 changes: 10 additions & 10 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1829,7 +1829,7 @@ fn test_channel_reserve_holding_cell_htlcs() {
	// attempt to send amt_msat > their_max_htlc_value_in_flight_msat
	{
 let payment_params = PaymentParameters::from_node_id(nodes[2].node.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features(nodes[2].node.invoice_features()).with_max_channel_saturation_power_of_half(0);
 .with_bolt11_features(nodes[2].node.invoice_features()).unwrap().with_max_channel_saturation_power_of_half(0);
 let (mut route, our_payment_hash, _, our_payment_secret) = get_route_and_payment_hash!(nodes[0], nodes[2], payment_params, recv_value_0);
 route.paths[0].hops.last_mut().unwrap().fee_msat += 1;
 assert!(route.paths[0].hops.iter().rev().skip(1).all(|h| h.fee_msat == feemsat));
Expand All@@ -1856,7 +1856,7 @@ fn test_channel_reserve_holding_cell_htlcs() {
 }

 let payment_params = PaymentParameters::from_node_id(nodes[2].node.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features(nodes[2].node.invoice_features()).with_max_channel_saturation_power_of_half(0);
 .with_bolt11_features(nodes[2].node.invoice_features()).unwrap().with_max_channel_saturation_power_of_half(0);
 let route = get_route!(nodes[0], payment_params, recv_value_0).unwrap();
 let (payment_preimage, ..) = send_along_route(&nodes[0], route, &[&nodes[1], &nodes[2]], recv_value_0);
 claim_payment(&nodes[0], &[&nodes[1], &nodes[2]], payment_preimage);
Expand DownExpand Up@@ -4795,7 +4795,7 @@ fn test_duplicate_payment_hash_one_failure_one_success() {
	// script push size limit so that the below script length checks match
	// ACCEPTED_HTLC_SCRIPT_WEIGHT.
	let payment_params = PaymentParameters::from_node_id(nodes[3].node.get_our_node_id(), TEST_FINAL_CLTV - 40)
 .with_features(nodes[3].node.invoice_features());
 .with_bolt11_features(nodes[3].node.invoice_features()).unwrap();
	let (route, _, _, _) = get_route_and_payment_hash!(nodes[0], nodes[3], payment_params, 800_000);
	send_along_route_with_secret(&nodes[0], route, &[&[&nodes[1], &nodes[2], &nodes[3]]], 800_000, duplicate_payment_hash, payment_secret);

Expand DownExpand Up@@ -6101,7 +6101,7 @@ fn test_update_add_htlc_bolt2_sender_cltv_expiry_too_high() {
	let _chan = create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 1000000, 0);

	let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), 0)
 .with_features(nodes[1].node.invoice_features());
 .with_bolt11_features(nodes[1].node.invoice_features()).unwrap();
	let (mut route, our_payment_hash, _, our_payment_secret) = get_route_and_payment_hash!(nodes[0], nodes[1], payment_params, 100000000);
	route.paths[0].hops.last_mut().unwrap().cltv_expiry_delta = 500000001;
	unwrap_send_err!(nodes[0].node.send_payment_with_route(&route, our_payment_hash,
Expand DownExpand Up@@ -7043,7 +7043,7 @@ fn test_check_htlc_underpaying() {

	let scorer = test_utils::TestScorer::new();
	let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
	let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), TEST_FINAL_CLTV).with_features(nodes[1].node.invoice_features());
	let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), TEST_FINAL_CLTV).with_bolt11_features(nodes[1].node.invoice_features()).unwrap();
	let route = get_route(&nodes[0].node.get_our_node_id(), &payment_params, &nodes[0].network_graph.read_only(), None, 10_000, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
	let (_, our_payment_hash, _) = get_payment_preimage_hash!(nodes[0]);
	let our_payment_secret = nodes[1].node.create_inbound_payment_for_hash(our_payment_hash, Some(100_000), 7200, None).unwrap();
Expand DownExpand Up@@ -7189,7 +7189,7 @@ fn test_bump_penalty_txn_on_revoked_commitment() {

	let payment_preimage = route_payment(&nodes[0], &vec!(&nodes[1])[..], 3000000).0;
	let payment_params = PaymentParameters::from_node_id(nodes[0].node.get_our_node_id(), 30)
 .with_features(nodes[0].node.invoice_features());
 .with_bolt11_features(nodes[0].node.invoice_features()).unwrap();
	let (route,_, _, _) = get_route_and_payment_hash!(nodes[1], nodes[0], payment_params, 3000000);
	send_along_route(&nodes[1], route, &vec!(&nodes[0])[..], 3000000);

Expand DownExpand Up@@ -7294,13 +7294,13 @@ fn test_bump_penalty_txn_on_revoked_htlcs() {

	let chan = create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 1000000, 59000000);
	// Lock HTLC in both directions (using a slightly lower CLTV delay to provide timely RBF bumps)
	let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), 50).with_features(nodes[1].node.invoice_features());
	let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), 50).with_bolt11_features(nodes[1].node.invoice_features()).unwrap();
	let scorer = test_utils::TestScorer::new();
	let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
	let route = get_route(&nodes[0].node.get_our_node_id(), &payment_params, &nodes[0].network_graph.read_only(), None,
 3_000_000, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
	let payment_preimage = send_along_route(&nodes[0], route, &[&nodes[1]], 3_000_000).0;
	let payment_params = PaymentParameters::from_node_id(nodes[0].node.get_our_node_id(), 50).with_features(nodes[0].node.invoice_features());
	let payment_params = PaymentParameters::from_node_id(nodes[0].node.get_our_node_id(), 50).with_bolt11_features(nodes[0].node.invoice_features()).unwrap();
	let route = get_route(&nodes[1].node.get_our_node_id(), &payment_params, &nodes[1].network_graph.read_only(), None,
 3_000_000, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
	send_along_route(&nodes[1], route, &[&nodes[0]], 3_000_000);
Expand DownExpand Up@@ -9300,7 +9300,7 @@ fn do_test_dup_htlc_second_rejected(test_for_second_fail_panic: bool) {
	let _chan = create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 100000, 10001);

	let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features(nodes[1].node.invoice_features());
 .with_bolt11_features(nodes[1].node.invoice_features()).unwrap();
	let route = get_route!(nodes[0], payment_params, 10_000).unwrap();

	let (our_payment_preimage, our_payment_hash, our_payment_secret) = get_payment_preimage_hash!(&nodes[1]);
Expand DownExpand Up@@ -9409,7 +9409,7 @@ fn test_inconsistent_mpp_params() {
	let chan_2_3 =create_announced_chan_between_nodes_with_value(&nodes, 2, 3, 100_000, 0);

	let payment_params = PaymentParameters::from_node_id(nodes[3].node.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features(nodes[3].node.invoice_features());
 .with_bolt11_features(nodes[3].node.invoice_features()).unwrap();
	let mut route = get_route!(nodes[0], payment_params, 15_000_000).unwrap();
	assert_eq!(route.paths.len(), 2);
	route.paths.sort_by(|path_a, _| {
Expand Down

10 changes: 5 additions & 5 deletions
lightning/src/ln/onion_route_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -714,8 +714,8 @@ fn do_test_onion_failure_stale_channel_update(announced_channel: bool) {
 htlc_minimum_msat: None,
 }])];
 let payment_params = PaymentParameters::from_node_id(*channel_to_update_counterparty, TEST_FINAL_CLTV)
 .with_features(nodes[2].node.invoice_features())
 .with_route_hints(hop_hints);
 .with_bolt11_features(nodes[2].node.invoice_features()).unwrap()
 .with_route_hints(hop_hints).unwrap();
 get_route_and_payment_hash!(nodes[0], nodes[2], payment_params, PAYMENT_AMT)
	};
	send_along_route_with_secret(&nodes[0], route.clone(), &[&[&nodes[1], &nodes[2]]], PAYMENT_AMT,
Expand DownExpand Up@@ -861,7 +861,7 @@ fn test_always_create_tlv_format_onion_payloads() {
	create_announced_chan_between_nodes(&nodes, 1, 2);

	let payment_params = PaymentParameters::from_node_id(nodes[2].node.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features(InvoiceFeatures::empty());
 .with_bolt11_features(InvoiceFeatures::empty()).unwrap();
	let (route, _payment_hash, _payment_preimage, _payment_secret) = get_route_and_payment_hash!(nodes[0], nodes[2], payment_params, 40000);

	let hops = &route.paths[0].hops;
Expand DownExpand Up@@ -963,7 +963,7 @@ macro_rules! get_phantom_route {
 let phantom_pubkey = $nodes[1].keys_manager.get_node_id(Recipient::PhantomNode).unwrap();
 let phantom_route_hint = $nodes[1].node.get_phantom_route_hints();
 let payment_params = PaymentParameters::from_node_id(phantom_pubkey, TEST_FINAL_CLTV)
 .with_features($nodes[1].node.invoice_features())
 .with_bolt11_features($nodes[1].node.invoice_features()).unwrap()
 .with_route_hints(vec![RouteHint(vec![
 RouteHintHop {
 src_node_id: $nodes[0].node.get_our_node_id(),
Expand All@@ -987,7 +987,7 @@ macro_rules! get_phantom_route {
 htlc_minimum_msat: None,
 htlc_maximum_msat: None,
 }
 ])]);
 ])]).unwrap();
 let scorer = test_utils::TestScorer::new();
 let network_graph = $nodes[0].network_graph.read_only();
 (get_route(
Expand Down
Loading

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

Skip to content
Prefactor PaymentParameters for blinded recipients#2258

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

from

May 8, 2023
 Merged


Prefactor PaymentParameters for blinded recipients
#2258
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
06eeefc

Groundwork for refactoring PaymentParams::Hints to ::Payee


valentinewallace Apr 26, 2023
cea78f5

Error if clear hints are provided for blinded PaymentParams


valentinewallace Apr 29, 2023
7f49f6b

Move payee node id from top level PaymentParams to Payee::Clear


valentinewallace Apr 29, 2023
6d62b62

Error if BOLT 11 features are provided for blinded payment params


valentinewallace Apr 29, 2023
91dc767

Move BOLT11 features from top level PaymentParams to Payee::Clear


valentinewallace May 3, 2023
746f25a

Add BOLT 12 features to PaymentParams


valentinewallace May 3, 2023
d56672c

Move final_cltv_expiry_delta from PaymentParams to Payee::Clear


valentinewallace Apr 27, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
fuzz/src/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -300,7 +300,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 let final_cltv_expiry_delta = slice_to_be32(get_slice!(4));
 let route_params = RouteParameters {
 payment_params: PaymentParameters::from_node_id(*target, final_cltv_expiry_delta)
 .with_route_hints(last_hops.clone()),
 .with_route_hints(last_hops.clone()).unwrap(),
 final_value_msat,
 };
 let _ = find_route(&our_pubkey, &route_params, &net_graph,
Expand Down

4 changes: 2 additions & 2 deletions
lightning-invoice/src/payment.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -152,9 +152,9 @@ fn pay_invoice_using_amount<P: Deref>(
	let mut payment_params = PaymentParameters::from_node_id(invoice.recover_payee_pub_key(),
 invoice.min_final_cltv_expiry_delta() as u32)
 .with_expiry_time(expiry_time_from_unix_epoch(invoice).as_secs())
 .with_route_hints(invoice.route_hints());
 .with_route_hints(invoice.route_hints()).unwrap();
	if let Some(features) = invoice.features() {
 payment_params = payment_params.with_features(features.clone());
 payment_params = payment_params.with_bolt11_features(features.clone()).unwrap();
	}
	let route_params = RouteParameters {
 payment_params,
Expand Down

8 changes: 4 additions & 4 deletions
lightning-invoice/src/utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -838,8 +838,8 @@ mod test {

 let payment_params = PaymentParameters::from_node_id(invoice.recover_payee_pub_key(),
 invoice.min_final_cltv_expiry_delta() as u32)
 .with_features(invoice.features().unwrap().clone())
 .with_route_hints(invoice.route_hints());
 .with_bolt11_features(invoice.features().unwrap().clone()).unwrap()
 .with_route_hints(invoice.route_hints()).unwrap();
 let route_params = RouteParameters {
 payment_params,
 final_value_msat: invoice.amount_milli_satoshis().unwrap(),
Expand DownExpand Up@@ -1294,8 +1294,8 @@ mod test {

 let payment_params = PaymentParameters::from_node_id(invoice.recover_payee_pub_key(),
 invoice.min_final_cltv_expiry_delta() as u32)
 .with_features(invoice.features().unwrap().clone())
 .with_route_hints(invoice.route_hints());
 .with_bolt11_features(invoice.features().unwrap().clone()).unwrap()
 .with_route_hints(invoice.route_hints()).unwrap();
 let params = RouteParameters {
 payment_params,
 final_value_msat: invoice.amount_milli_satoshis().unwrap(),
Expand Down

10 changes: 6 additions & 4 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,7 @@ use crate::ln::features::{ChannelFeatures, ChannelTypeFeatures, InitFeatures, No
#[cfg(any(feature = "_test_utils", test))]
use crate::ln::features::InvoiceFeatures;
use crate::routing::gossip::NetworkGraph;
use crate::routing::router::{BlindedTail, DefaultRouter, InFlightHtlcs, Path, PaymentParameters, Route, RouteHop, RouteParameters, Router};
use crate::routing::router::{BlindedTail, DefaultRouter, InFlightHtlcs, Path, Payee, PaymentParameters, Route, RouteHop, RouteParameters, Router};
use crate::routing::scoring::ProbabilisticScorer;
use crate::ln::msgs;
use crate::ln::onion_utils;
Expand DownExpand Up@@ -7061,8 +7061,10 @@ impl Readable for HTLCSource {
 return Err(DecodeError::InvalidValue);
 }
 if let Some(params) = payment_params.as_mut() {
 if params.final_cltv_expiry_delta == 0 {
 params.final_cltv_expiry_delta = path.final_cltv_expiry_delta().ok_or(DecodeError::InvalidValue)?;
 if let Payee::Clear { ref mut final_cltv_expiry_delta, .. } = params.payee {
 if final_cltv_expiry_delta == &0 {
 *final_cltv_expiry_delta = path.final_cltv_expiry_delta().ok_or(DecodeError::InvalidValue)?;
 }
 }
 }
 Ok(HTLCSource::OutboundRoute {
Expand DownExpand Up@@ -9180,7 +9182,7 @@ pub mod bench {
 macro_rules! send_payment {
 ($node_a: expr, $node_b: expr) => {
 let payment_params = PaymentParameters::from_node_id($node_b.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features($node_b.invoice_features());
 .with_bolt11_features($node_b.invoice_features()).unwrap();
 let mut payment_preimage = PaymentPreimage([0; 32]);
 payment_preimage.0[0..8].copy_from_slice(&payment_count.to_le_bytes());
 payment_count += 1;
Expand Down

9 changes: 9 additions & 0 deletions
lightning/src/ln/features.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -532,6 +532,14 @@ impl InvoiceFeatures {
	}
}

impl Bolt12InvoiceFeatures {
	/// Converts `Bolt12InvoiceFeatures` to `Features<C>`. Only known `Bolt12InvoiceFeatures` relevant
	/// to context `C` are included in the result.
	pub(crate) fn to_context<C: sealed::Context>(&self) -> Features<C> {
 self.to_context_internal()
	}
}

Comment thread
valentinewallace marked this conversation as resolved.

impl ChannelTypeFeatures {
	// Maps the relevant `InitFeatures` to `ChannelTypeFeatures`. Any unknown features to
	// `ChannelTypeFeatures` are not included in the result.
Expand DownExpand Up@@ -791,6 +799,7 @@ impl_feature_len_prefixed_write!(InitFeatures);
impl_feature_len_prefixed_write!(ChannelFeatures);
impl_feature_len_prefixed_write!(NodeFeatures);
impl_feature_len_prefixed_write!(InvoiceFeatures);
impl_feature_len_prefixed_write!(Bolt12InvoiceFeatures);
impl_feature_len_prefixed_write!(BlindedHopFeatures);

// Some features only appear inside of TLVs, so they don't have a length prefix when serialized.
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1723,7 +1723,7 @@ macro_rules! get_route {
macro_rules! get_route_and_payment_hash {
	($send_node: expr, $recv_node: expr, $recv_value: expr) => {{
 let payment_params = $crate::routing::router::PaymentParameters::from_node_id($recv_node.node.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features($recv_node.node.invoice_features());
 .with_bolt11_features($recv_node.node.invoice_features()).unwrap();
 $crate::get_route_and_payment_hash!($send_node, $recv_node, payment_params, $recv_value)
	}};
	($send_node: expr, $recv_node: expr, $payment_params: expr, $recv_value: expr) => {{
Expand DownExpand Up@@ -2272,7 +2272,7 @@ pub const TEST_FINAL_CLTV: u32 = 70;

pub fn route_payment<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route: &[&Node<'a, 'b, 'c>], recv_value: u64) -> (PaymentPreimage, PaymentHash, PaymentSecret) {
	let payment_params = PaymentParameters::from_node_id(expected_route.last().unwrap().node.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features(expected_route.last().unwrap().node.invoice_features());
 .with_bolt11_features(expected_route.last().unwrap().node.invoice_features()).unwrap();
	let route = get_route(origin_node, &payment_params, recv_value).unwrap();
	assert_eq!(route.paths.len(), 1);
	assert_eq!(route.paths[0].hops.len(), expected_route.len());
Expand All@@ -2286,7 +2286,7 @@ pub fn route_payment<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route:

pub fn route_over_limit<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route: &[&Node<'a, 'b, 'c>], recv_value: u64) {
	let payment_params = PaymentParameters::from_node_id(expected_route.last().unwrap().node.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features(expected_route.last().unwrap().node.invoice_features());
 .with_bolt11_features(expected_route.last().unwrap().node.invoice_features()).unwrap();
	let network_graph = origin_node.network_graph.read_only();
	let scorer = test_utils::TestScorer::new();
	let seed = [0u8; 32];
Expand Down

20 changes: 10 additions & 10 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1829,7 +1829,7 @@ fn test_channel_reserve_holding_cell_htlcs() {
	// attempt to send amt_msat > their_max_htlc_value_in_flight_msat
	{
 let payment_params = PaymentParameters::from_node_id(nodes[2].node.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features(nodes[2].node.invoice_features()).with_max_channel_saturation_power_of_half(0);
 .with_bolt11_features(nodes[2].node.invoice_features()).unwrap().with_max_channel_saturation_power_of_half(0);
 let (mut route, our_payment_hash, _, our_payment_secret) = get_route_and_payment_hash!(nodes[0], nodes[2], payment_params, recv_value_0);
 route.paths[0].hops.last_mut().unwrap().fee_msat += 1;
 assert!(route.paths[0].hops.iter().rev().skip(1).all(|h| h.fee_msat == feemsat));
Expand All@@ -1856,7 +1856,7 @@ fn test_channel_reserve_holding_cell_htlcs() {
 }

 let payment_params = PaymentParameters::from_node_id(nodes[2].node.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features(nodes[2].node.invoice_features()).with_max_channel_saturation_power_of_half(0);
 .with_bolt11_features(nodes[2].node.invoice_features()).unwrap().with_max_channel_saturation_power_of_half(0);
 let route = get_route!(nodes[0], payment_params, recv_value_0).unwrap();
 let (payment_preimage, ..) = send_along_route(&nodes[0], route, &[&nodes[1], &nodes[2]], recv_value_0);
 claim_payment(&nodes[0], &[&nodes[1], &nodes[2]], payment_preimage);
Expand DownExpand Up@@ -4795,7 +4795,7 @@ fn test_duplicate_payment_hash_one_failure_one_success() {
	// script push size limit so that the below script length checks match
	// ACCEPTED_HTLC_SCRIPT_WEIGHT.
	let payment_params = PaymentParameters::from_node_id(nodes[3].node.get_our_node_id(), TEST_FINAL_CLTV - 40)
 .with_features(nodes[3].node.invoice_features());
 .with_bolt11_features(nodes[3].node.invoice_features()).unwrap();
	let (route, _, _, _) = get_route_and_payment_hash!(nodes[0], nodes[3], payment_params, 800_000);
	send_along_route_with_secret(&nodes[0], route, &[&[&nodes[1], &nodes[2], &nodes[3]]], 800_000, duplicate_payment_hash, payment_secret);

Expand DownExpand Up@@ -6101,7 +6101,7 @@ fn test_update_add_htlc_bolt2_sender_cltv_expiry_too_high() {
	let _chan = create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 1000000, 0);

	let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), 0)
 .with_features(nodes[1].node.invoice_features());
 .with_bolt11_features(nodes[1].node.invoice_features()).unwrap();
	let (mut route, our_payment_hash, _, our_payment_secret) = get_route_and_payment_hash!(nodes[0], nodes[1], payment_params, 100000000);
	route.paths[0].hops.last_mut().unwrap().cltv_expiry_delta = 500000001;
	unwrap_send_err!(nodes[0].node.send_payment_with_route(&route, our_payment_hash,
Expand DownExpand Up@@ -7043,7 +7043,7 @@ fn test_check_htlc_underpaying() {

	let scorer = test_utils::TestScorer::new();
	let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
	let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), TEST_FINAL_CLTV).with_features(nodes[1].node.invoice_features());
	let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), TEST_FINAL_CLTV).with_bolt11_features(nodes[1].node.invoice_features()).unwrap();
	let route = get_route(&nodes[0].node.get_our_node_id(), &payment_params, &nodes[0].network_graph.read_only(), None, 10_000, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
	let (_, our_payment_hash, _) = get_payment_preimage_hash!(nodes[0]);
	let our_payment_secret = nodes[1].node.create_inbound_payment_for_hash(our_payment_hash, Some(100_000), 7200, None).unwrap();
Expand DownExpand Up@@ -7189,7 +7189,7 @@ fn test_bump_penalty_txn_on_revoked_commitment() {

	let payment_preimage = route_payment(&nodes[0], &vec!(&nodes[1])[..], 3000000).0;
	let payment_params = PaymentParameters::from_node_id(nodes[0].node.get_our_node_id(), 30)
 .with_features(nodes[0].node.invoice_features());
 .with_bolt11_features(nodes[0].node.invoice_features()).unwrap();
	let (route,_, _, _) = get_route_and_payment_hash!(nodes[1], nodes[0], payment_params, 3000000);
	send_along_route(&nodes[1], route, &vec!(&nodes[0])[..], 3000000);

Expand DownExpand Up@@ -7294,13 +7294,13 @@ fn test_bump_penalty_txn_on_revoked_htlcs() {

	let chan = create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 1000000, 59000000);
	// Lock HTLC in both directions (using a slightly lower CLTV delay to provide timely RBF bumps)
	let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), 50).with_features(nodes[1].node.invoice_features());
	let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), 50).with_bolt11_features(nodes[1].node.invoice_features()).unwrap();
	let scorer = test_utils::TestScorer::new();
	let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
	let route = get_route(&nodes[0].node.get_our_node_id(), &payment_params, &nodes[0].network_graph.read_only(), None,
 3_000_000, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
	let payment_preimage = send_along_route(&nodes[0], route, &[&nodes[1]], 3_000_000).0;
	let payment_params = PaymentParameters::from_node_id(nodes[0].node.get_our_node_id(), 50).with_features(nodes[0].node.invoice_features());
	let payment_params = PaymentParameters::from_node_id(nodes[0].node.get_our_node_id(), 50).with_bolt11_features(nodes[0].node.invoice_features()).unwrap();
	let route = get_route(&nodes[1].node.get_our_node_id(), &payment_params, &nodes[1].network_graph.read_only(), None,
 3_000_000, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
	send_along_route(&nodes[1], route, &[&nodes[0]], 3_000_000);
Expand DownExpand Up@@ -9300,7 +9300,7 @@ fn do_test_dup_htlc_second_rejected(test_for_second_fail_panic: bool) {
	let _chan = create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 100000, 10001);

	let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features(nodes[1].node.invoice_features());
 .with_bolt11_features(nodes[1].node.invoice_features()).unwrap();
	let route = get_route!(nodes[0], payment_params, 10_000).unwrap();

	let (our_payment_preimage, our_payment_hash, our_payment_secret) = get_payment_preimage_hash!(&nodes[1]);
Expand DownExpand Up@@ -9409,7 +9409,7 @@ fn test_inconsistent_mpp_params() {
	let chan_2_3 =create_announced_chan_between_nodes_with_value(&nodes, 2, 3, 100_000, 0);

	let payment_params = PaymentParameters::from_node_id(nodes[3].node.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features(nodes[3].node.invoice_features());
 .with_bolt11_features(nodes[3].node.invoice_features()).unwrap();
	let mut route = get_route!(nodes[0], payment_params, 15_000_000).unwrap();
	assert_eq!(route.paths.len(), 2);
	route.paths.sort_by(|path_a, _| {
Expand Down

10 changes: 5 additions & 5 deletions
lightning/src/ln/onion_route_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -714,8 +714,8 @@ fn do_test_onion_failure_stale_channel_update(announced_channel: bool) {
 htlc_minimum_msat: None,
 }])];
 let payment_params = PaymentParameters::from_node_id(*channel_to_update_counterparty, TEST_FINAL_CLTV)
 .with_features(nodes[2].node.invoice_features())
 .with_route_hints(hop_hints);
 .with_bolt11_features(nodes[2].node.invoice_features()).unwrap()
 .with_route_hints(hop_hints).unwrap();
 get_route_and_payment_hash!(nodes[0], nodes[2], payment_params, PAYMENT_AMT)
	};
	send_along_route_with_secret(&nodes[0], route.clone(), &[&[&nodes[1], &nodes[2]]], PAYMENT_AMT,
Expand DownExpand Up@@ -861,7 +861,7 @@ fn test_always_create_tlv_format_onion_payloads() {
	create_announced_chan_between_nodes(&nodes, 1, 2);

	let payment_params = PaymentParameters::from_node_id(nodes[2].node.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features(InvoiceFeatures::empty());
 .with_bolt11_features(InvoiceFeatures::empty()).unwrap();
	let (route, _payment_hash, _payment_preimage, _payment_secret) = get_route_and_payment_hash!(nodes[0], nodes[2], payment_params, 40000);

	let hops = &route.paths[0].hops;
Expand DownExpand Up@@ -963,7 +963,7 @@ macro_rules! get_phantom_route {
 let phantom_pubkey = $nodes[1].keys_manager.get_node_id(Recipient::PhantomNode).unwrap();
 let phantom_route_hint = $nodes[1].node.get_phantom_route_hints();
 let payment_params = PaymentParameters::from_node_id(phantom_pubkey, TEST_FINAL_CLTV)
 .with_features($nodes[1].node.invoice_features())
 .with_bolt11_features($nodes[1].node.invoice_features()).unwrap()
 .with_route_hints(vec![RouteHint(vec![
 RouteHintHop {
 src_node_id: $nodes[0].node.get_our_node_id(),
Expand All@@ -987,7 +987,7 @@ macro_rules! get_phantom_route {
 htlc_minimum_msat: None,
 htlc_maximum_msat: None,
 }
 ])]);
 ])]).unwrap();
 let scorer = test_utils::TestScorer::new();
 let network_graph = $nodes[0].network_graph.read_only();
 (get_route(
Expand Down
Loading

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

Skip to content
Prefactor PaymentParameters for blinded recipients#2258

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

from

May 8, 2023
 Merged


Prefactor PaymentParameters for blinded recipients
#2258
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
06eeefc

Groundwork for refactoring PaymentParams::Hints to ::Payee


valentinewallace Apr 26, 2023
cea78f5

Error if clear hints are provided for blinded PaymentParams


valentinewallace Apr 29, 2023
7f49f6b

Move payee node id from top level PaymentParams to Payee::Clear


valentinewallace Apr 29, 2023
6d62b62

Error if BOLT 11 features are provided for blinded payment params


valentinewallace Apr 29, 2023
91dc767

Move BOLT11 features from top level PaymentParams to Payee::Clear


valentinewallace May 3, 2023
746f25a

Add BOLT 12 features to PaymentParams


valentinewallace May 3, 2023
d56672c

Move final_cltv_expiry_delta from PaymentParams to Payee::Clear


valentinewallace Apr 27, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
fuzz/src/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -300,7 +300,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 let final_cltv_expiry_delta = slice_to_be32(get_slice!(4));
 let route_params = RouteParameters {
 payment_params: PaymentParameters::from_node_id(*target, final_cltv_expiry_delta)
 .with_route_hints(last_hops.clone()),
 .with_route_hints(last_hops.clone()).unwrap(),
 final_value_msat,
 };
 let _ = find_route(&our_pubkey, &route_params, &net_graph,
Expand Down

4 changes: 2 additions & 2 deletions
lightning-invoice/src/payment.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -152,9 +152,9 @@ fn pay_invoice_using_amount<P: Deref>(
	let mut payment_params = PaymentParameters::from_node_id(invoice.recover_payee_pub_key(),
 invoice.min_final_cltv_expiry_delta() as u32)
 .with_expiry_time(expiry_time_from_unix_epoch(invoice).as_secs())
 .with_route_hints(invoice.route_hints());
 .with_route_hints(invoice.route_hints()).unwrap();
	if let Some(features) = invoice.features() {
 payment_params = payment_params.with_features(features.clone());
 payment_params = payment_params.with_bolt11_features(features.clone()).unwrap();
	}
	let route_params = RouteParameters {
 payment_params,
Expand Down

8 changes: 4 additions & 4 deletions
lightning-invoice/src/utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -838,8 +838,8 @@ mod test {

 let payment_params = PaymentParameters::from_node_id(invoice.recover_payee_pub_key(),
 invoice.min_final_cltv_expiry_delta() as u32)
 .with_features(invoice.features().unwrap().clone())
 .with_route_hints(invoice.route_hints());
 .with_bolt11_features(invoice.features().unwrap().clone()).unwrap()
 .with_route_hints(invoice.route_hints()).unwrap();
 let route_params = RouteParameters {
 payment_params,
 final_value_msat: invoice.amount_milli_satoshis().unwrap(),
Expand DownExpand Up@@ -1294,8 +1294,8 @@ mod test {

 let payment_params = PaymentParameters::from_node_id(invoice.recover_payee_pub_key(),
 invoice.min_final_cltv_expiry_delta() as u32)
 .with_features(invoice.features().unwrap().clone())
 .with_route_hints(invoice.route_hints());
 .with_bolt11_features(invoice.features().unwrap().clone()).unwrap()
 .with_route_hints(invoice.route_hints()).unwrap();
 let params = RouteParameters {
 payment_params,
 final_value_msat: invoice.amount_milli_satoshis().unwrap(),
Expand Down

10 changes: 6 additions & 4 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,7 @@ use crate::ln::features::{ChannelFeatures, ChannelTypeFeatures, InitFeatures, No
#[cfg(any(feature = "_test_utils", test))]
use crate::ln::features::InvoiceFeatures;
use crate::routing::gossip::NetworkGraph;
use crate::routing::router::{BlindedTail, DefaultRouter, InFlightHtlcs, Path, PaymentParameters, Route, RouteHop, RouteParameters, Router};
use crate::routing::router::{BlindedTail, DefaultRouter, InFlightHtlcs, Path, Payee, PaymentParameters, Route, RouteHop, RouteParameters, Router};
use crate::routing::scoring::ProbabilisticScorer;
use crate::ln::msgs;
use crate::ln::onion_utils;
Expand DownExpand Up@@ -7061,8 +7061,10 @@ impl Readable for HTLCSource {
 return Err(DecodeError::InvalidValue);
 }
 if let Some(params) = payment_params.as_mut() {
 if params.final_cltv_expiry_delta == 0 {
 params.final_cltv_expiry_delta = path.final_cltv_expiry_delta().ok_or(DecodeError::InvalidValue)?;
 if let Payee::Clear { ref mut final_cltv_expiry_delta, .. } = params.payee {
 if final_cltv_expiry_delta == &0 {
 *final_cltv_expiry_delta = path.final_cltv_expiry_delta().ok_or(DecodeError::InvalidValue)?;
 }
 }
 }
 Ok(HTLCSource::OutboundRoute {
Expand DownExpand Up@@ -9180,7 +9182,7 @@ pub mod bench {
 macro_rules! send_payment {
 ($node_a: expr, $node_b: expr) => {
 let payment_params = PaymentParameters::from_node_id($node_b.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features($node_b.invoice_features());
 .with_bolt11_features($node_b.invoice_features()).unwrap();
 let mut payment_preimage = PaymentPreimage([0; 32]);
 payment_preimage.0[0..8].copy_from_slice(&payment_count.to_le_bytes());
 payment_count += 1;
Expand Down

9 changes: 9 additions & 0 deletions
lightning/src/ln/features.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -532,6 +532,14 @@ impl InvoiceFeatures {
	}
}

impl Bolt12InvoiceFeatures {
	/// Converts `Bolt12InvoiceFeatures` to `Features<C>`. Only known `Bolt12InvoiceFeatures` relevant
	/// to context `C` are included in the result.
	pub(crate) fn to_context<C: sealed::Context>(&self) -> Features<C> {
 self.to_context_internal()
	}
}

Comment thread
valentinewallace marked this conversation as resolved.

impl ChannelTypeFeatures {
	// Maps the relevant `InitFeatures` to `ChannelTypeFeatures`. Any unknown features to
	// `ChannelTypeFeatures` are not included in the result.
Expand DownExpand Up@@ -791,6 +799,7 @@ impl_feature_len_prefixed_write!(InitFeatures);
impl_feature_len_prefixed_write!(ChannelFeatures);
impl_feature_len_prefixed_write!(NodeFeatures);
impl_feature_len_prefixed_write!(InvoiceFeatures);
impl_feature_len_prefixed_write!(Bolt12InvoiceFeatures);
impl_feature_len_prefixed_write!(BlindedHopFeatures);

// Some features only appear inside of TLVs, so they don't have a length prefix when serialized.
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1723,7 +1723,7 @@ macro_rules! get_route {
macro_rules! get_route_and_payment_hash {
	($send_node: expr, $recv_node: expr, $recv_value: expr) => {{
 let payment_params = $crate::routing::router::PaymentParameters::from_node_id($recv_node.node.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features($recv_node.node.invoice_features());
 .with_bolt11_features($recv_node.node.invoice_features()).unwrap();
 $crate::get_route_and_payment_hash!($send_node, $recv_node, payment_params, $recv_value)
	}};
	($send_node: expr, $recv_node: expr, $payment_params: expr, $recv_value: expr) => {{
Expand DownExpand Up@@ -2272,7 +2272,7 @@ pub const TEST_FINAL_CLTV: u32 = 70;

pub fn route_payment<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route: &[&Node<'a, 'b, 'c>], recv_value: u64) -> (PaymentPreimage, PaymentHash, PaymentSecret) {
	let payment_params = PaymentParameters::from_node_id(expected_route.last().unwrap().node.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features(expected_route.last().unwrap().node.invoice_features());
 .with_bolt11_features(expected_route.last().unwrap().node.invoice_features()).unwrap();
	let route = get_route(origin_node, &payment_params, recv_value).unwrap();
	assert_eq!(route.paths.len(), 1);
	assert_eq!(route.paths[0].hops.len(), expected_route.len());
Expand All@@ -2286,7 +2286,7 @@ pub fn route_payment<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route:

pub fn route_over_limit<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route: &[&Node<'a, 'b, 'c>], recv_value: u64) {
	let payment_params = PaymentParameters::from_node_id(expected_route.last().unwrap().node.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features(expected_route.last().unwrap().node.invoice_features());
 .with_bolt11_features(expected_route.last().unwrap().node.invoice_features()).unwrap();
	let network_graph = origin_node.network_graph.read_only();
	let scorer = test_utils::TestScorer::new();
	let seed = [0u8; 32];
Expand Down

20 changes: 10 additions & 10 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1829,7 +1829,7 @@ fn test_channel_reserve_holding_cell_htlcs() {
	// attempt to send amt_msat > their_max_htlc_value_in_flight_msat
	{
 let payment_params = PaymentParameters::from_node_id(nodes[2].node.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features(nodes[2].node.invoice_features()).with_max_channel_saturation_power_of_half(0);
 .with_bolt11_features(nodes[2].node.invoice_features()).unwrap().with_max_channel_saturation_power_of_half(0);
 let (mut route, our_payment_hash, _, our_payment_secret) = get_route_and_payment_hash!(nodes[0], nodes[2], payment_params, recv_value_0);
 route.paths[0].hops.last_mut().unwrap().fee_msat += 1;
 assert!(route.paths[0].hops.iter().rev().skip(1).all(|h| h.fee_msat == feemsat));
Expand All@@ -1856,7 +1856,7 @@ fn test_channel_reserve_holding_cell_htlcs() {
 }

 let payment_params = PaymentParameters::from_node_id(nodes[2].node.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features(nodes[2].node.invoice_features()).with_max_channel_saturation_power_of_half(0);
 .with_bolt11_features(nodes[2].node.invoice_features()).unwrap().with_max_channel_saturation_power_of_half(0);
 let route = get_route!(nodes[0], payment_params, recv_value_0).unwrap();
 let (payment_preimage, ..) = send_along_route(&nodes[0], route, &[&nodes[1], &nodes[2]], recv_value_0);
 claim_payment(&nodes[0], &[&nodes[1], &nodes[2]], payment_preimage);
Expand DownExpand Up@@ -4795,7 +4795,7 @@ fn test_duplicate_payment_hash_one_failure_one_success() {
	// script push size limit so that the below script length checks match
	// ACCEPTED_HTLC_SCRIPT_WEIGHT.
	let payment_params = PaymentParameters::from_node_id(nodes[3].node.get_our_node_id(), TEST_FINAL_CLTV - 40)
 .with_features(nodes[3].node.invoice_features());
 .with_bolt11_features(nodes[3].node.invoice_features()).unwrap();
	let (route, _, _, _) = get_route_and_payment_hash!(nodes[0], nodes[3], payment_params, 800_000);
	send_along_route_with_secret(&nodes[0], route, &[&[&nodes[1], &nodes[2], &nodes[3]]], 800_000, duplicate_payment_hash, payment_secret);

Expand DownExpand Up@@ -6101,7 +6101,7 @@ fn test_update_add_htlc_bolt2_sender_cltv_expiry_too_high() {
	let _chan = create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 1000000, 0);

	let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), 0)
 .with_features(nodes[1].node.invoice_features());
 .with_bolt11_features(nodes[1].node.invoice_features()).unwrap();
	let (mut route, our_payment_hash, _, our_payment_secret) = get_route_and_payment_hash!(nodes[0], nodes[1], payment_params, 100000000);
	route.paths[0].hops.last_mut().unwrap().cltv_expiry_delta = 500000001;
	unwrap_send_err!(nodes[0].node.send_payment_with_route(&route, our_payment_hash,
Expand DownExpand Up@@ -7043,7 +7043,7 @@ fn test_check_htlc_underpaying() {

	let scorer = test_utils::TestScorer::new();
	let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
	let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), TEST_FINAL_CLTV).with_features(nodes[1].node.invoice_features());
	let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), TEST_FINAL_CLTV).with_bolt11_features(nodes[1].node.invoice_features()).unwrap();
	let route = get_route(&nodes[0].node.get_our_node_id(), &payment_params, &nodes[0].network_graph.read_only(), None, 10_000, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
	let (_, our_payment_hash, _) = get_payment_preimage_hash!(nodes[0]);
	let our_payment_secret = nodes[1].node.create_inbound_payment_for_hash(our_payment_hash, Some(100_000), 7200, None).unwrap();
Expand DownExpand Up@@ -7189,7 +7189,7 @@ fn test_bump_penalty_txn_on_revoked_commitment() {

	let payment_preimage = route_payment(&nodes[0], &vec!(&nodes[1])[..], 3000000).0;
	let payment_params = PaymentParameters::from_node_id(nodes[0].node.get_our_node_id(), 30)
 .with_features(nodes[0].node.invoice_features());
 .with_bolt11_features(nodes[0].node.invoice_features()).unwrap();
	let (route,_, _, _) = get_route_and_payment_hash!(nodes[1], nodes[0], payment_params, 3000000);
	send_along_route(&nodes[1], route, &vec!(&nodes[0])[..], 3000000);

Expand DownExpand Up@@ -7294,13 +7294,13 @@ fn test_bump_penalty_txn_on_revoked_htlcs() {

	let chan = create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 1000000, 59000000);
	// Lock HTLC in both directions (using a slightly lower CLTV delay to provide timely RBF bumps)
	let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), 50).with_features(nodes[1].node.invoice_features());
	let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), 50).with_bolt11_features(nodes[1].node.invoice_features()).unwrap();
	let scorer = test_utils::TestScorer::new();
	let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
	let route = get_route(&nodes[0].node.get_our_node_id(), &payment_params, &nodes[0].network_graph.read_only(), None,
 3_000_000, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
	let payment_preimage = send_along_route(&nodes[0], route, &[&nodes[1]], 3_000_000).0;
	let payment_params = PaymentParameters::from_node_id(nodes[0].node.get_our_node_id(), 50).with_features(nodes[0].node.invoice_features());
	let payment_params = PaymentParameters::from_node_id(nodes[0].node.get_our_node_id(), 50).with_bolt11_features(nodes[0].node.invoice_features()).unwrap();
	let route = get_route(&nodes[1].node.get_our_node_id(), &payment_params, &nodes[1].network_graph.read_only(), None,
 3_000_000, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
	send_along_route(&nodes[1], route, &[&nodes[0]], 3_000_000);
Expand DownExpand Up@@ -9300,7 +9300,7 @@ fn do_test_dup_htlc_second_rejected(test_for_second_fail_panic: bool) {
	let _chan = create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 100000, 10001);

	let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features(nodes[1].node.invoice_features());
 .with_bolt11_features(nodes[1].node.invoice_features()).unwrap();
	let route = get_route!(nodes[0], payment_params, 10_000).unwrap();

	let (our_payment_preimage, our_payment_hash, our_payment_secret) = get_payment_preimage_hash!(&nodes[1]);
Expand DownExpand Up@@ -9409,7 +9409,7 @@ fn test_inconsistent_mpp_params() {
	let chan_2_3 =create_announced_chan_between_nodes_with_value(&nodes, 2, 3, 100_000, 0);

	let payment_params = PaymentParameters::from_node_id(nodes[3].node.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features(nodes[3].node.invoice_features());
 .with_bolt11_features(nodes[3].node.invoice_features()).unwrap();
	let mut route = get_route!(nodes[0], payment_params, 15_000_000).unwrap();
	assert_eq!(route.paths.len(), 2);
	route.paths.sort_by(|path_a, _| {
Expand Down

10 changes: 5 additions & 5 deletions
lightning/src/ln/onion_route_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -714,8 +714,8 @@ fn do_test_onion_failure_stale_channel_update(announced_channel: bool) {
 htlc_minimum_msat: None,
 }])];
 let payment_params = PaymentParameters::from_node_id(*channel_to_update_counterparty, TEST_FINAL_CLTV)
 .with_features(nodes[2].node.invoice_features())
 .with_route_hints(hop_hints);
 .with_bolt11_features(nodes[2].node.invoice_features()).unwrap()
 .with_route_hints(hop_hints).unwrap();
 get_route_and_payment_hash!(nodes[0], nodes[2], payment_params, PAYMENT_AMT)
	};
	send_along_route_with_secret(&nodes[0], route.clone(), &[&[&nodes[1], &nodes[2]]], PAYMENT_AMT,
Expand DownExpand Up@@ -861,7 +861,7 @@ fn test_always_create_tlv_format_onion_payloads() {
	create_announced_chan_between_nodes(&nodes, 1, 2);

	let payment_params = PaymentParameters::from_node_id(nodes[2].node.get_our_node_id(), TEST_FINAL_CLTV)
 .with_features(InvoiceFeatures::empty());
 .with_bolt11_features(InvoiceFeatures::empty()).unwrap();
	let (route, _payment_hash, _payment_preimage, _payment_secret) = get_route_and_payment_hash!(nodes[0], nodes[2], payment_params, 40000);

	let hops = &route.paths[0].hops;
Expand DownExpand Up@@ -963,7 +963,7 @@ macro_rules! get_phantom_route {
 let phantom_pubkey = $nodes[1].keys_manager.get_node_id(Recipient::PhantomNode).unwrap();
 let phantom_route_hint = $nodes[1].node.get_phantom_route_hints();
 let payment_params = PaymentParameters::from_node_id(phantom_pubkey, TEST_FINAL_CLTV)
 .with_features($nodes[1].node.invoice_features())
 .with_bolt11_features($nodes[1].node.invoice_features()).unwrap()
 .with_route_hints(vec![RouteHint(vec![
 RouteHintHop {
 src_node_id: $nodes[0].node.get_our_node_id(),
Expand All@@ -987,7 +987,7 @@ macro_rules! get_phantom_route {
 htlc_minimum_msat: None,
 htlc_maximum_msat: None,
 }
 ])]);
 ])]).unwrap();
 let scorer = test_utils::TestScorer::new();
 let network_graph = $nodes[0].network_graph.read_only();
 (get_route(
Expand Down
Loading