Skip to content

Routing to blinded payment paths#2120

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 10 commits into from
Jun 20, 2023
Merged

Routing to blinded payment paths #2120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d017657
Fix panic on pathfinding to blinded recipient
valentinewallace May 9, 2023
6b6d549
Fix oops'd docs on PaymentParameters::with_max_channel_saturation
valentinewallace May 19, 2023
3184393
Reverse (BlindedPath, BlindedPayInfo) tuple order in offers invoice.
valentinewallace Jun 16, 2023
6a54098
Add utils for creating blinded PaymentParameters
valentinewallace May 19, 2023
a291881
Replace max_channel_saturation_power_of_half hardcode with const
valentinewallace Jun 14, 2023
be59d01
Routing: accommodate for blinded paths in used liquidity tracking
valentinewallace Jun 13, 2023
b3a27ac
Update CandidateRouteHop::short_channel_id to be optional
valentinewallace Jun 13, 2023
8344222
Add CandidateRouteHop::Blinded and ::OneHopBlinded variant
valentinewallace Jun 13, 2023
25a7073
Router: clean up Path construction
valentinewallace Jun 15, 2023
6c3ca55
Implement routing to blinded payment paths
valentinewallace Jun 14, 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/invoice_request_deser.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -97,7 +97,7 @@ fn build_response<'a, T: secp256k1::Signing + secp256k1::Verification>(
},
];

let payment_paths = paths.into_iter().zip(payinfo.into_iter()).collect();
let payment_paths = payinfo.into_iter().zip(paths.into_iter()).collect();
let payment_hash = PaymentHash([42; 32]);
invoice_request.respond_with(payment_paths, payment_hash)?.build()
}
Expand Down
2 changes: 1 addition & 1 deletion fuzz/src/refund_deser.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -86,7 +86,7 @@ fn build_response<'a, T: secp256k1::Signing + secp256k1::Verification>(
},
];

let payment_paths = paths.into_iter().zip(payinfo.into_iter()).collect();
let payment_paths = payinfo.into_iter().zip(paths.into_iter()).collect();
let payment_hash = PaymentHash([42; 32]);
refund.respond_with(payment_paths, payment_hash, signing_pubkey)?.build()
}
Expand Down
54 changes: 27 additions & 27 deletions lightning/src/offers/invoice.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@
//! # use lightning::offers::invoice::BlindedPayInfo;
//! # use lightning::blinded_path::BlindedPath;
//! #
//! # fn create_payment_paths() -> Vec<(BlindedPath, BlindedPayInfo)> { unimplemented!() }
//! # fn create_payment_paths() -> Vec<(BlindedPayInfo, BlindedPath)> { unimplemented!() }
//! # fn create_payment_hash() -> PaymentHash { unimplemented!() }
//! #
//! # fn parse_invoice_request(bytes: Vec<u8>) -> Result<(), lightning::offers::parse::ParseError> {
Expand DownExpand Up@@ -166,7 +166,7 @@ impl SigningPubkeyStrategy for DerivedSigningPubkey {}

impl<'a> InvoiceBuilder<'a, ExplicitSigningPubkey> {
pub(super) fn for_offer(
invoice_request: &'a InvoiceRequest, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>,
invoice_request: &'a InvoiceRequest, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>,
created_at: Duration, payment_hash: PaymentHash
) -> Result<Self, SemanticError> {
let amount_msats = Self::check_amount_msats(invoice_request)?;
Expand All@@ -182,7 +182,7 @@ impl<'a> InvoiceBuilder<'a, ExplicitSigningPubkey> {
}

pub(super) fn for_refund(
refund: &'a Refund, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, created_at: Duration,
refund: &'a Refund, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, created_at: Duration,
payment_hash: PaymentHash, signing_pubkey: PublicKey
) -> Result<Self, SemanticError> {
let amount_msats = refund.amount_msats();
Expand All@@ -199,7 +199,7 @@ impl<'a> InvoiceBuilder<'a, ExplicitSigningPubkey> {

impl<'a> InvoiceBuilder<'a, DerivedSigningPubkey> {
pub(super) fn for_offer_using_keys(
invoice_request: &'a InvoiceRequest, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>,
invoice_request: &'a InvoiceRequest, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>,
created_at: Duration, payment_hash: PaymentHash, keys: KeyPair
) -> Result<Self, SemanticError> {
let amount_msats = Self::check_amount_msats(invoice_request)?;
Expand All@@ -215,7 +215,7 @@ impl<'a> InvoiceBuilder<'a, DerivedSigningPubkey> {
}

pub(super) fn for_refund_using_keys(
refund: &'a Refund, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, created_at: Duration,
refund: &'a Refund, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, created_at: Duration,
payment_hash: PaymentHash, keys: KeyPair,
) -> Result<Self, SemanticError> {
let amount_msats = refund.amount_msats();
Expand DownExpand Up@@ -247,7 +247,7 @@ impl<'a, S: SigningPubkeyStrategy> InvoiceBuilder<'a, S> {
}

fn fields(
payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, created_at: Duration,
payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, created_at: Duration,
payment_hash: PaymentHash, amount_msats: u64, signing_pubkey: PublicKey
) -> InvoiceFields {
InvoiceFields {
Expand DownExpand Up@@ -454,7 +454,7 @@ enum InvoiceContents {
/// Invoice-specific fields for an `invoice` message.
#[derive(Clone, Debug, PartialEq)]
struct InvoiceFields {
payment_paths: Vec<(BlindedPath, BlindedPayInfo)>,
payment_paths: Vec<(BlindedPayInfo, BlindedPath)>,
created_at: Duration,
relative_expiry: Option<Duration>,
payment_hash: PaymentHash,
Expand All@@ -476,7 +476,7 @@ impl Invoice {
///
/// Blinded paths provide recipient privacy by obfuscating its node id. Note, however, that this
/// privacy is lost if a public node id is used for [`Invoice::signing_pubkey`].
pub fn payment_paths(&self) -> &[(BlindedPath, BlindedPayInfo)] {
pub fn payment_paths(&self) -> &[(BlindedPayInfo, BlindedPath)] {
&self.contents.fields().payment_paths[..]
}

Expand DownExpand Up@@ -703,8 +703,8 @@ impl InvoiceFields {
};

InvoiceTlvStreamRef {
paths: Some(Iterable(self.payment_paths.iter().map(|(path, _)| path))),
blindedpay: Some(Iterable(self.payment_paths.iter().map(|(_, payinfo)| payinfo))),
paths: Some(Iterable(self.payment_paths.iter().map(|(_, path)| path))),
blindedpay: Some(Iterable(self.payment_paths.iter().map(|(payinfo, _)| payinfo))),
created_at: Some(self.created_at.as_secs()),
relative_expiry: self.relative_expiry.map(|duration| duration.as_secs() as u32),
payment_hash: Some(&self.payment_hash),
Expand DownExpand Up@@ -750,13 +750,13 @@ tlv_stream!(InvoiceTlvStream, InvoiceTlvStreamRef, 160..240, {
});

type BlindedPathIter<'a> = core::iter::Map<
core::slice::Iter<'a, (BlindedPath, BlindedPayInfo)>,
for<'r> fn(&'r (BlindedPath, BlindedPayInfo)) -> &'r BlindedPath,
core::slice::Iter<'a, (BlindedPayInfo, BlindedPath)>,
for<'r> fn(&'r (BlindedPayInfo, BlindedPath)) -> &'r BlindedPath,
>;

type BlindedPayInfoIter<'a> = core::iter::Map<
core::slice::Iter<'a, (BlindedPath, BlindedPayInfo)>,
for<'r> fn(&'r (BlindedPath, BlindedPayInfo)) -> &'r BlindedPayInfo,
core::slice::Iter<'a, (BlindedPayInfo, BlindedPath)>,
for<'r> fn(&'r (BlindedPayInfo, BlindedPath)) -> &'r BlindedPayInfo,
>;

/// Information needed to route a payment across a [`BlindedPath`].
Expand DownExpand Up@@ -878,15 +878,15 @@ impl TryFrom<PartialInvoiceTlvStream> for InvoiceContents {
},
) = tlv_stream;

let payment_paths = match (paths, blindedpay) {
(None, _) => return Err(SemanticError::MissingPaths),
(_, None) => return Err(SemanticError::InvalidPayInfo),
(Some(paths), _) if paths.is_empty() => return Err(SemanticError::MissingPaths),
(Some(paths), Some(blindedpay)) if paths.len() != blindedpay.len() => {
let payment_paths = match (blindedpay, paths) {
(_, None) => return Err(SemanticError::MissingPaths),
(None, _) => return Err(SemanticError::InvalidPayInfo),
(_, Some(paths)) if paths.is_empty() => return Err(SemanticError::MissingPaths),
(Some(blindedpay), Some(paths)) if paths.len() != blindedpay.len() => {
return Err(SemanticError::InvalidPayInfo);
},
(Some(paths), Some(blindedpay)) => {
paths.into_iter().zip(blindedpay.into_iter()).collect::<Vec<_>>()
(Some(blindedpay), Some(paths)) => {
blindedpay.into_iter().zip(paths.into_iter()).collect::<Vec<_>>()
},
};

Expand DownExpand Up@@ -1052,8 +1052,8 @@ mod tests {
payer_note: None,
},
InvoiceTlvStreamRef {
paths: Some(Iterable(payment_paths.iter().map(|(path, _)| path))),
blindedpay: Some(Iterable(payment_paths.iter().map(|(_, payinfo)| payinfo))),
paths: Some(Iterable(payment_paths.iter().map(|(_, path)| path))),
blindedpay: Some(Iterable(payment_paths.iter().map(|(payinfo, _)| payinfo))),
created_at: Some(now.as_secs()),
relative_expiry: None,
payment_hash: Some(&payment_hash),
Expand DownExpand Up@@ -1130,8 +1130,8 @@ mod tests {
payer_note: None,
},
InvoiceTlvStreamRef {
paths: Some(Iterable(payment_paths.iter().map(|(path, _)| path))),
blindedpay: Some(Iterable(payment_paths.iter().map(|(_, payinfo)| payinfo))),
paths: Some(Iterable(payment_paths.iter().map(|(_, path)| path))),
blindedpay: Some(Iterable(payment_paths.iter().map(|(payinfo, _)| payinfo))),
created_at: Some(now.as_secs()),
relative_expiry: None,
payment_hash: Some(&payment_hash),
Expand DownExpand Up@@ -1516,7 +1516,7 @@ mod tests {

let empty_payment_paths = vec![];
let mut tlv_stream = invoice.as_tlv_stream();
tlv_stream.3.paths = Some(Iterable(empty_payment_paths.iter().map(|(path, _)| path)));
tlv_stream.3.paths = Some(Iterable(empty_payment_paths.iter().map(|(_, path)| path)));

match Invoice::try_from(tlv_stream.to_bytes()) {
Ok(_) => panic!("expected error"),
Expand All@@ -1526,7 +1526,7 @@ mod tests {
let mut payment_paths = payment_paths();
payment_paths.pop();
let mut tlv_stream = invoice.as_tlv_stream();
tlv_stream.3.blindedpay = Some(Iterable(payment_paths.iter().map(|(_, payinfo)| payinfo)));
tlv_stream.3.blindedpay = Some(Iterable(payment_paths.iter().map(|(payinfo, _)| payinfo)));

match Invoice::try_from(tlv_stream.to_bytes()) {
Ok(_) => panic!("expected error"),
Expand Down
8 changes: 4 additions & 4 deletions lightning/src/offers/invoice_request.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -480,7 +480,7 @@ impl InvoiceRequest {
/// [`Duration`]: core::time::Duration
#[cfg(feature = "std")]
pub fn respond_with(
&self, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, payment_hash: PaymentHash
&self, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, payment_hash: PaymentHash
) -> Result<InvoiceBuilder<ExplicitSigningPubkey>, SemanticError> {
let created_at = std::time::SystemTime::now()
.duration_since(std::time::SystemTime::UNIX_EPOCH)
Expand DownExpand Up@@ -509,7 +509,7 @@ impl InvoiceRequest {
///
/// [`Invoice::created_at`]: crate::offers::invoice::Invoice::created_at
pub fn respond_with_no_std(
&self, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, payment_hash: PaymentHash,
&self, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, payment_hash: PaymentHash,
created_at: core::time::Duration
) -> Result<InvoiceBuilder<ExplicitSigningPubkey>, SemanticError> {
if self.features().requires_unknown_bits() {
Expand All@@ -530,7 +530,7 @@ impl InvoiceRequest {
/// [`Invoice`]: crate::offers::invoice::Invoice
#[cfg(feature = "std")]
pub fn verify_and_respond_using_derived_keys<T: secp256k1::Signing>(
&self, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, payment_hash: PaymentHash,
&self, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, payment_hash: PaymentHash,
expanded_key: &ExpandedKey, secp_ctx: &Secp256k1<T>
) -> Result<InvoiceBuilder<DerivedSigningPubkey>, SemanticError> {
let created_at = std::time::SystemTime::now()
Expand All@@ -552,7 +552,7 @@ impl InvoiceRequest {
///
/// [`Invoice`]: crate::offers::invoice::Invoice
pub fn verify_and_respond_using_derived_keys_no_std<T: secp256k1::Signing>(
&self, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, payment_hash: PaymentHash,
&self, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, payment_hash: PaymentHash,
created_at: core::time::Duration, expanded_key: &ExpandedKey, secp_ctx: &Secp256k1<T>
) -> Result<InvoiceBuilder<DerivedSigningPubkey>, SemanticError> {
if self.features().requires_unknown_bits() {
Expand Down
8 changes: 4 additions & 4 deletions lightning/src/offers/refund.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -394,7 +394,7 @@ impl Refund {
/// [`Duration`]: core::time::Duration
#[cfg(feature = "std")]
pub fn respond_with(
&self, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, payment_hash: PaymentHash,
&self, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, payment_hash: PaymentHash,
signing_pubkey: PublicKey,
) -> Result<InvoiceBuilder<ExplicitSigningPubkey>, SemanticError> {
let created_at = std::time::SystemTime::now()
Expand DownExpand Up@@ -427,7 +427,7 @@ impl Refund {
///
/// [`Invoice::created_at`]: crate::offers::invoice::Invoice::created_at
pub fn respond_with_no_std(
&self, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, payment_hash: PaymentHash,
&self, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, payment_hash: PaymentHash,
signing_pubkey: PublicKey, created_at: Duration
) -> Result<InvoiceBuilder<ExplicitSigningPubkey>, SemanticError> {
if self.features().requires_unknown_bits() {
Expand All@@ -447,7 +447,7 @@ impl Refund {
/// [`Invoice`]: crate::offers::invoice::Invoice
#[cfg(feature = "std")]
pub fn respond_using_derived_keys<ES: Deref>(
&self, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, payment_hash: PaymentHash,
&self, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, payment_hash: PaymentHash,
expanded_key: &ExpandedKey, entropy_source: ES
) -> Result<InvoiceBuilder<DerivedSigningPubkey>, SemanticError>
where
Expand All@@ -471,7 +471,7 @@ impl Refund {
///
/// [`Invoice`]: crate::offers::invoice::Invoice
pub fn respond_using_derived_keys_no_std<ES: Deref>(
&self, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, payment_hash: PaymentHash,
&self, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, payment_hash: PaymentHash,
created_at: core::time::Duration, expanded_key: &ExpandedKey, entropy_source: ES
) -> Result<InvoiceBuilder<DerivedSigningPubkey>, SemanticError>
where
Expand Down
4 changes: 2 additions & 2 deletions lightning/src/offers/test_utils.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,7 +58,7 @@ pub(super) fn privkey(byte: u8) -> SecretKey {
SecretKey::from_slice(&[byte; 32]).unwrap()
}

pub(super) fn payment_paths() -> Vec<(BlindedPath, BlindedPayInfo)> {
pub(super) fn payment_paths() -> Vec<(BlindedPayInfo, BlindedPath)> {
let paths = vec![
BlindedPath {
introduction_node_id: pubkey(40),
Expand DownExpand Up@@ -97,7 +97,7 @@ pub(super) fn payment_paths() -> Vec<(BlindedPath, BlindedPayInfo)> {
},
];

paths.into_iter().zip(payinfo.into_iter()).collect()
payinfo.into_iter().zip(paths.into_iter()).collect()
}

pub(super) fn payment_hash() -> PaymentHash {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Routing to blinded payment paths by valentinewallace · Pull Request #2120 · lightningdevkit/rust-lightning · GitHub
Skip to content
Routing to blinded payment paths#2120

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

from

Jun 20, 2023
 Merged


Routing to blinded payment paths
#2120
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
d017657

Fix panic on pathfinding to blinded recipient


valentinewallace May 9, 2023
6b6d549

Fix oops'd docs on PaymentParameters::with_max_channel_saturation


valentinewallace May 19, 2023
3184393

Reverse (BlindedPath, BlindedPayInfo) tuple order in offers invoice.


valentinewallace Jun 16, 2023
6a54098

Add utils for creating blinded PaymentParameters


valentinewallace May 19, 2023
a291881

Replace max_channel_saturation_power_of_half hardcode with const


valentinewallace Jun 14, 2023
be59d01

Routing: accommodate for blinded paths in used liquidity tracking


valentinewallace Jun 13, 2023
b3a27ac

Update CandidateRouteHop::short_channel_id to be optional


valentinewallace Jun 13, 2023
8344222

Add CandidateRouteHop::Blinded and ::OneHopBlinded variant


valentinewallace Jun 13, 2023
25a7073

Router: clean up Path construction


valentinewallace Jun 15, 2023
6c3ca55

Implement routing to blinded payment paths


valentinewallace Jun 14, 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/invoice_request_deser.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -97,7 +97,7 @@ fn build_response<'a, T: secp256k1::Signing + secp256k1::Verification>(
 },
	];

	let payment_paths = paths.into_iter().zip(payinfo.into_iter()).collect();
	let payment_paths = payinfo.into_iter().zip(paths.into_iter()).collect();
	let payment_hash = PaymentHash([42; 32]);
	invoice_request.respond_with(payment_paths, payment_hash)?.build()
}
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,7 +86,7 @@ fn build_response<'a, T: secp256k1::Signing + secp256k1::Verification>(
 },
	];

	let payment_paths = paths.into_iter().zip(payinfo.into_iter()).collect();
	let payment_paths = payinfo.into_iter().zip(paths.into_iter()).collect();
	let payment_hash = PaymentHash([42; 32]);
	refund.respond_with(payment_paths, payment_hash, signing_pubkey)?.build()
}
Expand Down

54 changes: 27 additions & 27 deletions
lightning/src/offers/invoice.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@
//! # use lightning::offers::invoice::BlindedPayInfo;
//! # use lightning::blinded_path::BlindedPath;
//! #
//! # fn create_payment_paths() -> Vec<(BlindedPath, BlindedPayInfo)> { unimplemented!() }
//! # fn create_payment_paths() -> Vec<(BlindedPayInfo, BlindedPath)> { unimplemented!() }
//! # fn create_payment_hash() -> PaymentHash { unimplemented!() }
//! #
//! # fn parse_invoice_request(bytes: Vec<u8>) -> Result<(), lightning::offers::parse::ParseError> {
Expand DownExpand Up@@ -166,7 +166,7 @@ impl SigningPubkeyStrategy for DerivedSigningPubkey {}

impl<'a> InvoiceBuilder<'a, ExplicitSigningPubkey> {
	pub(super) fn for_offer(
 invoice_request: &'a InvoiceRequest, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>,
 invoice_request: &'a InvoiceRequest, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>,
 created_at: Duration, payment_hash: PaymentHash
	) -> Result<Self, SemanticError> {
 let amount_msats = Self::check_amount_msats(invoice_request)?;
Expand All@@ -182,7 +182,7 @@ impl<'a> InvoiceBuilder<'a, ExplicitSigningPubkey> {
	}

	pub(super) fn for_refund(
 refund: &'a Refund, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, created_at: Duration,
 refund: &'a Refund, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, created_at: Duration,
 payment_hash: PaymentHash, signing_pubkey: PublicKey
	) -> Result<Self, SemanticError> {
 let amount_msats = refund.amount_msats();
Expand All@@ -199,7 +199,7 @@ impl<'a> InvoiceBuilder<'a, ExplicitSigningPubkey> {

impl<'a> InvoiceBuilder<'a, DerivedSigningPubkey> {
	pub(super) fn for_offer_using_keys(
 invoice_request: &'a InvoiceRequest, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>,
 invoice_request: &'a InvoiceRequest, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>,
 created_at: Duration, payment_hash: PaymentHash, keys: KeyPair
	) -> Result<Self, SemanticError> {
 let amount_msats = Self::check_amount_msats(invoice_request)?;
Expand All@@ -215,7 +215,7 @@ impl<'a> InvoiceBuilder<'a, DerivedSigningPubkey> {
	}

	pub(super) fn for_refund_using_keys(
 refund: &'a Refund, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, created_at: Duration,
 refund: &'a Refund, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, created_at: Duration,
 payment_hash: PaymentHash, keys: KeyPair,
	) -> Result<Self, SemanticError> {
 let amount_msats = refund.amount_msats();
Expand DownExpand Up@@ -247,7 +247,7 @@ impl<'a, S: SigningPubkeyStrategy> InvoiceBuilder<'a, S> {
	}

	fn fields(
 payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, created_at: Duration,
 payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, created_at: Duration,
 payment_hash: PaymentHash, amount_msats: u64, signing_pubkey: PublicKey
	) -> InvoiceFields {
 InvoiceFields {
Expand DownExpand Up@@ -454,7 +454,7 @@ enum InvoiceContents {
/// Invoice-specific fields for an `invoice` message.
#[derive(Clone, Debug, PartialEq)]
struct InvoiceFields {
	payment_paths: Vec<(BlindedPath, BlindedPayInfo)>,
	payment_paths: Vec<(BlindedPayInfo, BlindedPath)>,
	created_at: Duration,
	relative_expiry: Option<Duration>,
	payment_hash: PaymentHash,
Expand All@@ -476,7 +476,7 @@ impl Invoice {
	///
	/// Blinded paths provide recipient privacy by obfuscating its node id. Note, however, that this
	/// privacy is lost if a public node id is used for [`Invoice::signing_pubkey`].
	pub fn payment_paths(&self) -> &[(BlindedPath, BlindedPayInfo)] {
	pub fn payment_paths(&self) -> &[(BlindedPayInfo, BlindedPath)] {
 &self.contents.fields().payment_paths[..]
	}

Expand DownExpand Up@@ -703,8 +703,8 @@ impl InvoiceFields {
 };

 InvoiceTlvStreamRef {
 paths: Some(Iterable(self.payment_paths.iter().map(|(path, _)| path))),
 blindedpay: Some(Iterable(self.payment_paths.iter().map(|(_, payinfo)| payinfo))),
 paths: Some(Iterable(self.payment_paths.iter().map(|(_, path)| path))),
 blindedpay: Some(Iterable(self.payment_paths.iter().map(|(payinfo, _)| payinfo))),
 created_at: Some(self.created_at.as_secs()),
 relative_expiry: self.relative_expiry.map(|duration| duration.as_secs() as u32),
 payment_hash: Some(&self.payment_hash),
Expand DownExpand Up@@ -750,13 +750,13 @@ tlv_stream!(InvoiceTlvStream, InvoiceTlvStreamRef, 160..240, {
});

type BlindedPathIter<'a> = core::iter::Map<
	core::slice::Iter<'a, (BlindedPath, BlindedPayInfo)>,
	for<'r> fn(&'r (BlindedPath, BlindedPayInfo)) -> &'r BlindedPath,
	core::slice::Iter<'a, (BlindedPayInfo, BlindedPath)>,
	for<'r> fn(&'r (BlindedPayInfo, BlindedPath)) -> &'r BlindedPath,
>;

type BlindedPayInfoIter<'a> = core::iter::Map<
	core::slice::Iter<'a, (BlindedPath, BlindedPayInfo)>,
	for<'r> fn(&'r (BlindedPath, BlindedPayInfo)) -> &'r BlindedPayInfo,
	core::slice::Iter<'a, (BlindedPayInfo, BlindedPath)>,
	for<'r> fn(&'r (BlindedPayInfo, BlindedPath)) -> &'r BlindedPayInfo,
>;

/// Information needed to route a payment across a [`BlindedPath`].
Expand DownExpand Up@@ -878,15 +878,15 @@ impl TryFrom<PartialInvoiceTlvStream> for InvoiceContents {
 },
 ) = tlv_stream;

 let payment_paths = match (paths, blindedpay) {
 (None, _) => return Err(SemanticError::MissingPaths),
 (_, None) => return Err(SemanticError::InvalidPayInfo),
 (Some(paths), _) if paths.is_empty() => return Err(SemanticError::MissingPaths),
 (Some(paths), Some(blindedpay)) if paths.len() != blindedpay.len() => {
 let payment_paths = match (blindedpay, paths) {
 (_, None) => return Err(SemanticError::MissingPaths),
 (None, _) => return Err(SemanticError::InvalidPayInfo),
 (_, Some(paths)) if paths.is_empty() => return Err(SemanticError::MissingPaths),
 (Some(blindedpay), Some(paths)) if paths.len() != blindedpay.len() => {
 return Err(SemanticError::InvalidPayInfo);
 },
 (Some(paths), Some(blindedpay)) => {
paths.into_iter().zip(blindedpay.into_iter()).collect::<Vec<_>>()
 (Some(blindedpay), Some(paths)) => {
blindedpay.into_iter().zip(paths.into_iter()).collect::<Vec<_>>()
 },
 };

Expand DownExpand Up@@ -1052,8 +1052,8 @@ mod tests {
 payer_note: None,
 },
 InvoiceTlvStreamRef {
 paths: Some(Iterable(payment_paths.iter().map(|(path, _)| path))),
 blindedpay: Some(Iterable(payment_paths.iter().map(|(_, payinfo)| payinfo))),
 paths: Some(Iterable(payment_paths.iter().map(|(_, path)| path))),
 blindedpay: Some(Iterable(payment_paths.iter().map(|(payinfo, _)| payinfo))),
 created_at: Some(now.as_secs()),
 relative_expiry: None,
 payment_hash: Some(&payment_hash),
Expand DownExpand Up@@ -1130,8 +1130,8 @@ mod tests {
 payer_note: None,
 },
 InvoiceTlvStreamRef {
 paths: Some(Iterable(payment_paths.iter().map(|(path, _)| path))),
 blindedpay: Some(Iterable(payment_paths.iter().map(|(_, payinfo)| payinfo))),
 paths: Some(Iterable(payment_paths.iter().map(|(_, path)| path))),
 blindedpay: Some(Iterable(payment_paths.iter().map(|(payinfo, _)| payinfo))),
 created_at: Some(now.as_secs()),
 relative_expiry: None,
 payment_hash: Some(&payment_hash),
Expand DownExpand Up@@ -1516,7 +1516,7 @@ mod tests {

 let empty_payment_paths = vec![];
 let mut tlv_stream = invoice.as_tlv_stream();
 tlv_stream.3.paths = Some(Iterable(empty_payment_paths.iter().map(|(path, _)| path)));
 tlv_stream.3.paths = Some(Iterable(empty_payment_paths.iter().map(|(_, path)| path)));

 match Invoice::try_from(tlv_stream.to_bytes()) {
 Ok(_) => panic!("expected error"),
Expand All@@ -1526,7 +1526,7 @@ mod tests {
 let mut payment_paths = payment_paths();
 payment_paths.pop();
 let mut tlv_stream = invoice.as_tlv_stream();
 tlv_stream.3.blindedpay = Some(Iterable(payment_paths.iter().map(|(_, payinfo)| payinfo)));
 tlv_stream.3.blindedpay = Some(Iterable(payment_paths.iter().map(|(payinfo, _)| payinfo)));

 match Invoice::try_from(tlv_stream.to_bytes()) {
 Ok(_) => panic!("expected error"),
Expand Down

8 changes: 4 additions & 4 deletions
lightning/src/offers/invoice_request.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -480,7 +480,7 @@ impl InvoiceRequest {
	/// [`Duration`]: core::time::Duration
	#[cfg(feature = "std")]
	pub fn respond_with(
 &self, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, payment_hash: PaymentHash
 &self, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, payment_hash: PaymentHash
	) -> Result<InvoiceBuilder<ExplicitSigningPubkey>, SemanticError> {
 let created_at = std::time::SystemTime::now()
 .duration_since(std::time::SystemTime::UNIX_EPOCH)
Expand DownExpand Up@@ -509,7 +509,7 @@ impl InvoiceRequest {
	///
	/// [`Invoice::created_at`]: crate::offers::invoice::Invoice::created_at
	pub fn respond_with_no_std(
 &self, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, payment_hash: PaymentHash,
 &self, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, payment_hash: PaymentHash,
 created_at: core::time::Duration
	) -> Result<InvoiceBuilder<ExplicitSigningPubkey>, SemanticError> {
 if self.features().requires_unknown_bits() {
Expand All@@ -530,7 +530,7 @@ impl InvoiceRequest {
	/// [`Invoice`]: crate::offers::invoice::Invoice
	#[cfg(feature = "std")]
	pub fn verify_and_respond_using_derived_keys<T: secp256k1::Signing>(
 &self, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, payment_hash: PaymentHash,
 &self, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, payment_hash: PaymentHash,
 expanded_key: &ExpandedKey, secp_ctx: &Secp256k1<T>
	) -> Result<InvoiceBuilder<DerivedSigningPubkey>, SemanticError> {
 let created_at = std::time::SystemTime::now()
Expand All@@ -552,7 +552,7 @@ impl InvoiceRequest {
	///
	/// [`Invoice`]: crate::offers::invoice::Invoice
	pub fn verify_and_respond_using_derived_keys_no_std<T: secp256k1::Signing>(
 &self, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, payment_hash: PaymentHash,
 &self, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, payment_hash: PaymentHash,
 created_at: core::time::Duration, expanded_key: &ExpandedKey, secp_ctx: &Secp256k1<T>
	) -> Result<InvoiceBuilder<DerivedSigningPubkey>, SemanticError> {
 if self.features().requires_unknown_bits() {
Expand Down

8 changes: 4 additions & 4 deletions
lightning/src/offers/refund.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -394,7 +394,7 @@ impl Refund {
	/// [`Duration`]: core::time::Duration
	#[cfg(feature = "std")]
	pub fn respond_with(
 &self, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, payment_hash: PaymentHash,
 &self, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, payment_hash: PaymentHash,
 signing_pubkey: PublicKey,
	) -> Result<InvoiceBuilder<ExplicitSigningPubkey>, SemanticError> {
 let created_at = std::time::SystemTime::now()
Expand DownExpand Up@@ -427,7 +427,7 @@ impl Refund {
	///
	/// [`Invoice::created_at`]: crate::offers::invoice::Invoice::created_at
	pub fn respond_with_no_std(
 &self, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, payment_hash: PaymentHash,
 &self, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, payment_hash: PaymentHash,
 signing_pubkey: PublicKey, created_at: Duration
	) -> Result<InvoiceBuilder<ExplicitSigningPubkey>, SemanticError> {
 if self.features().requires_unknown_bits() {
Expand All@@ -447,7 +447,7 @@ impl Refund {
	/// [`Invoice`]: crate::offers::invoice::Invoice
	#[cfg(feature = "std")]
	pub fn respond_using_derived_keys<ES: Deref>(
 &self, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, payment_hash: PaymentHash,
 &self, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, payment_hash: PaymentHash,
 expanded_key: &ExpandedKey, entropy_source: ES
	) -> Result<InvoiceBuilder<DerivedSigningPubkey>, SemanticError>
	where
Expand All@@ -471,7 +471,7 @@ impl Refund {
	///
	/// [`Invoice`]: crate::offers::invoice::Invoice
	pub fn respond_using_derived_keys_no_std<ES: Deref>(
 &self, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, payment_hash: PaymentHash,
 &self, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, payment_hash: PaymentHash,
 created_at: core::time::Duration, expanded_key: &ExpandedKey, entropy_source: ES
	) -> Result<InvoiceBuilder<DerivedSigningPubkey>, SemanticError>
	where
Expand Down

4 changes: 2 additions & 2 deletions
lightning/src/offers/test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,7 +58,7 @@ pub(super) fn privkey(byte: u8) -> SecretKey {
	SecretKey::from_slice(&[byte; 32]).unwrap()
}

pub(super) fn payment_paths() -> Vec<(BlindedPath, BlindedPayInfo)> {
pub(super) fn payment_paths() -> Vec<(BlindedPayInfo, BlindedPath)> {
	let paths = vec![
 BlindedPath {
 introduction_node_id: pubkey(40),
Expand DownExpand Up@@ -97,7 +97,7 @@ pub(super) fn payment_paths() -> Vec<(BlindedPath, BlindedPayInfo)> {
 },
	];

paths.into_iter().zip(payinfo.into_iter()).collect()
payinfo.into_iter().zip(paths.into_iter()).collect()
}

pub(super) fn payment_hash() -> PaymentHash {
Expand Down
Loading

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

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

from

Jun 20, 2023
 Merged


Routing to blinded payment paths
#2120
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
d017657

Fix panic on pathfinding to blinded recipient


valentinewallace May 9, 2023
6b6d549

Fix oops'd docs on PaymentParameters::with_max_channel_saturation


valentinewallace May 19, 2023
3184393

Reverse (BlindedPath, BlindedPayInfo) tuple order in offers invoice.


valentinewallace Jun 16, 2023
6a54098

Add utils for creating blinded PaymentParameters


valentinewallace May 19, 2023
a291881

Replace max_channel_saturation_power_of_half hardcode with const


valentinewallace Jun 14, 2023
be59d01

Routing: accommodate for blinded paths in used liquidity tracking


valentinewallace Jun 13, 2023
b3a27ac

Update CandidateRouteHop::short_channel_id to be optional


valentinewallace Jun 13, 2023
8344222

Add CandidateRouteHop::Blinded and ::OneHopBlinded variant


valentinewallace Jun 13, 2023
25a7073

Router: clean up Path construction


valentinewallace Jun 15, 2023
6c3ca55

Implement routing to blinded payment paths


valentinewallace Jun 14, 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/invoice_request_deser.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -97,7 +97,7 @@ fn build_response<'a, T: secp256k1::Signing + secp256k1::Verification>(
 },
	];

	let payment_paths = paths.into_iter().zip(payinfo.into_iter()).collect();
	let payment_paths = payinfo.into_iter().zip(paths.into_iter()).collect();
	let payment_hash = PaymentHash([42; 32]);
	invoice_request.respond_with(payment_paths, payment_hash)?.build()
}
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,7 +86,7 @@ fn build_response<'a, T: secp256k1::Signing + secp256k1::Verification>(
 },
	];

	let payment_paths = paths.into_iter().zip(payinfo.into_iter()).collect();
	let payment_paths = payinfo.into_iter().zip(paths.into_iter()).collect();
	let payment_hash = PaymentHash([42; 32]);
	refund.respond_with(payment_paths, payment_hash, signing_pubkey)?.build()
}
Expand Down

54 changes: 27 additions & 27 deletions
lightning/src/offers/invoice.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@
//! # use lightning::offers::invoice::BlindedPayInfo;
//! # use lightning::blinded_path::BlindedPath;
//! #
//! # fn create_payment_paths() -> Vec<(BlindedPath, BlindedPayInfo)> { unimplemented!() }
//! # fn create_payment_paths() -> Vec<(BlindedPayInfo, BlindedPath)> { unimplemented!() }
//! # fn create_payment_hash() -> PaymentHash { unimplemented!() }
//! #
//! # fn parse_invoice_request(bytes: Vec<u8>) -> Result<(), lightning::offers::parse::ParseError> {
Expand DownExpand Up@@ -166,7 +166,7 @@ impl SigningPubkeyStrategy for DerivedSigningPubkey {}

impl<'a> InvoiceBuilder<'a, ExplicitSigningPubkey> {
	pub(super) fn for_offer(
 invoice_request: &'a InvoiceRequest, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>,
 invoice_request: &'a InvoiceRequest, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>,
 created_at: Duration, payment_hash: PaymentHash
	) -> Result<Self, SemanticError> {
 let amount_msats = Self::check_amount_msats(invoice_request)?;
Expand All@@ -182,7 +182,7 @@ impl<'a> InvoiceBuilder<'a, ExplicitSigningPubkey> {
	}

	pub(super) fn for_refund(
 refund: &'a Refund, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, created_at: Duration,
 refund: &'a Refund, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, created_at: Duration,
 payment_hash: PaymentHash, signing_pubkey: PublicKey
	) -> Result<Self, SemanticError> {
 let amount_msats = refund.amount_msats();
Expand All@@ -199,7 +199,7 @@ impl<'a> InvoiceBuilder<'a, ExplicitSigningPubkey> {

impl<'a> InvoiceBuilder<'a, DerivedSigningPubkey> {
	pub(super) fn for_offer_using_keys(
 invoice_request: &'a InvoiceRequest, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>,
 invoice_request: &'a InvoiceRequest, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>,
 created_at: Duration, payment_hash: PaymentHash, keys: KeyPair
	) -> Result<Self, SemanticError> {
 let amount_msats = Self::check_amount_msats(invoice_request)?;
Expand All@@ -215,7 +215,7 @@ impl<'a> InvoiceBuilder<'a, DerivedSigningPubkey> {
	}

	pub(super) fn for_refund_using_keys(
 refund: &'a Refund, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, created_at: Duration,
 refund: &'a Refund, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, created_at: Duration,
 payment_hash: PaymentHash, keys: KeyPair,
	) -> Result<Self, SemanticError> {
 let amount_msats = refund.amount_msats();
Expand DownExpand Up@@ -247,7 +247,7 @@ impl<'a, S: SigningPubkeyStrategy> InvoiceBuilder<'a, S> {
	}

	fn fields(
 payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, created_at: Duration,
 payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, created_at: Duration,
 payment_hash: PaymentHash, amount_msats: u64, signing_pubkey: PublicKey
	) -> InvoiceFields {
 InvoiceFields {
Expand DownExpand Up@@ -454,7 +454,7 @@ enum InvoiceContents {
/// Invoice-specific fields for an `invoice` message.
#[derive(Clone, Debug, PartialEq)]
struct InvoiceFields {
	payment_paths: Vec<(BlindedPath, BlindedPayInfo)>,
	payment_paths: Vec<(BlindedPayInfo, BlindedPath)>,
	created_at: Duration,
	relative_expiry: Option<Duration>,
	payment_hash: PaymentHash,
Expand All@@ -476,7 +476,7 @@ impl Invoice {
	///
	/// Blinded paths provide recipient privacy by obfuscating its node id. Note, however, that this
	/// privacy is lost if a public node id is used for [`Invoice::signing_pubkey`].
	pub fn payment_paths(&self) -> &[(BlindedPath, BlindedPayInfo)] {
	pub fn payment_paths(&self) -> &[(BlindedPayInfo, BlindedPath)] {
 &self.contents.fields().payment_paths[..]
	}

Expand DownExpand Up@@ -703,8 +703,8 @@ impl InvoiceFields {
 };

 InvoiceTlvStreamRef {
 paths: Some(Iterable(self.payment_paths.iter().map(|(path, _)| path))),
 blindedpay: Some(Iterable(self.payment_paths.iter().map(|(_, payinfo)| payinfo))),
 paths: Some(Iterable(self.payment_paths.iter().map(|(_, path)| path))),
 blindedpay: Some(Iterable(self.payment_paths.iter().map(|(payinfo, _)| payinfo))),
 created_at: Some(self.created_at.as_secs()),
 relative_expiry: self.relative_expiry.map(|duration| duration.as_secs() as u32),
 payment_hash: Some(&self.payment_hash),
Expand DownExpand Up@@ -750,13 +750,13 @@ tlv_stream!(InvoiceTlvStream, InvoiceTlvStreamRef, 160..240, {
});

type BlindedPathIter<'a> = core::iter::Map<
	core::slice::Iter<'a, (BlindedPath, BlindedPayInfo)>,
	for<'r> fn(&'r (BlindedPath, BlindedPayInfo)) -> &'r BlindedPath,
	core::slice::Iter<'a, (BlindedPayInfo, BlindedPath)>,
	for<'r> fn(&'r (BlindedPayInfo, BlindedPath)) -> &'r BlindedPath,
>;

type BlindedPayInfoIter<'a> = core::iter::Map<
	core::slice::Iter<'a, (BlindedPath, BlindedPayInfo)>,
	for<'r> fn(&'r (BlindedPath, BlindedPayInfo)) -> &'r BlindedPayInfo,
	core::slice::Iter<'a, (BlindedPayInfo, BlindedPath)>,
	for<'r> fn(&'r (BlindedPayInfo, BlindedPath)) -> &'r BlindedPayInfo,
>;

/// Information needed to route a payment across a [`BlindedPath`].
Expand DownExpand Up@@ -878,15 +878,15 @@ impl TryFrom<PartialInvoiceTlvStream> for InvoiceContents {
 },
 ) = tlv_stream;

 let payment_paths = match (paths, blindedpay) {
 (None, _) => return Err(SemanticError::MissingPaths),
 (_, None) => return Err(SemanticError::InvalidPayInfo),
 (Some(paths), _) if paths.is_empty() => return Err(SemanticError::MissingPaths),
 (Some(paths), Some(blindedpay)) if paths.len() != blindedpay.len() => {
 let payment_paths = match (blindedpay, paths) {
 (_, None) => return Err(SemanticError::MissingPaths),
 (None, _) => return Err(SemanticError::InvalidPayInfo),
 (_, Some(paths)) if paths.is_empty() => return Err(SemanticError::MissingPaths),
 (Some(blindedpay), Some(paths)) if paths.len() != blindedpay.len() => {
 return Err(SemanticError::InvalidPayInfo);
 },
 (Some(paths), Some(blindedpay)) => {
paths.into_iter().zip(blindedpay.into_iter()).collect::<Vec<_>>()
 (Some(blindedpay), Some(paths)) => {
blindedpay.into_iter().zip(paths.into_iter()).collect::<Vec<_>>()
 },
 };

Expand DownExpand Up@@ -1052,8 +1052,8 @@ mod tests {
 payer_note: None,
 },
 InvoiceTlvStreamRef {
 paths: Some(Iterable(payment_paths.iter().map(|(path, _)| path))),
 blindedpay: Some(Iterable(payment_paths.iter().map(|(_, payinfo)| payinfo))),
 paths: Some(Iterable(payment_paths.iter().map(|(_, path)| path))),
 blindedpay: Some(Iterable(payment_paths.iter().map(|(payinfo, _)| payinfo))),
 created_at: Some(now.as_secs()),
 relative_expiry: None,
 payment_hash: Some(&payment_hash),
Expand DownExpand Up@@ -1130,8 +1130,8 @@ mod tests {
 payer_note: None,
 },
 InvoiceTlvStreamRef {
 paths: Some(Iterable(payment_paths.iter().map(|(path, _)| path))),
 blindedpay: Some(Iterable(payment_paths.iter().map(|(_, payinfo)| payinfo))),
 paths: Some(Iterable(payment_paths.iter().map(|(_, path)| path))),
 blindedpay: Some(Iterable(payment_paths.iter().map(|(payinfo, _)| payinfo))),
 created_at: Some(now.as_secs()),
 relative_expiry: None,
 payment_hash: Some(&payment_hash),
Expand DownExpand Up@@ -1516,7 +1516,7 @@ mod tests {

 let empty_payment_paths = vec![];
 let mut tlv_stream = invoice.as_tlv_stream();
 tlv_stream.3.paths = Some(Iterable(empty_payment_paths.iter().map(|(path, _)| path)));
 tlv_stream.3.paths = Some(Iterable(empty_payment_paths.iter().map(|(_, path)| path)));

 match Invoice::try_from(tlv_stream.to_bytes()) {
 Ok(_) => panic!("expected error"),
Expand All@@ -1526,7 +1526,7 @@ mod tests {
 let mut payment_paths = payment_paths();
 payment_paths.pop();
 let mut tlv_stream = invoice.as_tlv_stream();
 tlv_stream.3.blindedpay = Some(Iterable(payment_paths.iter().map(|(_, payinfo)| payinfo)));
 tlv_stream.3.blindedpay = Some(Iterable(payment_paths.iter().map(|(payinfo, _)| payinfo)));

 match Invoice::try_from(tlv_stream.to_bytes()) {
 Ok(_) => panic!("expected error"),
Expand Down

8 changes: 4 additions & 4 deletions
lightning/src/offers/invoice_request.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -480,7 +480,7 @@ impl InvoiceRequest {
	/// [`Duration`]: core::time::Duration
	#[cfg(feature = "std")]
	pub fn respond_with(
 &self, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, payment_hash: PaymentHash
 &self, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, payment_hash: PaymentHash
	) -> Result<InvoiceBuilder<ExplicitSigningPubkey>, SemanticError> {
 let created_at = std::time::SystemTime::now()
 .duration_since(std::time::SystemTime::UNIX_EPOCH)
Expand DownExpand Up@@ -509,7 +509,7 @@ impl InvoiceRequest {
	///
	/// [`Invoice::created_at`]: crate::offers::invoice::Invoice::created_at
	pub fn respond_with_no_std(
 &self, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, payment_hash: PaymentHash,
 &self, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, payment_hash: PaymentHash,
 created_at: core::time::Duration
	) -> Result<InvoiceBuilder<ExplicitSigningPubkey>, SemanticError> {
 if self.features().requires_unknown_bits() {
Expand All@@ -530,7 +530,7 @@ impl InvoiceRequest {
	/// [`Invoice`]: crate::offers::invoice::Invoice
	#[cfg(feature = "std")]
	pub fn verify_and_respond_using_derived_keys<T: secp256k1::Signing>(
 &self, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, payment_hash: PaymentHash,
 &self, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, payment_hash: PaymentHash,
 expanded_key: &ExpandedKey, secp_ctx: &Secp256k1<T>
	) -> Result<InvoiceBuilder<DerivedSigningPubkey>, SemanticError> {
 let created_at = std::time::SystemTime::now()
Expand All@@ -552,7 +552,7 @@ impl InvoiceRequest {
	///
	/// [`Invoice`]: crate::offers::invoice::Invoice
	pub fn verify_and_respond_using_derived_keys_no_std<T: secp256k1::Signing>(
 &self, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, payment_hash: PaymentHash,
 &self, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, payment_hash: PaymentHash,
 created_at: core::time::Duration, expanded_key: &ExpandedKey, secp_ctx: &Secp256k1<T>
	) -> Result<InvoiceBuilder<DerivedSigningPubkey>, SemanticError> {
 if self.features().requires_unknown_bits() {
Expand Down

8 changes: 4 additions & 4 deletions
lightning/src/offers/refund.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -394,7 +394,7 @@ impl Refund {
	/// [`Duration`]: core::time::Duration
	#[cfg(feature = "std")]
	pub fn respond_with(
 &self, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, payment_hash: PaymentHash,
 &self, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, payment_hash: PaymentHash,
 signing_pubkey: PublicKey,
	) -> Result<InvoiceBuilder<ExplicitSigningPubkey>, SemanticError> {
 let created_at = std::time::SystemTime::now()
Expand DownExpand Up@@ -427,7 +427,7 @@ impl Refund {
	///
	/// [`Invoice::created_at`]: crate::offers::invoice::Invoice::created_at
	pub fn respond_with_no_std(
 &self, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, payment_hash: PaymentHash,
 &self, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, payment_hash: PaymentHash,
 signing_pubkey: PublicKey, created_at: Duration
	) -> Result<InvoiceBuilder<ExplicitSigningPubkey>, SemanticError> {
 if self.features().requires_unknown_bits() {
Expand All@@ -447,7 +447,7 @@ impl Refund {
	/// [`Invoice`]: crate::offers::invoice::Invoice
	#[cfg(feature = "std")]
	pub fn respond_using_derived_keys<ES: Deref>(
 &self, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, payment_hash: PaymentHash,
 &self, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, payment_hash: PaymentHash,
 expanded_key: &ExpandedKey, entropy_source: ES
	) -> Result<InvoiceBuilder<DerivedSigningPubkey>, SemanticError>
	where
Expand All@@ -471,7 +471,7 @@ impl Refund {
	///
	/// [`Invoice`]: crate::offers::invoice::Invoice
	pub fn respond_using_derived_keys_no_std<ES: Deref>(
 &self, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, payment_hash: PaymentHash,
 &self, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, payment_hash: PaymentHash,
 created_at: core::time::Duration, expanded_key: &ExpandedKey, entropy_source: ES
	) -> Result<InvoiceBuilder<DerivedSigningPubkey>, SemanticError>
	where
Expand Down

4 changes: 2 additions & 2 deletions
lightning/src/offers/test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,7 +58,7 @@ pub(super) fn privkey(byte: u8) -> SecretKey {
	SecretKey::from_slice(&[byte; 32]).unwrap()
}

pub(super) fn payment_paths() -> Vec<(BlindedPath, BlindedPayInfo)> {
pub(super) fn payment_paths() -> Vec<(BlindedPayInfo, BlindedPath)> {
	let paths = vec![
 BlindedPath {
 introduction_node_id: pubkey(40),
Expand DownExpand Up@@ -97,7 +97,7 @@ pub(super) fn payment_paths() -> Vec<(BlindedPath, BlindedPayInfo)> {
 },
	];

paths.into_iter().zip(payinfo.into_iter()).collect()
payinfo.into_iter().zip(paths.into_iter()).collect()
}

pub(super) fn payment_hash() -> PaymentHash {
Expand Down
Loading

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

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

from

Jun 20, 2023
 Merged


Routing to blinded payment paths
#2120
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
d017657

Fix panic on pathfinding to blinded recipient


valentinewallace May 9, 2023
6b6d549

Fix oops'd docs on PaymentParameters::with_max_channel_saturation


valentinewallace May 19, 2023
3184393

Reverse (BlindedPath, BlindedPayInfo) tuple order in offers invoice.


valentinewallace Jun 16, 2023
6a54098

Add utils for creating blinded PaymentParameters


valentinewallace May 19, 2023
a291881

Replace max_channel_saturation_power_of_half hardcode with const


valentinewallace Jun 14, 2023
be59d01

Routing: accommodate for blinded paths in used liquidity tracking


valentinewallace Jun 13, 2023
b3a27ac

Update CandidateRouteHop::short_channel_id to be optional


valentinewallace Jun 13, 2023
8344222

Add CandidateRouteHop::Blinded and ::OneHopBlinded variant


valentinewallace Jun 13, 2023
25a7073

Router: clean up Path construction


valentinewallace Jun 15, 2023
6c3ca55

Implement routing to blinded payment paths


valentinewallace Jun 14, 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/invoice_request_deser.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -97,7 +97,7 @@ fn build_response<'a, T: secp256k1::Signing + secp256k1::Verification>(
 },
	];

	let payment_paths = paths.into_iter().zip(payinfo.into_iter()).collect();
	let payment_paths = payinfo.into_iter().zip(paths.into_iter()).collect();
	let payment_hash = PaymentHash([42; 32]);
	invoice_request.respond_with(payment_paths, payment_hash)?.build()
}
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,7 +86,7 @@ fn build_response<'a, T: secp256k1::Signing + secp256k1::Verification>(
 },
	];

	let payment_paths = paths.into_iter().zip(payinfo.into_iter()).collect();
	let payment_paths = payinfo.into_iter().zip(paths.into_iter()).collect();
	let payment_hash = PaymentHash([42; 32]);
	refund.respond_with(payment_paths, payment_hash, signing_pubkey)?.build()
}
Expand Down

54 changes: 27 additions & 27 deletions
lightning/src/offers/invoice.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@
//! # use lightning::offers::invoice::BlindedPayInfo;
//! # use lightning::blinded_path::BlindedPath;
//! #
//! # fn create_payment_paths() -> Vec<(BlindedPath, BlindedPayInfo)> { unimplemented!() }
//! # fn create_payment_paths() -> Vec<(BlindedPayInfo, BlindedPath)> { unimplemented!() }
//! # fn create_payment_hash() -> PaymentHash { unimplemented!() }
//! #
//! # fn parse_invoice_request(bytes: Vec<u8>) -> Result<(), lightning::offers::parse::ParseError> {
Expand DownExpand Up@@ -166,7 +166,7 @@ impl SigningPubkeyStrategy for DerivedSigningPubkey {}

impl<'a> InvoiceBuilder<'a, ExplicitSigningPubkey> {
	pub(super) fn for_offer(
 invoice_request: &'a InvoiceRequest, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>,
 invoice_request: &'a InvoiceRequest, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>,
 created_at: Duration, payment_hash: PaymentHash
	) -> Result<Self, SemanticError> {
 let amount_msats = Self::check_amount_msats(invoice_request)?;
Expand All@@ -182,7 +182,7 @@ impl<'a> InvoiceBuilder<'a, ExplicitSigningPubkey> {
	}

	pub(super) fn for_refund(
 refund: &'a Refund, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, created_at: Duration,
 refund: &'a Refund, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, created_at: Duration,
 payment_hash: PaymentHash, signing_pubkey: PublicKey
	) -> Result<Self, SemanticError> {
 let amount_msats = refund.amount_msats();
Expand All@@ -199,7 +199,7 @@ impl<'a> InvoiceBuilder<'a, ExplicitSigningPubkey> {

impl<'a> InvoiceBuilder<'a, DerivedSigningPubkey> {
	pub(super) fn for_offer_using_keys(
 invoice_request: &'a InvoiceRequest, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>,
 invoice_request: &'a InvoiceRequest, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>,
 created_at: Duration, payment_hash: PaymentHash, keys: KeyPair
	) -> Result<Self, SemanticError> {
 let amount_msats = Self::check_amount_msats(invoice_request)?;
Expand All@@ -215,7 +215,7 @@ impl<'a> InvoiceBuilder<'a, DerivedSigningPubkey> {
	}

	pub(super) fn for_refund_using_keys(
 refund: &'a Refund, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, created_at: Duration,
 refund: &'a Refund, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, created_at: Duration,
 payment_hash: PaymentHash, keys: KeyPair,
	) -> Result<Self, SemanticError> {
 let amount_msats = refund.amount_msats();
Expand DownExpand Up@@ -247,7 +247,7 @@ impl<'a, S: SigningPubkeyStrategy> InvoiceBuilder<'a, S> {
	}

	fn fields(
 payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, created_at: Duration,
 payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, created_at: Duration,
 payment_hash: PaymentHash, amount_msats: u64, signing_pubkey: PublicKey
	) -> InvoiceFields {
 InvoiceFields {
Expand DownExpand Up@@ -454,7 +454,7 @@ enum InvoiceContents {
/// Invoice-specific fields for an `invoice` message.
#[derive(Clone, Debug, PartialEq)]
struct InvoiceFields {
	payment_paths: Vec<(BlindedPath, BlindedPayInfo)>,
	payment_paths: Vec<(BlindedPayInfo, BlindedPath)>,
	created_at: Duration,
	relative_expiry: Option<Duration>,
	payment_hash: PaymentHash,
Expand All@@ -476,7 +476,7 @@ impl Invoice {
	///
	/// Blinded paths provide recipient privacy by obfuscating its node id. Note, however, that this
	/// privacy is lost if a public node id is used for [`Invoice::signing_pubkey`].
	pub fn payment_paths(&self) -> &[(BlindedPath, BlindedPayInfo)] {
	pub fn payment_paths(&self) -> &[(BlindedPayInfo, BlindedPath)] {
 &self.contents.fields().payment_paths[..]
	}

Expand DownExpand Up@@ -703,8 +703,8 @@ impl InvoiceFields {
 };

 InvoiceTlvStreamRef {
 paths: Some(Iterable(self.payment_paths.iter().map(|(path, _)| path))),
 blindedpay: Some(Iterable(self.payment_paths.iter().map(|(_, payinfo)| payinfo))),
 paths: Some(Iterable(self.payment_paths.iter().map(|(_, path)| path))),
 blindedpay: Some(Iterable(self.payment_paths.iter().map(|(payinfo, _)| payinfo))),
 created_at: Some(self.created_at.as_secs()),
 relative_expiry: self.relative_expiry.map(|duration| duration.as_secs() as u32),
 payment_hash: Some(&self.payment_hash),
Expand DownExpand Up@@ -750,13 +750,13 @@ tlv_stream!(InvoiceTlvStream, InvoiceTlvStreamRef, 160..240, {
});

type BlindedPathIter<'a> = core::iter::Map<
	core::slice::Iter<'a, (BlindedPath, BlindedPayInfo)>,
	for<'r> fn(&'r (BlindedPath, BlindedPayInfo)) -> &'r BlindedPath,
	core::slice::Iter<'a, (BlindedPayInfo, BlindedPath)>,
	for<'r> fn(&'r (BlindedPayInfo, BlindedPath)) -> &'r BlindedPath,
>;

type BlindedPayInfoIter<'a> = core::iter::Map<
	core::slice::Iter<'a, (BlindedPath, BlindedPayInfo)>,
	for<'r> fn(&'r (BlindedPath, BlindedPayInfo)) -> &'r BlindedPayInfo,
	core::slice::Iter<'a, (BlindedPayInfo, BlindedPath)>,
	for<'r> fn(&'r (BlindedPayInfo, BlindedPath)) -> &'r BlindedPayInfo,
>;

/// Information needed to route a payment across a [`BlindedPath`].
Expand DownExpand Up@@ -878,15 +878,15 @@ impl TryFrom<PartialInvoiceTlvStream> for InvoiceContents {
 },
 ) = tlv_stream;

 let payment_paths = match (paths, blindedpay) {
 (None, _) => return Err(SemanticError::MissingPaths),
 (_, None) => return Err(SemanticError::InvalidPayInfo),
 (Some(paths), _) if paths.is_empty() => return Err(SemanticError::MissingPaths),
 (Some(paths), Some(blindedpay)) if paths.len() != blindedpay.len() => {
 let payment_paths = match (blindedpay, paths) {
 (_, None) => return Err(SemanticError::MissingPaths),
 (None, _) => return Err(SemanticError::InvalidPayInfo),
 (_, Some(paths)) if paths.is_empty() => return Err(SemanticError::MissingPaths),
 (Some(blindedpay), Some(paths)) if paths.len() != blindedpay.len() => {
 return Err(SemanticError::InvalidPayInfo);
 },
 (Some(paths), Some(blindedpay)) => {
paths.into_iter().zip(blindedpay.into_iter()).collect::<Vec<_>>()
 (Some(blindedpay), Some(paths)) => {
blindedpay.into_iter().zip(paths.into_iter()).collect::<Vec<_>>()
 },
 };

Expand DownExpand Up@@ -1052,8 +1052,8 @@ mod tests {
 payer_note: None,
 },
 InvoiceTlvStreamRef {
 paths: Some(Iterable(payment_paths.iter().map(|(path, _)| path))),
 blindedpay: Some(Iterable(payment_paths.iter().map(|(_, payinfo)| payinfo))),
 paths: Some(Iterable(payment_paths.iter().map(|(_, path)| path))),
 blindedpay: Some(Iterable(payment_paths.iter().map(|(payinfo, _)| payinfo))),
 created_at: Some(now.as_secs()),
 relative_expiry: None,
 payment_hash: Some(&payment_hash),
Expand DownExpand Up@@ -1130,8 +1130,8 @@ mod tests {
 payer_note: None,
 },
 InvoiceTlvStreamRef {
 paths: Some(Iterable(payment_paths.iter().map(|(path, _)| path))),
 blindedpay: Some(Iterable(payment_paths.iter().map(|(_, payinfo)| payinfo))),
 paths: Some(Iterable(payment_paths.iter().map(|(_, path)| path))),
 blindedpay: Some(Iterable(payment_paths.iter().map(|(payinfo, _)| payinfo))),
 created_at: Some(now.as_secs()),
 relative_expiry: None,
 payment_hash: Some(&payment_hash),
Expand DownExpand Up@@ -1516,7 +1516,7 @@ mod tests {

 let empty_payment_paths = vec![];
 let mut tlv_stream = invoice.as_tlv_stream();
 tlv_stream.3.paths = Some(Iterable(empty_payment_paths.iter().map(|(path, _)| path)));
 tlv_stream.3.paths = Some(Iterable(empty_payment_paths.iter().map(|(_, path)| path)));

 match Invoice::try_from(tlv_stream.to_bytes()) {
 Ok(_) => panic!("expected error"),
Expand All@@ -1526,7 +1526,7 @@ mod tests {
 let mut payment_paths = payment_paths();
 payment_paths.pop();
 let mut tlv_stream = invoice.as_tlv_stream();
 tlv_stream.3.blindedpay = Some(Iterable(payment_paths.iter().map(|(_, payinfo)| payinfo)));
 tlv_stream.3.blindedpay = Some(Iterable(payment_paths.iter().map(|(payinfo, _)| payinfo)));

 match Invoice::try_from(tlv_stream.to_bytes()) {
 Ok(_) => panic!("expected error"),
Expand Down

8 changes: 4 additions & 4 deletions
lightning/src/offers/invoice_request.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -480,7 +480,7 @@ impl InvoiceRequest {
	/// [`Duration`]: core::time::Duration
	#[cfg(feature = "std")]
	pub fn respond_with(
 &self, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, payment_hash: PaymentHash
 &self, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, payment_hash: PaymentHash
	) -> Result<InvoiceBuilder<ExplicitSigningPubkey>, SemanticError> {
 let created_at = std::time::SystemTime::now()
 .duration_since(std::time::SystemTime::UNIX_EPOCH)
Expand DownExpand Up@@ -509,7 +509,7 @@ impl InvoiceRequest {
	///
	/// [`Invoice::created_at`]: crate::offers::invoice::Invoice::created_at
	pub fn respond_with_no_std(
 &self, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, payment_hash: PaymentHash,
 &self, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, payment_hash: PaymentHash,
 created_at: core::time::Duration
	) -> Result<InvoiceBuilder<ExplicitSigningPubkey>, SemanticError> {
 if self.features().requires_unknown_bits() {
Expand All@@ -530,7 +530,7 @@ impl InvoiceRequest {
	/// [`Invoice`]: crate::offers::invoice::Invoice
	#[cfg(feature = "std")]
	pub fn verify_and_respond_using_derived_keys<T: secp256k1::Signing>(
 &self, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, payment_hash: PaymentHash,
 &self, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, payment_hash: PaymentHash,
 expanded_key: &ExpandedKey, secp_ctx: &Secp256k1<T>
	) -> Result<InvoiceBuilder<DerivedSigningPubkey>, SemanticError> {
 let created_at = std::time::SystemTime::now()
Expand All@@ -552,7 +552,7 @@ impl InvoiceRequest {
	///
	/// [`Invoice`]: crate::offers::invoice::Invoice
	pub fn verify_and_respond_using_derived_keys_no_std<T: secp256k1::Signing>(
 &self, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, payment_hash: PaymentHash,
 &self, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, payment_hash: PaymentHash,
 created_at: core::time::Duration, expanded_key: &ExpandedKey, secp_ctx: &Secp256k1<T>
	) -> Result<InvoiceBuilder<DerivedSigningPubkey>, SemanticError> {
 if self.features().requires_unknown_bits() {
Expand Down

8 changes: 4 additions & 4 deletions
lightning/src/offers/refund.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -394,7 +394,7 @@ impl Refund {
	/// [`Duration`]: core::time::Duration
	#[cfg(feature = "std")]
	pub fn respond_with(
 &self, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, payment_hash: PaymentHash,
 &self, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, payment_hash: PaymentHash,
 signing_pubkey: PublicKey,
	) -> Result<InvoiceBuilder<ExplicitSigningPubkey>, SemanticError> {
 let created_at = std::time::SystemTime::now()
Expand DownExpand Up@@ -427,7 +427,7 @@ impl Refund {
	///
	/// [`Invoice::created_at`]: crate::offers::invoice::Invoice::created_at
	pub fn respond_with_no_std(
 &self, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, payment_hash: PaymentHash,
 &self, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, payment_hash: PaymentHash,
 signing_pubkey: PublicKey, created_at: Duration
	) -> Result<InvoiceBuilder<ExplicitSigningPubkey>, SemanticError> {
 if self.features().requires_unknown_bits() {
Expand All@@ -447,7 +447,7 @@ impl Refund {
	/// [`Invoice`]: crate::offers::invoice::Invoice
	#[cfg(feature = "std")]
	pub fn respond_using_derived_keys<ES: Deref>(
 &self, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, payment_hash: PaymentHash,
 &self, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, payment_hash: PaymentHash,
 expanded_key: &ExpandedKey, entropy_source: ES
	) -> Result<InvoiceBuilder<DerivedSigningPubkey>, SemanticError>
	where
Expand All@@ -471,7 +471,7 @@ impl Refund {
	///
	/// [`Invoice`]: crate::offers::invoice::Invoice
	pub fn respond_using_derived_keys_no_std<ES: Deref>(
 &self, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, payment_hash: PaymentHash,
 &self, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, payment_hash: PaymentHash,
 created_at: core::time::Duration, expanded_key: &ExpandedKey, entropy_source: ES
	) -> Result<InvoiceBuilder<DerivedSigningPubkey>, SemanticError>
	where
Expand Down

4 changes: 2 additions & 2 deletions
lightning/src/offers/test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,7 +58,7 @@ pub(super) fn privkey(byte: u8) -> SecretKey {
	SecretKey::from_slice(&[byte; 32]).unwrap()
}

pub(super) fn payment_paths() -> Vec<(BlindedPath, BlindedPayInfo)> {
pub(super) fn payment_paths() -> Vec<(BlindedPayInfo, BlindedPath)> {
	let paths = vec![
 BlindedPath {
 introduction_node_id: pubkey(40),
Expand DownExpand Up@@ -97,7 +97,7 @@ pub(super) fn payment_paths() -> Vec<(BlindedPath, BlindedPayInfo)> {
 },
	];

paths.into_iter().zip(payinfo.into_iter()).collect()
payinfo.into_iter().zip(paths.into_iter()).collect()
}

pub(super) fn payment_hash() -> PaymentHash {
Expand Down
Loading

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

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

from

Jun 20, 2023
 Merged


Routing to blinded payment paths
#2120
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
d017657

Fix panic on pathfinding to blinded recipient


valentinewallace May 9, 2023
6b6d549

Fix oops'd docs on PaymentParameters::with_max_channel_saturation


valentinewallace May 19, 2023
3184393

Reverse (BlindedPath, BlindedPayInfo) tuple order in offers invoice.


valentinewallace Jun 16, 2023
6a54098

Add utils for creating blinded PaymentParameters


valentinewallace May 19, 2023
a291881

Replace max_channel_saturation_power_of_half hardcode with const


valentinewallace Jun 14, 2023
be59d01

Routing: accommodate for blinded paths in used liquidity tracking


valentinewallace Jun 13, 2023
b3a27ac

Update CandidateRouteHop::short_channel_id to be optional


valentinewallace Jun 13, 2023
8344222

Add CandidateRouteHop::Blinded and ::OneHopBlinded variant


valentinewallace Jun 13, 2023
25a7073

Router: clean up Path construction


valentinewallace Jun 15, 2023
6c3ca55

Implement routing to blinded payment paths


valentinewallace Jun 14, 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/invoice_request_deser.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -97,7 +97,7 @@ fn build_response<'a, T: secp256k1::Signing + secp256k1::Verification>(
 },
	];

	let payment_paths = paths.into_iter().zip(payinfo.into_iter()).collect();
	let payment_paths = payinfo.into_iter().zip(paths.into_iter()).collect();
	let payment_hash = PaymentHash([42; 32]);
	invoice_request.respond_with(payment_paths, payment_hash)?.build()
}
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,7 +86,7 @@ fn build_response<'a, T: secp256k1::Signing + secp256k1::Verification>(
 },
	];

	let payment_paths = paths.into_iter().zip(payinfo.into_iter()).collect();
	let payment_paths = payinfo.into_iter().zip(paths.into_iter()).collect();
	let payment_hash = PaymentHash([42; 32]);
	refund.respond_with(payment_paths, payment_hash, signing_pubkey)?.build()
}
Expand Down

54 changes: 27 additions & 27 deletions
lightning/src/offers/invoice.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@
//! # use lightning::offers::invoice::BlindedPayInfo;
//! # use lightning::blinded_path::BlindedPath;
//! #
//! # fn create_payment_paths() -> Vec<(BlindedPath, BlindedPayInfo)> { unimplemented!() }
//! # fn create_payment_paths() -> Vec<(BlindedPayInfo, BlindedPath)> { unimplemented!() }
//! # fn create_payment_hash() -> PaymentHash { unimplemented!() }
//! #
//! # fn parse_invoice_request(bytes: Vec<u8>) -> Result<(), lightning::offers::parse::ParseError> {
Expand DownExpand Up@@ -166,7 +166,7 @@ impl SigningPubkeyStrategy for DerivedSigningPubkey {}

impl<'a> InvoiceBuilder<'a, ExplicitSigningPubkey> {
	pub(super) fn for_offer(
 invoice_request: &'a InvoiceRequest, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>,
 invoice_request: &'a InvoiceRequest, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>,
 created_at: Duration, payment_hash: PaymentHash
	) -> Result<Self, SemanticError> {
 let amount_msats = Self::check_amount_msats(invoice_request)?;
Expand All@@ -182,7 +182,7 @@ impl<'a> InvoiceBuilder<'a, ExplicitSigningPubkey> {
	}

	pub(super) fn for_refund(
 refund: &'a Refund, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, created_at: Duration,
 refund: &'a Refund, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, created_at: Duration,
 payment_hash: PaymentHash, signing_pubkey: PublicKey
	) -> Result<Self, SemanticError> {
 let amount_msats = refund.amount_msats();
Expand All@@ -199,7 +199,7 @@ impl<'a> InvoiceBuilder<'a, ExplicitSigningPubkey> {

impl<'a> InvoiceBuilder<'a, DerivedSigningPubkey> {
	pub(super) fn for_offer_using_keys(
 invoice_request: &'a InvoiceRequest, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>,
 invoice_request: &'a InvoiceRequest, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>,
 created_at: Duration, payment_hash: PaymentHash, keys: KeyPair
	) -> Result<Self, SemanticError> {
 let amount_msats = Self::check_amount_msats(invoice_request)?;
Expand All@@ -215,7 +215,7 @@ impl<'a> InvoiceBuilder<'a, DerivedSigningPubkey> {
	}

	pub(super) fn for_refund_using_keys(
 refund: &'a Refund, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, created_at: Duration,
 refund: &'a Refund, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, created_at: Duration,
 payment_hash: PaymentHash, keys: KeyPair,
	) -> Result<Self, SemanticError> {
 let amount_msats = refund.amount_msats();
Expand DownExpand Up@@ -247,7 +247,7 @@ impl<'a, S: SigningPubkeyStrategy> InvoiceBuilder<'a, S> {
	}

	fn fields(
 payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, created_at: Duration,
 payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, created_at: Duration,
 payment_hash: PaymentHash, amount_msats: u64, signing_pubkey: PublicKey
	) -> InvoiceFields {
 InvoiceFields {
Expand DownExpand Up@@ -454,7 +454,7 @@ enum InvoiceContents {
/// Invoice-specific fields for an `invoice` message.
#[derive(Clone, Debug, PartialEq)]
struct InvoiceFields {
	payment_paths: Vec<(BlindedPath, BlindedPayInfo)>,
	payment_paths: Vec<(BlindedPayInfo, BlindedPath)>,
	created_at: Duration,
	relative_expiry: Option<Duration>,
	payment_hash: PaymentHash,
Expand All@@ -476,7 +476,7 @@ impl Invoice {
	///
	/// Blinded paths provide recipient privacy by obfuscating its node id. Note, however, that this
	/// privacy is lost if a public node id is used for [`Invoice::signing_pubkey`].
	pub fn payment_paths(&self) -> &[(BlindedPath, BlindedPayInfo)] {
	pub fn payment_paths(&self) -> &[(BlindedPayInfo, BlindedPath)] {
 &self.contents.fields().payment_paths[..]
	}

Expand DownExpand Up@@ -703,8 +703,8 @@ impl InvoiceFields {
 };

 InvoiceTlvStreamRef {
 paths: Some(Iterable(self.payment_paths.iter().map(|(path, _)| path))),
 blindedpay: Some(Iterable(self.payment_paths.iter().map(|(_, payinfo)| payinfo))),
 paths: Some(Iterable(self.payment_paths.iter().map(|(_, path)| path))),
 blindedpay: Some(Iterable(self.payment_paths.iter().map(|(payinfo, _)| payinfo))),
 created_at: Some(self.created_at.as_secs()),
 relative_expiry: self.relative_expiry.map(|duration| duration.as_secs() as u32),
 payment_hash: Some(&self.payment_hash),
Expand DownExpand Up@@ -750,13 +750,13 @@ tlv_stream!(InvoiceTlvStream, InvoiceTlvStreamRef, 160..240, {
});

type BlindedPathIter<'a> = core::iter::Map<
	core::slice::Iter<'a, (BlindedPath, BlindedPayInfo)>,
	for<'r> fn(&'r (BlindedPath, BlindedPayInfo)) -> &'r BlindedPath,
	core::slice::Iter<'a, (BlindedPayInfo, BlindedPath)>,
	for<'r> fn(&'r (BlindedPayInfo, BlindedPath)) -> &'r BlindedPath,
>;

type BlindedPayInfoIter<'a> = core::iter::Map<
	core::slice::Iter<'a, (BlindedPath, BlindedPayInfo)>,
	for<'r> fn(&'r (BlindedPath, BlindedPayInfo)) -> &'r BlindedPayInfo,
	core::slice::Iter<'a, (BlindedPayInfo, BlindedPath)>,
	for<'r> fn(&'r (BlindedPayInfo, BlindedPath)) -> &'r BlindedPayInfo,
>;

/// Information needed to route a payment across a [`BlindedPath`].
Expand DownExpand Up@@ -878,15 +878,15 @@ impl TryFrom<PartialInvoiceTlvStream> for InvoiceContents {
 },
 ) = tlv_stream;

 let payment_paths = match (paths, blindedpay) {
 (None, _) => return Err(SemanticError::MissingPaths),
 (_, None) => return Err(SemanticError::InvalidPayInfo),
 (Some(paths), _) if paths.is_empty() => return Err(SemanticError::MissingPaths),
 (Some(paths), Some(blindedpay)) if paths.len() != blindedpay.len() => {
 let payment_paths = match (blindedpay, paths) {
 (_, None) => return Err(SemanticError::MissingPaths),
 (None, _) => return Err(SemanticError::InvalidPayInfo),
 (_, Some(paths)) if paths.is_empty() => return Err(SemanticError::MissingPaths),
 (Some(blindedpay), Some(paths)) if paths.len() != blindedpay.len() => {
 return Err(SemanticError::InvalidPayInfo);
 },
 (Some(paths), Some(blindedpay)) => {
paths.into_iter().zip(blindedpay.into_iter()).collect::<Vec<_>>()
 (Some(blindedpay), Some(paths)) => {
blindedpay.into_iter().zip(paths.into_iter()).collect::<Vec<_>>()
 },
 };

Expand DownExpand Up@@ -1052,8 +1052,8 @@ mod tests {
 payer_note: None,
 },
 InvoiceTlvStreamRef {
 paths: Some(Iterable(payment_paths.iter().map(|(path, _)| path))),
 blindedpay: Some(Iterable(payment_paths.iter().map(|(_, payinfo)| payinfo))),
 paths: Some(Iterable(payment_paths.iter().map(|(_, path)| path))),
 blindedpay: Some(Iterable(payment_paths.iter().map(|(payinfo, _)| payinfo))),
 created_at: Some(now.as_secs()),
 relative_expiry: None,
 payment_hash: Some(&payment_hash),
Expand DownExpand Up@@ -1130,8 +1130,8 @@ mod tests {
 payer_note: None,
 },
 InvoiceTlvStreamRef {
 paths: Some(Iterable(payment_paths.iter().map(|(path, _)| path))),
 blindedpay: Some(Iterable(payment_paths.iter().map(|(_, payinfo)| payinfo))),
 paths: Some(Iterable(payment_paths.iter().map(|(_, path)| path))),
 blindedpay: Some(Iterable(payment_paths.iter().map(|(payinfo, _)| payinfo))),
 created_at: Some(now.as_secs()),
 relative_expiry: None,
 payment_hash: Some(&payment_hash),
Expand DownExpand Up@@ -1516,7 +1516,7 @@ mod tests {

 let empty_payment_paths = vec![];
 let mut tlv_stream = invoice.as_tlv_stream();
 tlv_stream.3.paths = Some(Iterable(empty_payment_paths.iter().map(|(path, _)| path)));
 tlv_stream.3.paths = Some(Iterable(empty_payment_paths.iter().map(|(_, path)| path)));

 match Invoice::try_from(tlv_stream.to_bytes()) {
 Ok(_) => panic!("expected error"),
Expand All@@ -1526,7 +1526,7 @@ mod tests {
 let mut payment_paths = payment_paths();
 payment_paths.pop();
 let mut tlv_stream = invoice.as_tlv_stream();
 tlv_stream.3.blindedpay = Some(Iterable(payment_paths.iter().map(|(_, payinfo)| payinfo)));
 tlv_stream.3.blindedpay = Some(Iterable(payment_paths.iter().map(|(payinfo, _)| payinfo)));

 match Invoice::try_from(tlv_stream.to_bytes()) {
 Ok(_) => panic!("expected error"),
Expand Down

8 changes: 4 additions & 4 deletions
lightning/src/offers/invoice_request.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -480,7 +480,7 @@ impl InvoiceRequest {
	/// [`Duration`]: core::time::Duration
	#[cfg(feature = "std")]
	pub fn respond_with(
 &self, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, payment_hash: PaymentHash
 &self, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, payment_hash: PaymentHash
	) -> Result<InvoiceBuilder<ExplicitSigningPubkey>, SemanticError> {
 let created_at = std::time::SystemTime::now()
 .duration_since(std::time::SystemTime::UNIX_EPOCH)
Expand DownExpand Up@@ -509,7 +509,7 @@ impl InvoiceRequest {
	///
	/// [`Invoice::created_at`]: crate::offers::invoice::Invoice::created_at
	pub fn respond_with_no_std(
 &self, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, payment_hash: PaymentHash,
 &self, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, payment_hash: PaymentHash,
 created_at: core::time::Duration
	) -> Result<InvoiceBuilder<ExplicitSigningPubkey>, SemanticError> {
 if self.features().requires_unknown_bits() {
Expand All@@ -530,7 +530,7 @@ impl InvoiceRequest {
	/// [`Invoice`]: crate::offers::invoice::Invoice
	#[cfg(feature = "std")]
	pub fn verify_and_respond_using_derived_keys<T: secp256k1::Signing>(
 &self, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, payment_hash: PaymentHash,
 &self, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, payment_hash: PaymentHash,
 expanded_key: &ExpandedKey, secp_ctx: &Secp256k1<T>
	) -> Result<InvoiceBuilder<DerivedSigningPubkey>, SemanticError> {
 let created_at = std::time::SystemTime::now()
Expand All@@ -552,7 +552,7 @@ impl InvoiceRequest {
	///
	/// [`Invoice`]: crate::offers::invoice::Invoice
	pub fn verify_and_respond_using_derived_keys_no_std<T: secp256k1::Signing>(
 &self, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, payment_hash: PaymentHash,
 &self, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, payment_hash: PaymentHash,
 created_at: core::time::Duration, expanded_key: &ExpandedKey, secp_ctx: &Secp256k1<T>
	) -> Result<InvoiceBuilder<DerivedSigningPubkey>, SemanticError> {
 if self.features().requires_unknown_bits() {
Expand Down

8 changes: 4 additions & 4 deletions
lightning/src/offers/refund.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -394,7 +394,7 @@ impl Refund {
	/// [`Duration`]: core::time::Duration
	#[cfg(feature = "std")]
	pub fn respond_with(
 &self, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, payment_hash: PaymentHash,
 &self, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, payment_hash: PaymentHash,
 signing_pubkey: PublicKey,
	) -> Result<InvoiceBuilder<ExplicitSigningPubkey>, SemanticError> {
 let created_at = std::time::SystemTime::now()
Expand DownExpand Up@@ -427,7 +427,7 @@ impl Refund {
	///
	/// [`Invoice::created_at`]: crate::offers::invoice::Invoice::created_at
	pub fn respond_with_no_std(
 &self, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, payment_hash: PaymentHash,
 &self, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, payment_hash: PaymentHash,
 signing_pubkey: PublicKey, created_at: Duration
	) -> Result<InvoiceBuilder<ExplicitSigningPubkey>, SemanticError> {
 if self.features().requires_unknown_bits() {
Expand All@@ -447,7 +447,7 @@ impl Refund {
	/// [`Invoice`]: crate::offers::invoice::Invoice
	#[cfg(feature = "std")]
	pub fn respond_using_derived_keys<ES: Deref>(
 &self, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, payment_hash: PaymentHash,
 &self, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, payment_hash: PaymentHash,
 expanded_key: &ExpandedKey, entropy_source: ES
	) -> Result<InvoiceBuilder<DerivedSigningPubkey>, SemanticError>
	where
Expand All@@ -471,7 +471,7 @@ impl Refund {
	///
	/// [`Invoice`]: crate::offers::invoice::Invoice
	pub fn respond_using_derived_keys_no_std<ES: Deref>(
 &self, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, payment_hash: PaymentHash,
 &self, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, payment_hash: PaymentHash,
 created_at: core::time::Duration, expanded_key: &ExpandedKey, entropy_source: ES
	) -> Result<InvoiceBuilder<DerivedSigningPubkey>, SemanticError>
	where
Expand Down

4 changes: 2 additions & 2 deletions
lightning/src/offers/test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,7 +58,7 @@ pub(super) fn privkey(byte: u8) -> SecretKey {
	SecretKey::from_slice(&[byte; 32]).unwrap()
}

pub(super) fn payment_paths() -> Vec<(BlindedPath, BlindedPayInfo)> {
pub(super) fn payment_paths() -> Vec<(BlindedPayInfo, BlindedPath)> {
	let paths = vec![
 BlindedPath {
 introduction_node_id: pubkey(40),
Expand DownExpand Up@@ -97,7 +97,7 @@ pub(super) fn payment_paths() -> Vec<(BlindedPath, BlindedPayInfo)> {
 },
	];

paths.into_iter().zip(payinfo.into_iter()).collect()
payinfo.into_iter().zip(paths.into_iter()).collect()
}

pub(super) fn payment_hash() -> PaymentHash {
Expand Down
Loading

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

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

from

Jun 20, 2023
 Merged


Routing to blinded payment paths
#2120
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
d017657

Fix panic on pathfinding to blinded recipient


valentinewallace May 9, 2023
6b6d549

Fix oops'd docs on PaymentParameters::with_max_channel_saturation


valentinewallace May 19, 2023
3184393

Reverse (BlindedPath, BlindedPayInfo) tuple order in offers invoice.


valentinewallace Jun 16, 2023
6a54098

Add utils for creating blinded PaymentParameters


valentinewallace May 19, 2023
a291881

Replace max_channel_saturation_power_of_half hardcode with const


valentinewallace Jun 14, 2023
be59d01

Routing: accommodate for blinded paths in used liquidity tracking


valentinewallace Jun 13, 2023
b3a27ac

Update CandidateRouteHop::short_channel_id to be optional


valentinewallace Jun 13, 2023
8344222

Add CandidateRouteHop::Blinded and ::OneHopBlinded variant


valentinewallace Jun 13, 2023
25a7073

Router: clean up Path construction


valentinewallace Jun 15, 2023
6c3ca55

Implement routing to blinded payment paths


valentinewallace Jun 14, 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/invoice_request_deser.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -97,7 +97,7 @@ fn build_response<'a, T: secp256k1::Signing + secp256k1::Verification>(
 },
	];

	let payment_paths = paths.into_iter().zip(payinfo.into_iter()).collect();
	let payment_paths = payinfo.into_iter().zip(paths.into_iter()).collect();
	let payment_hash = PaymentHash([42; 32]);
	invoice_request.respond_with(payment_paths, payment_hash)?.build()
}
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,7 +86,7 @@ fn build_response<'a, T: secp256k1::Signing + secp256k1::Verification>(
 },
	];

	let payment_paths = paths.into_iter().zip(payinfo.into_iter()).collect();
	let payment_paths = payinfo.into_iter().zip(paths.into_iter()).collect();
	let payment_hash = PaymentHash([42; 32]);
	refund.respond_with(payment_paths, payment_hash, signing_pubkey)?.build()
}
Expand Down

54 changes: 27 additions & 27 deletions
lightning/src/offers/invoice.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@
//! # use lightning::offers::invoice::BlindedPayInfo;
//! # use lightning::blinded_path::BlindedPath;
//! #
//! # fn create_payment_paths() -> Vec<(BlindedPath, BlindedPayInfo)> { unimplemented!() }
//! # fn create_payment_paths() -> Vec<(BlindedPayInfo, BlindedPath)> { unimplemented!() }
//! # fn create_payment_hash() -> PaymentHash { unimplemented!() }
//! #
//! # fn parse_invoice_request(bytes: Vec<u8>) -> Result<(), lightning::offers::parse::ParseError> {
Expand DownExpand Up@@ -166,7 +166,7 @@ impl SigningPubkeyStrategy for DerivedSigningPubkey {}

impl<'a> InvoiceBuilder<'a, ExplicitSigningPubkey> {
	pub(super) fn for_offer(
 invoice_request: &'a InvoiceRequest, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>,
 invoice_request: &'a InvoiceRequest, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>,
 created_at: Duration, payment_hash: PaymentHash
	) -> Result<Self, SemanticError> {
 let amount_msats = Self::check_amount_msats(invoice_request)?;
Expand All@@ -182,7 +182,7 @@ impl<'a> InvoiceBuilder<'a, ExplicitSigningPubkey> {
	}

	pub(super) fn for_refund(
 refund: &'a Refund, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, created_at: Duration,
 refund: &'a Refund, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, created_at: Duration,
 payment_hash: PaymentHash, signing_pubkey: PublicKey
	) -> Result<Self, SemanticError> {
 let amount_msats = refund.amount_msats();
Expand All@@ -199,7 +199,7 @@ impl<'a> InvoiceBuilder<'a, ExplicitSigningPubkey> {

impl<'a> InvoiceBuilder<'a, DerivedSigningPubkey> {
	pub(super) fn for_offer_using_keys(
 invoice_request: &'a InvoiceRequest, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>,
 invoice_request: &'a InvoiceRequest, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>,
 created_at: Duration, payment_hash: PaymentHash, keys: KeyPair
	) -> Result<Self, SemanticError> {
 let amount_msats = Self::check_amount_msats(invoice_request)?;
Expand All@@ -215,7 +215,7 @@ impl<'a> InvoiceBuilder<'a, DerivedSigningPubkey> {
	}

	pub(super) fn for_refund_using_keys(
 refund: &'a Refund, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, created_at: Duration,
 refund: &'a Refund, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, created_at: Duration,
 payment_hash: PaymentHash, keys: KeyPair,
	) -> Result<Self, SemanticError> {
 let amount_msats = refund.amount_msats();
Expand DownExpand Up@@ -247,7 +247,7 @@ impl<'a, S: SigningPubkeyStrategy> InvoiceBuilder<'a, S> {
	}

	fn fields(
 payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, created_at: Duration,
 payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, created_at: Duration,
 payment_hash: PaymentHash, amount_msats: u64, signing_pubkey: PublicKey
	) -> InvoiceFields {
 InvoiceFields {
Expand DownExpand Up@@ -454,7 +454,7 @@ enum InvoiceContents {
/// Invoice-specific fields for an `invoice` message.
#[derive(Clone, Debug, PartialEq)]
struct InvoiceFields {
	payment_paths: Vec<(BlindedPath, BlindedPayInfo)>,
	payment_paths: Vec<(BlindedPayInfo, BlindedPath)>,
	created_at: Duration,
	relative_expiry: Option<Duration>,
	payment_hash: PaymentHash,
Expand All@@ -476,7 +476,7 @@ impl Invoice {
	///
	/// Blinded paths provide recipient privacy by obfuscating its node id. Note, however, that this
	/// privacy is lost if a public node id is used for [`Invoice::signing_pubkey`].
	pub fn payment_paths(&self) -> &[(BlindedPath, BlindedPayInfo)] {
	pub fn payment_paths(&self) -> &[(BlindedPayInfo, BlindedPath)] {
 &self.contents.fields().payment_paths[..]
	}

Expand DownExpand Up@@ -703,8 +703,8 @@ impl InvoiceFields {
 };

 InvoiceTlvStreamRef {
 paths: Some(Iterable(self.payment_paths.iter().map(|(path, _)| path))),
 blindedpay: Some(Iterable(self.payment_paths.iter().map(|(_, payinfo)| payinfo))),
 paths: Some(Iterable(self.payment_paths.iter().map(|(_, path)| path))),
 blindedpay: Some(Iterable(self.payment_paths.iter().map(|(payinfo, _)| payinfo))),
 created_at: Some(self.created_at.as_secs()),
 relative_expiry: self.relative_expiry.map(|duration| duration.as_secs() as u32),
 payment_hash: Some(&self.payment_hash),
Expand DownExpand Up@@ -750,13 +750,13 @@ tlv_stream!(InvoiceTlvStream, InvoiceTlvStreamRef, 160..240, {
});

type BlindedPathIter<'a> = core::iter::Map<
	core::slice::Iter<'a, (BlindedPath, BlindedPayInfo)>,
	for<'r> fn(&'r (BlindedPath, BlindedPayInfo)) -> &'r BlindedPath,
	core::slice::Iter<'a, (BlindedPayInfo, BlindedPath)>,
	for<'r> fn(&'r (BlindedPayInfo, BlindedPath)) -> &'r BlindedPath,
>;

type BlindedPayInfoIter<'a> = core::iter::Map<
	core::slice::Iter<'a, (BlindedPath, BlindedPayInfo)>,
	for<'r> fn(&'r (BlindedPath, BlindedPayInfo)) -> &'r BlindedPayInfo,
	core::slice::Iter<'a, (BlindedPayInfo, BlindedPath)>,
	for<'r> fn(&'r (BlindedPayInfo, BlindedPath)) -> &'r BlindedPayInfo,
>;

/// Information needed to route a payment across a [`BlindedPath`].
Expand DownExpand Up@@ -878,15 +878,15 @@ impl TryFrom<PartialInvoiceTlvStream> for InvoiceContents {
 },
 ) = tlv_stream;

 let payment_paths = match (paths, blindedpay) {
 (None, _) => return Err(SemanticError::MissingPaths),
 (_, None) => return Err(SemanticError::InvalidPayInfo),
 (Some(paths), _) if paths.is_empty() => return Err(SemanticError::MissingPaths),
 (Some(paths), Some(blindedpay)) if paths.len() != blindedpay.len() => {
 let payment_paths = match (blindedpay, paths) {
 (_, None) => return Err(SemanticError::MissingPaths),
 (None, _) => return Err(SemanticError::InvalidPayInfo),
 (_, Some(paths)) if paths.is_empty() => return Err(SemanticError::MissingPaths),
 (Some(blindedpay), Some(paths)) if paths.len() != blindedpay.len() => {
 return Err(SemanticError::InvalidPayInfo);
 },
 (Some(paths), Some(blindedpay)) => {
paths.into_iter().zip(blindedpay.into_iter()).collect::<Vec<_>>()
 (Some(blindedpay), Some(paths)) => {
blindedpay.into_iter().zip(paths.into_iter()).collect::<Vec<_>>()
 },
 };

Expand DownExpand Up@@ -1052,8 +1052,8 @@ mod tests {
 payer_note: None,
 },
 InvoiceTlvStreamRef {
 paths: Some(Iterable(payment_paths.iter().map(|(path, _)| path))),
 blindedpay: Some(Iterable(payment_paths.iter().map(|(_, payinfo)| payinfo))),
 paths: Some(Iterable(payment_paths.iter().map(|(_, path)| path))),
 blindedpay: Some(Iterable(payment_paths.iter().map(|(payinfo, _)| payinfo))),
 created_at: Some(now.as_secs()),
 relative_expiry: None,
 payment_hash: Some(&payment_hash),
Expand DownExpand Up@@ -1130,8 +1130,8 @@ mod tests {
 payer_note: None,
 },
 InvoiceTlvStreamRef {
 paths: Some(Iterable(payment_paths.iter().map(|(path, _)| path))),
 blindedpay: Some(Iterable(payment_paths.iter().map(|(_, payinfo)| payinfo))),
 paths: Some(Iterable(payment_paths.iter().map(|(_, path)| path))),
 blindedpay: Some(Iterable(payment_paths.iter().map(|(payinfo, _)| payinfo))),
 created_at: Some(now.as_secs()),
 relative_expiry: None,
 payment_hash: Some(&payment_hash),
Expand DownExpand Up@@ -1516,7 +1516,7 @@ mod tests {

 let empty_payment_paths = vec![];
 let mut tlv_stream = invoice.as_tlv_stream();
 tlv_stream.3.paths = Some(Iterable(empty_payment_paths.iter().map(|(path, _)| path)));
 tlv_stream.3.paths = Some(Iterable(empty_payment_paths.iter().map(|(_, path)| path)));

 match Invoice::try_from(tlv_stream.to_bytes()) {
 Ok(_) => panic!("expected error"),
Expand All@@ -1526,7 +1526,7 @@ mod tests {
 let mut payment_paths = payment_paths();
 payment_paths.pop();
 let mut tlv_stream = invoice.as_tlv_stream();
 tlv_stream.3.blindedpay = Some(Iterable(payment_paths.iter().map(|(_, payinfo)| payinfo)));
 tlv_stream.3.blindedpay = Some(Iterable(payment_paths.iter().map(|(payinfo, _)| payinfo)));

 match Invoice::try_from(tlv_stream.to_bytes()) {
 Ok(_) => panic!("expected error"),
Expand Down

8 changes: 4 additions & 4 deletions
lightning/src/offers/invoice_request.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -480,7 +480,7 @@ impl InvoiceRequest {
	/// [`Duration`]: core::time::Duration
	#[cfg(feature = "std")]
	pub fn respond_with(
 &self, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, payment_hash: PaymentHash
 &self, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, payment_hash: PaymentHash
	) -> Result<InvoiceBuilder<ExplicitSigningPubkey>, SemanticError> {
 let created_at = std::time::SystemTime::now()
 .duration_since(std::time::SystemTime::UNIX_EPOCH)
Expand DownExpand Up@@ -509,7 +509,7 @@ impl InvoiceRequest {
	///
	/// [`Invoice::created_at`]: crate::offers::invoice::Invoice::created_at
	pub fn respond_with_no_std(
 &self, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, payment_hash: PaymentHash,
 &self, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, payment_hash: PaymentHash,
 created_at: core::time::Duration
	) -> Result<InvoiceBuilder<ExplicitSigningPubkey>, SemanticError> {
 if self.features().requires_unknown_bits() {
Expand All@@ -530,7 +530,7 @@ impl InvoiceRequest {
	/// [`Invoice`]: crate::offers::invoice::Invoice
	#[cfg(feature = "std")]
	pub fn verify_and_respond_using_derived_keys<T: secp256k1::Signing>(
 &self, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, payment_hash: PaymentHash,
 &self, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, payment_hash: PaymentHash,
 expanded_key: &ExpandedKey, secp_ctx: &Secp256k1<T>
	) -> Result<InvoiceBuilder<DerivedSigningPubkey>, SemanticError> {
 let created_at = std::time::SystemTime::now()
Expand All@@ -552,7 +552,7 @@ impl InvoiceRequest {
	///
	/// [`Invoice`]: crate::offers::invoice::Invoice
	pub fn verify_and_respond_using_derived_keys_no_std<T: secp256k1::Signing>(
 &self, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, payment_hash: PaymentHash,
 &self, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, payment_hash: PaymentHash,
 created_at: core::time::Duration, expanded_key: &ExpandedKey, secp_ctx: &Secp256k1<T>
	) -> Result<InvoiceBuilder<DerivedSigningPubkey>, SemanticError> {
 if self.features().requires_unknown_bits() {
Expand Down

8 changes: 4 additions & 4 deletions
lightning/src/offers/refund.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -394,7 +394,7 @@ impl Refund {
	/// [`Duration`]: core::time::Duration
	#[cfg(feature = "std")]
	pub fn respond_with(
 &self, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, payment_hash: PaymentHash,
 &self, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, payment_hash: PaymentHash,
 signing_pubkey: PublicKey,
	) -> Result<InvoiceBuilder<ExplicitSigningPubkey>, SemanticError> {
 let created_at = std::time::SystemTime::now()
Expand DownExpand Up@@ -427,7 +427,7 @@ impl Refund {
	///
	/// [`Invoice::created_at`]: crate::offers::invoice::Invoice::created_at
	pub fn respond_with_no_std(
 &self, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, payment_hash: PaymentHash,
 &self, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, payment_hash: PaymentHash,
 signing_pubkey: PublicKey, created_at: Duration
	) -> Result<InvoiceBuilder<ExplicitSigningPubkey>, SemanticError> {
 if self.features().requires_unknown_bits() {
Expand All@@ -447,7 +447,7 @@ impl Refund {
	/// [`Invoice`]: crate::offers::invoice::Invoice
	#[cfg(feature = "std")]
	pub fn respond_using_derived_keys<ES: Deref>(
 &self, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, payment_hash: PaymentHash,
 &self, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, payment_hash: PaymentHash,
 expanded_key: &ExpandedKey, entropy_source: ES
	) -> Result<InvoiceBuilder<DerivedSigningPubkey>, SemanticError>
	where
Expand All@@ -471,7 +471,7 @@ impl Refund {
	///
	/// [`Invoice`]: crate::offers::invoice::Invoice
	pub fn respond_using_derived_keys_no_std<ES: Deref>(
 &self, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, payment_hash: PaymentHash,
 &self, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, payment_hash: PaymentHash,
 created_at: core::time::Duration, expanded_key: &ExpandedKey, entropy_source: ES
	) -> Result<InvoiceBuilder<DerivedSigningPubkey>, SemanticError>
	where
Expand Down

4 changes: 2 additions & 2 deletions
lightning/src/offers/test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,7 +58,7 @@ pub(super) fn privkey(byte: u8) -> SecretKey {
	SecretKey::from_slice(&[byte; 32]).unwrap()
}

pub(super) fn payment_paths() -> Vec<(BlindedPath, BlindedPayInfo)> {
pub(super) fn payment_paths() -> Vec<(BlindedPayInfo, BlindedPath)> {
	let paths = vec![
 BlindedPath {
 introduction_node_id: pubkey(40),
Expand DownExpand Up@@ -97,7 +97,7 @@ pub(super) fn payment_paths() -> Vec<(BlindedPath, BlindedPayInfo)> {
 },
	];

paths.into_iter().zip(payinfo.into_iter()).collect()
payinfo.into_iter().zip(paths.into_iter()).collect()
}

pub(super) fn payment_hash() -> PaymentHash {
Expand Down
Loading

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

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

from

Jun 20, 2023
 Merged


Routing to blinded payment paths
#2120
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
d017657

Fix panic on pathfinding to blinded recipient


valentinewallace May 9, 2023
6b6d549

Fix oops'd docs on PaymentParameters::with_max_channel_saturation


valentinewallace May 19, 2023
3184393

Reverse (BlindedPath, BlindedPayInfo) tuple order in offers invoice.


valentinewallace Jun 16, 2023
6a54098

Add utils for creating blinded PaymentParameters


valentinewallace May 19, 2023
a291881

Replace max_channel_saturation_power_of_half hardcode with const


valentinewallace Jun 14, 2023
be59d01

Routing: accommodate for blinded paths in used liquidity tracking


valentinewallace Jun 13, 2023
b3a27ac

Update CandidateRouteHop::short_channel_id to be optional


valentinewallace Jun 13, 2023
8344222

Add CandidateRouteHop::Blinded and ::OneHopBlinded variant


valentinewallace Jun 13, 2023
25a7073

Router: clean up Path construction


valentinewallace Jun 15, 2023
6c3ca55

Implement routing to blinded payment paths


valentinewallace Jun 14, 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/invoice_request_deser.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -97,7 +97,7 @@ fn build_response<'a, T: secp256k1::Signing + secp256k1::Verification>(
 },
	];

	let payment_paths = paths.into_iter().zip(payinfo.into_iter()).collect();
	let payment_paths = payinfo.into_iter().zip(paths.into_iter()).collect();
	let payment_hash = PaymentHash([42; 32]);
	invoice_request.respond_with(payment_paths, payment_hash)?.build()
}
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,7 +86,7 @@ fn build_response<'a, T: secp256k1::Signing + secp256k1::Verification>(
 },
	];

	let payment_paths = paths.into_iter().zip(payinfo.into_iter()).collect();
	let payment_paths = payinfo.into_iter().zip(paths.into_iter()).collect();
	let payment_hash = PaymentHash([42; 32]);
	refund.respond_with(payment_paths, payment_hash, signing_pubkey)?.build()
}
Expand Down

54 changes: 27 additions & 27 deletions
lightning/src/offers/invoice.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@
//! # use lightning::offers::invoice::BlindedPayInfo;
//! # use lightning::blinded_path::BlindedPath;
//! #
//! # fn create_payment_paths() -> Vec<(BlindedPath, BlindedPayInfo)> { unimplemented!() }
//! # fn create_payment_paths() -> Vec<(BlindedPayInfo, BlindedPath)> { unimplemented!() }
//! # fn create_payment_hash() -> PaymentHash { unimplemented!() }
//! #
//! # fn parse_invoice_request(bytes: Vec<u8>) -> Result<(), lightning::offers::parse::ParseError> {
Expand DownExpand Up@@ -166,7 +166,7 @@ impl SigningPubkeyStrategy for DerivedSigningPubkey {}

impl<'a> InvoiceBuilder<'a, ExplicitSigningPubkey> {
	pub(super) fn for_offer(
 invoice_request: &'a InvoiceRequest, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>,
 invoice_request: &'a InvoiceRequest, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>,
 created_at: Duration, payment_hash: PaymentHash
	) -> Result<Self, SemanticError> {
 let amount_msats = Self::check_amount_msats(invoice_request)?;
Expand All@@ -182,7 +182,7 @@ impl<'a> InvoiceBuilder<'a, ExplicitSigningPubkey> {
	}

	pub(super) fn for_refund(
 refund: &'a Refund, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, created_at: Duration,
 refund: &'a Refund, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, created_at: Duration,
 payment_hash: PaymentHash, signing_pubkey: PublicKey
	) -> Result<Self, SemanticError> {
 let amount_msats = refund.amount_msats();
Expand All@@ -199,7 +199,7 @@ impl<'a> InvoiceBuilder<'a, ExplicitSigningPubkey> {

impl<'a> InvoiceBuilder<'a, DerivedSigningPubkey> {
	pub(super) fn for_offer_using_keys(
 invoice_request: &'a InvoiceRequest, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>,
 invoice_request: &'a InvoiceRequest, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>,
 created_at: Duration, payment_hash: PaymentHash, keys: KeyPair
	) -> Result<Self, SemanticError> {
 let amount_msats = Self::check_amount_msats(invoice_request)?;
Expand All@@ -215,7 +215,7 @@ impl<'a> InvoiceBuilder<'a, DerivedSigningPubkey> {
	}

	pub(super) fn for_refund_using_keys(
 refund: &'a Refund, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, created_at: Duration,
 refund: &'a Refund, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, created_at: Duration,
 payment_hash: PaymentHash, keys: KeyPair,
	) -> Result<Self, SemanticError> {
 let amount_msats = refund.amount_msats();
Expand DownExpand Up@@ -247,7 +247,7 @@ impl<'a, S: SigningPubkeyStrategy> InvoiceBuilder<'a, S> {
	}

	fn fields(
 payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, created_at: Duration,
 payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, created_at: Duration,
 payment_hash: PaymentHash, amount_msats: u64, signing_pubkey: PublicKey
	) -> InvoiceFields {
 InvoiceFields {
Expand DownExpand Up@@ -454,7 +454,7 @@ enum InvoiceContents {
/// Invoice-specific fields for an `invoice` message.
#[derive(Clone, Debug, PartialEq)]
struct InvoiceFields {
	payment_paths: Vec<(BlindedPath, BlindedPayInfo)>,
	payment_paths: Vec<(BlindedPayInfo, BlindedPath)>,
	created_at: Duration,
	relative_expiry: Option<Duration>,
	payment_hash: PaymentHash,
Expand All@@ -476,7 +476,7 @@ impl Invoice {
	///
	/// Blinded paths provide recipient privacy by obfuscating its node id. Note, however, that this
	/// privacy is lost if a public node id is used for [`Invoice::signing_pubkey`].
	pub fn payment_paths(&self) -> &[(BlindedPath, BlindedPayInfo)] {
	pub fn payment_paths(&self) -> &[(BlindedPayInfo, BlindedPath)] {
 &self.contents.fields().payment_paths[..]
	}

Expand DownExpand Up@@ -703,8 +703,8 @@ impl InvoiceFields {
 };

 InvoiceTlvStreamRef {
 paths: Some(Iterable(self.payment_paths.iter().map(|(path, _)| path))),
 blindedpay: Some(Iterable(self.payment_paths.iter().map(|(_, payinfo)| payinfo))),
 paths: Some(Iterable(self.payment_paths.iter().map(|(_, path)| path))),
 blindedpay: Some(Iterable(self.payment_paths.iter().map(|(payinfo, _)| payinfo))),
 created_at: Some(self.created_at.as_secs()),
 relative_expiry: self.relative_expiry.map(|duration| duration.as_secs() as u32),
 payment_hash: Some(&self.payment_hash),
Expand DownExpand Up@@ -750,13 +750,13 @@ tlv_stream!(InvoiceTlvStream, InvoiceTlvStreamRef, 160..240, {
});

type BlindedPathIter<'a> = core::iter::Map<
	core::slice::Iter<'a, (BlindedPath, BlindedPayInfo)>,
	for<'r> fn(&'r (BlindedPath, BlindedPayInfo)) -> &'r BlindedPath,
	core::slice::Iter<'a, (BlindedPayInfo, BlindedPath)>,
	for<'r> fn(&'r (BlindedPayInfo, BlindedPath)) -> &'r BlindedPath,
>;

type BlindedPayInfoIter<'a> = core::iter::Map<
	core::slice::Iter<'a, (BlindedPath, BlindedPayInfo)>,
	for<'r> fn(&'r (BlindedPath, BlindedPayInfo)) -> &'r BlindedPayInfo,
	core::slice::Iter<'a, (BlindedPayInfo, BlindedPath)>,
	for<'r> fn(&'r (BlindedPayInfo, BlindedPath)) -> &'r BlindedPayInfo,
>;

/// Information needed to route a payment across a [`BlindedPath`].
Expand DownExpand Up@@ -878,15 +878,15 @@ impl TryFrom<PartialInvoiceTlvStream> for InvoiceContents {
 },
 ) = tlv_stream;

 let payment_paths = match (paths, blindedpay) {
 (None, _) => return Err(SemanticError::MissingPaths),
 (_, None) => return Err(SemanticError::InvalidPayInfo),
 (Some(paths), _) if paths.is_empty() => return Err(SemanticError::MissingPaths),
 (Some(paths), Some(blindedpay)) if paths.len() != blindedpay.len() => {
 let payment_paths = match (blindedpay, paths) {
 (_, None) => return Err(SemanticError::MissingPaths),
 (None, _) => return Err(SemanticError::InvalidPayInfo),
 (_, Some(paths)) if paths.is_empty() => return Err(SemanticError::MissingPaths),
 (Some(blindedpay), Some(paths)) if paths.len() != blindedpay.len() => {
 return Err(SemanticError::InvalidPayInfo);
 },
 (Some(paths), Some(blindedpay)) => {
paths.into_iter().zip(blindedpay.into_iter()).collect::<Vec<_>>()
 (Some(blindedpay), Some(paths)) => {
blindedpay.into_iter().zip(paths.into_iter()).collect::<Vec<_>>()
 },
 };

Expand DownExpand Up@@ -1052,8 +1052,8 @@ mod tests {
 payer_note: None,
 },
 InvoiceTlvStreamRef {
 paths: Some(Iterable(payment_paths.iter().map(|(path, _)| path))),
 blindedpay: Some(Iterable(payment_paths.iter().map(|(_, payinfo)| payinfo))),
 paths: Some(Iterable(payment_paths.iter().map(|(_, path)| path))),
 blindedpay: Some(Iterable(payment_paths.iter().map(|(payinfo, _)| payinfo))),
 created_at: Some(now.as_secs()),
 relative_expiry: None,
 payment_hash: Some(&payment_hash),
Expand DownExpand Up@@ -1130,8 +1130,8 @@ mod tests {
 payer_note: None,
 },
 InvoiceTlvStreamRef {
 paths: Some(Iterable(payment_paths.iter().map(|(path, _)| path))),
 blindedpay: Some(Iterable(payment_paths.iter().map(|(_, payinfo)| payinfo))),
 paths: Some(Iterable(payment_paths.iter().map(|(_, path)| path))),
 blindedpay: Some(Iterable(payment_paths.iter().map(|(payinfo, _)| payinfo))),
 created_at: Some(now.as_secs()),
 relative_expiry: None,
 payment_hash: Some(&payment_hash),
Expand DownExpand Up@@ -1516,7 +1516,7 @@ mod tests {

 let empty_payment_paths = vec![];
 let mut tlv_stream = invoice.as_tlv_stream();
 tlv_stream.3.paths = Some(Iterable(empty_payment_paths.iter().map(|(path, _)| path)));
 tlv_stream.3.paths = Some(Iterable(empty_payment_paths.iter().map(|(_, path)| path)));

 match Invoice::try_from(tlv_stream.to_bytes()) {
 Ok(_) => panic!("expected error"),
Expand All@@ -1526,7 +1526,7 @@ mod tests {
 let mut payment_paths = payment_paths();
 payment_paths.pop();
 let mut tlv_stream = invoice.as_tlv_stream();
 tlv_stream.3.blindedpay = Some(Iterable(payment_paths.iter().map(|(_, payinfo)| payinfo)));
 tlv_stream.3.blindedpay = Some(Iterable(payment_paths.iter().map(|(payinfo, _)| payinfo)));

 match Invoice::try_from(tlv_stream.to_bytes()) {
 Ok(_) => panic!("expected error"),
Expand Down

8 changes: 4 additions & 4 deletions
lightning/src/offers/invoice_request.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -480,7 +480,7 @@ impl InvoiceRequest {
	/// [`Duration`]: core::time::Duration
	#[cfg(feature = "std")]
	pub fn respond_with(
 &self, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, payment_hash: PaymentHash
 &self, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, payment_hash: PaymentHash
	) -> Result<InvoiceBuilder<ExplicitSigningPubkey>, SemanticError> {
 let created_at = std::time::SystemTime::now()
 .duration_since(std::time::SystemTime::UNIX_EPOCH)
Expand DownExpand Up@@ -509,7 +509,7 @@ impl InvoiceRequest {
	///
	/// [`Invoice::created_at`]: crate::offers::invoice::Invoice::created_at
	pub fn respond_with_no_std(
 &self, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, payment_hash: PaymentHash,
 &self, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, payment_hash: PaymentHash,
 created_at: core::time::Duration
	) -> Result<InvoiceBuilder<ExplicitSigningPubkey>, SemanticError> {
 if self.features().requires_unknown_bits() {
Expand All@@ -530,7 +530,7 @@ impl InvoiceRequest {
	/// [`Invoice`]: crate::offers::invoice::Invoice
	#[cfg(feature = "std")]
	pub fn verify_and_respond_using_derived_keys<T: secp256k1::Signing>(
 &self, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, payment_hash: PaymentHash,
 &self, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, payment_hash: PaymentHash,
 expanded_key: &ExpandedKey, secp_ctx: &Secp256k1<T>
	) -> Result<InvoiceBuilder<DerivedSigningPubkey>, SemanticError> {
 let created_at = std::time::SystemTime::now()
Expand All@@ -552,7 +552,7 @@ impl InvoiceRequest {
	///
	/// [`Invoice`]: crate::offers::invoice::Invoice
	pub fn verify_and_respond_using_derived_keys_no_std<T: secp256k1::Signing>(
 &self, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, payment_hash: PaymentHash,
 &self, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, payment_hash: PaymentHash,
 created_at: core::time::Duration, expanded_key: &ExpandedKey, secp_ctx: &Secp256k1<T>
	) -> Result<InvoiceBuilder<DerivedSigningPubkey>, SemanticError> {
 if self.features().requires_unknown_bits() {
Expand Down

8 changes: 4 additions & 4 deletions
lightning/src/offers/refund.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -394,7 +394,7 @@ impl Refund {
	/// [`Duration`]: core::time::Duration
	#[cfg(feature = "std")]
	pub fn respond_with(
 &self, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, payment_hash: PaymentHash,
 &self, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, payment_hash: PaymentHash,
 signing_pubkey: PublicKey,
	) -> Result<InvoiceBuilder<ExplicitSigningPubkey>, SemanticError> {
 let created_at = std::time::SystemTime::now()
Expand DownExpand Up@@ -427,7 +427,7 @@ impl Refund {
	///
	/// [`Invoice::created_at`]: crate::offers::invoice::Invoice::created_at
	pub fn respond_with_no_std(
 &self, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, payment_hash: PaymentHash,
 &self, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, payment_hash: PaymentHash,
 signing_pubkey: PublicKey, created_at: Duration
	) -> Result<InvoiceBuilder<ExplicitSigningPubkey>, SemanticError> {
 if self.features().requires_unknown_bits() {
Expand All@@ -447,7 +447,7 @@ impl Refund {
	/// [`Invoice`]: crate::offers::invoice::Invoice
	#[cfg(feature = "std")]
	pub fn respond_using_derived_keys<ES: Deref>(
 &self, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, payment_hash: PaymentHash,
 &self, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, payment_hash: PaymentHash,
 expanded_key: &ExpandedKey, entropy_source: ES
	) -> Result<InvoiceBuilder<DerivedSigningPubkey>, SemanticError>
	where
Expand All@@ -471,7 +471,7 @@ impl Refund {
	///
	/// [`Invoice`]: crate::offers::invoice::Invoice
	pub fn respond_using_derived_keys_no_std<ES: Deref>(
 &self, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, payment_hash: PaymentHash,
 &self, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, payment_hash: PaymentHash,
 created_at: core::time::Duration, expanded_key: &ExpandedKey, entropy_source: ES
	) -> Result<InvoiceBuilder<DerivedSigningPubkey>, SemanticError>
	where
Expand Down

4 changes: 2 additions & 2 deletions
lightning/src/offers/test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,7 +58,7 @@ pub(super) fn privkey(byte: u8) -> SecretKey {
	SecretKey::from_slice(&[byte; 32]).unwrap()
}

pub(super) fn payment_paths() -> Vec<(BlindedPath, BlindedPayInfo)> {
pub(super) fn payment_paths() -> Vec<(BlindedPayInfo, BlindedPath)> {
	let paths = vec![
 BlindedPath {
 introduction_node_id: pubkey(40),
Expand DownExpand Up@@ -97,7 +97,7 @@ pub(super) fn payment_paths() -> Vec<(BlindedPath, BlindedPayInfo)> {
 },
	];

paths.into_iter().zip(payinfo.into_iter()).collect()
payinfo.into_iter().zip(paths.into_iter()).collect()
}

pub(super) fn payment_hash() -> PaymentHash {
Expand Down
Loading

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

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

from

Jun 20, 2023
 Merged


Routing to blinded payment paths
#2120
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
d017657

Fix panic on pathfinding to blinded recipient


valentinewallace May 9, 2023
6b6d549

Fix oops'd docs on PaymentParameters::with_max_channel_saturation


valentinewallace May 19, 2023
3184393

Reverse (BlindedPath, BlindedPayInfo) tuple order in offers invoice.


valentinewallace Jun 16, 2023
6a54098

Add utils for creating blinded PaymentParameters


valentinewallace May 19, 2023
a291881

Replace max_channel_saturation_power_of_half hardcode with const


valentinewallace Jun 14, 2023
be59d01

Routing: accommodate for blinded paths in used liquidity tracking


valentinewallace Jun 13, 2023
b3a27ac

Update CandidateRouteHop::short_channel_id to be optional


valentinewallace Jun 13, 2023
8344222

Add CandidateRouteHop::Blinded and ::OneHopBlinded variant


valentinewallace Jun 13, 2023
25a7073

Router: clean up Path construction


valentinewallace Jun 15, 2023
6c3ca55

Implement routing to blinded payment paths


valentinewallace Jun 14, 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/invoice_request_deser.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -97,7 +97,7 @@ fn build_response<'a, T: secp256k1::Signing + secp256k1::Verification>(
 },
	];

	let payment_paths = paths.into_iter().zip(payinfo.into_iter()).collect();
	let payment_paths = payinfo.into_iter().zip(paths.into_iter()).collect();
	let payment_hash = PaymentHash([42; 32]);
	invoice_request.respond_with(payment_paths, payment_hash)?.build()
}
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,7 +86,7 @@ fn build_response<'a, T: secp256k1::Signing + secp256k1::Verification>(
 },
	];

	let payment_paths = paths.into_iter().zip(payinfo.into_iter()).collect();
	let payment_paths = payinfo.into_iter().zip(paths.into_iter()).collect();
	let payment_hash = PaymentHash([42; 32]);
	refund.respond_with(payment_paths, payment_hash, signing_pubkey)?.build()
}
Expand Down

54 changes: 27 additions & 27 deletions
lightning/src/offers/invoice.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@
//! # use lightning::offers::invoice::BlindedPayInfo;
//! # use lightning::blinded_path::BlindedPath;
//! #
//! # fn create_payment_paths() -> Vec<(BlindedPath, BlindedPayInfo)> { unimplemented!() }
//! # fn create_payment_paths() -> Vec<(BlindedPayInfo, BlindedPath)> { unimplemented!() }
//! # fn create_payment_hash() -> PaymentHash { unimplemented!() }
//! #
//! # fn parse_invoice_request(bytes: Vec<u8>) -> Result<(), lightning::offers::parse::ParseError> {
Expand DownExpand Up@@ -166,7 +166,7 @@ impl SigningPubkeyStrategy for DerivedSigningPubkey {}

impl<'a> InvoiceBuilder<'a, ExplicitSigningPubkey> {
	pub(super) fn for_offer(
 invoice_request: &'a InvoiceRequest, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>,
 invoice_request: &'a InvoiceRequest, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>,
 created_at: Duration, payment_hash: PaymentHash
	) -> Result<Self, SemanticError> {
 let amount_msats = Self::check_amount_msats(invoice_request)?;
Expand All@@ -182,7 +182,7 @@ impl<'a> InvoiceBuilder<'a, ExplicitSigningPubkey> {
	}

	pub(super) fn for_refund(
 refund: &'a Refund, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, created_at: Duration,
 refund: &'a Refund, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, created_at: Duration,
 payment_hash: PaymentHash, signing_pubkey: PublicKey
	) -> Result<Self, SemanticError> {
 let amount_msats = refund.amount_msats();
Expand All@@ -199,7 +199,7 @@ impl<'a> InvoiceBuilder<'a, ExplicitSigningPubkey> {

impl<'a> InvoiceBuilder<'a, DerivedSigningPubkey> {
	pub(super) fn for_offer_using_keys(
 invoice_request: &'a InvoiceRequest, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>,
 invoice_request: &'a InvoiceRequest, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>,
 created_at: Duration, payment_hash: PaymentHash, keys: KeyPair
	) -> Result<Self, SemanticError> {
 let amount_msats = Self::check_amount_msats(invoice_request)?;
Expand All@@ -215,7 +215,7 @@ impl<'a> InvoiceBuilder<'a, DerivedSigningPubkey> {
	}

	pub(super) fn for_refund_using_keys(
 refund: &'a Refund, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, created_at: Duration,
 refund: &'a Refund, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, created_at: Duration,
 payment_hash: PaymentHash, keys: KeyPair,
	) -> Result<Self, SemanticError> {
 let amount_msats = refund.amount_msats();
Expand DownExpand Up@@ -247,7 +247,7 @@ impl<'a, S: SigningPubkeyStrategy> InvoiceBuilder<'a, S> {
	}

	fn fields(
 payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, created_at: Duration,
 payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, created_at: Duration,
 payment_hash: PaymentHash, amount_msats: u64, signing_pubkey: PublicKey
	) -> InvoiceFields {
 InvoiceFields {
Expand DownExpand Up@@ -454,7 +454,7 @@ enum InvoiceContents {
/// Invoice-specific fields for an `invoice` message.
#[derive(Clone, Debug, PartialEq)]
struct InvoiceFields {
	payment_paths: Vec<(BlindedPath, BlindedPayInfo)>,
	payment_paths: Vec<(BlindedPayInfo, BlindedPath)>,
	created_at: Duration,
	relative_expiry: Option<Duration>,
	payment_hash: PaymentHash,
Expand All@@ -476,7 +476,7 @@ impl Invoice {
	///
	/// Blinded paths provide recipient privacy by obfuscating its node id. Note, however, that this
	/// privacy is lost if a public node id is used for [`Invoice::signing_pubkey`].
	pub fn payment_paths(&self) -> &[(BlindedPath, BlindedPayInfo)] {
	pub fn payment_paths(&self) -> &[(BlindedPayInfo, BlindedPath)] {
 &self.contents.fields().payment_paths[..]
	}

Expand DownExpand Up@@ -703,8 +703,8 @@ impl InvoiceFields {
 };

 InvoiceTlvStreamRef {
 paths: Some(Iterable(self.payment_paths.iter().map(|(path, _)| path))),
 blindedpay: Some(Iterable(self.payment_paths.iter().map(|(_, payinfo)| payinfo))),
 paths: Some(Iterable(self.payment_paths.iter().map(|(_, path)| path))),
 blindedpay: Some(Iterable(self.payment_paths.iter().map(|(payinfo, _)| payinfo))),
 created_at: Some(self.created_at.as_secs()),
 relative_expiry: self.relative_expiry.map(|duration| duration.as_secs() as u32),
 payment_hash: Some(&self.payment_hash),
Expand DownExpand Up@@ -750,13 +750,13 @@ tlv_stream!(InvoiceTlvStream, InvoiceTlvStreamRef, 160..240, {
});

type BlindedPathIter<'a> = core::iter::Map<
	core::slice::Iter<'a, (BlindedPath, BlindedPayInfo)>,
	for<'r> fn(&'r (BlindedPath, BlindedPayInfo)) -> &'r BlindedPath,
	core::slice::Iter<'a, (BlindedPayInfo, BlindedPath)>,
	for<'r> fn(&'r (BlindedPayInfo, BlindedPath)) -> &'r BlindedPath,
>;

type BlindedPayInfoIter<'a> = core::iter::Map<
	core::slice::Iter<'a, (BlindedPath, BlindedPayInfo)>,
	for<'r> fn(&'r (BlindedPath, BlindedPayInfo)) -> &'r BlindedPayInfo,
	core::slice::Iter<'a, (BlindedPayInfo, BlindedPath)>,
	for<'r> fn(&'r (BlindedPayInfo, BlindedPath)) -> &'r BlindedPayInfo,
>;

/// Information needed to route a payment across a [`BlindedPath`].
Expand DownExpand Up@@ -878,15 +878,15 @@ impl TryFrom<PartialInvoiceTlvStream> for InvoiceContents {
 },
 ) = tlv_stream;

 let payment_paths = match (paths, blindedpay) {
 (None, _) => return Err(SemanticError::MissingPaths),
 (_, None) => return Err(SemanticError::InvalidPayInfo),
 (Some(paths), _) if paths.is_empty() => return Err(SemanticError::MissingPaths),
 (Some(paths), Some(blindedpay)) if paths.len() != blindedpay.len() => {
 let payment_paths = match (blindedpay, paths) {
 (_, None) => return Err(SemanticError::MissingPaths),
 (None, _) => return Err(SemanticError::InvalidPayInfo),
 (_, Some(paths)) if paths.is_empty() => return Err(SemanticError::MissingPaths),
 (Some(blindedpay), Some(paths)) if paths.len() != blindedpay.len() => {
 return Err(SemanticError::InvalidPayInfo);
 },
 (Some(paths), Some(blindedpay)) => {
paths.into_iter().zip(blindedpay.into_iter()).collect::<Vec<_>>()
 (Some(blindedpay), Some(paths)) => {
blindedpay.into_iter().zip(paths.into_iter()).collect::<Vec<_>>()
 },
 };

Expand DownExpand Up@@ -1052,8 +1052,8 @@ mod tests {
 payer_note: None,
 },
 InvoiceTlvStreamRef {
 paths: Some(Iterable(payment_paths.iter().map(|(path, _)| path))),
 blindedpay: Some(Iterable(payment_paths.iter().map(|(_, payinfo)| payinfo))),
 paths: Some(Iterable(payment_paths.iter().map(|(_, path)| path))),
 blindedpay: Some(Iterable(payment_paths.iter().map(|(payinfo, _)| payinfo))),
 created_at: Some(now.as_secs()),
 relative_expiry: None,
 payment_hash: Some(&payment_hash),
Expand DownExpand Up@@ -1130,8 +1130,8 @@ mod tests {
 payer_note: None,
 },
 InvoiceTlvStreamRef {
 paths: Some(Iterable(payment_paths.iter().map(|(path, _)| path))),
 blindedpay: Some(Iterable(payment_paths.iter().map(|(_, payinfo)| payinfo))),
 paths: Some(Iterable(payment_paths.iter().map(|(_, path)| path))),
 blindedpay: Some(Iterable(payment_paths.iter().map(|(payinfo, _)| payinfo))),
 created_at: Some(now.as_secs()),
 relative_expiry: None,
 payment_hash: Some(&payment_hash),
Expand DownExpand Up@@ -1516,7 +1516,7 @@ mod tests {

 let empty_payment_paths = vec![];
 let mut tlv_stream = invoice.as_tlv_stream();
 tlv_stream.3.paths = Some(Iterable(empty_payment_paths.iter().map(|(path, _)| path)));
 tlv_stream.3.paths = Some(Iterable(empty_payment_paths.iter().map(|(_, path)| path)));

 match Invoice::try_from(tlv_stream.to_bytes()) {
 Ok(_) => panic!("expected error"),
Expand All@@ -1526,7 +1526,7 @@ mod tests {
 let mut payment_paths = payment_paths();
 payment_paths.pop();
 let mut tlv_stream = invoice.as_tlv_stream();
 tlv_stream.3.blindedpay = Some(Iterable(payment_paths.iter().map(|(_, payinfo)| payinfo)));
 tlv_stream.3.blindedpay = Some(Iterable(payment_paths.iter().map(|(payinfo, _)| payinfo)));

 match Invoice::try_from(tlv_stream.to_bytes()) {
 Ok(_) => panic!("expected error"),
Expand Down

8 changes: 4 additions & 4 deletions
lightning/src/offers/invoice_request.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -480,7 +480,7 @@ impl InvoiceRequest {
	/// [`Duration`]: core::time::Duration
	#[cfg(feature = "std")]
	pub fn respond_with(
 &self, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, payment_hash: PaymentHash
 &self, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, payment_hash: PaymentHash
	) -> Result<InvoiceBuilder<ExplicitSigningPubkey>, SemanticError> {
 let created_at = std::time::SystemTime::now()
 .duration_since(std::time::SystemTime::UNIX_EPOCH)
Expand DownExpand Up@@ -509,7 +509,7 @@ impl InvoiceRequest {
	///
	/// [`Invoice::created_at`]: crate::offers::invoice::Invoice::created_at
	pub fn respond_with_no_std(
 &self, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, payment_hash: PaymentHash,
 &self, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, payment_hash: PaymentHash,
 created_at: core::time::Duration
	) -> Result<InvoiceBuilder<ExplicitSigningPubkey>, SemanticError> {
 if self.features().requires_unknown_bits() {
Expand All@@ -530,7 +530,7 @@ impl InvoiceRequest {
	/// [`Invoice`]: crate::offers::invoice::Invoice
	#[cfg(feature = "std")]
	pub fn verify_and_respond_using_derived_keys<T: secp256k1::Signing>(
 &self, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, payment_hash: PaymentHash,
 &self, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, payment_hash: PaymentHash,
 expanded_key: &ExpandedKey, secp_ctx: &Secp256k1<T>
	) -> Result<InvoiceBuilder<DerivedSigningPubkey>, SemanticError> {
 let created_at = std::time::SystemTime::now()
Expand All@@ -552,7 +552,7 @@ impl InvoiceRequest {
	///
	/// [`Invoice`]: crate::offers::invoice::Invoice
	pub fn verify_and_respond_using_derived_keys_no_std<T: secp256k1::Signing>(
 &self, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, payment_hash: PaymentHash,
 &self, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, payment_hash: PaymentHash,
 created_at: core::time::Duration, expanded_key: &ExpandedKey, secp_ctx: &Secp256k1<T>
	) -> Result<InvoiceBuilder<DerivedSigningPubkey>, SemanticError> {
 if self.features().requires_unknown_bits() {
Expand Down

8 changes: 4 additions & 4 deletions
lightning/src/offers/refund.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -394,7 +394,7 @@ impl Refund {
	/// [`Duration`]: core::time::Duration
	#[cfg(feature = "std")]
	pub fn respond_with(
 &self, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, payment_hash: PaymentHash,
 &self, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, payment_hash: PaymentHash,
 signing_pubkey: PublicKey,
	) -> Result<InvoiceBuilder<ExplicitSigningPubkey>, SemanticError> {
 let created_at = std::time::SystemTime::now()
Expand DownExpand Up@@ -427,7 +427,7 @@ impl Refund {
	///
	/// [`Invoice::created_at`]: crate::offers::invoice::Invoice::created_at
	pub fn respond_with_no_std(
 &self, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, payment_hash: PaymentHash,
 &self, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, payment_hash: PaymentHash,
 signing_pubkey: PublicKey, created_at: Duration
	) -> Result<InvoiceBuilder<ExplicitSigningPubkey>, SemanticError> {
 if self.features().requires_unknown_bits() {
Expand All@@ -447,7 +447,7 @@ impl Refund {
	/// [`Invoice`]: crate::offers::invoice::Invoice
	#[cfg(feature = "std")]
	pub fn respond_using_derived_keys<ES: Deref>(
 &self, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, payment_hash: PaymentHash,
 &self, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, payment_hash: PaymentHash,
 expanded_key: &ExpandedKey, entropy_source: ES
	) -> Result<InvoiceBuilder<DerivedSigningPubkey>, SemanticError>
	where
Expand All@@ -471,7 +471,7 @@ impl Refund {
	///
	/// [`Invoice`]: crate::offers::invoice::Invoice
	pub fn respond_using_derived_keys_no_std<ES: Deref>(
 &self, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, payment_hash: PaymentHash,
 &self, payment_paths: Vec<(BlindedPayInfo, BlindedPath)>, payment_hash: PaymentHash,
 created_at: core::time::Duration, expanded_key: &ExpandedKey, entropy_source: ES
	) -> Result<InvoiceBuilder<DerivedSigningPubkey>, SemanticError>
	where
Expand Down

4 changes: 2 additions & 2 deletions
lightning/src/offers/test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,7 +58,7 @@ pub(super) fn privkey(byte: u8) -> SecretKey {
	SecretKey::from_slice(&[byte; 32]).unwrap()
}

pub(super) fn payment_paths() -> Vec<(BlindedPath, BlindedPayInfo)> {
pub(super) fn payment_paths() -> Vec<(BlindedPayInfo, BlindedPath)> {
	let paths = vec![
 BlindedPath {
 introduction_node_id: pubkey(40),
Expand DownExpand Up@@ -97,7 +97,7 @@ pub(super) fn payment_paths() -> Vec<(BlindedPath, BlindedPayInfo)> {
 },
	];

paths.into_iter().zip(payinfo.into_iter()).collect()
payinfo.into_iter().zip(paths.into_iter()).collect()
}

pub(super) fn payment_hash() -> PaymentHash {
Expand Down
Loading