Blinded pathfinding groundwork#2146

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 17 commits into from
Apr 24, 2023
Merged

Blinded pathfinding groundwork #2146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
efed905
Move blinded_path and its utils into a new module
valentinewallace Mar 16, 2023
e691e50
Update docs and method names for blinded payment paths
valentinewallace Mar 16, 2023
ed4348f
Update PaymentParameters::route_hints for blinded paths
valentinewallace Mar 17, 2023
6d6a86c
Extract read/write variants from impl_for_vec
valentinewallace Apr 9, 2023
2a23b80
outbound_payment: remove unused cltv delta var
valentinewallace Apr 3, 2023
b5827f7
Minor Route/RouteHop doc updates
valentinewallace Apr 5, 2023
93afed5
Add utilities for getting a path's final value and cltv delta
valentinewallace Apr 19, 2023
d5b05e5
Replace Vec<RouteHop> with new Path struct
valentinewallace Apr 9, 2023
64c26c8
Add blinded path {metadata} fields to Path, but disallow paying blind…
valentinewallace Apr 18, 2023
97a8c91
Support (de)ser for Path::blinded_tails in events
valentinewallace Apr 9, 2023
c8fd77d
Support (de)serializing Path::blinded_tails in Routes
valentinewallace Apr 9, 2023
2e51a1c
Support (de)serializing Path::blinded_tails in HTLCSource
valentinewallace Apr 9, 2023
dac4a1c
Account for Path::blinded_tail in InflightHtlcs::process_path
valentinewallace Apr 9, 2023
976411d
Test scoring paths with blinded tails
valentinewallace Apr 19, 2023
5a6f9b0
Account for Path::blinded_tail when adding a shadow cltv offset
valentinewallace Apr 9, 2023
5c2cf77
Update changelog for backwards compat
valentinewallace Apr 9, 2023
b131634
Fix outbound_payment for new Path::blinded_tail
valentinewallace Apr 19, 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
10 changes: 5 additions & 5 deletions fuzz/src/chanmon_consistency.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,7 @@ use lightning::util::errors::APIError;
use lightning::util::logger::Logger;
use lightning::util::config::UserConfig;
use lightning::util::ser::{Readable, ReadableArgs, Writeable, Writer};
use lightning::routing::router::{InFlightHtlcs, Route, RouteHop, RouteParameters, Router};
use lightning::routing::router::{InFlightHtlcs, Path, Route, RouteHop, RouteParameters, Router};

use crate::utils::test_logger::{self, Output};
use crate::utils::test_persister::TestPersister;
Expand DownExpand Up@@ -352,14 +352,14 @@ fn send_payment(source: &ChanMan, dest: &ChanMan, dest_chan_id: u64, amt: u64, p
payment_id[0..8].copy_from_slice(&payment_idx.to_ne_bytes());
*payment_idx += 1;
if let Err(err) = source.send_payment_with_route(&Route {
paths: vec![vec![RouteHop {
paths: vec![Path { hops: vec![RouteHop {
pubkey: dest.get_our_node_id(),
node_features: dest.node_features(),
short_channel_id: dest_chan_id,
channel_features: dest.channel_features(),
fee_msat: amt,
cltv_expiry_delta: 200,
}]],
}], blinded_tail: None }],
payment_params: None,
}, payment_hash, RecipientOnionFields::secret_only(payment_secret), PaymentId(payment_id)) {
check_payment_err(err);
Expand All@@ -374,7 +374,7 @@ fn send_hop_payment(source: &ChanMan, middle: &ChanMan, middle_chan_id: u64, des
payment_id[0..8].copy_from_slice(&payment_idx.to_ne_bytes());
*payment_idx += 1;
if let Err(err) = source.send_payment_with_route(&Route {
paths: vec![vec![RouteHop {
paths: vec![Path { hops: vec![RouteHop {
pubkey: middle.get_our_node_id(),
node_features: middle.node_features(),
short_channel_id: middle_chan_id,
Expand All@@ -388,7 +388,7 @@ fn send_hop_payment(source: &ChanMan, middle: &ChanMan, middle_chan_id: u64, des
channel_features: dest.channel_features(),
fee_msat: amt,
cltv_expiry_delta: 200,
}]],
}], blinded_tail: None }],
payment_params: None,
}, payment_hash, RecipientOnionFields::secret_only(payment_secret), PaymentId(payment_id)) {
check_payment_err(err);
Expand Down
6 changes: 3 additions & 3 deletions fuzz/src/invoice_request_deser.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,13 +10,13 @@
use bitcoin::secp256k1::{KeyPair, Parity, PublicKey, Secp256k1, SecretKey, self};
use crate::utils::test_logger;
use core::convert::{Infallible, TryFrom};
use lightning::blinded_path::BlindedPath;
use lightning::chain::keysinterface::EntropySource;
use lightning::ln::PaymentHash;
use lightning::ln::features::BlindedHopFeatures;
use lightning::offers::invoice::{BlindedPayInfo, UnsignedInvoice};
use lightning::offers::invoice_request::InvoiceRequest;
use lightning::offers::parse::SemanticError;
use lightning::onion_message::BlindedPath;
use lightning::util::ser::Writeable;

#[inline]
Expand DownExpand Up@@ -74,8 +74,8 @@ fn build_response<'a, T: secp256k1::Signing + secp256k1::Verification>(
) -> Result<UnsignedInvoice<'a>, SemanticError> {
let entropy_source = Randomness {};
let paths = vec![
BlindedPath::new(&[pubkey(43), pubkey(44), pubkey(42)], &entropy_source, secp_ctx).unwrap(),
BlindedPath::new(&[pubkey(45), pubkey(46), pubkey(42)], &entropy_source, secp_ctx).unwrap(),
BlindedPath::new_for_message(&[pubkey(43), pubkey(44), pubkey(42)], &entropy_source, secp_ctx).unwrap(),
BlindedPath::new_for_message(&[pubkey(45), pubkey(46), pubkey(42)], &entropy_source, secp_ctx).unwrap(),
];

let payinfo = vec![
Expand Down
6 changes: 3 additions & 3 deletions fuzz/src/refund_deser.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,13 +10,13 @@
use bitcoin::secp256k1::{KeyPair, PublicKey, Secp256k1, SecretKey, self};
use crate::utils::test_logger;
use core::convert::{Infallible, TryFrom};
use lightning::blinded_path::BlindedPath;
use lightning::chain::keysinterface::EntropySource;
use lightning::ln::PaymentHash;
use lightning::ln::features::BlindedHopFeatures;
use lightning::offers::invoice::{BlindedPayInfo, UnsignedInvoice};
use lightning::offers::parse::SemanticError;
use lightning::offers::refund::Refund;
use lightning::onion_message::BlindedPath;
use lightning::util::ser::Writeable;

#[inline]
Expand DownExpand Up@@ -63,8 +63,8 @@ fn build_response<'a, T: secp256k1::Signing + secp256k1::Verification>(
) -> Result<UnsignedInvoice<'a>, SemanticError> {
let entropy_source = Randomness {};
let paths = vec![
BlindedPath::new(&[pubkey(43), pubkey(44), pubkey(42)], &entropy_source, secp_ctx).unwrap(),
BlindedPath::new(&[pubkey(45), pubkey(46), pubkey(42)], &entropy_source, secp_ctx).unwrap(),
BlindedPath::new_for_message(&[pubkey(43), pubkey(44), pubkey(42)], &entropy_source, secp_ctx).unwrap(),
BlindedPath::new_for_message(&[pubkey(45), pubkey(46), pubkey(42)], &entropy_source, secp_ctx).unwrap(),
];

let payinfo = vec![
Expand Down
45 changes: 20 additions & 25 deletions lightning-background-processor/src/lib.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -236,26 +236,21 @@ fn update_scorer<'a, S: 'static + Deref<Target = SC> + Send + Sync, SC: 'a + Wri
let mut score = scorer.lock();
match event {
Event::PaymentPathFailed { ref path, short_channel_id: Some(scid), .. } => {
let path = path.iter().collect::<Vec<_>>();
score.payment_path_failed(&path, *scid);
score.payment_path_failed(path, *scid);
},
Event::PaymentPathFailed { ref path, payment_failed_permanently: true, .. } => {
// Reached if the destination explicitly failed it back. We treat this as a successful probe
// because the payment made it all the way to the destination with sufficient liquidity.
let path = path.iter().collect::<Vec<_>>();
score.probe_successful(&path);
score.probe_successful(path);
},
Event::PaymentPathSuccessful { path, .. } => {
let path = path.iter().collect::<Vec<_>>();
score.payment_path_successful(&path);
score.payment_path_successful(path);
},
Event::ProbeSuccessful { path, .. } => {
let path = path.iter().collect::<Vec<_>>();
score.probe_successful(&path);
score.probe_successful(path);
},
Event::ProbeFailed { path, short_channel_id: Some(scid), .. } => {
let path = path.iter().collect::<Vec<_>>();
score.probe_failed(&path, *scid);
score.probe_failed(path, *scid);
},
_ => {},
}
Expand DownExpand Up@@ -751,7 +746,7 @@ mod tests {
use lightning::ln::msgs::{ChannelMessageHandler, Init};
use lightning::ln::peer_handler::{PeerManager, MessageHandler, SocketDescriptor, IgnoringMessageHandler};
use lightning::routing::gossip::{NetworkGraph, NodeId, P2PGossipSync};
use lightning::routing::router::{DefaultRouter, RouteHop};
use lightning::routing::router::{DefaultRouter, Path, RouteHop};
use lightning::routing::scoring::{ChannelUsage, Score};
use lightning::util::config::UserConfig;
use lightning::util::ser::Writeable;
Expand DownExpand Up@@ -891,10 +886,10 @@ mod tests {

#[derive(Debug)]
enum TestResult {
PaymentFailure { path: Vec<RouteHop>, short_channel_id: u64 },
PaymentSuccess { path: Vec<RouteHop> },
ProbeFailure { path: Vec<RouteHop> },
ProbeSuccess { path: Vec<RouteHop> },
PaymentFailure { path: Path, short_channel_id: u64 },
PaymentSuccess { path: Path },
ProbeFailure { path: Path },
ProbeSuccess { path: Path },
}

impl TestScorer {
Expand All@@ -916,11 +911,11 @@ mod tests {
&self, _short_channel_id: u64, _source: &NodeId, _target: &NodeId, _usage: ChannelUsage
) -> u64 { unimplemented!(); }

fn payment_path_failed(&mut self, actual_path: &[&RouteHop], actual_short_channel_id: u64) {
fn payment_path_failed(&mut self, actual_path: &Path, actual_short_channel_id: u64) {
if let Some(expectations) = &mut self.event_expectations {
match expectations.pop_front().unwrap() {
TestResult::PaymentFailure { path, short_channel_id } => {
assert_eq!(actual_path, &path.iter().collect::<Vec<_>>()[..]);
assert_eq!(actual_path, &path);
assert_eq!(actual_short_channel_id, short_channel_id);
},
TestResult::PaymentSuccess { path } => {
Expand All@@ -936,14 +931,14 @@ mod tests {
}
}

fn payment_path_successful(&mut self, actual_path: &[&RouteHop]) {
fn payment_path_successful(&mut self, actual_path: &Path) {
if let Some(expectations) = &mut self.event_expectations {
match expectations.pop_front().unwrap() {
TestResult::PaymentFailure { path, .. } => {
panic!("Unexpected payment path failure: {:?}", path)
},
TestResult::PaymentSuccess { path } => {
assert_eq!(actual_path, &path.iter().collect::<Vec<_>>()[..]);
assert_eq!(actual_path, &path);
},
TestResult::ProbeFailure { path } => {
panic!("Unexpected probe failure: {:?}", path)
Expand All@@ -955,7 +950,7 @@ mod tests {
}
}

fn probe_failed(&mut self, actual_path: &[&RouteHop], _: u64) {
fn probe_failed(&mut self, actual_path: &Path, _: u64) {
if let Some(expectations) = &mut self.event_expectations {
match expectations.pop_front().unwrap() {
TestResult::PaymentFailure { path, .. } => {
Expand All@@ -965,15 +960,15 @@ mod tests {
panic!("Unexpected payment path success: {:?}", path)
},
TestResult::ProbeFailure { path } => {
assert_eq!(actual_path, &path.iter().collect::<Vec<_>>()[..]);
assert_eq!(actual_path, &path);
},
TestResult::ProbeSuccess { path } => {
panic!("Unexpected probe success: {:?}", path)
}
}
}
}
fn probe_successful(&mut self, actual_path: &[&RouteHop]) {
fn probe_successful(&mut self, actual_path: &Path) {
if let Some(expectations) = &mut self.event_expectations {
match expectations.pop_front().unwrap() {
TestResult::PaymentFailure { path, .. } => {
Expand All@@ -986,7 +981,7 @@ mod tests {
panic!("Unexpected probe failure: {:?}", path)
},
TestResult::ProbeSuccess { path } => {
assert_eq!(actual_path, &path.iter().collect::<Vec<_>>()[..]);
assert_eq!(actual_path, &path);
}
}
}
Expand DownExpand Up@@ -1510,14 +1505,14 @@ mod tests {
let node_1_privkey = SecretKey::from_slice(&[42; 32]).unwrap();
let node_1_id = PublicKey::from_secret_key(&secp_ctx, &node_1_privkey);

let path = vec![RouteHop {
let path = Path { hops: vec![RouteHop {
pubkey: node_1_id,
node_features: NodeFeatures::empty(),
short_channel_id: scored_scid,
channel_features: ChannelFeatures::empty(),
fee_msat: 0,
cltv_expiry_delta: MIN_CLTV_EXPIRY_DELTA as u32,
}];
}], blinded_tail: None };

$nodes[0].scorer.lock().unwrap().expect(TestResult::PaymentFailure { path: path.clone(), short_channel_id: scored_scid });
$nodes[0].node.push_pending_event(Event::PaymentPathFailed {
Expand Down
34 changes: 18 additions & 16 deletions lightning/src/onion_message/blinded_path.rs → lightning/src/blinded_path/mod.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,13 +9,14 @@

//! Creating blinded paths and related utilities live here.

pub(crate) mod utils;

use bitcoin::hashes::{Hash, HashEngine};
use bitcoin::hashes::sha256::Hash as Sha256;
use bitcoin::secp256k1::{self, PublicKey, Scalar, Secp256k1, SecretKey};

use crate::chain::keysinterface::{EntropySource, NodeSigner, Recipient};
use super::packet::ControlTlvs;
use super::utils;
use crate::onion_message::ControlTlvs;
use crate::ln::msgs::DecodeError;
use crate::ln::onion_utils;
use crate::util::chacha20poly1305rfc::{ChaChaPolyReadAdapter, ChaChaPolyWriteAdapter};
Expand All@@ -26,18 +27,18 @@ use core::ops::Deref;
use crate::io::{self, Cursor};
use crate::prelude::*;

/// Onion messages can be sent and received to blinded paths, which serve to hide the identity of
/// the recipient.
#[derive(Clone, Debug, PartialEq)]
/// Onion messages and payments can be sent and received to blinded paths, which serve to hide the
/// identity of the recipient.
#[derive(Clone, Debug, Hash, PartialEq, Eq)]
pub struct BlindedPath {
/// To send to a blinded path, the sender first finds a route to the unblinded
/// `introduction_node_id`, which can unblind its [`encrypted_payload`] to find out the onion
/// message's next hop and forward it along.
/// message or payment's next hop and forward it along.
///
/// [`encrypted_payload`]: BlindedHop::encrypted_payload
pub(crate) introduction_node_id: PublicKey,
/// Used by the introduction node to decrypt its [`encrypted_payload`] to forward the onion
/// message.
/// message or payment.
///
/// [`encrypted_payload`]: BlindedHop::encrypted_payload
pub(crate) blinding_point: PublicKey,
Expand All@@ -47,7 +48,7 @@ pub struct BlindedPath {

/// Used to construct the blinded hops portion of a blinded path. These hops cannot be identified
/// by outside observers and thus can be used to hide the identity of the recipient.
#[derive(Clone, Debug, PartialEq)]
#[derive(Clone, Debug, Hash, PartialEq, Eq)]
pub struct BlindedHop {
/// The blinded node id of this hop in a blinded path.
pub(crate) blinded_node_id: PublicKey,
Expand All@@ -58,12 +59,12 @@ pub struct BlindedHop {
}

impl BlindedPath {
/// Create a blinded path to be forwarded along `node_pks`. The last node pubkey in `node_pks`
/// will be the destination node.
/// Create a blinded path for an onion message, to be forwarded along `node_pks`. The last node
/// pubkey in `node_pks` will be the destination node.
///
/// Errors if less than two hops are provided or if `node_pk`(s) are invalid.
// TODO: make all payloads the same size with padding + add dummy hops
pub fn new<ES: EntropySource, T: secp256k1::Signing + secp256k1::Verification>
pub fn new_for_message<ES: EntropySource, T: secp256k1::Signing + secp256k1::Verification>
(node_pks: &[PublicKey], entropy_source: &ES, secp_ctx: &Secp256k1<T>) -> Result<Self, ()>
{
if node_pks.len() < 2 { return Err(()) }
Expand All@@ -74,12 +75,13 @@ impl BlindedPath {
Ok(BlindedPath {
introduction_node_id,
blinding_point: PublicKey::from_secret_key(secp_ctx, &blinding_secret),
blinded_hops: blinded_hops(secp_ctx, node_pks, &blinding_secret).map_err(|_| ())?,
blinded_hops: blinded_message_hops(secp_ctx, node_pks, &blinding_secret).map_err(|_| ())?,
})
}

// Advance the blinded path by one hop, so make the second hop into the new introduction node.
pub(super) fn advance_by_one<NS: Deref, T: secp256k1::Signing + secp256k1::Verification>
// Advance the blinded onion message path by one hop, so make the second hop into the new
// introduction node.
pub(super) fn advance_message_path_by_one<NS: Deref, T: secp256k1::Signing + secp256k1::Verification>
(&mut self, node_signer: &NS, secp_ctx: &Secp256k1<T>) -> Result<(), ()>
where NS::Target: NodeSigner
{
Expand DownExpand Up@@ -114,8 +116,8 @@ impl BlindedPath {
}
}

/// Construct blinded hops for the given `unblinded_path`.
fn blinded_hops<T: secp256k1::Signing + secp256k1::Verification>(
/// Construct blinded onion message hops for the given `unblinded_path`.
fn blinded_message_hops<T: secp256k1::Signing + secp256k1::Verification>(
secp_ctx: &Secp256k1<T>, unblinded_path: &[PublicKey], session_priv: &SecretKey
) -> Result<Vec<BlindedHop>, secp256k1::Error> {
let mut blinded_hops = Vec::with_capacity(unblinded_path.len());
Expand Down
6 changes: 3 additions & 3 deletions lightning/src/onion_message/utils.rs → lightning/src/blinded_path/utils.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,15 +15,15 @@ use bitcoin::hashes::sha256::Hash as Sha256;
use bitcoin::secp256k1::{self, PublicKey, Secp256k1, SecretKey, Scalar};
use bitcoin::secp256k1::ecdh::SharedSecret;

use super::BlindedPath;
use crate::ln::onion_utils;
use super::blinded_path::BlindedPath;
use super::messenger::Destination;
use crate::onion_message::Destination;

use crate::prelude::*;

// TODO: DRY with onion_utils::construct_onion_keys_callback
#[inline]
pub(super) fn construct_keys_callback<T: secp256k1::Signing + secp256k1::Verification,
pub(crate) fn construct_keys_callback<T: secp256k1::Signing + secp256k1::Verification,
FType: FnMut(PublicKey, SharedSecret, PublicKey, [u8; 32], Option<PublicKey>, Option<Vec<u8>>)>(
secp_ctx: &Secp256k1<T>, unblinded_path: &[PublicKey], destination: Option<Destination>,
session_priv: &SecretKey, mut callback: FType
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" + '

Skip to content
Blinded pathfinding groundwork#2146

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

from

Apr 24, 2023
 Merged


Blinded pathfinding groundwork
#2146
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


17 commits


Select commit
Hold shift + click to select a range
efed905

Move blinded_path and its utils into a new module


valentinewallace Mar 16, 2023
e691e50

Update docs and method names for blinded payment paths


valentinewallace Mar 16, 2023
ed4348f

Update PaymentParameters::route_hints for blinded paths


valentinewallace Mar 17, 2023
6d6a86c

Extract read/write variants from impl_for_vec


valentinewallace Apr 9, 2023
2a23b80

outbound_payment: remove unused cltv delta var


valentinewallace Apr 3, 2023
b5827f7

Minor Route/RouteHop doc updates


valentinewallace Apr 5, 2023
93afed5

Add utilities for getting a path's final value and cltv delta


valentinewallace Apr 19, 2023
d5b05e5

Replace Vec<RouteHop> with new Path struct


valentinewallace Apr 9, 2023
64c26c8

Add blinded path {metadata} fields to Path, but disallow paying blind…


valentinewallace Apr 18, 2023
97a8c91

Support (de)ser for Path::blinded_tails in events


valentinewallace Apr 9, 2023
c8fd77d

Support (de)serializing Path::blinded_tails in Routes


valentinewallace Apr 9, 2023
2e51a1c

Support (de)serializing Path::blinded_tails in HTLCSource


valentinewallace Apr 9, 2023
dac4a1c

Account for Path::blinded_tail in InflightHtlcs::process_path


valentinewallace Apr 9, 2023
976411d

Test scoring paths with blinded tails


valentinewallace Apr 19, 2023
5a6f9b0

Account for Path::blinded_tail when adding a shadow cltv offset


valentinewallace Apr 9, 2023
5c2cf77

Update changelog for backwards compat


valentinewallace Apr 9, 2023
b131634

Fix outbound_payment for new Path::blinded_tail


valentinewallace Apr 19, 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


10 changes: 5 additions & 5 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,7 @@ use lightning::util::errors::APIError;
use lightning::util::logger::Logger;
use lightning::util::config::UserConfig;
use lightning::util::ser::{Readable, ReadableArgs, Writeable, Writer};
use lightning::routing::router::{InFlightHtlcs, Route, RouteHop, RouteParameters, Router};
use lightning::routing::router::{InFlightHtlcs, Path, Route, RouteHop, RouteParameters, Router};

use crate::utils::test_logger::{self, Output};
use crate::utils::test_persister::TestPersister;
Expand DownExpand Up@@ -352,14 +352,14 @@ fn send_payment(source: &ChanMan, dest: &ChanMan, dest_chan_id: u64, amt: u64, p
	payment_id[0..8].copy_from_slice(&payment_idx.to_ne_bytes());
	*payment_idx += 1;
	if let Err(err) = source.send_payment_with_route(&Route {
 paths: vec![vec![RouteHop {
 paths: vec![Path { hops: vec![RouteHop {
 pubkey: dest.get_our_node_id(),
 node_features: dest.node_features(),
 short_channel_id: dest_chan_id,
 channel_features: dest.channel_features(),
 fee_msat: amt,
 cltv_expiry_delta: 200,
 }]],
 }], blinded_tail: None }],
 payment_params: None,
	}, payment_hash, RecipientOnionFields::secret_only(payment_secret), PaymentId(payment_id)) {
 check_payment_err(err);
Expand All@@ -374,7 +374,7 @@ fn send_hop_payment(source: &ChanMan, middle: &ChanMan, middle_chan_id: u64, des
	payment_id[0..8].copy_from_slice(&payment_idx.to_ne_bytes());
	*payment_idx += 1;
	if let Err(err) = source.send_payment_with_route(&Route {
 paths: vec![vec![RouteHop {
 paths: vec![Path { hops: vec![RouteHop {
 pubkey: middle.get_our_node_id(),
 node_features: middle.node_features(),
 short_channel_id: middle_chan_id,
Expand All@@ -388,7 +388,7 @@ fn send_hop_payment(source: &ChanMan, middle: &ChanMan, middle_chan_id: u64, des
 channel_features: dest.channel_features(),
 fee_msat: amt,
 cltv_expiry_delta: 200,
 }]],
 }], blinded_tail: None }],
 payment_params: None,
	}, payment_hash, RecipientOnionFields::secret_only(payment_secret), PaymentId(payment_id)) {
 check_payment_err(err);
Expand Down

6 changes: 3 additions & 3 deletions
fuzz/src/invoice_request_deser.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,13 +10,13 @@
use bitcoin::secp256k1::{KeyPair, Parity, PublicKey, Secp256k1, SecretKey, self};
use crate::utils::test_logger;
use core::convert::{Infallible, TryFrom};
use lightning::blinded_path::BlindedPath;
use lightning::chain::keysinterface::EntropySource;
use lightning::ln::PaymentHash;
use lightning::ln::features::BlindedHopFeatures;
use lightning::offers::invoice::{BlindedPayInfo, UnsignedInvoice};
use lightning::offers::invoice_request::InvoiceRequest;
use lightning::offers::parse::SemanticError;
use lightning::onion_message::BlindedPath;
use lightning::util::ser::Writeable;

#[inline]
Expand DownExpand Up@@ -74,8 +74,8 @@ fn build_response<'a, T: secp256k1::Signing + secp256k1::Verification>(
) -> Result<UnsignedInvoice<'a>, SemanticError> {
	let entropy_source = Randomness {};
	let paths = vec![
 BlindedPath::new(&[pubkey(43), pubkey(44), pubkey(42)], &entropy_source, secp_ctx).unwrap(),
 BlindedPath::new(&[pubkey(45), pubkey(46), pubkey(42)], &entropy_source, secp_ctx).unwrap(),
 BlindedPath::new_for_message(&[pubkey(43), pubkey(44), pubkey(42)], &entropy_source, secp_ctx).unwrap(),
 BlindedPath::new_for_message(&[pubkey(45), pubkey(46), pubkey(42)], &entropy_source, secp_ctx).unwrap(),
	];

	let payinfo = vec![
Expand Down

6 changes: 3 additions & 3 deletions
fuzz/src/refund_deser.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,13 +10,13 @@
use bitcoin::secp256k1::{KeyPair, PublicKey, Secp256k1, SecretKey, self};
use crate::utils::test_logger;
use core::convert::{Infallible, TryFrom};
use lightning::blinded_path::BlindedPath;
use lightning::chain::keysinterface::EntropySource;
use lightning::ln::PaymentHash;
use lightning::ln::features::BlindedHopFeatures;
use lightning::offers::invoice::{BlindedPayInfo, UnsignedInvoice};
use lightning::offers::parse::SemanticError;
use lightning::offers::refund::Refund;
use lightning::onion_message::BlindedPath;
use lightning::util::ser::Writeable;

#[inline]
Expand DownExpand Up@@ -63,8 +63,8 @@ fn build_response<'a, T: secp256k1::Signing + secp256k1::Verification>(
) -> Result<UnsignedInvoice<'a>, SemanticError> {
	let entropy_source = Randomness {};
	let paths = vec![
 BlindedPath::new(&[pubkey(43), pubkey(44), pubkey(42)], &entropy_source, secp_ctx).unwrap(),
 BlindedPath::new(&[pubkey(45), pubkey(46), pubkey(42)], &entropy_source, secp_ctx).unwrap(),
 BlindedPath::new_for_message(&[pubkey(43), pubkey(44), pubkey(42)], &entropy_source, secp_ctx).unwrap(),
 BlindedPath::new_for_message(&[pubkey(45), pubkey(46), pubkey(42)], &entropy_source, secp_ctx).unwrap(),
	];

	let payinfo = vec![
Expand Down

45 changes: 20 additions & 25 deletions
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -236,26 +236,21 @@ fn update_scorer<'a, S: 'static + Deref<Target = SC> + Send + Sync, SC: 'a + Wri
	let mut score = scorer.lock();
	match event {
 Event::PaymentPathFailed { ref path, short_channel_id: Some(scid), .. } => {
 let path = path.iter().collect::<Vec<_>>();
 score.payment_path_failed(&path, *scid);
 score.payment_path_failed(path, *scid);
 },
 Event::PaymentPathFailed { ref path, payment_failed_permanently: true, .. } => {
 // Reached if the destination explicitly failed it back. We treat this as a successful probe
 // because the payment made it all the way to the destination with sufficient liquidity.
 let path = path.iter().collect::<Vec<_>>();
 score.probe_successful(&path);
 score.probe_successful(path);
 },
 Event::PaymentPathSuccessful { path, .. } => {
 let path = path.iter().collect::<Vec<_>>();
 score.payment_path_successful(&path);
 score.payment_path_successful(path);
 },
 Event::ProbeSuccessful { path, .. } => {
 let path = path.iter().collect::<Vec<_>>();
 score.probe_successful(&path);
 score.probe_successful(path);
 },
 Event::ProbeFailed { path, short_channel_id: Some(scid), .. } => {
 let path = path.iter().collect::<Vec<_>>();
 score.probe_failed(&path, *scid);
 score.probe_failed(path, *scid);
 },
 _ => {},
	}
Expand DownExpand Up@@ -751,7 +746,7 @@ mod tests {
	use lightning::ln::msgs::{ChannelMessageHandler, Init};
	use lightning::ln::peer_handler::{PeerManager, MessageHandler, SocketDescriptor, IgnoringMessageHandler};
	use lightning::routing::gossip::{NetworkGraph, NodeId, P2PGossipSync};
	use lightning::routing::router::{DefaultRouter, RouteHop};
	use lightning::routing::router::{DefaultRouter, Path, RouteHop};
	use lightning::routing::scoring::{ChannelUsage, Score};
	use lightning::util::config::UserConfig;
	use lightning::util::ser::Writeable;
Expand DownExpand Up@@ -891,10 +886,10 @@ mod tests {

	#[derive(Debug)]
	enum TestResult {
 PaymentFailure { path: Vec<RouteHop>, short_channel_id: u64 },
 PaymentSuccess { path: Vec<RouteHop> },
 ProbeFailure { path: Vec<RouteHop> },
 ProbeSuccess { path: Vec<RouteHop> },
 PaymentFailure { path: Path, short_channel_id: u64 },
 PaymentSuccess { path: Path },
 ProbeFailure { path: Path },
 ProbeSuccess { path: Path },
	}

	impl TestScorer {
Expand All@@ -916,11 +911,11 @@ mod tests {
 &self, _short_channel_id: u64, _source: &NodeId, _target: &NodeId, _usage: ChannelUsage
 ) -> u64 { unimplemented!(); }

 fn payment_path_failed(&mut self, actual_path: &[&RouteHop], actual_short_channel_id: u64) {
 fn payment_path_failed(&mut self, actual_path: &Path, actual_short_channel_id: u64) {
 if let Some(expectations) = &mut self.event_expectations {
 match expectations.pop_front().unwrap() {
 TestResult::PaymentFailure { path, short_channel_id } => {
 assert_eq!(actual_path, &path.iter().collect::<Vec<_>>()[..]);
 assert_eq!(actual_path, &path);
 assert_eq!(actual_short_channel_id, short_channel_id);
 },
 TestResult::PaymentSuccess { path } => {
Expand All@@ -936,14 +931,14 @@ mod tests {
 }
 }

 fn payment_path_successful(&mut self, actual_path: &[&RouteHop]) {
 fn payment_path_successful(&mut self, actual_path: &Path) {
 if let Some(expectations) = &mut self.event_expectations {
 match expectations.pop_front().unwrap() {
 TestResult::PaymentFailure { path, .. } => {
 panic!("Unexpected payment path failure: {:?}", path)
 },
 TestResult::PaymentSuccess { path } => {
 assert_eq!(actual_path, &path.iter().collect::<Vec<_>>()[..]);
 assert_eq!(actual_path, &path);
 },
 TestResult::ProbeFailure { path } => {
 panic!("Unexpected probe failure: {:?}", path)
Expand All@@ -955,7 +950,7 @@ mod tests {
 }
 }

 fn probe_failed(&mut self, actual_path: &[&RouteHop], _: u64) {
 fn probe_failed(&mut self, actual_path: &Path, _: u64) {
 if let Some(expectations) = &mut self.event_expectations {
 match expectations.pop_front().unwrap() {
 TestResult::PaymentFailure { path, .. } => {
Expand All@@ -965,15 +960,15 @@ mod tests {
 panic!("Unexpected payment path success: {:?}", path)
 },
 TestResult::ProbeFailure { path } => {
 assert_eq!(actual_path, &path.iter().collect::<Vec<_>>()[..]);
 assert_eq!(actual_path, &path);
 },
 TestResult::ProbeSuccess { path } => {
 panic!("Unexpected probe success: {:?}", path)
 }
 }
 }
 }
 fn probe_successful(&mut self, actual_path: &[&RouteHop]) {
 fn probe_successful(&mut self, actual_path: &Path) {
 if let Some(expectations) = &mut self.event_expectations {
 match expectations.pop_front().unwrap() {
 TestResult::PaymentFailure { path, .. } => {
Expand All@@ -986,7 +981,7 @@ mod tests {
 panic!("Unexpected probe failure: {:?}", path)
 },
 TestResult::ProbeSuccess { path } => {
 assert_eq!(actual_path, &path.iter().collect::<Vec<_>>()[..]);
 assert_eq!(actual_path, &path);
 }
 }
 }
Expand DownExpand Up@@ -1510,14 +1505,14 @@ mod tests {
 let node_1_privkey = SecretKey::from_slice(&[42; 32]).unwrap();
 let node_1_id = PublicKey::from_secret_key(&secp_ctx, &node_1_privkey);

 let path = vec![RouteHop {
 let path = Path { hops: vec![RouteHop {
 pubkey: node_1_id,
 node_features: NodeFeatures::empty(),
 short_channel_id: scored_scid,
 channel_features: ChannelFeatures::empty(),
 fee_msat: 0,
 cltv_expiry_delta: MIN_CLTV_EXPIRY_DELTA as u32,
 }];
 }], blinded_tail: None };

 $nodes[0].scorer.lock().unwrap().expect(TestResult::PaymentFailure { path: path.clone(), short_channel_id: scored_scid });
 $nodes[0].node.push_pending_event(Event::PaymentPathFailed {
Expand Down

34 changes: 18 additions & 16 deletions
lightning/src/onion_message/blinded_path.rs → lightning/src/blinded_path/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,13 +9,14 @@

//! Creating blinded paths and related utilities live here.

pub(crate) mod utils;

use bitcoin::hashes::{Hash, HashEngine};
use bitcoin::hashes::sha256::Hash as Sha256;
use bitcoin::secp256k1::{self, PublicKey, Scalar, Secp256k1, SecretKey};

use crate::chain::keysinterface::{EntropySource, NodeSigner, Recipient};
use super::packet::ControlTlvs;
use super::utils;
use crate::onion_message::ControlTlvs;
use crate::ln::msgs::DecodeError;
use crate::ln::onion_utils;
use crate::util::chacha20poly1305rfc::{ChaChaPolyReadAdapter, ChaChaPolyWriteAdapter};
Expand All@@ -26,18 +27,18 @@ use core::ops::Deref;
use crate::io::{self, Cursor};
use crate::prelude::*;

/// Onion messages can be sent and received to blinded paths, which serve to hide the identity of
/// the recipient.
#[derive(Clone, Debug, PartialEq)]
/// Onion messages and payments can be sent and received to blinded paths, which serve to hide the
/// identity of the recipient.
#[derive(Clone, Debug, Hash, PartialEq, Eq)]
pub struct BlindedPath {
	/// To send to a blinded path, the sender first finds a route to the unblinded
	/// `introduction_node_id`, which can unblind its [`encrypted_payload`] to find out the onion
	/// message's next hop and forward it along.
	/// message or payment's next hop and forward it along.
	///
	/// [`encrypted_payload`]: BlindedHop::encrypted_payload
	pub(crate) introduction_node_id: PublicKey,
	/// Used by the introduction node to decrypt its [`encrypted_payload`] to forward the onion
	/// message.
	/// message or payment.
	///
	/// [`encrypted_payload`]: BlindedHop::encrypted_payload
	pub(crate) blinding_point: PublicKey,
Expand All@@ -47,7 +48,7 @@ pub struct BlindedPath {

/// Used to construct the blinded hops portion of a blinded path. These hops cannot be identified
/// by outside observers and thus can be used to hide the identity of the recipient.
#[derive(Clone, Debug, PartialEq)]
#[derive(Clone, Debug, Hash, PartialEq, Eq)]
pub struct BlindedHop {
	/// The blinded node id of this hop in a blinded path.
	pub(crate) blinded_node_id: PublicKey,
Expand All@@ -58,12 +59,12 @@ pub struct BlindedHop {
}

impl BlindedPath {
	/// Create a blinded path to be forwarded along `node_pks`. The last node pubkey in `node_pks`
	/// will be the destination node.
	/// Create a blinded path for an onion message, to be forwarded along `node_pks`. The last node
	/// pubkey in `node_pks` will be the destination node.
	///
	/// Errors if less than two hops are provided or if `node_pk`(s) are invalid.
	// TODO: make all payloads the same size with padding + add dummy hops
	pub fn new<ES: EntropySource, T: secp256k1::Signing + secp256k1::Verification>
	pub fn new_for_message<ES: EntropySource, T: secp256k1::Signing + secp256k1::Verification>
 (node_pks: &[PublicKey], entropy_source: &ES, secp_ctx: &Secp256k1<T>) -> Result<Self, ()>
	{
 if node_pks.len() < 2 { return Err(()) }
Expand All@@ -74,12 +75,13 @@ impl BlindedPath {
 Ok(BlindedPath {
 introduction_node_id,
 blinding_point: PublicKey::from_secret_key(secp_ctx, &blinding_secret),
 blinded_hops: blinded_hops(secp_ctx, node_pks, &blinding_secret).map_err(|_| ())?,
 blinded_hops: blinded_message_hops(secp_ctx, node_pks, &blinding_secret).map_err(|_| ())?,
 })
	}

	// Advance the blinded path by one hop, so make the second hop into the new introduction node.
	pub(super) fn advance_by_one<NS: Deref, T: secp256k1::Signing + secp256k1::Verification>
	// Advance the blinded onion message path by one hop, so make the second hop into the new
	// introduction node.
	pub(super) fn advance_message_path_by_one<NS: Deref, T: secp256k1::Signing + secp256k1::Verification>
 (&mut self, node_signer: &NS, secp_ctx: &Secp256k1<T>) -> Result<(), ()>
 where NS::Target: NodeSigner
	{
Expand DownExpand Up@@ -114,8 +116,8 @@ impl BlindedPath {
	}
}

/// Construct blinded hops for the given `unblinded_path`.
fn blinded_hops<T: secp256k1::Signing + secp256k1::Verification>(
/// Construct blinded onion message hops for the given `unblinded_path`.
fn blinded_message_hops<T: secp256k1::Signing + secp256k1::Verification>(
	secp_ctx: &Secp256k1<T>, unblinded_path: &[PublicKey], session_priv: &SecretKey
) -> Result<Vec<BlindedHop>, secp256k1::Error> {
	let mut blinded_hops = Vec::with_capacity(unblinded_path.len());
Expand Down

6 changes: 3 additions & 3 deletions
lightning/src/onion_message/utils.rs → lightning/src/blinded_path/utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,15 +15,15 @@ use bitcoin::hashes::sha256::Hash as Sha256;
use bitcoin::secp256k1::{self, PublicKey, Secp256k1, SecretKey, Scalar};
use bitcoin::secp256k1::ecdh::SharedSecret;

use super::BlindedPath;
use crate::ln::onion_utils;
use super::blinded_path::BlindedPath;
use super::messenger::Destination;
use crate::onion_message::Destination;

use crate::prelude::*;

// TODO: DRY with onion_utils::construct_onion_keys_callback
#[inline]
pub(super) fn construct_keys_callback<T: secp256k1::Signing + secp256k1::Verification,
pub(crate) fn construct_keys_callback<T: secp256k1::Signing + secp256k1::Verification,
	FType: FnMut(PublicKey, SharedSecret, PublicKey, [u8; 32], Option<PublicKey>, Option<Vec<u8>>)>(
	secp_ctx: &Secp256k1<T>, unblinded_path: &[PublicKey], destination: Option<Destination>,
	session_priv: &SecretKey, mut callback: FType
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('^' + ".*" + '

Skip to content
Blinded pathfinding groundwork#2146

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

from

Apr 24, 2023
 Merged


Blinded pathfinding groundwork
#2146
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


17 commits


Select commit
Hold shift + click to select a range
efed905

Move blinded_path and its utils into a new module


valentinewallace Mar 16, 2023
e691e50

Update docs and method names for blinded payment paths


valentinewallace Mar 16, 2023
ed4348f

Update PaymentParameters::route_hints for blinded paths


valentinewallace Mar 17, 2023
6d6a86c

Extract read/write variants from impl_for_vec


valentinewallace Apr 9, 2023
2a23b80

outbound_payment: remove unused cltv delta var


valentinewallace Apr 3, 2023
b5827f7

Minor Route/RouteHop doc updates


valentinewallace Apr 5, 2023
93afed5

Add utilities for getting a path's final value and cltv delta


valentinewallace Apr 19, 2023
d5b05e5

Replace Vec<RouteHop> with new Path struct


valentinewallace Apr 9, 2023
64c26c8

Add blinded path {metadata} fields to Path, but disallow paying blind…


valentinewallace Apr 18, 2023
97a8c91

Support (de)ser for Path::blinded_tails in events


valentinewallace Apr 9, 2023
c8fd77d

Support (de)serializing Path::blinded_tails in Routes


valentinewallace Apr 9, 2023
2e51a1c

Support (de)serializing Path::blinded_tails in HTLCSource


valentinewallace Apr 9, 2023
dac4a1c

Account for Path::blinded_tail in InflightHtlcs::process_path


valentinewallace Apr 9, 2023
976411d

Test scoring paths with blinded tails


valentinewallace Apr 19, 2023
5a6f9b0

Account for Path::blinded_tail when adding a shadow cltv offset


valentinewallace Apr 9, 2023
5c2cf77

Update changelog for backwards compat


valentinewallace Apr 9, 2023
b131634

Fix outbound_payment for new Path::blinded_tail


valentinewallace Apr 19, 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


10 changes: 5 additions & 5 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,7 @@ use lightning::util::errors::APIError;
use lightning::util::logger::Logger;
use lightning::util::config::UserConfig;
use lightning::util::ser::{Readable, ReadableArgs, Writeable, Writer};
use lightning::routing::router::{InFlightHtlcs, Route, RouteHop, RouteParameters, Router};
use lightning::routing::router::{InFlightHtlcs, Path, Route, RouteHop, RouteParameters, Router};

use crate::utils::test_logger::{self, Output};
use crate::utils::test_persister::TestPersister;
Expand DownExpand Up@@ -352,14 +352,14 @@ fn send_payment(source: &ChanMan, dest: &ChanMan, dest_chan_id: u64, amt: u64, p
	payment_id[0..8].copy_from_slice(&payment_idx.to_ne_bytes());
	*payment_idx += 1;
	if let Err(err) = source.send_payment_with_route(&Route {
 paths: vec![vec![RouteHop {
 paths: vec![Path { hops: vec![RouteHop {
 pubkey: dest.get_our_node_id(),
 node_features: dest.node_features(),
 short_channel_id: dest_chan_id,
 channel_features: dest.channel_features(),
 fee_msat: amt,
 cltv_expiry_delta: 200,
 }]],
 }], blinded_tail: None }],
 payment_params: None,
	}, payment_hash, RecipientOnionFields::secret_only(payment_secret), PaymentId(payment_id)) {
 check_payment_err(err);
Expand All@@ -374,7 +374,7 @@ fn send_hop_payment(source: &ChanMan, middle: &ChanMan, middle_chan_id: u64, des
	payment_id[0..8].copy_from_slice(&payment_idx.to_ne_bytes());
	*payment_idx += 1;
	if let Err(err) = source.send_payment_with_route(&Route {
 paths: vec![vec![RouteHop {
 paths: vec![Path { hops: vec![RouteHop {
 pubkey: middle.get_our_node_id(),
 node_features: middle.node_features(),
 short_channel_id: middle_chan_id,
Expand All@@ -388,7 +388,7 @@ fn send_hop_payment(source: &ChanMan, middle: &ChanMan, middle_chan_id: u64, des
 channel_features: dest.channel_features(),
 fee_msat: amt,
 cltv_expiry_delta: 200,
 }]],
 }], blinded_tail: None }],
 payment_params: None,
	}, payment_hash, RecipientOnionFields::secret_only(payment_secret), PaymentId(payment_id)) {
 check_payment_err(err);
Expand Down

6 changes: 3 additions & 3 deletions
fuzz/src/invoice_request_deser.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,13 +10,13 @@
use bitcoin::secp256k1::{KeyPair, Parity, PublicKey, Secp256k1, SecretKey, self};
use crate::utils::test_logger;
use core::convert::{Infallible, TryFrom};
use lightning::blinded_path::BlindedPath;
use lightning::chain::keysinterface::EntropySource;
use lightning::ln::PaymentHash;
use lightning::ln::features::BlindedHopFeatures;
use lightning::offers::invoice::{BlindedPayInfo, UnsignedInvoice};
use lightning::offers::invoice_request::InvoiceRequest;
use lightning::offers::parse::SemanticError;
use lightning::onion_message::BlindedPath;
use lightning::util::ser::Writeable;

#[inline]
Expand DownExpand Up@@ -74,8 +74,8 @@ fn build_response<'a, T: secp256k1::Signing + secp256k1::Verification>(
) -> Result<UnsignedInvoice<'a>, SemanticError> {
	let entropy_source = Randomness {};
	let paths = vec![
 BlindedPath::new(&[pubkey(43), pubkey(44), pubkey(42)], &entropy_source, secp_ctx).unwrap(),
 BlindedPath::new(&[pubkey(45), pubkey(46), pubkey(42)], &entropy_source, secp_ctx).unwrap(),
 BlindedPath::new_for_message(&[pubkey(43), pubkey(44), pubkey(42)], &entropy_source, secp_ctx).unwrap(),
 BlindedPath::new_for_message(&[pubkey(45), pubkey(46), pubkey(42)], &entropy_source, secp_ctx).unwrap(),
	];

	let payinfo = vec![
Expand Down

6 changes: 3 additions & 3 deletions
fuzz/src/refund_deser.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,13 +10,13 @@
use bitcoin::secp256k1::{KeyPair, PublicKey, Secp256k1, SecretKey, self};
use crate::utils::test_logger;
use core::convert::{Infallible, TryFrom};
use lightning::blinded_path::BlindedPath;
use lightning::chain::keysinterface::EntropySource;
use lightning::ln::PaymentHash;
use lightning::ln::features::BlindedHopFeatures;
use lightning::offers::invoice::{BlindedPayInfo, UnsignedInvoice};
use lightning::offers::parse::SemanticError;
use lightning::offers::refund::Refund;
use lightning::onion_message::BlindedPath;
use lightning::util::ser::Writeable;

#[inline]
Expand DownExpand Up@@ -63,8 +63,8 @@ fn build_response<'a, T: secp256k1::Signing + secp256k1::Verification>(
) -> Result<UnsignedInvoice<'a>, SemanticError> {
	let entropy_source = Randomness {};
	let paths = vec![
 BlindedPath::new(&[pubkey(43), pubkey(44), pubkey(42)], &entropy_source, secp_ctx).unwrap(),
 BlindedPath::new(&[pubkey(45), pubkey(46), pubkey(42)], &entropy_source, secp_ctx).unwrap(),
 BlindedPath::new_for_message(&[pubkey(43), pubkey(44), pubkey(42)], &entropy_source, secp_ctx).unwrap(),
 BlindedPath::new_for_message(&[pubkey(45), pubkey(46), pubkey(42)], &entropy_source, secp_ctx).unwrap(),
	];

	let payinfo = vec![
Expand Down

45 changes: 20 additions & 25 deletions
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -236,26 +236,21 @@ fn update_scorer<'a, S: 'static + Deref<Target = SC> + Send + Sync, SC: 'a + Wri
	let mut score = scorer.lock();
	match event {
 Event::PaymentPathFailed { ref path, short_channel_id: Some(scid), .. } => {
 let path = path.iter().collect::<Vec<_>>();
 score.payment_path_failed(&path, *scid);
 score.payment_path_failed(path, *scid);
 },
 Event::PaymentPathFailed { ref path, payment_failed_permanently: true, .. } => {
 // Reached if the destination explicitly failed it back. We treat this as a successful probe
 // because the payment made it all the way to the destination with sufficient liquidity.
 let path = path.iter().collect::<Vec<_>>();
 score.probe_successful(&path);
 score.probe_successful(path);
 },
 Event::PaymentPathSuccessful { path, .. } => {
 let path = path.iter().collect::<Vec<_>>();
 score.payment_path_successful(&path);
 score.payment_path_successful(path);
 },
 Event::ProbeSuccessful { path, .. } => {
 let path = path.iter().collect::<Vec<_>>();
 score.probe_successful(&path);
 score.probe_successful(path);
 },
 Event::ProbeFailed { path, short_channel_id: Some(scid), .. } => {
 let path = path.iter().collect::<Vec<_>>();
 score.probe_failed(&path, *scid);
 score.probe_failed(path, *scid);
 },
 _ => {},
	}
Expand DownExpand Up@@ -751,7 +746,7 @@ mod tests {
	use lightning::ln::msgs::{ChannelMessageHandler, Init};
	use lightning::ln::peer_handler::{PeerManager, MessageHandler, SocketDescriptor, IgnoringMessageHandler};
	use lightning::routing::gossip::{NetworkGraph, NodeId, P2PGossipSync};
	use lightning::routing::router::{DefaultRouter, RouteHop};
	use lightning::routing::router::{DefaultRouter, Path, RouteHop};
	use lightning::routing::scoring::{ChannelUsage, Score};
	use lightning::util::config::UserConfig;
	use lightning::util::ser::Writeable;
Expand DownExpand Up@@ -891,10 +886,10 @@ mod tests {

	#[derive(Debug)]
	enum TestResult {
 PaymentFailure { path: Vec<RouteHop>, short_channel_id: u64 },
 PaymentSuccess { path: Vec<RouteHop> },
 ProbeFailure { path: Vec<RouteHop> },
 ProbeSuccess { path: Vec<RouteHop> },
 PaymentFailure { path: Path, short_channel_id: u64 },
 PaymentSuccess { path: Path },
 ProbeFailure { path: Path },
 ProbeSuccess { path: Path },
	}

	impl TestScorer {
Expand All@@ -916,11 +911,11 @@ mod tests {
 &self, _short_channel_id: u64, _source: &NodeId, _target: &NodeId, _usage: ChannelUsage
 ) -> u64 { unimplemented!(); }

 fn payment_path_failed(&mut self, actual_path: &[&RouteHop], actual_short_channel_id: u64) {
 fn payment_path_failed(&mut self, actual_path: &Path, actual_short_channel_id: u64) {
 if let Some(expectations) = &mut self.event_expectations {
 match expectations.pop_front().unwrap() {
 TestResult::PaymentFailure { path, short_channel_id } => {
 assert_eq!(actual_path, &path.iter().collect::<Vec<_>>()[..]);
 assert_eq!(actual_path, &path);
 assert_eq!(actual_short_channel_id, short_channel_id);
 },
 TestResult::PaymentSuccess { path } => {
Expand All@@ -936,14 +931,14 @@ mod tests {
 }
 }

 fn payment_path_successful(&mut self, actual_path: &[&RouteHop]) {
 fn payment_path_successful(&mut self, actual_path: &Path) {
 if let Some(expectations) = &mut self.event_expectations {
 match expectations.pop_front().unwrap() {
 TestResult::PaymentFailure { path, .. } => {
 panic!("Unexpected payment path failure: {:?}", path)
 },
 TestResult::PaymentSuccess { path } => {
 assert_eq!(actual_path, &path.iter().collect::<Vec<_>>()[..]);
 assert_eq!(actual_path, &path);
 },
 TestResult::ProbeFailure { path } => {
 panic!("Unexpected probe failure: {:?}", path)
Expand All@@ -955,7 +950,7 @@ mod tests {
 }
 }

 fn probe_failed(&mut self, actual_path: &[&RouteHop], _: u64) {
 fn probe_failed(&mut self, actual_path: &Path, _: u64) {
 if let Some(expectations) = &mut self.event_expectations {
 match expectations.pop_front().unwrap() {
 TestResult::PaymentFailure { path, .. } => {
Expand All@@ -965,15 +960,15 @@ mod tests {
 panic!("Unexpected payment path success: {:?}", path)
 },
 TestResult::ProbeFailure { path } => {
 assert_eq!(actual_path, &path.iter().collect::<Vec<_>>()[..]);
 assert_eq!(actual_path, &path);
 },
 TestResult::ProbeSuccess { path } => {
 panic!("Unexpected probe success: {:?}", path)
 }
 }
 }
 }
 fn probe_successful(&mut self, actual_path: &[&RouteHop]) {
 fn probe_successful(&mut self, actual_path: &Path) {
 if let Some(expectations) = &mut self.event_expectations {
 match expectations.pop_front().unwrap() {
 TestResult::PaymentFailure { path, .. } => {
Expand All@@ -986,7 +981,7 @@ mod tests {
 panic!("Unexpected probe failure: {:?}", path)
 },
 TestResult::ProbeSuccess { path } => {
 assert_eq!(actual_path, &path.iter().collect::<Vec<_>>()[..]);
 assert_eq!(actual_path, &path);
 }
 }
 }
Expand DownExpand Up@@ -1510,14 +1505,14 @@ mod tests {
 let node_1_privkey = SecretKey::from_slice(&[42; 32]).unwrap();
 let node_1_id = PublicKey::from_secret_key(&secp_ctx, &node_1_privkey);

 let path = vec![RouteHop {
 let path = Path { hops: vec![RouteHop {
 pubkey: node_1_id,
 node_features: NodeFeatures::empty(),
 short_channel_id: scored_scid,
 channel_features: ChannelFeatures::empty(),
 fee_msat: 0,
 cltv_expiry_delta: MIN_CLTV_EXPIRY_DELTA as u32,
 }];
 }], blinded_tail: None };

 $nodes[0].scorer.lock().unwrap().expect(TestResult::PaymentFailure { path: path.clone(), short_channel_id: scored_scid });
 $nodes[0].node.push_pending_event(Event::PaymentPathFailed {
Expand Down

34 changes: 18 additions & 16 deletions
lightning/src/onion_message/blinded_path.rs → lightning/src/blinded_path/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,13 +9,14 @@

//! Creating blinded paths and related utilities live here.

pub(crate) mod utils;

use bitcoin::hashes::{Hash, HashEngine};
use bitcoin::hashes::sha256::Hash as Sha256;
use bitcoin::secp256k1::{self, PublicKey, Scalar, Secp256k1, SecretKey};

use crate::chain::keysinterface::{EntropySource, NodeSigner, Recipient};
use super::packet::ControlTlvs;
use super::utils;
use crate::onion_message::ControlTlvs;
use crate::ln::msgs::DecodeError;
use crate::ln::onion_utils;
use crate::util::chacha20poly1305rfc::{ChaChaPolyReadAdapter, ChaChaPolyWriteAdapter};
Expand All@@ -26,18 +27,18 @@ use core::ops::Deref;
use crate::io::{self, Cursor};
use crate::prelude::*;

/// Onion messages can be sent and received to blinded paths, which serve to hide the identity of
/// the recipient.
#[derive(Clone, Debug, PartialEq)]
/// Onion messages and payments can be sent and received to blinded paths, which serve to hide the
/// identity of the recipient.
#[derive(Clone, Debug, Hash, PartialEq, Eq)]
pub struct BlindedPath {
	/// To send to a blinded path, the sender first finds a route to the unblinded
	/// `introduction_node_id`, which can unblind its [`encrypted_payload`] to find out the onion
	/// message's next hop and forward it along.
	/// message or payment's next hop and forward it along.
	///
	/// [`encrypted_payload`]: BlindedHop::encrypted_payload
	pub(crate) introduction_node_id: PublicKey,
	/// Used by the introduction node to decrypt its [`encrypted_payload`] to forward the onion
	/// message.
	/// message or payment.
	///
	/// [`encrypted_payload`]: BlindedHop::encrypted_payload
	pub(crate) blinding_point: PublicKey,
Expand All@@ -47,7 +48,7 @@ pub struct BlindedPath {

/// Used to construct the blinded hops portion of a blinded path. These hops cannot be identified
/// by outside observers and thus can be used to hide the identity of the recipient.
#[derive(Clone, Debug, PartialEq)]
#[derive(Clone, Debug, Hash, PartialEq, Eq)]
pub struct BlindedHop {
	/// The blinded node id of this hop in a blinded path.
	pub(crate) blinded_node_id: PublicKey,
Expand All@@ -58,12 +59,12 @@ pub struct BlindedHop {
}

impl BlindedPath {
	/// Create a blinded path to be forwarded along `node_pks`. The last node pubkey in `node_pks`
	/// will be the destination node.
	/// Create a blinded path for an onion message, to be forwarded along `node_pks`. The last node
	/// pubkey in `node_pks` will be the destination node.
	///
	/// Errors if less than two hops are provided or if `node_pk`(s) are invalid.
	// TODO: make all payloads the same size with padding + add dummy hops
	pub fn new<ES: EntropySource, T: secp256k1::Signing + secp256k1::Verification>
	pub fn new_for_message<ES: EntropySource, T: secp256k1::Signing + secp256k1::Verification>
 (node_pks: &[PublicKey], entropy_source: &ES, secp_ctx: &Secp256k1<T>) -> Result<Self, ()>
	{
 if node_pks.len() < 2 { return Err(()) }
Expand All@@ -74,12 +75,13 @@ impl BlindedPath {
 Ok(BlindedPath {
 introduction_node_id,
 blinding_point: PublicKey::from_secret_key(secp_ctx, &blinding_secret),
 blinded_hops: blinded_hops(secp_ctx, node_pks, &blinding_secret).map_err(|_| ())?,
 blinded_hops: blinded_message_hops(secp_ctx, node_pks, &blinding_secret).map_err(|_| ())?,
 })
	}

	// Advance the blinded path by one hop, so make the second hop into the new introduction node.
	pub(super) fn advance_by_one<NS: Deref, T: secp256k1::Signing + secp256k1::Verification>
	// Advance the blinded onion message path by one hop, so make the second hop into the new
	// introduction node.
	pub(super) fn advance_message_path_by_one<NS: Deref, T: secp256k1::Signing + secp256k1::Verification>
 (&mut self, node_signer: &NS, secp_ctx: &Secp256k1<T>) -> Result<(), ()>
 where NS::Target: NodeSigner
	{
Expand DownExpand Up@@ -114,8 +116,8 @@ impl BlindedPath {
	}
}

/// Construct blinded hops for the given `unblinded_path`.
fn blinded_hops<T: secp256k1::Signing + secp256k1::Verification>(
/// Construct blinded onion message hops for the given `unblinded_path`.
fn blinded_message_hops<T: secp256k1::Signing + secp256k1::Verification>(
	secp_ctx: &Secp256k1<T>, unblinded_path: &[PublicKey], session_priv: &SecretKey
) -> Result<Vec<BlindedHop>, secp256k1::Error> {
	let mut blinded_hops = Vec::with_capacity(unblinded_path.len());
Expand Down

6 changes: 3 additions & 3 deletions
lightning/src/onion_message/utils.rs → lightning/src/blinded_path/utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,15 +15,15 @@ use bitcoin::hashes::sha256::Hash as Sha256;
use bitcoin::secp256k1::{self, PublicKey, Secp256k1, SecretKey, Scalar};
use bitcoin::secp256k1::ecdh::SharedSecret;

use super::BlindedPath;
use crate::ln::onion_utils;
use super::blinded_path::BlindedPath;
use super::messenger::Destination;
use crate::onion_message::Destination;

use crate::prelude::*;

// TODO: DRY with onion_utils::construct_onion_keys_callback
#[inline]
pub(super) fn construct_keys_callback<T: secp256k1::Signing + secp256k1::Verification,
pub(crate) fn construct_keys_callback<T: secp256k1::Signing + secp256k1::Verification,
	FType: FnMut(PublicKey, SharedSecret, PublicKey, [u8; 32], Option<PublicKey>, Option<Vec<u8>>)>(
	secp_ctx: &Secp256k1<T>, unblinded_path: &[PublicKey], destination: Option<Destination>,
	session_priv: &SecretKey, mut callback: FType
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('^' + ".*" + '

Skip to content
Blinded pathfinding groundwork#2146

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

from

Apr 24, 2023
 Merged


Blinded pathfinding groundwork
#2146
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


17 commits


Select commit
Hold shift + click to select a range
efed905

Move blinded_path and its utils into a new module


valentinewallace Mar 16, 2023
e691e50

Update docs and method names for blinded payment paths


valentinewallace Mar 16, 2023
ed4348f

Update PaymentParameters::route_hints for blinded paths


valentinewallace Mar 17, 2023
6d6a86c

Extract read/write variants from impl_for_vec


valentinewallace Apr 9, 2023
2a23b80

outbound_payment: remove unused cltv delta var


valentinewallace Apr 3, 2023
b5827f7

Minor Route/RouteHop doc updates


valentinewallace Apr 5, 2023
93afed5

Add utilities for getting a path's final value and cltv delta


valentinewallace Apr 19, 2023
d5b05e5

Replace Vec<RouteHop> with new Path struct


valentinewallace Apr 9, 2023
64c26c8

Add blinded path {metadata} fields to Path, but disallow paying blind…


valentinewallace Apr 18, 2023
97a8c91

Support (de)ser for Path::blinded_tails in events


valentinewallace Apr 9, 2023
c8fd77d

Support (de)serializing Path::blinded_tails in Routes


valentinewallace Apr 9, 2023
2e51a1c

Support (de)serializing Path::blinded_tails in HTLCSource


valentinewallace Apr 9, 2023
dac4a1c

Account for Path::blinded_tail in InflightHtlcs::process_path


valentinewallace Apr 9, 2023
976411d

Test scoring paths with blinded tails


valentinewallace Apr 19, 2023
5a6f9b0

Account for Path::blinded_tail when adding a shadow cltv offset


valentinewallace Apr 9, 2023
5c2cf77

Update changelog for backwards compat


valentinewallace Apr 9, 2023
b131634

Fix outbound_payment for new Path::blinded_tail


valentinewallace Apr 19, 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


10 changes: 5 additions & 5 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,7 @@ use lightning::util::errors::APIError;
use lightning::util::logger::Logger;
use lightning::util::config::UserConfig;
use lightning::util::ser::{Readable, ReadableArgs, Writeable, Writer};
use lightning::routing::router::{InFlightHtlcs, Route, RouteHop, RouteParameters, Router};
use lightning::routing::router::{InFlightHtlcs, Path, Route, RouteHop, RouteParameters, Router};

use crate::utils::test_logger::{self, Output};
use crate::utils::test_persister::TestPersister;
Expand DownExpand Up@@ -352,14 +352,14 @@ fn send_payment(source: &ChanMan, dest: &ChanMan, dest_chan_id: u64, amt: u64, p
	payment_id[0..8].copy_from_slice(&payment_idx.to_ne_bytes());
	*payment_idx += 1;
	if let Err(err) = source.send_payment_with_route(&Route {
 paths: vec![vec![RouteHop {
 paths: vec![Path { hops: vec![RouteHop {
 pubkey: dest.get_our_node_id(),
 node_features: dest.node_features(),
 short_channel_id: dest_chan_id,
 channel_features: dest.channel_features(),
 fee_msat: amt,
 cltv_expiry_delta: 200,
 }]],
 }], blinded_tail: None }],
 payment_params: None,
	}, payment_hash, RecipientOnionFields::secret_only(payment_secret), PaymentId(payment_id)) {
 check_payment_err(err);
Expand All@@ -374,7 +374,7 @@ fn send_hop_payment(source: &ChanMan, middle: &ChanMan, middle_chan_id: u64, des
	payment_id[0..8].copy_from_slice(&payment_idx.to_ne_bytes());
	*payment_idx += 1;
	if let Err(err) = source.send_payment_with_route(&Route {
 paths: vec![vec![RouteHop {
 paths: vec![Path { hops: vec![RouteHop {
 pubkey: middle.get_our_node_id(),
 node_features: middle.node_features(),
 short_channel_id: middle_chan_id,
Expand All@@ -388,7 +388,7 @@ fn send_hop_payment(source: &ChanMan, middle: &ChanMan, middle_chan_id: u64, des
 channel_features: dest.channel_features(),
 fee_msat: amt,
 cltv_expiry_delta: 200,
 }]],
 }], blinded_tail: None }],
 payment_params: None,
	}, payment_hash, RecipientOnionFields::secret_only(payment_secret), PaymentId(payment_id)) {
 check_payment_err(err);
Expand Down

6 changes: 3 additions & 3 deletions
fuzz/src/invoice_request_deser.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,13 +10,13 @@
use bitcoin::secp256k1::{KeyPair, Parity, PublicKey, Secp256k1, SecretKey, self};
use crate::utils::test_logger;
use core::convert::{Infallible, TryFrom};
use lightning::blinded_path::BlindedPath;
use lightning::chain::keysinterface::EntropySource;
use lightning::ln::PaymentHash;
use lightning::ln::features::BlindedHopFeatures;
use lightning::offers::invoice::{BlindedPayInfo, UnsignedInvoice};
use lightning::offers::invoice_request::InvoiceRequest;
use lightning::offers::parse::SemanticError;
use lightning::onion_message::BlindedPath;
use lightning::util::ser::Writeable;

#[inline]
Expand DownExpand Up@@ -74,8 +74,8 @@ fn build_response<'a, T: secp256k1::Signing + secp256k1::Verification>(
) -> Result<UnsignedInvoice<'a>, SemanticError> {
	let entropy_source = Randomness {};
	let paths = vec![
 BlindedPath::new(&[pubkey(43), pubkey(44), pubkey(42)], &entropy_source, secp_ctx).unwrap(),
 BlindedPath::new(&[pubkey(45), pubkey(46), pubkey(42)], &entropy_source, secp_ctx).unwrap(),
 BlindedPath::new_for_message(&[pubkey(43), pubkey(44), pubkey(42)], &entropy_source, secp_ctx).unwrap(),
 BlindedPath::new_for_message(&[pubkey(45), pubkey(46), pubkey(42)], &entropy_source, secp_ctx).unwrap(),
	];

	let payinfo = vec![
Expand Down

6 changes: 3 additions & 3 deletions
fuzz/src/refund_deser.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,13 +10,13 @@
use bitcoin::secp256k1::{KeyPair, PublicKey, Secp256k1, SecretKey, self};
use crate::utils::test_logger;
use core::convert::{Infallible, TryFrom};
use lightning::blinded_path::BlindedPath;
use lightning::chain::keysinterface::EntropySource;
use lightning::ln::PaymentHash;
use lightning::ln::features::BlindedHopFeatures;
use lightning::offers::invoice::{BlindedPayInfo, UnsignedInvoice};
use lightning::offers::parse::SemanticError;
use lightning::offers::refund::Refund;
use lightning::onion_message::BlindedPath;
use lightning::util::ser::Writeable;

#[inline]
Expand DownExpand Up@@ -63,8 +63,8 @@ fn build_response<'a, T: secp256k1::Signing + secp256k1::Verification>(
) -> Result<UnsignedInvoice<'a>, SemanticError> {
	let entropy_source = Randomness {};
	let paths = vec![
 BlindedPath::new(&[pubkey(43), pubkey(44), pubkey(42)], &entropy_source, secp_ctx).unwrap(),
 BlindedPath::new(&[pubkey(45), pubkey(46), pubkey(42)], &entropy_source, secp_ctx).unwrap(),
 BlindedPath::new_for_message(&[pubkey(43), pubkey(44), pubkey(42)], &entropy_source, secp_ctx).unwrap(),
 BlindedPath::new_for_message(&[pubkey(45), pubkey(46), pubkey(42)], &entropy_source, secp_ctx).unwrap(),
	];

	let payinfo = vec![
Expand Down

45 changes: 20 additions & 25 deletions
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -236,26 +236,21 @@ fn update_scorer<'a, S: 'static + Deref<Target = SC> + Send + Sync, SC: 'a + Wri
	let mut score = scorer.lock();
	match event {
 Event::PaymentPathFailed { ref path, short_channel_id: Some(scid), .. } => {
 let path = path.iter().collect::<Vec<_>>();
 score.payment_path_failed(&path, *scid);
 score.payment_path_failed(path, *scid);
 },
 Event::PaymentPathFailed { ref path, payment_failed_permanently: true, .. } => {
 // Reached if the destination explicitly failed it back. We treat this as a successful probe
 // because the payment made it all the way to the destination with sufficient liquidity.
 let path = path.iter().collect::<Vec<_>>();
 score.probe_successful(&path);
 score.probe_successful(path);
 },
 Event::PaymentPathSuccessful { path, .. } => {
 let path = path.iter().collect::<Vec<_>>();
 score.payment_path_successful(&path);
 score.payment_path_successful(path);
 },
 Event::ProbeSuccessful { path, .. } => {
 let path = path.iter().collect::<Vec<_>>();
 score.probe_successful(&path);
 score.probe_successful(path);
 },
 Event::ProbeFailed { path, short_channel_id: Some(scid), .. } => {
 let path = path.iter().collect::<Vec<_>>();
 score.probe_failed(&path, *scid);
 score.probe_failed(path, *scid);
 },
 _ => {},
	}
Expand DownExpand Up@@ -751,7 +746,7 @@ mod tests {
	use lightning::ln::msgs::{ChannelMessageHandler, Init};
	use lightning::ln::peer_handler::{PeerManager, MessageHandler, SocketDescriptor, IgnoringMessageHandler};
	use lightning::routing::gossip::{NetworkGraph, NodeId, P2PGossipSync};
	use lightning::routing::router::{DefaultRouter, RouteHop};
	use lightning::routing::router::{DefaultRouter, Path, RouteHop};
	use lightning::routing::scoring::{ChannelUsage, Score};
	use lightning::util::config::UserConfig;
	use lightning::util::ser::Writeable;
Expand DownExpand Up@@ -891,10 +886,10 @@ mod tests {

	#[derive(Debug)]
	enum TestResult {
 PaymentFailure { path: Vec<RouteHop>, short_channel_id: u64 },
 PaymentSuccess { path: Vec<RouteHop> },
 ProbeFailure { path: Vec<RouteHop> },
 ProbeSuccess { path: Vec<RouteHop> },
 PaymentFailure { path: Path, short_channel_id: u64 },
 PaymentSuccess { path: Path },
 ProbeFailure { path: Path },
 ProbeSuccess { path: Path },
	}

	impl TestScorer {
Expand All@@ -916,11 +911,11 @@ mod tests {
 &self, _short_channel_id: u64, _source: &NodeId, _target: &NodeId, _usage: ChannelUsage
 ) -> u64 { unimplemented!(); }

 fn payment_path_failed(&mut self, actual_path: &[&RouteHop], actual_short_channel_id: u64) {
 fn payment_path_failed(&mut self, actual_path: &Path, actual_short_channel_id: u64) {
 if let Some(expectations) = &mut self.event_expectations {
 match expectations.pop_front().unwrap() {
 TestResult::PaymentFailure { path, short_channel_id } => {
 assert_eq!(actual_path, &path.iter().collect::<Vec<_>>()[..]);
 assert_eq!(actual_path, &path);
 assert_eq!(actual_short_channel_id, short_channel_id);
 },
 TestResult::PaymentSuccess { path } => {
Expand All@@ -936,14 +931,14 @@ mod tests {
 }
 }

 fn payment_path_successful(&mut self, actual_path: &[&RouteHop]) {
 fn payment_path_successful(&mut self, actual_path: &Path) {
 if let Some(expectations) = &mut self.event_expectations {
 match expectations.pop_front().unwrap() {
 TestResult::PaymentFailure { path, .. } => {
 panic!("Unexpected payment path failure: {:?}", path)
 },
 TestResult::PaymentSuccess { path } => {
 assert_eq!(actual_path, &path.iter().collect::<Vec<_>>()[..]);
 assert_eq!(actual_path, &path);
 },
 TestResult::ProbeFailure { path } => {
 panic!("Unexpected probe failure: {:?}", path)
Expand All@@ -955,7 +950,7 @@ mod tests {
 }
 }

 fn probe_failed(&mut self, actual_path: &[&RouteHop], _: u64) {
 fn probe_failed(&mut self, actual_path: &Path, _: u64) {
 if let Some(expectations) = &mut self.event_expectations {
 match expectations.pop_front().unwrap() {
 TestResult::PaymentFailure { path, .. } => {
Expand All@@ -965,15 +960,15 @@ mod tests {
 panic!("Unexpected payment path success: {:?}", path)
 },
 TestResult::ProbeFailure { path } => {
 assert_eq!(actual_path, &path.iter().collect::<Vec<_>>()[..]);
 assert_eq!(actual_path, &path);
 },
 TestResult::ProbeSuccess { path } => {
 panic!("Unexpected probe success: {:?}", path)
 }
 }
 }
 }
 fn probe_successful(&mut self, actual_path: &[&RouteHop]) {
 fn probe_successful(&mut self, actual_path: &Path) {
 if let Some(expectations) = &mut self.event_expectations {
 match expectations.pop_front().unwrap() {
 TestResult::PaymentFailure { path, .. } => {
Expand All@@ -986,7 +981,7 @@ mod tests {
 panic!("Unexpected probe failure: {:?}", path)
 },
 TestResult::ProbeSuccess { path } => {
 assert_eq!(actual_path, &path.iter().collect::<Vec<_>>()[..]);
 assert_eq!(actual_path, &path);
 }
 }
 }
Expand DownExpand Up@@ -1510,14 +1505,14 @@ mod tests {
 let node_1_privkey = SecretKey::from_slice(&[42; 32]).unwrap();
 let node_1_id = PublicKey::from_secret_key(&secp_ctx, &node_1_privkey);

 let path = vec![RouteHop {
 let path = Path { hops: vec![RouteHop {
 pubkey: node_1_id,
 node_features: NodeFeatures::empty(),
 short_channel_id: scored_scid,
 channel_features: ChannelFeatures::empty(),
 fee_msat: 0,
 cltv_expiry_delta: MIN_CLTV_EXPIRY_DELTA as u32,
 }];
 }], blinded_tail: None };

 $nodes[0].scorer.lock().unwrap().expect(TestResult::PaymentFailure { path: path.clone(), short_channel_id: scored_scid });
 $nodes[0].node.push_pending_event(Event::PaymentPathFailed {
Expand Down

34 changes: 18 additions & 16 deletions
lightning/src/onion_message/blinded_path.rs → lightning/src/blinded_path/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,13 +9,14 @@

//! Creating blinded paths and related utilities live here.

pub(crate) mod utils;

use bitcoin::hashes::{Hash, HashEngine};
use bitcoin::hashes::sha256::Hash as Sha256;
use bitcoin::secp256k1::{self, PublicKey, Scalar, Secp256k1, SecretKey};

use crate::chain::keysinterface::{EntropySource, NodeSigner, Recipient};
use super::packet::ControlTlvs;
use super::utils;
use crate::onion_message::ControlTlvs;
use crate::ln::msgs::DecodeError;
use crate::ln::onion_utils;
use crate::util::chacha20poly1305rfc::{ChaChaPolyReadAdapter, ChaChaPolyWriteAdapter};
Expand All@@ -26,18 +27,18 @@ use core::ops::Deref;
use crate::io::{self, Cursor};
use crate::prelude::*;

/// Onion messages can be sent and received to blinded paths, which serve to hide the identity of
/// the recipient.
#[derive(Clone, Debug, PartialEq)]
/// Onion messages and payments can be sent and received to blinded paths, which serve to hide the
/// identity of the recipient.
#[derive(Clone, Debug, Hash, PartialEq, Eq)]
pub struct BlindedPath {
	/// To send to a blinded path, the sender first finds a route to the unblinded
	/// `introduction_node_id`, which can unblind its [`encrypted_payload`] to find out the onion
	/// message's next hop and forward it along.
	/// message or payment's next hop and forward it along.
	///
	/// [`encrypted_payload`]: BlindedHop::encrypted_payload
	pub(crate) introduction_node_id: PublicKey,
	/// Used by the introduction node to decrypt its [`encrypted_payload`] to forward the onion
	/// message.
	/// message or payment.
	///
	/// [`encrypted_payload`]: BlindedHop::encrypted_payload
	pub(crate) blinding_point: PublicKey,
Expand All@@ -47,7 +48,7 @@ pub struct BlindedPath {

/// Used to construct the blinded hops portion of a blinded path. These hops cannot be identified
/// by outside observers and thus can be used to hide the identity of the recipient.
#[derive(Clone, Debug, PartialEq)]
#[derive(Clone, Debug, Hash, PartialEq, Eq)]
pub struct BlindedHop {
	/// The blinded node id of this hop in a blinded path.
	pub(crate) blinded_node_id: PublicKey,
Expand All@@ -58,12 +59,12 @@ pub struct BlindedHop {
}

impl BlindedPath {
	/// Create a blinded path to be forwarded along `node_pks`. The last node pubkey in `node_pks`
	/// will be the destination node.
	/// Create a blinded path for an onion message, to be forwarded along `node_pks`. The last node
	/// pubkey in `node_pks` will be the destination node.
	///
	/// Errors if less than two hops are provided or if `node_pk`(s) are invalid.
	// TODO: make all payloads the same size with padding + add dummy hops
	pub fn new<ES: EntropySource, T: secp256k1::Signing + secp256k1::Verification>
	pub fn new_for_message<ES: EntropySource, T: secp256k1::Signing + secp256k1::Verification>
 (node_pks: &[PublicKey], entropy_source: &ES, secp_ctx: &Secp256k1<T>) -> Result<Self, ()>
	{
 if node_pks.len() < 2 { return Err(()) }
Expand All@@ -74,12 +75,13 @@ impl BlindedPath {
 Ok(BlindedPath {
 introduction_node_id,
 blinding_point: PublicKey::from_secret_key(secp_ctx, &blinding_secret),
 blinded_hops: blinded_hops(secp_ctx, node_pks, &blinding_secret).map_err(|_| ())?,
 blinded_hops: blinded_message_hops(secp_ctx, node_pks, &blinding_secret).map_err(|_| ())?,
 })
	}

	// Advance the blinded path by one hop, so make the second hop into the new introduction node.
	pub(super) fn advance_by_one<NS: Deref, T: secp256k1::Signing + secp256k1::Verification>
	// Advance the blinded onion message path by one hop, so make the second hop into the new
	// introduction node.
	pub(super) fn advance_message_path_by_one<NS: Deref, T: secp256k1::Signing + secp256k1::Verification>
 (&mut self, node_signer: &NS, secp_ctx: &Secp256k1<T>) -> Result<(), ()>
 where NS::Target: NodeSigner
	{
Expand DownExpand Up@@ -114,8 +116,8 @@ impl BlindedPath {
	}
}

/// Construct blinded hops for the given `unblinded_path`.
fn blinded_hops<T: secp256k1::Signing + secp256k1::Verification>(
/// Construct blinded onion message hops for the given `unblinded_path`.
fn blinded_message_hops<T: secp256k1::Signing + secp256k1::Verification>(
	secp_ctx: &Secp256k1<T>, unblinded_path: &[PublicKey], session_priv: &SecretKey
) -> Result<Vec<BlindedHop>, secp256k1::Error> {
	let mut blinded_hops = Vec::with_capacity(unblinded_path.len());
Expand Down

6 changes: 3 additions & 3 deletions
lightning/src/onion_message/utils.rs → lightning/src/blinded_path/utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,15 +15,15 @@ use bitcoin::hashes::sha256::Hash as Sha256;
use bitcoin::secp256k1::{self, PublicKey, Secp256k1, SecretKey, Scalar};
use bitcoin::secp256k1::ecdh::SharedSecret;

use super::BlindedPath;
use crate::ln::onion_utils;
use super::blinded_path::BlindedPath;
use super::messenger::Destination;
use crate::onion_message::Destination;

use crate::prelude::*;

// TODO: DRY with onion_utils::construct_onion_keys_callback
#[inline]
pub(super) fn construct_keys_callback<T: secp256k1::Signing + secp256k1::Verification,
pub(crate) fn construct_keys_callback<T: secp256k1::Signing + secp256k1::Verification,
	FType: FnMut(PublicKey, SharedSecret, PublicKey, [u8; 32], Option<PublicKey>, Option<Vec<u8>>)>(
	secp_ctx: &Secp256k1<T>, unblinded_path: &[PublicKey], destination: Option<Destination>,
	session_priv: &SecretKey, mut callback: FType
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" + '

Skip to content
Blinded pathfinding groundwork#2146

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

from

Apr 24, 2023
 Merged


Blinded pathfinding groundwork
#2146
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


17 commits


Select commit
Hold shift + click to select a range
efed905

Move blinded_path and its utils into a new module


valentinewallace Mar 16, 2023
e691e50

Update docs and method names for blinded payment paths


valentinewallace Mar 16, 2023
ed4348f

Update PaymentParameters::route_hints for blinded paths


valentinewallace Mar 17, 2023
6d6a86c

Extract read/write variants from impl_for_vec


valentinewallace Apr 9, 2023
2a23b80

outbound_payment: remove unused cltv delta var


valentinewallace Apr 3, 2023
b5827f7

Minor Route/RouteHop doc updates


valentinewallace Apr 5, 2023
93afed5

Add utilities for getting a path's final value and cltv delta


valentinewallace Apr 19, 2023
d5b05e5

Replace Vec<RouteHop> with new Path struct


valentinewallace Apr 9, 2023
64c26c8

Add blinded path {metadata} fields to Path, but disallow paying blind…


valentinewallace Apr 18, 2023
97a8c91

Support (de)ser for Path::blinded_tails in events


valentinewallace Apr 9, 2023
c8fd77d

Support (de)serializing Path::blinded_tails in Routes


valentinewallace Apr 9, 2023
2e51a1c

Support (de)serializing Path::blinded_tails in HTLCSource


valentinewallace Apr 9, 2023
dac4a1c

Account for Path::blinded_tail in InflightHtlcs::process_path


valentinewallace Apr 9, 2023
976411d

Test scoring paths with blinded tails


valentinewallace Apr 19, 2023
5a6f9b0

Account for Path::blinded_tail when adding a shadow cltv offset


valentinewallace Apr 9, 2023
5c2cf77

Update changelog for backwards compat


valentinewallace Apr 9, 2023
b131634

Fix outbound_payment for new Path::blinded_tail


valentinewallace Apr 19, 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


10 changes: 5 additions & 5 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,7 @@ use lightning::util::errors::APIError;
use lightning::util::logger::Logger;
use lightning::util::config::UserConfig;
use lightning::util::ser::{Readable, ReadableArgs, Writeable, Writer};
use lightning::routing::router::{InFlightHtlcs, Route, RouteHop, RouteParameters, Router};
use lightning::routing::router::{InFlightHtlcs, Path, Route, RouteHop, RouteParameters, Router};

use crate::utils::test_logger::{self, Output};
use crate::utils::test_persister::TestPersister;
Expand DownExpand Up@@ -352,14 +352,14 @@ fn send_payment(source: &ChanMan, dest: &ChanMan, dest_chan_id: u64, amt: u64, p
	payment_id[0..8].copy_from_slice(&payment_idx.to_ne_bytes());
	*payment_idx += 1;
	if let Err(err) = source.send_payment_with_route(&Route {
 paths: vec![vec![RouteHop {
 paths: vec![Path { hops: vec![RouteHop {
 pubkey: dest.get_our_node_id(),
 node_features: dest.node_features(),
 short_channel_id: dest_chan_id,
 channel_features: dest.channel_features(),
 fee_msat: amt,
 cltv_expiry_delta: 200,
 }]],
 }], blinded_tail: None }],
 payment_params: None,
	}, payment_hash, RecipientOnionFields::secret_only(payment_secret), PaymentId(payment_id)) {
 check_payment_err(err);
Expand All@@ -374,7 +374,7 @@ fn send_hop_payment(source: &ChanMan, middle: &ChanMan, middle_chan_id: u64, des
	payment_id[0..8].copy_from_slice(&payment_idx.to_ne_bytes());
	*payment_idx += 1;
	if let Err(err) = source.send_payment_with_route(&Route {
 paths: vec![vec![RouteHop {
 paths: vec![Path { hops: vec![RouteHop {
 pubkey: middle.get_our_node_id(),
 node_features: middle.node_features(),
 short_channel_id: middle_chan_id,
Expand All@@ -388,7 +388,7 @@ fn send_hop_payment(source: &ChanMan, middle: &ChanMan, middle_chan_id: u64, des
 channel_features: dest.channel_features(),
 fee_msat: amt,
 cltv_expiry_delta: 200,
 }]],
 }], blinded_tail: None }],
 payment_params: None,
	}, payment_hash, RecipientOnionFields::secret_only(payment_secret), PaymentId(payment_id)) {
 check_payment_err(err);
Expand Down

6 changes: 3 additions & 3 deletions
fuzz/src/invoice_request_deser.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,13 +10,13 @@
use bitcoin::secp256k1::{KeyPair, Parity, PublicKey, Secp256k1, SecretKey, self};
use crate::utils::test_logger;
use core::convert::{Infallible, TryFrom};
use lightning::blinded_path::BlindedPath;
use lightning::chain::keysinterface::EntropySource;
use lightning::ln::PaymentHash;
use lightning::ln::features::BlindedHopFeatures;
use lightning::offers::invoice::{BlindedPayInfo, UnsignedInvoice};
use lightning::offers::invoice_request::InvoiceRequest;
use lightning::offers::parse::SemanticError;
use lightning::onion_message::BlindedPath;
use lightning::util::ser::Writeable;

#[inline]
Expand DownExpand Up@@ -74,8 +74,8 @@ fn build_response<'a, T: secp256k1::Signing + secp256k1::Verification>(
) -> Result<UnsignedInvoice<'a>, SemanticError> {
	let entropy_source = Randomness {};
	let paths = vec![
 BlindedPath::new(&[pubkey(43), pubkey(44), pubkey(42)], &entropy_source, secp_ctx).unwrap(),
 BlindedPath::new(&[pubkey(45), pubkey(46), pubkey(42)], &entropy_source, secp_ctx).unwrap(),
 BlindedPath::new_for_message(&[pubkey(43), pubkey(44), pubkey(42)], &entropy_source, secp_ctx).unwrap(),
 BlindedPath::new_for_message(&[pubkey(45), pubkey(46), pubkey(42)], &entropy_source, secp_ctx).unwrap(),
	];

	let payinfo = vec![
Expand Down

6 changes: 3 additions & 3 deletions
fuzz/src/refund_deser.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,13 +10,13 @@
use bitcoin::secp256k1::{KeyPair, PublicKey, Secp256k1, SecretKey, self};
use crate::utils::test_logger;
use core::convert::{Infallible, TryFrom};
use lightning::blinded_path::BlindedPath;
use lightning::chain::keysinterface::EntropySource;
use lightning::ln::PaymentHash;
use lightning::ln::features::BlindedHopFeatures;
use lightning::offers::invoice::{BlindedPayInfo, UnsignedInvoice};
use lightning::offers::parse::SemanticError;
use lightning::offers::refund::Refund;
use lightning::onion_message::BlindedPath;
use lightning::util::ser::Writeable;

#[inline]
Expand DownExpand Up@@ -63,8 +63,8 @@ fn build_response<'a, T: secp256k1::Signing + secp256k1::Verification>(
) -> Result<UnsignedInvoice<'a>, SemanticError> {
	let entropy_source = Randomness {};
	let paths = vec![
 BlindedPath::new(&[pubkey(43), pubkey(44), pubkey(42)], &entropy_source, secp_ctx).unwrap(),
 BlindedPath::new(&[pubkey(45), pubkey(46), pubkey(42)], &entropy_source, secp_ctx).unwrap(),
 BlindedPath::new_for_message(&[pubkey(43), pubkey(44), pubkey(42)], &entropy_source, secp_ctx).unwrap(),
 BlindedPath::new_for_message(&[pubkey(45), pubkey(46), pubkey(42)], &entropy_source, secp_ctx).unwrap(),
	];

	let payinfo = vec![
Expand Down

45 changes: 20 additions & 25 deletions
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -236,26 +236,21 @@ fn update_scorer<'a, S: 'static + Deref<Target = SC> + Send + Sync, SC: 'a + Wri
	let mut score = scorer.lock();
	match event {
 Event::PaymentPathFailed { ref path, short_channel_id: Some(scid), .. } => {
 let path = path.iter().collect::<Vec<_>>();
 score.payment_path_failed(&path, *scid);
 score.payment_path_failed(path, *scid);
 },
 Event::PaymentPathFailed { ref path, payment_failed_permanently: true, .. } => {
 // Reached if the destination explicitly failed it back. We treat this as a successful probe
 // because the payment made it all the way to the destination with sufficient liquidity.
 let path = path.iter().collect::<Vec<_>>();
 score.probe_successful(&path);
 score.probe_successful(path);
 },
 Event::PaymentPathSuccessful { path, .. } => {
 let path = path.iter().collect::<Vec<_>>();
 score.payment_path_successful(&path);
 score.payment_path_successful(path);
 },
 Event::ProbeSuccessful { path, .. } => {
 let path = path.iter().collect::<Vec<_>>();
 score.probe_successful(&path);
 score.probe_successful(path);
 },
 Event::ProbeFailed { path, short_channel_id: Some(scid), .. } => {
 let path = path.iter().collect::<Vec<_>>();
 score.probe_failed(&path, *scid);
 score.probe_failed(path, *scid);
 },
 _ => {},
	}
Expand DownExpand Up@@ -751,7 +746,7 @@ mod tests {
	use lightning::ln::msgs::{ChannelMessageHandler, Init};
	use lightning::ln::peer_handler::{PeerManager, MessageHandler, SocketDescriptor, IgnoringMessageHandler};
	use lightning::routing::gossip::{NetworkGraph, NodeId, P2PGossipSync};
	use lightning::routing::router::{DefaultRouter, RouteHop};
	use lightning::routing::router::{DefaultRouter, Path, RouteHop};
	use lightning::routing::scoring::{ChannelUsage, Score};
	use lightning::util::config::UserConfig;
	use lightning::util::ser::Writeable;
Expand DownExpand Up@@ -891,10 +886,10 @@ mod tests {

	#[derive(Debug)]
	enum TestResult {
 PaymentFailure { path: Vec<RouteHop>, short_channel_id: u64 },
 PaymentSuccess { path: Vec<RouteHop> },
 ProbeFailure { path: Vec<RouteHop> },
 ProbeSuccess { path: Vec<RouteHop> },
 PaymentFailure { path: Path, short_channel_id: u64 },
 PaymentSuccess { path: Path },
 ProbeFailure { path: Path },
 ProbeSuccess { path: Path },
	}

	impl TestScorer {
Expand All@@ -916,11 +911,11 @@ mod tests {
 &self, _short_channel_id: u64, _source: &NodeId, _target: &NodeId, _usage: ChannelUsage
 ) -> u64 { unimplemented!(); }

 fn payment_path_failed(&mut self, actual_path: &[&RouteHop], actual_short_channel_id: u64) {
 fn payment_path_failed(&mut self, actual_path: &Path, actual_short_channel_id: u64) {
 if let Some(expectations) = &mut self.event_expectations {
 match expectations.pop_front().unwrap() {
 TestResult::PaymentFailure { path, short_channel_id } => {
 assert_eq!(actual_path, &path.iter().collect::<Vec<_>>()[..]);
 assert_eq!(actual_path, &path);
 assert_eq!(actual_short_channel_id, short_channel_id);
 },
 TestResult::PaymentSuccess { path } => {
Expand All@@ -936,14 +931,14 @@ mod tests {
 }
 }

 fn payment_path_successful(&mut self, actual_path: &[&RouteHop]) {
 fn payment_path_successful(&mut self, actual_path: &Path) {
 if let Some(expectations) = &mut self.event_expectations {
 match expectations.pop_front().unwrap() {
 TestResult::PaymentFailure { path, .. } => {
 panic!("Unexpected payment path failure: {:?}", path)
 },
 TestResult::PaymentSuccess { path } => {
 assert_eq!(actual_path, &path.iter().collect::<Vec<_>>()[..]);
 assert_eq!(actual_path, &path);
 },
 TestResult::ProbeFailure { path } => {
 panic!("Unexpected probe failure: {:?}", path)
Expand All@@ -955,7 +950,7 @@ mod tests {
 }
 }

 fn probe_failed(&mut self, actual_path: &[&RouteHop], _: u64) {
 fn probe_failed(&mut self, actual_path: &Path, _: u64) {
 if let Some(expectations) = &mut self.event_expectations {
 match expectations.pop_front().unwrap() {
 TestResult::PaymentFailure { path, .. } => {
Expand All@@ -965,15 +960,15 @@ mod tests {
 panic!("Unexpected payment path success: {:?}", path)
 },
 TestResult::ProbeFailure { path } => {
 assert_eq!(actual_path, &path.iter().collect::<Vec<_>>()[..]);
 assert_eq!(actual_path, &path);
 },
 TestResult::ProbeSuccess { path } => {
 panic!("Unexpected probe success: {:?}", path)
 }
 }
 }
 }
 fn probe_successful(&mut self, actual_path: &[&RouteHop]) {
 fn probe_successful(&mut self, actual_path: &Path) {
 if let Some(expectations) = &mut self.event_expectations {
 match expectations.pop_front().unwrap() {
 TestResult::PaymentFailure { path, .. } => {
Expand All@@ -986,7 +981,7 @@ mod tests {
 panic!("Unexpected probe failure: {:?}", path)
 },
 TestResult::ProbeSuccess { path } => {
 assert_eq!(actual_path, &path.iter().collect::<Vec<_>>()[..]);
 assert_eq!(actual_path, &path);
 }
 }
 }
Expand DownExpand Up@@ -1510,14 +1505,14 @@ mod tests {
 let node_1_privkey = SecretKey::from_slice(&[42; 32]).unwrap();
 let node_1_id = PublicKey::from_secret_key(&secp_ctx, &node_1_privkey);

 let path = vec![RouteHop {
 let path = Path { hops: vec![RouteHop {
 pubkey: node_1_id,
 node_features: NodeFeatures::empty(),
 short_channel_id: scored_scid,
 channel_features: ChannelFeatures::empty(),
 fee_msat: 0,
 cltv_expiry_delta: MIN_CLTV_EXPIRY_DELTA as u32,
 }];
 }], blinded_tail: None };

 $nodes[0].scorer.lock().unwrap().expect(TestResult::PaymentFailure { path: path.clone(), short_channel_id: scored_scid });
 $nodes[0].node.push_pending_event(Event::PaymentPathFailed {
Expand Down

34 changes: 18 additions & 16 deletions
lightning/src/onion_message/blinded_path.rs → lightning/src/blinded_path/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,13 +9,14 @@

//! Creating blinded paths and related utilities live here.

pub(crate) mod utils;

use bitcoin::hashes::{Hash, HashEngine};
use bitcoin::hashes::sha256::Hash as Sha256;
use bitcoin::secp256k1::{self, PublicKey, Scalar, Secp256k1, SecretKey};

use crate::chain::keysinterface::{EntropySource, NodeSigner, Recipient};
use super::packet::ControlTlvs;
use super::utils;
use crate::onion_message::ControlTlvs;
use crate::ln::msgs::DecodeError;
use crate::ln::onion_utils;
use crate::util::chacha20poly1305rfc::{ChaChaPolyReadAdapter, ChaChaPolyWriteAdapter};
Expand All@@ -26,18 +27,18 @@ use core::ops::Deref;
use crate::io::{self, Cursor};
use crate::prelude::*;

/// Onion messages can be sent and received to blinded paths, which serve to hide the identity of
/// the recipient.
#[derive(Clone, Debug, PartialEq)]
/// Onion messages and payments can be sent and received to blinded paths, which serve to hide the
/// identity of the recipient.
#[derive(Clone, Debug, Hash, PartialEq, Eq)]
pub struct BlindedPath {
	/// To send to a blinded path, the sender first finds a route to the unblinded
	/// `introduction_node_id`, which can unblind its [`encrypted_payload`] to find out the onion
	/// message's next hop and forward it along.
	/// message or payment's next hop and forward it along.
	///
	/// [`encrypted_payload`]: BlindedHop::encrypted_payload
	pub(crate) introduction_node_id: PublicKey,
	/// Used by the introduction node to decrypt its [`encrypted_payload`] to forward the onion
	/// message.
	/// message or payment.
	///
	/// [`encrypted_payload`]: BlindedHop::encrypted_payload
	pub(crate) blinding_point: PublicKey,
Expand All@@ -47,7 +48,7 @@ pub struct BlindedPath {

/// Used to construct the blinded hops portion of a blinded path. These hops cannot be identified
/// by outside observers and thus can be used to hide the identity of the recipient.
#[derive(Clone, Debug, PartialEq)]
#[derive(Clone, Debug, Hash, PartialEq, Eq)]
pub struct BlindedHop {
	/// The blinded node id of this hop in a blinded path.
	pub(crate) blinded_node_id: PublicKey,
Expand All@@ -58,12 +59,12 @@ pub struct BlindedHop {
}

impl BlindedPath {
	/// Create a blinded path to be forwarded along `node_pks`. The last node pubkey in `node_pks`
	/// will be the destination node.
	/// Create a blinded path for an onion message, to be forwarded along `node_pks`. The last node
	/// pubkey in `node_pks` will be the destination node.
	///
	/// Errors if less than two hops are provided or if `node_pk`(s) are invalid.
	// TODO: make all payloads the same size with padding + add dummy hops
	pub fn new<ES: EntropySource, T: secp256k1::Signing + secp256k1::Verification>
	pub fn new_for_message<ES: EntropySource, T: secp256k1::Signing + secp256k1::Verification>
 (node_pks: &[PublicKey], entropy_source: &ES, secp_ctx: &Secp256k1<T>) -> Result<Self, ()>
	{
 if node_pks.len() < 2 { return Err(()) }
Expand All@@ -74,12 +75,13 @@ impl BlindedPath {
 Ok(BlindedPath {
 introduction_node_id,
 blinding_point: PublicKey::from_secret_key(secp_ctx, &blinding_secret),
 blinded_hops: blinded_hops(secp_ctx, node_pks, &blinding_secret).map_err(|_| ())?,
 blinded_hops: blinded_message_hops(secp_ctx, node_pks, &blinding_secret).map_err(|_| ())?,
 })
	}

	// Advance the blinded path by one hop, so make the second hop into the new introduction node.
	pub(super) fn advance_by_one<NS: Deref, T: secp256k1::Signing + secp256k1::Verification>
	// Advance the blinded onion message path by one hop, so make the second hop into the new
	// introduction node.
	pub(super) fn advance_message_path_by_one<NS: Deref, T: secp256k1::Signing + secp256k1::Verification>
 (&mut self, node_signer: &NS, secp_ctx: &Secp256k1<T>) -> Result<(), ()>
 where NS::Target: NodeSigner
	{
Expand DownExpand Up@@ -114,8 +116,8 @@ impl BlindedPath {
	}
}

/// Construct blinded hops for the given `unblinded_path`.
fn blinded_hops<T: secp256k1::Signing + secp256k1::Verification>(
/// Construct blinded onion message hops for the given `unblinded_path`.
fn blinded_message_hops<T: secp256k1::Signing + secp256k1::Verification>(
	secp_ctx: &Secp256k1<T>, unblinded_path: &[PublicKey], session_priv: &SecretKey
) -> Result<Vec<BlindedHop>, secp256k1::Error> {
	let mut blinded_hops = Vec::with_capacity(unblinded_path.len());
Expand Down

6 changes: 3 additions & 3 deletions
lightning/src/onion_message/utils.rs → lightning/src/blinded_path/utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,15 +15,15 @@ use bitcoin::hashes::sha256::Hash as Sha256;
use bitcoin::secp256k1::{self, PublicKey, Secp256k1, SecretKey, Scalar};
use bitcoin::secp256k1::ecdh::SharedSecret;

use super::BlindedPath;
use crate::ln::onion_utils;
use super::blinded_path::BlindedPath;
use super::messenger::Destination;
use crate::onion_message::Destination;

use crate::prelude::*;

// TODO: DRY with onion_utils::construct_onion_keys_callback
#[inline]
pub(super) fn construct_keys_callback<T: secp256k1::Signing + secp256k1::Verification,
pub(crate) fn construct_keys_callback<T: secp256k1::Signing + secp256k1::Verification,
	FType: FnMut(PublicKey, SharedSecret, PublicKey, [u8; 32], Option<PublicKey>, Option<Vec<u8>>)>(
	secp_ctx: &Secp256k1<T>, unblinded_path: &[PublicKey], destination: Option<Destination>,
	session_priv: &SecretKey, mut callback: FType
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('^' + ".*" + '

Skip to content
Blinded pathfinding groundwork#2146

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

from

Apr 24, 2023
 Merged


Blinded pathfinding groundwork
#2146
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


17 commits


Select commit
Hold shift + click to select a range
efed905

Move blinded_path and its utils into a new module


valentinewallace Mar 16, 2023
e691e50

Update docs and method names for blinded payment paths


valentinewallace Mar 16, 2023
ed4348f

Update PaymentParameters::route_hints for blinded paths


valentinewallace Mar 17, 2023
6d6a86c

Extract read/write variants from impl_for_vec


valentinewallace Apr 9, 2023
2a23b80

outbound_payment: remove unused cltv delta var


valentinewallace Apr 3, 2023
b5827f7

Minor Route/RouteHop doc updates


valentinewallace Apr 5, 2023
93afed5

Add utilities for getting a path's final value and cltv delta


valentinewallace Apr 19, 2023
d5b05e5

Replace Vec<RouteHop> with new Path struct


valentinewallace Apr 9, 2023
64c26c8

Add blinded path {metadata} fields to Path, but disallow paying blind…


valentinewallace Apr 18, 2023
97a8c91

Support (de)ser for Path::blinded_tails in events


valentinewallace Apr 9, 2023
c8fd77d

Support (de)serializing Path::blinded_tails in Routes


valentinewallace Apr 9, 2023
2e51a1c

Support (de)serializing Path::blinded_tails in HTLCSource


valentinewallace Apr 9, 2023
dac4a1c

Account for Path::blinded_tail in InflightHtlcs::process_path


valentinewallace Apr 9, 2023
976411d

Test scoring paths with blinded tails


valentinewallace Apr 19, 2023
5a6f9b0

Account for Path::blinded_tail when adding a shadow cltv offset


valentinewallace Apr 9, 2023
5c2cf77

Update changelog for backwards compat


valentinewallace Apr 9, 2023
b131634

Fix outbound_payment for new Path::blinded_tail


valentinewallace Apr 19, 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


10 changes: 5 additions & 5 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,7 @@ use lightning::util::errors::APIError;
use lightning::util::logger::Logger;
use lightning::util::config::UserConfig;
use lightning::util::ser::{Readable, ReadableArgs, Writeable, Writer};
use lightning::routing::router::{InFlightHtlcs, Route, RouteHop, RouteParameters, Router};
use lightning::routing::router::{InFlightHtlcs, Path, Route, RouteHop, RouteParameters, Router};

use crate::utils::test_logger::{self, Output};
use crate::utils::test_persister::TestPersister;
Expand DownExpand Up@@ -352,14 +352,14 @@ fn send_payment(source: &ChanMan, dest: &ChanMan, dest_chan_id: u64, amt: u64, p
	payment_id[0..8].copy_from_slice(&payment_idx.to_ne_bytes());
	*payment_idx += 1;
	if let Err(err) = source.send_payment_with_route(&Route {
 paths: vec![vec![RouteHop {
 paths: vec![Path { hops: vec![RouteHop {
 pubkey: dest.get_our_node_id(),
 node_features: dest.node_features(),
 short_channel_id: dest_chan_id,
 channel_features: dest.channel_features(),
 fee_msat: amt,
 cltv_expiry_delta: 200,
 }]],
 }], blinded_tail: None }],
 payment_params: None,
	}, payment_hash, RecipientOnionFields::secret_only(payment_secret), PaymentId(payment_id)) {
 check_payment_err(err);
Expand All@@ -374,7 +374,7 @@ fn send_hop_payment(source: &ChanMan, middle: &ChanMan, middle_chan_id: u64, des
	payment_id[0..8].copy_from_slice(&payment_idx.to_ne_bytes());
	*payment_idx += 1;
	if let Err(err) = source.send_payment_with_route(&Route {
 paths: vec![vec![RouteHop {
 paths: vec![Path { hops: vec![RouteHop {
 pubkey: middle.get_our_node_id(),
 node_features: middle.node_features(),
 short_channel_id: middle_chan_id,
Expand All@@ -388,7 +388,7 @@ fn send_hop_payment(source: &ChanMan, middle: &ChanMan, middle_chan_id: u64, des
 channel_features: dest.channel_features(),
 fee_msat: amt,
 cltv_expiry_delta: 200,
 }]],
 }], blinded_tail: None }],
 payment_params: None,
	}, payment_hash, RecipientOnionFields::secret_only(payment_secret), PaymentId(payment_id)) {
 check_payment_err(err);
Expand Down

6 changes: 3 additions & 3 deletions
fuzz/src/invoice_request_deser.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,13 +10,13 @@
use bitcoin::secp256k1::{KeyPair, Parity, PublicKey, Secp256k1, SecretKey, self};
use crate::utils::test_logger;
use core::convert::{Infallible, TryFrom};
use lightning::blinded_path::BlindedPath;
use lightning::chain::keysinterface::EntropySource;
use lightning::ln::PaymentHash;
use lightning::ln::features::BlindedHopFeatures;
use lightning::offers::invoice::{BlindedPayInfo, UnsignedInvoice};
use lightning::offers::invoice_request::InvoiceRequest;
use lightning::offers::parse::SemanticError;
use lightning::onion_message::BlindedPath;
use lightning::util::ser::Writeable;

#[inline]
Expand DownExpand Up@@ -74,8 +74,8 @@ fn build_response<'a, T: secp256k1::Signing + secp256k1::Verification>(
) -> Result<UnsignedInvoice<'a>, SemanticError> {
	let entropy_source = Randomness {};
	let paths = vec![
 BlindedPath::new(&[pubkey(43), pubkey(44), pubkey(42)], &entropy_source, secp_ctx).unwrap(),
 BlindedPath::new(&[pubkey(45), pubkey(46), pubkey(42)], &entropy_source, secp_ctx).unwrap(),
 BlindedPath::new_for_message(&[pubkey(43), pubkey(44), pubkey(42)], &entropy_source, secp_ctx).unwrap(),
 BlindedPath::new_for_message(&[pubkey(45), pubkey(46), pubkey(42)], &entropy_source, secp_ctx).unwrap(),
	];

	let payinfo = vec![
Expand Down

6 changes: 3 additions & 3 deletions
fuzz/src/refund_deser.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,13 +10,13 @@
use bitcoin::secp256k1::{KeyPair, PublicKey, Secp256k1, SecretKey, self};
use crate::utils::test_logger;
use core::convert::{Infallible, TryFrom};
use lightning::blinded_path::BlindedPath;
use lightning::chain::keysinterface::EntropySource;
use lightning::ln::PaymentHash;
use lightning::ln::features::BlindedHopFeatures;
use lightning::offers::invoice::{BlindedPayInfo, UnsignedInvoice};
use lightning::offers::parse::SemanticError;
use lightning::offers::refund::Refund;
use lightning::onion_message::BlindedPath;
use lightning::util::ser::Writeable;

#[inline]
Expand DownExpand Up@@ -63,8 +63,8 @@ fn build_response<'a, T: secp256k1::Signing + secp256k1::Verification>(
) -> Result<UnsignedInvoice<'a>, SemanticError> {
	let entropy_source = Randomness {};
	let paths = vec![
 BlindedPath::new(&[pubkey(43), pubkey(44), pubkey(42)], &entropy_source, secp_ctx).unwrap(),
 BlindedPath::new(&[pubkey(45), pubkey(46), pubkey(42)], &entropy_source, secp_ctx).unwrap(),
 BlindedPath::new_for_message(&[pubkey(43), pubkey(44), pubkey(42)], &entropy_source, secp_ctx).unwrap(),
 BlindedPath::new_for_message(&[pubkey(45), pubkey(46), pubkey(42)], &entropy_source, secp_ctx).unwrap(),
	];

	let payinfo = vec![
Expand Down

45 changes: 20 additions & 25 deletions
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -236,26 +236,21 @@ fn update_scorer<'a, S: 'static + Deref<Target = SC> + Send + Sync, SC: 'a + Wri
	let mut score = scorer.lock();
	match event {
 Event::PaymentPathFailed { ref path, short_channel_id: Some(scid), .. } => {
 let path = path.iter().collect::<Vec<_>>();
 score.payment_path_failed(&path, *scid);
 score.payment_path_failed(path, *scid);
 },
 Event::PaymentPathFailed { ref path, payment_failed_permanently: true, .. } => {
 // Reached if the destination explicitly failed it back. We treat this as a successful probe
 // because the payment made it all the way to the destination with sufficient liquidity.
 let path = path.iter().collect::<Vec<_>>();
 score.probe_successful(&path);
 score.probe_successful(path);
 },
 Event::PaymentPathSuccessful { path, .. } => {
 let path = path.iter().collect::<Vec<_>>();
 score.payment_path_successful(&path);
 score.payment_path_successful(path);
 },
 Event::ProbeSuccessful { path, .. } => {
 let path = path.iter().collect::<Vec<_>>();
 score.probe_successful(&path);
 score.probe_successful(path);
 },
 Event::ProbeFailed { path, short_channel_id: Some(scid), .. } => {
 let path = path.iter().collect::<Vec<_>>();
 score.probe_failed(&path, *scid);
 score.probe_failed(path, *scid);
 },
 _ => {},
	}
Expand DownExpand Up@@ -751,7 +746,7 @@ mod tests {
	use lightning::ln::msgs::{ChannelMessageHandler, Init};
	use lightning::ln::peer_handler::{PeerManager, MessageHandler, SocketDescriptor, IgnoringMessageHandler};
	use lightning::routing::gossip::{NetworkGraph, NodeId, P2PGossipSync};
	use lightning::routing::router::{DefaultRouter, RouteHop};
	use lightning::routing::router::{DefaultRouter, Path, RouteHop};
	use lightning::routing::scoring::{ChannelUsage, Score};
	use lightning::util::config::UserConfig;
	use lightning::util::ser::Writeable;
Expand DownExpand Up@@ -891,10 +886,10 @@ mod tests {

	#[derive(Debug)]
	enum TestResult {
 PaymentFailure { path: Vec<RouteHop>, short_channel_id: u64 },
 PaymentSuccess { path: Vec<RouteHop> },
 ProbeFailure { path: Vec<RouteHop> },
 ProbeSuccess { path: Vec<RouteHop> },
 PaymentFailure { path: Path, short_channel_id: u64 },
 PaymentSuccess { path: Path },
 ProbeFailure { path: Path },
 ProbeSuccess { path: Path },
	}

	impl TestScorer {
Expand All@@ -916,11 +911,11 @@ mod tests {
 &self, _short_channel_id: u64, _source: &NodeId, _target: &NodeId, _usage: ChannelUsage
 ) -> u64 { unimplemented!(); }

 fn payment_path_failed(&mut self, actual_path: &[&RouteHop], actual_short_channel_id: u64) {
 fn payment_path_failed(&mut self, actual_path: &Path, actual_short_channel_id: u64) {
 if let Some(expectations) = &mut self.event_expectations {
 match expectations.pop_front().unwrap() {
 TestResult::PaymentFailure { path, short_channel_id } => {
 assert_eq!(actual_path, &path.iter().collect::<Vec<_>>()[..]);
 assert_eq!(actual_path, &path);
 assert_eq!(actual_short_channel_id, short_channel_id);
 },
 TestResult::PaymentSuccess { path } => {
Expand All@@ -936,14 +931,14 @@ mod tests {
 }
 }

 fn payment_path_successful(&mut self, actual_path: &[&RouteHop]) {
 fn payment_path_successful(&mut self, actual_path: &Path) {
 if let Some(expectations) = &mut self.event_expectations {
 match expectations.pop_front().unwrap() {
 TestResult::PaymentFailure { path, .. } => {
 panic!("Unexpected payment path failure: {:?}", path)
 },
 TestResult::PaymentSuccess { path } => {
 assert_eq!(actual_path, &path.iter().collect::<Vec<_>>()[..]);
 assert_eq!(actual_path, &path);
 },
 TestResult::ProbeFailure { path } => {
 panic!("Unexpected probe failure: {:?}", path)
Expand All@@ -955,7 +950,7 @@ mod tests {
 }
 }

 fn probe_failed(&mut self, actual_path: &[&RouteHop], _: u64) {
 fn probe_failed(&mut self, actual_path: &Path, _: u64) {
 if let Some(expectations) = &mut self.event_expectations {
 match expectations.pop_front().unwrap() {
 TestResult::PaymentFailure { path, .. } => {
Expand All@@ -965,15 +960,15 @@ mod tests {
 panic!("Unexpected payment path success: {:?}", path)
 },
 TestResult::ProbeFailure { path } => {
 assert_eq!(actual_path, &path.iter().collect::<Vec<_>>()[..]);
 assert_eq!(actual_path, &path);
 },
 TestResult::ProbeSuccess { path } => {
 panic!("Unexpected probe success: {:?}", path)
 }
 }
 }
 }
 fn probe_successful(&mut self, actual_path: &[&RouteHop]) {
 fn probe_successful(&mut self, actual_path: &Path) {
 if let Some(expectations) = &mut self.event_expectations {
 match expectations.pop_front().unwrap() {
 TestResult::PaymentFailure { path, .. } => {
Expand All@@ -986,7 +981,7 @@ mod tests {
 panic!("Unexpected probe failure: {:?}", path)
 },
 TestResult::ProbeSuccess { path } => {
 assert_eq!(actual_path, &path.iter().collect::<Vec<_>>()[..]);
 assert_eq!(actual_path, &path);
 }
 }
 }
Expand DownExpand Up@@ -1510,14 +1505,14 @@ mod tests {
 let node_1_privkey = SecretKey::from_slice(&[42; 32]).unwrap();
 let node_1_id = PublicKey::from_secret_key(&secp_ctx, &node_1_privkey);

 let path = vec![RouteHop {
 let path = Path { hops: vec![RouteHop {
 pubkey: node_1_id,
 node_features: NodeFeatures::empty(),
 short_channel_id: scored_scid,
 channel_features: ChannelFeatures::empty(),
 fee_msat: 0,
 cltv_expiry_delta: MIN_CLTV_EXPIRY_DELTA as u32,
 }];
 }], blinded_tail: None };

 $nodes[0].scorer.lock().unwrap().expect(TestResult::PaymentFailure { path: path.clone(), short_channel_id: scored_scid });
 $nodes[0].node.push_pending_event(Event::PaymentPathFailed {
Expand Down

34 changes: 18 additions & 16 deletions
lightning/src/onion_message/blinded_path.rs → lightning/src/blinded_path/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,13 +9,14 @@

//! Creating blinded paths and related utilities live here.

pub(crate) mod utils;

use bitcoin::hashes::{Hash, HashEngine};
use bitcoin::hashes::sha256::Hash as Sha256;
use bitcoin::secp256k1::{self, PublicKey, Scalar, Secp256k1, SecretKey};

use crate::chain::keysinterface::{EntropySource, NodeSigner, Recipient};
use super::packet::ControlTlvs;
use super::utils;
use crate::onion_message::ControlTlvs;
use crate::ln::msgs::DecodeError;
use crate::ln::onion_utils;
use crate::util::chacha20poly1305rfc::{ChaChaPolyReadAdapter, ChaChaPolyWriteAdapter};
Expand All@@ -26,18 +27,18 @@ use core::ops::Deref;
use crate::io::{self, Cursor};
use crate::prelude::*;

/// Onion messages can be sent and received to blinded paths, which serve to hide the identity of
/// the recipient.
#[derive(Clone, Debug, PartialEq)]
/// Onion messages and payments can be sent and received to blinded paths, which serve to hide the
/// identity of the recipient.
#[derive(Clone, Debug, Hash, PartialEq, Eq)]
pub struct BlindedPath {
	/// To send to a blinded path, the sender first finds a route to the unblinded
	/// `introduction_node_id`, which can unblind its [`encrypted_payload`] to find out the onion
	/// message's next hop and forward it along.
	/// message or payment's next hop and forward it along.
	///
	/// [`encrypted_payload`]: BlindedHop::encrypted_payload
	pub(crate) introduction_node_id: PublicKey,
	/// Used by the introduction node to decrypt its [`encrypted_payload`] to forward the onion
	/// message.
	/// message or payment.
	///
	/// [`encrypted_payload`]: BlindedHop::encrypted_payload
	pub(crate) blinding_point: PublicKey,
Expand All@@ -47,7 +48,7 @@ pub struct BlindedPath {

/// Used to construct the blinded hops portion of a blinded path. These hops cannot be identified
/// by outside observers and thus can be used to hide the identity of the recipient.
#[derive(Clone, Debug, PartialEq)]
#[derive(Clone, Debug, Hash, PartialEq, Eq)]
pub struct BlindedHop {
	/// The blinded node id of this hop in a blinded path.
	pub(crate) blinded_node_id: PublicKey,
Expand All@@ -58,12 +59,12 @@ pub struct BlindedHop {
}

impl BlindedPath {
	/// Create a blinded path to be forwarded along `node_pks`. The last node pubkey in `node_pks`
	/// will be the destination node.
	/// Create a blinded path for an onion message, to be forwarded along `node_pks`. The last node
	/// pubkey in `node_pks` will be the destination node.
	///
	/// Errors if less than two hops are provided or if `node_pk`(s) are invalid.
	// TODO: make all payloads the same size with padding + add dummy hops
	pub fn new<ES: EntropySource, T: secp256k1::Signing + secp256k1::Verification>
	pub fn new_for_message<ES: EntropySource, T: secp256k1::Signing + secp256k1::Verification>
 (node_pks: &[PublicKey], entropy_source: &ES, secp_ctx: &Secp256k1<T>) -> Result<Self, ()>
	{
 if node_pks.len() < 2 { return Err(()) }
Expand All@@ -74,12 +75,13 @@ impl BlindedPath {
 Ok(BlindedPath {
 introduction_node_id,
 blinding_point: PublicKey::from_secret_key(secp_ctx, &blinding_secret),
 blinded_hops: blinded_hops(secp_ctx, node_pks, &blinding_secret).map_err(|_| ())?,
 blinded_hops: blinded_message_hops(secp_ctx, node_pks, &blinding_secret).map_err(|_| ())?,
 })
	}

	// Advance the blinded path by one hop, so make the second hop into the new introduction node.
	pub(super) fn advance_by_one<NS: Deref, T: secp256k1::Signing + secp256k1::Verification>
	// Advance the blinded onion message path by one hop, so make the second hop into the new
	// introduction node.
	pub(super) fn advance_message_path_by_one<NS: Deref, T: secp256k1::Signing + secp256k1::Verification>
 (&mut self, node_signer: &NS, secp_ctx: &Secp256k1<T>) -> Result<(), ()>
 where NS::Target: NodeSigner
	{
Expand DownExpand Up@@ -114,8 +116,8 @@ impl BlindedPath {
	}
}

/// Construct blinded hops for the given `unblinded_path`.
fn blinded_hops<T: secp256k1::Signing + secp256k1::Verification>(
/// Construct blinded onion message hops for the given `unblinded_path`.
fn blinded_message_hops<T: secp256k1::Signing + secp256k1::Verification>(
	secp_ctx: &Secp256k1<T>, unblinded_path: &[PublicKey], session_priv: &SecretKey
) -> Result<Vec<BlindedHop>, secp256k1::Error> {
	let mut blinded_hops = Vec::with_capacity(unblinded_path.len());
Expand Down

6 changes: 3 additions & 3 deletions
lightning/src/onion_message/utils.rs → lightning/src/blinded_path/utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,15 +15,15 @@ use bitcoin::hashes::sha256::Hash as Sha256;
use bitcoin::secp256k1::{self, PublicKey, Secp256k1, SecretKey, Scalar};
use bitcoin::secp256k1::ecdh::SharedSecret;

use super::BlindedPath;
use crate::ln::onion_utils;
use super::blinded_path::BlindedPath;
use super::messenger::Destination;
use crate::onion_message::Destination;

use crate::prelude::*;

// TODO: DRY with onion_utils::construct_onion_keys_callback
#[inline]
pub(super) fn construct_keys_callback<T: secp256k1::Signing + secp256k1::Verification,
pub(crate) fn construct_keys_callback<T: secp256k1::Signing + secp256k1::Verification,
	FType: FnMut(PublicKey, SharedSecret, PublicKey, [u8; 32], Option<PublicKey>, Option<Vec<u8>>)>(
	secp_ctx: &Secp256k1<T>, unblinded_path: &[PublicKey], destination: Option<Destination>,
	session_priv: &SecretKey, mut callback: FType
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('^' + ".*" + '

Skip to content
Blinded pathfinding groundwork#2146

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

from

Apr 24, 2023
 Merged


Blinded pathfinding groundwork
#2146
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


17 commits


Select commit
Hold shift + click to select a range
efed905

Move blinded_path and its utils into a new module


valentinewallace Mar 16, 2023
e691e50

Update docs and method names for blinded payment paths


valentinewallace Mar 16, 2023
ed4348f

Update PaymentParameters::route_hints for blinded paths


valentinewallace Mar 17, 2023
6d6a86c

Extract read/write variants from impl_for_vec


valentinewallace Apr 9, 2023
2a23b80

outbound_payment: remove unused cltv delta var


valentinewallace Apr 3, 2023
b5827f7

Minor Route/RouteHop doc updates


valentinewallace Apr 5, 2023
93afed5

Add utilities for getting a path's final value and cltv delta


valentinewallace Apr 19, 2023
d5b05e5

Replace Vec<RouteHop> with new Path struct


valentinewallace Apr 9, 2023
64c26c8

Add blinded path {metadata} fields to Path, but disallow paying blind…


valentinewallace Apr 18, 2023
97a8c91

Support (de)ser for Path::blinded_tails in events


valentinewallace Apr 9, 2023
c8fd77d

Support (de)serializing Path::blinded_tails in Routes


valentinewallace Apr 9, 2023
2e51a1c

Support (de)serializing Path::blinded_tails in HTLCSource


valentinewallace Apr 9, 2023
dac4a1c

Account for Path::blinded_tail in InflightHtlcs::process_path


valentinewallace Apr 9, 2023
976411d

Test scoring paths with blinded tails


valentinewallace Apr 19, 2023
5a6f9b0

Account for Path::blinded_tail when adding a shadow cltv offset


valentinewallace Apr 9, 2023
5c2cf77

Update changelog for backwards compat


valentinewallace Apr 9, 2023
b131634

Fix outbound_payment for new Path::blinded_tail


valentinewallace Apr 19, 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


10 changes: 5 additions & 5 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,7 @@ use lightning::util::errors::APIError;
use lightning::util::logger::Logger;
use lightning::util::config::UserConfig;
use lightning::util::ser::{Readable, ReadableArgs, Writeable, Writer};
use lightning::routing::router::{InFlightHtlcs, Route, RouteHop, RouteParameters, Router};
use lightning::routing::router::{InFlightHtlcs, Path, Route, RouteHop, RouteParameters, Router};

use crate::utils::test_logger::{self, Output};
use crate::utils::test_persister::TestPersister;
Expand DownExpand Up@@ -352,14 +352,14 @@ fn send_payment(source: &ChanMan, dest: &ChanMan, dest_chan_id: u64, amt: u64, p
	payment_id[0..8].copy_from_slice(&payment_idx.to_ne_bytes());
	*payment_idx += 1;
	if let Err(err) = source.send_payment_with_route(&Route {
 paths: vec![vec![RouteHop {
 paths: vec![Path { hops: vec![RouteHop {
 pubkey: dest.get_our_node_id(),
 node_features: dest.node_features(),
 short_channel_id: dest_chan_id,
 channel_features: dest.channel_features(),
 fee_msat: amt,
 cltv_expiry_delta: 200,
 }]],
 }], blinded_tail: None }],
 payment_params: None,
	}, payment_hash, RecipientOnionFields::secret_only(payment_secret), PaymentId(payment_id)) {
 check_payment_err(err);
Expand All@@ -374,7 +374,7 @@ fn send_hop_payment(source: &ChanMan, middle: &ChanMan, middle_chan_id: u64, des
	payment_id[0..8].copy_from_slice(&payment_idx.to_ne_bytes());
	*payment_idx += 1;
	if let Err(err) = source.send_payment_with_route(&Route {
 paths: vec![vec![RouteHop {
 paths: vec![Path { hops: vec![RouteHop {
 pubkey: middle.get_our_node_id(),
 node_features: middle.node_features(),
 short_channel_id: middle_chan_id,
Expand All@@ -388,7 +388,7 @@ fn send_hop_payment(source: &ChanMan, middle: &ChanMan, middle_chan_id: u64, des
 channel_features: dest.channel_features(),
 fee_msat: amt,
 cltv_expiry_delta: 200,
 }]],
 }], blinded_tail: None }],
 payment_params: None,
	}, payment_hash, RecipientOnionFields::secret_only(payment_secret), PaymentId(payment_id)) {
 check_payment_err(err);
Expand Down

6 changes: 3 additions & 3 deletions
fuzz/src/invoice_request_deser.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,13 +10,13 @@
use bitcoin::secp256k1::{KeyPair, Parity, PublicKey, Secp256k1, SecretKey, self};
use crate::utils::test_logger;
use core::convert::{Infallible, TryFrom};
use lightning::blinded_path::BlindedPath;
use lightning::chain::keysinterface::EntropySource;
use lightning::ln::PaymentHash;
use lightning::ln::features::BlindedHopFeatures;
use lightning::offers::invoice::{BlindedPayInfo, UnsignedInvoice};
use lightning::offers::invoice_request::InvoiceRequest;
use lightning::offers::parse::SemanticError;
use lightning::onion_message::BlindedPath;
use lightning::util::ser::Writeable;

#[inline]
Expand DownExpand Up@@ -74,8 +74,8 @@ fn build_response<'a, T: secp256k1::Signing + secp256k1::Verification>(
) -> Result<UnsignedInvoice<'a>, SemanticError> {
	let entropy_source = Randomness {};
	let paths = vec![
 BlindedPath::new(&[pubkey(43), pubkey(44), pubkey(42)], &entropy_source, secp_ctx).unwrap(),
 BlindedPath::new(&[pubkey(45), pubkey(46), pubkey(42)], &entropy_source, secp_ctx).unwrap(),
 BlindedPath::new_for_message(&[pubkey(43), pubkey(44), pubkey(42)], &entropy_source, secp_ctx).unwrap(),
 BlindedPath::new_for_message(&[pubkey(45), pubkey(46), pubkey(42)], &entropy_source, secp_ctx).unwrap(),
	];

	let payinfo = vec![
Expand Down

6 changes: 3 additions & 3 deletions
fuzz/src/refund_deser.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,13 +10,13 @@
use bitcoin::secp256k1::{KeyPair, PublicKey, Secp256k1, SecretKey, self};
use crate::utils::test_logger;
use core::convert::{Infallible, TryFrom};
use lightning::blinded_path::BlindedPath;
use lightning::chain::keysinterface::EntropySource;
use lightning::ln::PaymentHash;
use lightning::ln::features::BlindedHopFeatures;
use lightning::offers::invoice::{BlindedPayInfo, UnsignedInvoice};
use lightning::offers::parse::SemanticError;
use lightning::offers::refund::Refund;
use lightning::onion_message::BlindedPath;
use lightning::util::ser::Writeable;

#[inline]
Expand DownExpand Up@@ -63,8 +63,8 @@ fn build_response<'a, T: secp256k1::Signing + secp256k1::Verification>(
) -> Result<UnsignedInvoice<'a>, SemanticError> {
	let entropy_source = Randomness {};
	let paths = vec![
 BlindedPath::new(&[pubkey(43), pubkey(44), pubkey(42)], &entropy_source, secp_ctx).unwrap(),
 BlindedPath::new(&[pubkey(45), pubkey(46), pubkey(42)], &entropy_source, secp_ctx).unwrap(),
 BlindedPath::new_for_message(&[pubkey(43), pubkey(44), pubkey(42)], &entropy_source, secp_ctx).unwrap(),
 BlindedPath::new_for_message(&[pubkey(45), pubkey(46), pubkey(42)], &entropy_source, secp_ctx).unwrap(),
	];

	let payinfo = vec![
Expand Down

45 changes: 20 additions & 25 deletions
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -236,26 +236,21 @@ fn update_scorer<'a, S: 'static + Deref<Target = SC> + Send + Sync, SC: 'a + Wri
	let mut score = scorer.lock();
	match event {
 Event::PaymentPathFailed { ref path, short_channel_id: Some(scid), .. } => {
 let path = path.iter().collect::<Vec<_>>();
 score.payment_path_failed(&path, *scid);
 score.payment_path_failed(path, *scid);
 },
 Event::PaymentPathFailed { ref path, payment_failed_permanently: true, .. } => {
 // Reached if the destination explicitly failed it back. We treat this as a successful probe
 // because the payment made it all the way to the destination with sufficient liquidity.
 let path = path.iter().collect::<Vec<_>>();
 score.probe_successful(&path);
 score.probe_successful(path);
 },
 Event::PaymentPathSuccessful { path, .. } => {
 let path = path.iter().collect::<Vec<_>>();
 score.payment_path_successful(&path);
 score.payment_path_successful(path);
 },
 Event::ProbeSuccessful { path, .. } => {
 let path = path.iter().collect::<Vec<_>>();
 score.probe_successful(&path);
 score.probe_successful(path);
 },
 Event::ProbeFailed { path, short_channel_id: Some(scid), .. } => {
 let path = path.iter().collect::<Vec<_>>();
 score.probe_failed(&path, *scid);
 score.probe_failed(path, *scid);
 },
 _ => {},
	}
Expand DownExpand Up@@ -751,7 +746,7 @@ mod tests {
	use lightning::ln::msgs::{ChannelMessageHandler, Init};
	use lightning::ln::peer_handler::{PeerManager, MessageHandler, SocketDescriptor, IgnoringMessageHandler};
	use lightning::routing::gossip::{NetworkGraph, NodeId, P2PGossipSync};
	use lightning::routing::router::{DefaultRouter, RouteHop};
	use lightning::routing::router::{DefaultRouter, Path, RouteHop};
	use lightning::routing::scoring::{ChannelUsage, Score};
	use lightning::util::config::UserConfig;
	use lightning::util::ser::Writeable;
Expand DownExpand Up@@ -891,10 +886,10 @@ mod tests {

	#[derive(Debug)]
	enum TestResult {
 PaymentFailure { path: Vec<RouteHop>, short_channel_id: u64 },
 PaymentSuccess { path: Vec<RouteHop> },
 ProbeFailure { path: Vec<RouteHop> },
 ProbeSuccess { path: Vec<RouteHop> },
 PaymentFailure { path: Path, short_channel_id: u64 },
 PaymentSuccess { path: Path },
 ProbeFailure { path: Path },
 ProbeSuccess { path: Path },
	}

	impl TestScorer {
Expand All@@ -916,11 +911,11 @@ mod tests {
 &self, _short_channel_id: u64, _source: &NodeId, _target: &NodeId, _usage: ChannelUsage
 ) -> u64 { unimplemented!(); }

 fn payment_path_failed(&mut self, actual_path: &[&RouteHop], actual_short_channel_id: u64) {
 fn payment_path_failed(&mut self, actual_path: &Path, actual_short_channel_id: u64) {
 if let Some(expectations) = &mut self.event_expectations {
 match expectations.pop_front().unwrap() {
 TestResult::PaymentFailure { path, short_channel_id } => {
 assert_eq!(actual_path, &path.iter().collect::<Vec<_>>()[..]);
 assert_eq!(actual_path, &path);
 assert_eq!(actual_short_channel_id, short_channel_id);
 },
 TestResult::PaymentSuccess { path } => {
Expand All@@ -936,14 +931,14 @@ mod tests {
 }
 }

 fn payment_path_successful(&mut self, actual_path: &[&RouteHop]) {
 fn payment_path_successful(&mut self, actual_path: &Path) {
 if let Some(expectations) = &mut self.event_expectations {
 match expectations.pop_front().unwrap() {
 TestResult::PaymentFailure { path, .. } => {
 panic!("Unexpected payment path failure: {:?}", path)
 },
 TestResult::PaymentSuccess { path } => {
 assert_eq!(actual_path, &path.iter().collect::<Vec<_>>()[..]);
 assert_eq!(actual_path, &path);
 },
 TestResult::ProbeFailure { path } => {
 panic!("Unexpected probe failure: {:?}", path)
Expand All@@ -955,7 +950,7 @@ mod tests {
 }
 }

 fn probe_failed(&mut self, actual_path: &[&RouteHop], _: u64) {
 fn probe_failed(&mut self, actual_path: &Path, _: u64) {
 if let Some(expectations) = &mut self.event_expectations {
 match expectations.pop_front().unwrap() {
 TestResult::PaymentFailure { path, .. } => {
Expand All@@ -965,15 +960,15 @@ mod tests {
 panic!("Unexpected payment path success: {:?}", path)
 },
 TestResult::ProbeFailure { path } => {
 assert_eq!(actual_path, &path.iter().collect::<Vec<_>>()[..]);
 assert_eq!(actual_path, &path);
 },
 TestResult::ProbeSuccess { path } => {
 panic!("Unexpected probe success: {:?}", path)
 }
 }
 }
 }
 fn probe_successful(&mut self, actual_path: &[&RouteHop]) {
 fn probe_successful(&mut self, actual_path: &Path) {
 if let Some(expectations) = &mut self.event_expectations {
 match expectations.pop_front().unwrap() {
 TestResult::PaymentFailure { path, .. } => {
Expand All@@ -986,7 +981,7 @@ mod tests {
 panic!("Unexpected probe failure: {:?}", path)
 },
 TestResult::ProbeSuccess { path } => {
 assert_eq!(actual_path, &path.iter().collect::<Vec<_>>()[..]);
 assert_eq!(actual_path, &path);
 }
 }
 }
Expand DownExpand Up@@ -1510,14 +1505,14 @@ mod tests {
 let node_1_privkey = SecretKey::from_slice(&[42; 32]).unwrap();
 let node_1_id = PublicKey::from_secret_key(&secp_ctx, &node_1_privkey);

 let path = vec![RouteHop {
 let path = Path { hops: vec![RouteHop {
 pubkey: node_1_id,
 node_features: NodeFeatures::empty(),
 short_channel_id: scored_scid,
 channel_features: ChannelFeatures::empty(),
 fee_msat: 0,
 cltv_expiry_delta: MIN_CLTV_EXPIRY_DELTA as u32,
 }];
 }], blinded_tail: None };

 $nodes[0].scorer.lock().unwrap().expect(TestResult::PaymentFailure { path: path.clone(), short_channel_id: scored_scid });
 $nodes[0].node.push_pending_event(Event::PaymentPathFailed {
Expand Down

34 changes: 18 additions & 16 deletions
lightning/src/onion_message/blinded_path.rs → lightning/src/blinded_path/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,13 +9,14 @@

//! Creating blinded paths and related utilities live here.

pub(crate) mod utils;

use bitcoin::hashes::{Hash, HashEngine};
use bitcoin::hashes::sha256::Hash as Sha256;
use bitcoin::secp256k1::{self, PublicKey, Scalar, Secp256k1, SecretKey};

use crate::chain::keysinterface::{EntropySource, NodeSigner, Recipient};
use super::packet::ControlTlvs;
use super::utils;
use crate::onion_message::ControlTlvs;
use crate::ln::msgs::DecodeError;
use crate::ln::onion_utils;
use crate::util::chacha20poly1305rfc::{ChaChaPolyReadAdapter, ChaChaPolyWriteAdapter};
Expand All@@ -26,18 +27,18 @@ use core::ops::Deref;
use crate::io::{self, Cursor};
use crate::prelude::*;

/// Onion messages can be sent and received to blinded paths, which serve to hide the identity of
/// the recipient.
#[derive(Clone, Debug, PartialEq)]
/// Onion messages and payments can be sent and received to blinded paths, which serve to hide the
/// identity of the recipient.
#[derive(Clone, Debug, Hash, PartialEq, Eq)]
pub struct BlindedPath {
	/// To send to a blinded path, the sender first finds a route to the unblinded
	/// `introduction_node_id`, which can unblind its [`encrypted_payload`] to find out the onion
	/// message's next hop and forward it along.
	/// message or payment's next hop and forward it along.
	///
	/// [`encrypted_payload`]: BlindedHop::encrypted_payload
	pub(crate) introduction_node_id: PublicKey,
	/// Used by the introduction node to decrypt its [`encrypted_payload`] to forward the onion
	/// message.
	/// message or payment.
	///
	/// [`encrypted_payload`]: BlindedHop::encrypted_payload
	pub(crate) blinding_point: PublicKey,
Expand All@@ -47,7 +48,7 @@ pub struct BlindedPath {

/// Used to construct the blinded hops portion of a blinded path. These hops cannot be identified
/// by outside observers and thus can be used to hide the identity of the recipient.
#[derive(Clone, Debug, PartialEq)]
#[derive(Clone, Debug, Hash, PartialEq, Eq)]
pub struct BlindedHop {
	/// The blinded node id of this hop in a blinded path.
	pub(crate) blinded_node_id: PublicKey,
Expand All@@ -58,12 +59,12 @@ pub struct BlindedHop {
}

impl BlindedPath {
	/// Create a blinded path to be forwarded along `node_pks`. The last node pubkey in `node_pks`
	/// will be the destination node.
	/// Create a blinded path for an onion message, to be forwarded along `node_pks`. The last node
	/// pubkey in `node_pks` will be the destination node.
	///
	/// Errors if less than two hops are provided or if `node_pk`(s) are invalid.
	// TODO: make all payloads the same size with padding + add dummy hops
	pub fn new<ES: EntropySource, T: secp256k1::Signing + secp256k1::Verification>
	pub fn new_for_message<ES: EntropySource, T: secp256k1::Signing + secp256k1::Verification>
 (node_pks: &[PublicKey], entropy_source: &ES, secp_ctx: &Secp256k1<T>) -> Result<Self, ()>
	{
 if node_pks.len() < 2 { return Err(()) }
Expand All@@ -74,12 +75,13 @@ impl BlindedPath {
 Ok(BlindedPath {
 introduction_node_id,
 blinding_point: PublicKey::from_secret_key(secp_ctx, &blinding_secret),
 blinded_hops: blinded_hops(secp_ctx, node_pks, &blinding_secret).map_err(|_| ())?,
 blinded_hops: blinded_message_hops(secp_ctx, node_pks, &blinding_secret).map_err(|_| ())?,
 })
	}

	// Advance the blinded path by one hop, so make the second hop into the new introduction node.
	pub(super) fn advance_by_one<NS: Deref, T: secp256k1::Signing + secp256k1::Verification>
	// Advance the blinded onion message path by one hop, so make the second hop into the new
	// introduction node.
	pub(super) fn advance_message_path_by_one<NS: Deref, T: secp256k1::Signing + secp256k1::Verification>
 (&mut self, node_signer: &NS, secp_ctx: &Secp256k1<T>) -> Result<(), ()>
 where NS::Target: NodeSigner
	{
Expand DownExpand Up@@ -114,8 +116,8 @@ impl BlindedPath {
	}
}

/// Construct blinded hops for the given `unblinded_path`.
fn blinded_hops<T: secp256k1::Signing + secp256k1::Verification>(
/// Construct blinded onion message hops for the given `unblinded_path`.
fn blinded_message_hops<T: secp256k1::Signing + secp256k1::Verification>(
	secp_ctx: &Secp256k1<T>, unblinded_path: &[PublicKey], session_priv: &SecretKey
) -> Result<Vec<BlindedHop>, secp256k1::Error> {
	let mut blinded_hops = Vec::with_capacity(unblinded_path.len());
Expand Down

6 changes: 3 additions & 3 deletions
lightning/src/onion_message/utils.rs → lightning/src/blinded_path/utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,15 +15,15 @@ use bitcoin::hashes::sha256::Hash as Sha256;
use bitcoin::secp256k1::{self, PublicKey, Secp256k1, SecretKey, Scalar};
use bitcoin::secp256k1::ecdh::SharedSecret;

use super::BlindedPath;
use crate::ln::onion_utils;
use super::blinded_path::BlindedPath;
use super::messenger::Destination;
use crate::onion_message::Destination;

use crate::prelude::*;

// TODO: DRY with onion_utils::construct_onion_keys_callback
#[inline]
pub(super) fn construct_keys_callback<T: secp256k1::Signing + secp256k1::Verification,
pub(crate) fn construct_keys_callback<T: secp256k1::Signing + secp256k1::Verification,
	FType: FnMut(PublicKey, SharedSecret, PublicKey, [u8; 32], Option<PublicKey>, Option<Vec<u8>>)>(
	secp_ctx: &Secp256k1<T>, unblinded_path: &[PublicKey], destination: Option<Destination>,
	session_priv: &SecretKey, mut callback: FType
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); }
})();
})();

Skip to content
Blinded pathfinding groundwork#2146

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

from

Apr 24, 2023
 Merged


Blinded pathfinding groundwork
#2146
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


17 commits


Select commit
Hold shift + click to select a range
efed905

Move blinded_path and its utils into a new module


valentinewallace Mar 16, 2023
e691e50

Update docs and method names for blinded payment paths


valentinewallace Mar 16, 2023
ed4348f

Update PaymentParameters::route_hints for blinded paths


valentinewallace Mar 17, 2023
6d6a86c

Extract read/write variants from impl_for_vec


valentinewallace Apr 9, 2023
2a23b80

outbound_payment: remove unused cltv delta var


valentinewallace Apr 3, 2023
b5827f7

Minor Route/RouteHop doc updates


valentinewallace Apr 5, 2023
93afed5

Add utilities for getting a path's final value and cltv delta


valentinewallace Apr 19, 2023
d5b05e5

Replace Vec<RouteHop> with new Path struct


valentinewallace Apr 9, 2023
64c26c8

Add blinded path {metadata} fields to Path, but disallow paying blind…


valentinewallace Apr 18, 2023
97a8c91

Support (de)ser for Path::blinded_tails in events


valentinewallace Apr 9, 2023
c8fd77d

Support (de)serializing Path::blinded_tails in Routes


valentinewallace Apr 9, 2023
2e51a1c

Support (de)serializing Path::blinded_tails in HTLCSource


valentinewallace Apr 9, 2023
dac4a1c

Account for Path::blinded_tail in InflightHtlcs::process_path


valentinewallace Apr 9, 2023
976411d

Test scoring paths with blinded tails


valentinewallace Apr 19, 2023
5a6f9b0

Account for Path::blinded_tail when adding a shadow cltv offset


valentinewallace Apr 9, 2023
5c2cf77

Update changelog for backwards compat


valentinewallace Apr 9, 2023
b131634

Fix outbound_payment for new Path::blinded_tail


valentinewallace Apr 19, 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


10 changes: 5 additions & 5 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,7 @@ use lightning::util::errors::APIError;
use lightning::util::logger::Logger;
use lightning::util::config::UserConfig;
use lightning::util::ser::{Readable, ReadableArgs, Writeable, Writer};
use lightning::routing::router::{InFlightHtlcs, Route, RouteHop, RouteParameters, Router};
use lightning::routing::router::{InFlightHtlcs, Path, Route, RouteHop, RouteParameters, Router};

use crate::utils::test_logger::{self, Output};
use crate::utils::test_persister::TestPersister;
Expand DownExpand Up@@ -352,14 +352,14 @@ fn send_payment(source: &ChanMan, dest: &ChanMan, dest_chan_id: u64, amt: u64, p
	payment_id[0..8].copy_from_slice(&payment_idx.to_ne_bytes());
	*payment_idx += 1;
	if let Err(err) = source.send_payment_with_route(&Route {
 paths: vec![vec![RouteHop {
 paths: vec![Path { hops: vec![RouteHop {
 pubkey: dest.get_our_node_id(),
 node_features: dest.node_features(),
 short_channel_id: dest_chan_id,
 channel_features: dest.channel_features(),
 fee_msat: amt,
 cltv_expiry_delta: 200,
 }]],
 }], blinded_tail: None }],
 payment_params: None,
	}, payment_hash, RecipientOnionFields::secret_only(payment_secret), PaymentId(payment_id)) {
 check_payment_err(err);
Expand All@@ -374,7 +374,7 @@ fn send_hop_payment(source: &ChanMan, middle: &ChanMan, middle_chan_id: u64, des
	payment_id[0..8].copy_from_slice(&payment_idx.to_ne_bytes());
	*payment_idx += 1;
	if let Err(err) = source.send_payment_with_route(&Route {
 paths: vec![vec![RouteHop {
 paths: vec![Path { hops: vec![RouteHop {
 pubkey: middle.get_our_node_id(),
 node_features: middle.node_features(),
 short_channel_id: middle_chan_id,
Expand All@@ -388,7 +388,7 @@ fn send_hop_payment(source: &ChanMan, middle: &ChanMan, middle_chan_id: u64, des
 channel_features: dest.channel_features(),
 fee_msat: amt,
 cltv_expiry_delta: 200,
 }]],
 }], blinded_tail: None }],
 payment_params: None,
	}, payment_hash, RecipientOnionFields::secret_only(payment_secret), PaymentId(payment_id)) {
 check_payment_err(err);
Expand Down

6 changes: 3 additions & 3 deletions
fuzz/src/invoice_request_deser.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,13 +10,13 @@
use bitcoin::secp256k1::{KeyPair, Parity, PublicKey, Secp256k1, SecretKey, self};
use crate::utils::test_logger;
use core::convert::{Infallible, TryFrom};
use lightning::blinded_path::BlindedPath;
use lightning::chain::keysinterface::EntropySource;
use lightning::ln::PaymentHash;
use lightning::ln::features::BlindedHopFeatures;
use lightning::offers::invoice::{BlindedPayInfo, UnsignedInvoice};
use lightning::offers::invoice_request::InvoiceRequest;
use lightning::offers::parse::SemanticError;
use lightning::onion_message::BlindedPath;
use lightning::util::ser::Writeable;

#[inline]
Expand DownExpand Up@@ -74,8 +74,8 @@ fn build_response<'a, T: secp256k1::Signing + secp256k1::Verification>(
) -> Result<UnsignedInvoice<'a>, SemanticError> {
	let entropy_source = Randomness {};
	let paths = vec![
 BlindedPath::new(&[pubkey(43), pubkey(44), pubkey(42)], &entropy_source, secp_ctx).unwrap(),
 BlindedPath::new(&[pubkey(45), pubkey(46), pubkey(42)], &entropy_source, secp_ctx).unwrap(),
 BlindedPath::new_for_message(&[pubkey(43), pubkey(44), pubkey(42)], &entropy_source, secp_ctx).unwrap(),
 BlindedPath::new_for_message(&[pubkey(45), pubkey(46), pubkey(42)], &entropy_source, secp_ctx).unwrap(),
	];

	let payinfo = vec![
Expand Down

6 changes: 3 additions & 3 deletions
fuzz/src/refund_deser.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,13 +10,13 @@
use bitcoin::secp256k1::{KeyPair, PublicKey, Secp256k1, SecretKey, self};
use crate::utils::test_logger;
use core::convert::{Infallible, TryFrom};
use lightning::blinded_path::BlindedPath;
use lightning::chain::keysinterface::EntropySource;
use lightning::ln::PaymentHash;
use lightning::ln::features::BlindedHopFeatures;
use lightning::offers::invoice::{BlindedPayInfo, UnsignedInvoice};
use lightning::offers::parse::SemanticError;
use lightning::offers::refund::Refund;
use lightning::onion_message::BlindedPath;
use lightning::util::ser::Writeable;

#[inline]
Expand DownExpand Up@@ -63,8 +63,8 @@ fn build_response<'a, T: secp256k1::Signing + secp256k1::Verification>(
) -> Result<UnsignedInvoice<'a>, SemanticError> {
	let entropy_source = Randomness {};
	let paths = vec![
 BlindedPath::new(&[pubkey(43), pubkey(44), pubkey(42)], &entropy_source, secp_ctx).unwrap(),
 BlindedPath::new(&[pubkey(45), pubkey(46), pubkey(42)], &entropy_source, secp_ctx).unwrap(),
 BlindedPath::new_for_message(&[pubkey(43), pubkey(44), pubkey(42)], &entropy_source, secp_ctx).unwrap(),
 BlindedPath::new_for_message(&[pubkey(45), pubkey(46), pubkey(42)], &entropy_source, secp_ctx).unwrap(),
	];

	let payinfo = vec![
Expand Down

45 changes: 20 additions & 25 deletions
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -236,26 +236,21 @@ fn update_scorer<'a, S: 'static + Deref<Target = SC> + Send + Sync, SC: 'a + Wri
	let mut score = scorer.lock();
	match event {
 Event::PaymentPathFailed { ref path, short_channel_id: Some(scid), .. } => {
 let path = path.iter().collect::<Vec<_>>();
 score.payment_path_failed(&path, *scid);
 score.payment_path_failed(path, *scid);
 },
 Event::PaymentPathFailed { ref path, payment_failed_permanently: true, .. } => {
 // Reached if the destination explicitly failed it back. We treat this as a successful probe
 // because the payment made it all the way to the destination with sufficient liquidity.
 let path = path.iter().collect::<Vec<_>>();
 score.probe_successful(&path);
 score.probe_successful(path);
 },
 Event::PaymentPathSuccessful { path, .. } => {
 let path = path.iter().collect::<Vec<_>>();
 score.payment_path_successful(&path);
 score.payment_path_successful(path);
 },
 Event::ProbeSuccessful { path, .. } => {
 let path = path.iter().collect::<Vec<_>>();
 score.probe_successful(&path);
 score.probe_successful(path);
 },
 Event::ProbeFailed { path, short_channel_id: Some(scid), .. } => {
 let path = path.iter().collect::<Vec<_>>();
 score.probe_failed(&path, *scid);
 score.probe_failed(path, *scid);
 },
 _ => {},
	}
Expand DownExpand Up@@ -751,7 +746,7 @@ mod tests {
	use lightning::ln::msgs::{ChannelMessageHandler, Init};
	use lightning::ln::peer_handler::{PeerManager, MessageHandler, SocketDescriptor, IgnoringMessageHandler};
	use lightning::routing::gossip::{NetworkGraph, NodeId, P2PGossipSync};
	use lightning::routing::router::{DefaultRouter, RouteHop};
	use lightning::routing::router::{DefaultRouter, Path, RouteHop};
	use lightning::routing::scoring::{ChannelUsage, Score};
	use lightning::util::config::UserConfig;
	use lightning::util::ser::Writeable;
Expand DownExpand Up@@ -891,10 +886,10 @@ mod tests {

	#[derive(Debug)]
	enum TestResult {
 PaymentFailure { path: Vec<RouteHop>, short_channel_id: u64 },
 PaymentSuccess { path: Vec<RouteHop> },
 ProbeFailure { path: Vec<RouteHop> },
 ProbeSuccess { path: Vec<RouteHop> },
 PaymentFailure { path: Path, short_channel_id: u64 },
 PaymentSuccess { path: Path },
 ProbeFailure { path: Path },
 ProbeSuccess { path: Path },
	}

	impl TestScorer {
Expand All@@ -916,11 +911,11 @@ mod tests {
 &self, _short_channel_id: u64, _source: &NodeId, _target: &NodeId, _usage: ChannelUsage
 ) -> u64 { unimplemented!(); }

 fn payment_path_failed(&mut self, actual_path: &[&RouteHop], actual_short_channel_id: u64) {
 fn payment_path_failed(&mut self, actual_path: &Path, actual_short_channel_id: u64) {
 if let Some(expectations) = &mut self.event_expectations {
 match expectations.pop_front().unwrap() {
 TestResult::PaymentFailure { path, short_channel_id } => {
 assert_eq!(actual_path, &path.iter().collect::<Vec<_>>()[..]);
 assert_eq!(actual_path, &path);
 assert_eq!(actual_short_channel_id, short_channel_id);
 },
 TestResult::PaymentSuccess { path } => {
Expand All@@ -936,14 +931,14 @@ mod tests {
 }
 }

 fn payment_path_successful(&mut self, actual_path: &[&RouteHop]) {
 fn payment_path_successful(&mut self, actual_path: &Path) {
 if let Some(expectations) = &mut self.event_expectations {
 match expectations.pop_front().unwrap() {
 TestResult::PaymentFailure { path, .. } => {
 panic!("Unexpected payment path failure: {:?}", path)
 },
 TestResult::PaymentSuccess { path } => {
 assert_eq!(actual_path, &path.iter().collect::<Vec<_>>()[..]);
 assert_eq!(actual_path, &path);
 },
 TestResult::ProbeFailure { path } => {
 panic!("Unexpected probe failure: {:?}", path)
Expand All@@ -955,7 +950,7 @@ mod tests {
 }
 }

 fn probe_failed(&mut self, actual_path: &[&RouteHop], _: u64) {
 fn probe_failed(&mut self, actual_path: &Path, _: u64) {
 if let Some(expectations) = &mut self.event_expectations {
 match expectations.pop_front().unwrap() {
 TestResult::PaymentFailure { path, .. } => {
Expand All@@ -965,15 +960,15 @@ mod tests {
 panic!("Unexpected payment path success: {:?}", path)
 },
 TestResult::ProbeFailure { path } => {
 assert_eq!(actual_path, &path.iter().collect::<Vec<_>>()[..]);
 assert_eq!(actual_path, &path);
 },
 TestResult::ProbeSuccess { path } => {
 panic!("Unexpected probe success: {:?}", path)
 }
 }
 }
 }
 fn probe_successful(&mut self, actual_path: &[&RouteHop]) {
 fn probe_successful(&mut self, actual_path: &Path) {
 if let Some(expectations) = &mut self.event_expectations {
 match expectations.pop_front().unwrap() {
 TestResult::PaymentFailure { path, .. } => {
Expand All@@ -986,7 +981,7 @@ mod tests {
 panic!("Unexpected probe failure: {:?}", path)
 },
 TestResult::ProbeSuccess { path } => {
 assert_eq!(actual_path, &path.iter().collect::<Vec<_>>()[..]);
 assert_eq!(actual_path, &path);
 }
 }
 }
Expand DownExpand Up@@ -1510,14 +1505,14 @@ mod tests {
 let node_1_privkey = SecretKey::from_slice(&[42; 32]).unwrap();
 let node_1_id = PublicKey::from_secret_key(&secp_ctx, &node_1_privkey);

 let path = vec![RouteHop {
 let path = Path { hops: vec![RouteHop {
 pubkey: node_1_id,
 node_features: NodeFeatures::empty(),
 short_channel_id: scored_scid,
 channel_features: ChannelFeatures::empty(),
 fee_msat: 0,
 cltv_expiry_delta: MIN_CLTV_EXPIRY_DELTA as u32,
 }];
 }], blinded_tail: None };

 $nodes[0].scorer.lock().unwrap().expect(TestResult::PaymentFailure { path: path.clone(), short_channel_id: scored_scid });
 $nodes[0].node.push_pending_event(Event::PaymentPathFailed {
Expand Down

34 changes: 18 additions & 16 deletions
lightning/src/onion_message/blinded_path.rs → lightning/src/blinded_path/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,13 +9,14 @@

//! Creating blinded paths and related utilities live here.

pub(crate) mod utils;

use bitcoin::hashes::{Hash, HashEngine};
use bitcoin::hashes::sha256::Hash as Sha256;
use bitcoin::secp256k1::{self, PublicKey, Scalar, Secp256k1, SecretKey};

use crate::chain::keysinterface::{EntropySource, NodeSigner, Recipient};
use super::packet::ControlTlvs;
use super::utils;
use crate::onion_message::ControlTlvs;
use crate::ln::msgs::DecodeError;
use crate::ln::onion_utils;
use crate::util::chacha20poly1305rfc::{ChaChaPolyReadAdapter, ChaChaPolyWriteAdapter};
Expand All@@ -26,18 +27,18 @@ use core::ops::Deref;
use crate::io::{self, Cursor};
use crate::prelude::*;

/// Onion messages can be sent and received to blinded paths, which serve to hide the identity of
/// the recipient.
#[derive(Clone, Debug, PartialEq)]
/// Onion messages and payments can be sent and received to blinded paths, which serve to hide the
/// identity of the recipient.
#[derive(Clone, Debug, Hash, PartialEq, Eq)]
pub struct BlindedPath {
	/// To send to a blinded path, the sender first finds a route to the unblinded
	/// `introduction_node_id`, which can unblind its [`encrypted_payload`] to find out the onion
	/// message's next hop and forward it along.
	/// message or payment's next hop and forward it along.
	///
	/// [`encrypted_payload`]: BlindedHop::encrypted_payload
	pub(crate) introduction_node_id: PublicKey,
	/// Used by the introduction node to decrypt its [`encrypted_payload`] to forward the onion
	/// message.
	/// message or payment.
	///
	/// [`encrypted_payload`]: BlindedHop::encrypted_payload
	pub(crate) blinding_point: PublicKey,
Expand All@@ -47,7 +48,7 @@ pub struct BlindedPath {

/// Used to construct the blinded hops portion of a blinded path. These hops cannot be identified
/// by outside observers and thus can be used to hide the identity of the recipient.
#[derive(Clone, Debug, PartialEq)]
#[derive(Clone, Debug, Hash, PartialEq, Eq)]
pub struct BlindedHop {
	/// The blinded node id of this hop in a blinded path.
	pub(crate) blinded_node_id: PublicKey,
Expand All@@ -58,12 +59,12 @@ pub struct BlindedHop {
}

impl BlindedPath {
	/// Create a blinded path to be forwarded along `node_pks`. The last node pubkey in `node_pks`
	/// will be the destination node.
	/// Create a blinded path for an onion message, to be forwarded along `node_pks`. The last node
	/// pubkey in `node_pks` will be the destination node.
	///
	/// Errors if less than two hops are provided or if `node_pk`(s) are invalid.
	// TODO: make all payloads the same size with padding + add dummy hops
	pub fn new<ES: EntropySource, T: secp256k1::Signing + secp256k1::Verification>
	pub fn new_for_message<ES: EntropySource, T: secp256k1::Signing + secp256k1::Verification>
 (node_pks: &[PublicKey], entropy_source: &ES, secp_ctx: &Secp256k1<T>) -> Result<Self, ()>
	{
 if node_pks.len() < 2 { return Err(()) }
Expand All@@ -74,12 +75,13 @@ impl BlindedPath {
 Ok(BlindedPath {
 introduction_node_id,
 blinding_point: PublicKey::from_secret_key(secp_ctx, &blinding_secret),
 blinded_hops: blinded_hops(secp_ctx, node_pks, &blinding_secret).map_err(|_| ())?,
 blinded_hops: blinded_message_hops(secp_ctx, node_pks, &blinding_secret).map_err(|_| ())?,
 })
	}

	// Advance the blinded path by one hop, so make the second hop into the new introduction node.
	pub(super) fn advance_by_one<NS: Deref, T: secp256k1::Signing + secp256k1::Verification>
	// Advance the blinded onion message path by one hop, so make the second hop into the new
	// introduction node.
	pub(super) fn advance_message_path_by_one<NS: Deref, T: secp256k1::Signing + secp256k1::Verification>
 (&mut self, node_signer: &NS, secp_ctx: &Secp256k1<T>) -> Result<(), ()>
 where NS::Target: NodeSigner
	{
Expand DownExpand Up@@ -114,8 +116,8 @@ impl BlindedPath {
	}
}

/// Construct blinded hops for the given `unblinded_path`.
fn blinded_hops<T: secp256k1::Signing + secp256k1::Verification>(
/// Construct blinded onion message hops for the given `unblinded_path`.
fn blinded_message_hops<T: secp256k1::Signing + secp256k1::Verification>(
	secp_ctx: &Secp256k1<T>, unblinded_path: &[PublicKey], session_priv: &SecretKey
) -> Result<Vec<BlindedHop>, secp256k1::Error> {
	let mut blinded_hops = Vec::with_capacity(unblinded_path.len());
Expand Down

6 changes: 3 additions & 3 deletions
lightning/src/onion_message/utils.rs → lightning/src/blinded_path/utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,15 +15,15 @@ use bitcoin::hashes::sha256::Hash as Sha256;
use bitcoin::secp256k1::{self, PublicKey, Secp256k1, SecretKey, Scalar};
use bitcoin::secp256k1::ecdh::SharedSecret;

use super::BlindedPath;
use crate::ln::onion_utils;
use super::blinded_path::BlindedPath;
use super::messenger::Destination;
use crate::onion_message::Destination;

use crate::prelude::*;

// TODO: DRY with onion_utils::construct_onion_keys_callback
#[inline]
pub(super) fn construct_keys_callback<T: secp256k1::Signing + secp256k1::Verification,
pub(crate) fn construct_keys_callback<T: secp256k1::Signing + secp256k1::Verification,
	FType: FnMut(PublicKey, SharedSecret, PublicKey, [u8; 32], Option<PublicKey>, Option<Vec<u8>>)>(
	secp_ctx: &Secp256k1<T>, unblinded_path: &[PublicKey], destination: Option<Destination>,
	session_priv: &SecretKey, mut callback: FType
Expand Down
Loading