Add random 'shadow route' CLTV delta offsets to improve privacy.#1286

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
jkczyz merged 1 commit into from
Mar 9, 2022
Merged

Add random 'shadow route' CLTV delta offsets to improve privacy. #1286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions fuzz/src/full_stack.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -459,7 +459,8 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
final_value_msat,
final_cltv_expiry_delta: 42,
};
let route = match find_route(&our_id, &params, &network_graph, None, Arc::clone(&logger), &scorer) {
let random_seed_bytes: [u8; 32] = keys_manager.get_secure_random_bytes();
let route = match find_route(&our_id, &params, &network_graph, None, Arc::clone(&logger), &scorer, &random_seed_bytes) {
Ok(route) => route,
Err(_) => return,
};
Expand All@@ -482,7 +483,8 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
final_value_msat,
final_cltv_expiry_delta: 42,
};
let mut route = match find_route(&our_id, &params, &network_graph, None, Arc::clone(&logger), &scorer) {
let random_seed_bytes: [u8; 32] = keys_manager.get_secure_random_bytes();
let mut route = match find_route(&our_id, &params, &network_graph, None, Arc::clone(&logger), &scorer, &random_seed_bytes) {
Ok(route) => route,
Err(_) => return,
};
Expand Down
3 changes: 2 additions & 1 deletion fuzz/src/router.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -250,6 +250,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
}
}
let scorer = FixedPenaltyScorer::with_penalty(0);
let random_seed_bytes: [u8; 32] = [get_slice!(1)[0]; 32];
for target in node_pks.iter() {
let route_params = RouteParameters {
payment_params: PaymentParameters::from_node_id(*target).with_route_hints(last_hops.clone()),
Expand All@@ -258,7 +259,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
};
let _ = find_route(&our_pubkey, &route_params, &net_graph,
first_hops.map(|c| c.iter().collect::<Vec<_>>()).as_ref().map(|a| a.as_slice()),
Arc::clone(&logger), &scorer);
Arc::clone(&logger), &scorer, &random_seed_bytes);
}
},
}
Expand Down
4 changes: 3 additions & 1 deletion lightning-background-processor/src/lib.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -669,13 +669,15 @@ mod tests {

#[test]
fn test_invoice_payer() {
let keys_manager = test_utils::TestKeysInterface::new(&[0u8; 32], Network::Testnet);
let random_seed_bytes = keys_manager.get_secure_random_bytes();
let nodes = create_nodes(2, "test_invoice_payer".to_string());

// Initiate the background processors to watch each node.
let data_dir = nodes[0].persister.get_data_dir();
let persister = move |node: &ChannelManager<InMemorySigner, Arc<ChainMonitor>, Arc<test_utils::TestBroadcaster>, Arc<KeysManager>, Arc<test_utils::TestFeeEstimator>, Arc<test_utils::TestLogger>>| FilesystemPersister::persist_manager(data_dir.clone(), node);
let router = DefaultRouter::new(Arc::clone(&nodes[0].network_graph), Arc::clone(&nodes[0].logger));
let scorer = Arc::new(Mutex::new(test_utils::TestScorer::with_penalty(0)));
let router = DefaultRouter::new(Arc::clone(&nodes[0].network_graph), Arc::clone(&nodes[0].logger), random_seed_bytes);
let invoice_payer = Arc::new(InvoicePayer::new(Arc::clone(&nodes[0].node), router, scorer, Arc::clone(&nodes[0].logger), |_: &_| {}, RetryAttempts(2)));
let event_handler = Arc::clone(&invoice_payer);
let bg_processor = BackgroundProcessor::start(persister, event_handler, nodes[0].chain_monitor.clone(), nodes[0].node.clone(), nodes[0].net_graph_msg_handler.clone(), nodes[0].peer_manager.clone(), nodes[0].logger.clone());
Expand Down
26 changes: 19 additions & 7 deletions lightning-invoice/src/utils.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ use {CreationError, Currency, DEFAULT_EXPIRY_TIME, Invoice, InvoiceBuilder, Sign
use payment::{Payer, Router};

use bech32::ToBase32;
use bitcoin_hashes::Hash;
use bitcoin_hashes::{Hash, sha256};
use crate::prelude::*;
use lightning::chain;
use lightning::chain::chaininterface::{BroadcasterInterface, FeeEstimator};
Expand All@@ -22,6 +22,7 @@ use secp256k1::key::PublicKey;
use core::convert::TryInto;
use core::ops::Deref;
use core::time::Duration;
use sync::Mutex;

#[cfg(feature = "std")]
/// Utility to create an invoice that can be paid to one of multiple nodes, or a "phantom invoice."
Expand DownExpand Up@@ -224,12 +225,15 @@ where
pub struct DefaultRouter<G: Deref<Target = NetworkGraph>, L: Deref> where L::Target: Logger {
network_graph: G,
logger: L,
random_seed_bytes: Mutex<[u8; 32]>,
}

impl<G: Deref<Target = NetworkGraph>, L: Deref> DefaultRouter<G, L> where L::Target: Logger {
/// Creates a new router using the given [`NetworkGraph`] and [`Logger`].
pub fn new(network_graph: G, logger: L) -> Self {
Self { network_graph, logger }
/// Creates a new router using the given [`NetworkGraph`], a [`Logger`], and a randomness source
/// `random_seed_bytes`.
pub fn new(network_graph: G, logger: L, random_seed_bytes: [u8; 32]) -> Self {
let random_seed_bytes = Mutex::new(random_seed_bytes);
Self { network_graph, logger, random_seed_bytes }
}
}

Expand All@@ -239,7 +243,12 @@ where L::Target: Logger {
&self, payer: &PublicKey, params: &RouteParameters, _payment_hash: &PaymentHash,
first_hops: Option<&[&ChannelDetails]>, scorer: &S
) -> Result<Route, LightningError> {
find_route(payer, params, &*self.network_graph, first_hops, &*self.logger, scorer)
let random_seed_bytes = {
let mut locked_random_seed_bytes = self.random_seed_bytes.lock().unwrap();
*locked_random_seed_bytes = sha256::Hash::hash(&*locked_random_seed_bytes).into_inner();
*locked_random_seed_bytes
};
find_route(payer, params, &*self.network_graph, first_hops, &*self.logger, scorer, &random_seed_bytes)
}
}

Expand DownExpand Up@@ -299,6 +308,7 @@ mod test {
use lightning::util::enforcing_trait_impls::EnforcingSigner;
use lightning::util::events::{MessageSendEvent, MessageSendEventsProvider, Event};
use lightning::util::test_utils;
use lightning::chain::keysinterface::KeysInterface;
use utils::create_invoice_from_channelmanager_and_duration_since_epoch;

#[test]
Expand DownExpand Up@@ -327,9 +337,10 @@ mod test {
let network_graph = node_cfgs[0].network_graph;
let logger = test_utils::TestLogger::new();
let scorer = test_utils::TestScorer::with_penalty(0);
let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
let route = find_route(
&nodes[0].node.get_our_node_id(), &route_params, network_graph,
Some(&first_hops.iter().collect::<Vec<_>>()), &logger, &scorer,
Some(&first_hops.iter().collect::<Vec<_>>()), &logger, &scorer, &random_seed_bytes
).unwrap();

let payment_event = {
Expand DownExpand Up@@ -415,9 +426,10 @@ mod test {
let network_graph = node_cfgs[0].network_graph;
let logger = test_utils::TestLogger::new();
let scorer = test_utils::TestScorer::with_penalty(0);
let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
let route = find_route(
&nodes[0].node.get_our_node_id(), &params, network_graph,
Some(&first_hops.iter().collect::<Vec<_>>()), &logger, &scorer,
Some(&first_hops.iter().collect::<Vec<_>>()), &logger, &scorer, &random_seed_bytes
).unwrap();
let (payment_event, fwd_idx) = {
let mut payment_hash = PaymentHash([0; 32]);
Expand Down
23 changes: 15 additions & 8 deletions lightning/src/ln/channelmanager.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6844,6 +6844,7 @@ mod tests {
use util::errors::APIError;
use util::events::{Event, MessageSendEvent, MessageSendEventsProvider};
use util::test_utils;
use chain::keysinterface::KeysInterface;

#[cfg(feature = "std")]
#[test]
Expand DownExpand Up@@ -7097,6 +7098,7 @@ mod tests {
let nodes = create_network(2, &node_cfgs, &node_chanmgrs);
create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known());
let scorer = test_utils::TestScorer::with_penalty(0);
let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();

// To start (1), send a regular payment but don't claim it.
let expected_route = [&nodes[1]];
Expand All@@ -7110,7 +7112,7 @@ mod tests {
};
let route = find_route(
&nodes[0].node.get_our_node_id(), &route_params, nodes[0].network_graph, None,
nodes[0].logger, &scorer
nodes[0].logger, &scorer, &random_seed_bytes
).unwrap();
nodes[0].node.send_spontaneous_payment(&route, Some(payment_preimage)).unwrap();
check_added_monitors!(nodes[0], 1);
Expand DownExpand Up@@ -7141,7 +7143,7 @@ mod tests {
let payment_preimage = PaymentPreimage([42; 32]);
let route = find_route(
&nodes[0].node.get_our_node_id(), &route_params, nodes[0].network_graph, None,
nodes[0].logger, &scorer
nodes[0].logger, &scorer, &random_seed_bytes
).unwrap();
let (payment_hash, _) = nodes[0].node.send_spontaneous_payment(&route, Some(payment_preimage)).unwrap();
check_added_monitors!(nodes[0], 1);
Expand DownExpand Up@@ -7202,9 +7204,10 @@ mod tests {
let network_graph = nodes[0].network_graph;
let first_hops = nodes[0].node.list_usable_channels();
let scorer = test_utils::TestScorer::with_penalty(0);
let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
let route = find_route(
&payer_pubkey, &route_params, network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
nodes[0].logger, &scorer
nodes[0].logger, &scorer, &random_seed_bytes
).unwrap();

let test_preimage = PaymentPreimage([42; 32]);
Expand DownExpand Up@@ -7245,9 +7248,10 @@ mod tests {
let network_graph = nodes[0].network_graph;
let first_hops = nodes[0].node.list_usable_channels();
let scorer = test_utils::TestScorer::with_penalty(0);
let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
let route = find_route(
&payer_pubkey, &route_params, network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
nodes[0].logger, &scorer
nodes[0].logger, &scorer, &random_seed_bytes
).unwrap();

let test_preimage = PaymentPreimage([42; 32]);
Expand DownExpand Up@@ -7331,7 +7335,7 @@ mod tests {
pub mod bench {
use chain::Listen;
use chain::chainmonitor::{ChainMonitor, Persist};
use chain::keysinterface::{KeysManager, InMemorySigner};
use chain::keysinterface::{KeysManager, KeysInterface, InMemorySigner};
use ln::channelmanager::{BestBlock, ChainParameters, ChannelManager, PaymentHash, PaymentPreimage};
use ln::features::{InitFeatures, InvoiceFeatures};
use ln::functional_test_utils::*;
Expand All@@ -7340,7 +7344,7 @@ pub mod bench {
use routing::router::{PaymentParameters, get_route};
use util::test_utils;
use util::config::UserConfig;
use util::events::{Event, MessageSendEvent, MessageSendEventsProvider, PaymentPurpose};
use util::events::{Event, MessageSendEvent, MessageSendEventsProvider};

use bitcoin::hashes::Hash;
use bitcoin::hashes::sha256::Hash as Sha256;
Expand DownExpand Up@@ -7448,8 +7452,11 @@ pub mod bench {
let payment_params = PaymentParameters::from_node_id($node_b.get_our_node_id())
.with_features(InvoiceFeatures::known());
let scorer = test_utils::TestScorer::with_penalty(0);
let route = get_route(&$node_a.get_our_node_id(), &payment_params, &dummy_graph,
Some(&usable_channels.iter().map(|r| r).collect::<Vec<_>>()), 10_000, TEST_FINAL_CLTV, &logger_a, &scorer).unwrap();
let seed = [3u8; 32];
let keys_manager = KeysManager::new(&seed, 42, 42);
let random_seed_bytes = keys_manager.get_secure_random_bytes();
let route = get_route(&$node_a.get_our_node_id(), &payment_params, &dummy_graph.read_only(),
Some(&usable_channels.iter().map(|r| r).collect::<Vec<_>>()), 10_000, TEST_FINAL_CLTV, &logger_a, &scorer, &random_seed_bytes).unwrap();

let mut payment_preimage = PaymentPreimage([0; 32]);
payment_preimage.0[0..8].copy_from_slice(&payment_count.to_le_bytes());
Expand Down
25 changes: 18 additions & 7 deletions lightning/src/ln/functional_test_utils.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@
//! A bunch of useful utilities for building networks of nodes and exchanging messages between
//! nodes for functional tests.

use chain::{BestBlock, Confirm, Listen, Watch};
use chain::{BestBlock, Confirm, Listen, Watch, keysinterface::KeysInterface};
use chain::channelmonitor::ChannelMonitor;
use chain::transaction::OutPoint;
use ln::{PaymentPreimage, PaymentHash, PaymentSecret};
Expand DownExpand Up@@ -1094,15 +1094,18 @@ macro_rules! get_route_and_payment_hash {
$crate::get_route_and_payment_hash!($send_node, $recv_node, vec![], $recv_value, TEST_FINAL_CLTV)
}};
($send_node: expr, $recv_node: expr, $last_hops: expr, $recv_value: expr, $cltv: expr) => {{
use $crate::chain::keysinterface::KeysInterface;
let (payment_preimage, payment_hash, payment_secret) = $crate::get_payment_preimage_hash!($recv_node, Some($recv_value));
let payment_params = $crate::routing::router::PaymentParameters::from_node_id($recv_node.node.get_our_node_id())
.with_features($crate::ln::features::InvoiceFeatures::known())
.with_route_hints($last_hops);
let scorer = $crate::util::test_utils::TestScorer::with_penalty(0);
let keys_manager = $crate::util::test_utils::TestKeysInterface::new(&[0u8; 32], bitcoin::network::constants::Network::Testnet);
let random_seed_bytes = keys_manager.get_secure_random_bytes();
let route = $crate::routing::router::get_route(
&$send_node.node.get_our_node_id(), &payment_params, $send_node.network_graph,
&$send_node.node.get_our_node_id(), &payment_params, &$send_node.network_graph.read_only(),
Some(&$send_node.node.list_usable_channels().iter().collect::<Vec<_>>()),
$recv_value, $cltv, $send_node.logger, &scorer
$recv_value, $cltv, $send_node.logger, &scorer, &random_seed_bytes
).unwrap();
(route, payment_hash, payment_preimage, payment_secret)
}}
Expand DownExpand Up@@ -1557,11 +1560,15 @@ pub const TEST_FINAL_CLTV: u32 = 70;
pub fn route_payment<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route: &[&Node<'a, 'b, 'c>], recv_value: u64) -> (PaymentPreimage, PaymentHash, PaymentSecret) {
let payment_params = PaymentParameters::from_node_id(expected_route.last().unwrap().node.get_our_node_id())
.with_features(InvoiceFeatures::known());
let network_graph = origin_node.network_graph.read_only();
let scorer = test_utils::TestScorer::with_penalty(0);
let seed = [0u8; 32];
let keys_manager = test_utils::TestKeysInterface::new(&seed, Network::Testnet);
let random_seed_bytes = keys_manager.get_secure_random_bytes();
let route = get_route(
&origin_node.node.get_our_node_id(), &payment_params, &origin_node.network_graph,
&origin_node.node.get_our_node_id(), &payment_params, &network_graph,
Some(&origin_node.node.list_usable_channels().iter().collect::<Vec<_>>()),
recv_value, TEST_FINAL_CLTV, origin_node.logger, &scorer).unwrap();
recv_value, TEST_FINAL_CLTV, origin_node.logger, &scorer, &random_seed_bytes).unwrap();
assert_eq!(route.paths.len(), 1);
assert_eq!(route.paths[0].len(), expected_route.len());
for (node, hop) in expected_route.iter().zip(route.paths[0].iter()) {
Expand All@@ -1575,10 +1582,14 @@ pub fn route_payment<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route:
pub fn route_over_limit<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route: &[&Node<'a, 'b, 'c>], recv_value: u64) {
let payment_params = PaymentParameters::from_node_id(expected_route.last().unwrap().node.get_our_node_id())
.with_features(InvoiceFeatures::known());
let network_graph = origin_node.network_graph.read_only();
let scorer = test_utils::TestScorer::with_penalty(0);
let seed = [0u8; 32];
let keys_manager = test_utils::TestKeysInterface::new(&seed, Network::Testnet);
let random_seed_bytes = keys_manager.get_secure_random_bytes();
let route = get_route(
&origin_node.node.get_our_node_id(), &payment_params, origin_node.network_graph,
None, recv_value, TEST_FINAL_CLTV, origin_node.logger, &scorer).unwrap();
&origin_node.node.get_our_node_id(), &payment_params, &network_graph,
None, recv_value, TEST_FINAL_CLTV, origin_node.logger, &scorer, &random_seed_bytes).unwrap();
assert_eq!(route.paths.len(), 1);
assert_eq!(route.paths[0].len(), expected_route.len());
for (node, hop) in expected_route.iter().zip(route.paths[0].iter()) {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Add random 'shadow route' CLTV delta offsets to improve privacy.#1286

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

jkczyz
merged 1 commit into

from

Mar 9, 2022
 Merged


Add random 'shadow route' CLTV delta offsets to improve privacy.
#1286
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


6 changes: 4 additions & 2 deletions
fuzz/src/full_stack.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -459,7 +459,8 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
 final_value_msat,
 final_cltv_expiry_delta: 42,
 };
 let route = match find_route(&our_id, &params, &network_graph, None, Arc::clone(&logger), &scorer) {
 let random_seed_bytes: [u8; 32] = keys_manager.get_secure_random_bytes();
 let route = match find_route(&our_id, &params, &network_graph, None, Arc::clone(&logger), &scorer, &random_seed_bytes) {
 Ok(route) => route,
 Err(_) => return,
 };
Expand All@@ -482,7 +483,8 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
 final_value_msat,
 final_cltv_expiry_delta: 42,
 };
 let mut route = match find_route(&our_id, &params, &network_graph, None, Arc::clone(&logger), &scorer) {
 let random_seed_bytes: [u8; 32] = keys_manager.get_secure_random_bytes();
 let mut route = match find_route(&our_id, &params, &network_graph, None, Arc::clone(&logger), &scorer, &random_seed_bytes) {
 Ok(route) => route,
 Err(_) => return,
 };
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -250,6 +250,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 }
 }
 let scorer = FixedPenaltyScorer::with_penalty(0);
 let random_seed_bytes: [u8; 32] = [get_slice!(1)[0]; 32];
 for target in node_pks.iter() {
 let route_params = RouteParameters {
 payment_params: PaymentParameters::from_node_id(*target).with_route_hints(last_hops.clone()),
Expand All@@ -258,7 +259,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 };
 let _ = find_route(&our_pubkey, &route_params, &net_graph,
 first_hops.map(|c| c.iter().collect::<Vec<_>>()).as_ref().map(|a| a.as_slice()),
 Arc::clone(&logger), &scorer);
 Arc::clone(&logger), &scorer, &random_seed_bytes);
 }
 },
 }
Expand Down

4 changes: 3 additions & 1 deletion
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -669,13 +669,15 @@ mod tests {

	#[test]
	fn test_invoice_payer() {
 let keys_manager = test_utils::TestKeysInterface::new(&[0u8; 32], Network::Testnet);
 let random_seed_bytes = keys_manager.get_secure_random_bytes();
 let nodes = create_nodes(2, "test_invoice_payer".to_string());

 // Initiate the background processors to watch each node.
 let data_dir = nodes[0].persister.get_data_dir();
 let persister = move |node: &ChannelManager<InMemorySigner, Arc<ChainMonitor>, Arc<test_utils::TestBroadcaster>, Arc<KeysManager>, Arc<test_utils::TestFeeEstimator>, Arc<test_utils::TestLogger>>| FilesystemPersister::persist_manager(data_dir.clone(), node);
 let router = DefaultRouter::new(Arc::clone(&nodes[0].network_graph), Arc::clone(&nodes[0].logger));
 let scorer = Arc::new(Mutex::new(test_utils::TestScorer::with_penalty(0)));
 let router = DefaultRouter::new(Arc::clone(&nodes[0].network_graph), Arc::clone(&nodes[0].logger), random_seed_bytes);
 let invoice_payer = Arc::new(InvoicePayer::new(Arc::clone(&nodes[0].node), router, scorer, Arc::clone(&nodes[0].logger), |_: &_| {}, RetryAttempts(2)));
 let event_handler = Arc::clone(&invoice_payer);
 let bg_processor = BackgroundProcessor::start(persister, event_handler, nodes[0].chain_monitor.clone(), nodes[0].node.clone(), nodes[0].net_graph_msg_handler.clone(), nodes[0].peer_manager.clone(), nodes[0].logger.clone());
Expand Down

26 changes: 19 additions & 7 deletions
lightning-invoice/src/utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ use {CreationError, Currency, DEFAULT_EXPIRY_TIME, Invoice, InvoiceBuilder, Sign
use payment::{Payer, Router};

use bech32::ToBase32;
use bitcoin_hashes::Hash;
use bitcoin_hashes::{Hash, sha256};
use crate::prelude::*;
use lightning::chain;
use lightning::chain::chaininterface::{BroadcasterInterface, FeeEstimator};
Expand All@@ -22,6 +22,7 @@ use secp256k1::key::PublicKey;
use core::convert::TryInto;
use core::ops::Deref;
use core::time::Duration;
use sync::Mutex;

#[cfg(feature = "std")]
/// Utility to create an invoice that can be paid to one of multiple nodes, or a "phantom invoice."
Expand DownExpand Up@@ -224,12 +225,15 @@ where
pub struct DefaultRouter<G: Deref<Target = NetworkGraph>, L: Deref> where L::Target: Logger {
	network_graph: G,
	logger: L,
	random_seed_bytes: Mutex<[u8; 32]>,
}

impl<G: Deref<Target = NetworkGraph>, L: Deref> DefaultRouter<G, L> where L::Target: Logger {
	/// Creates a new router using the given [`NetworkGraph`] and [`Logger`].
	pub fn new(network_graph: G, logger: L) -> Self {
 Self { network_graph, logger }
	/// Creates a new router using the given [`NetworkGraph`], a [`Logger`], and a randomness source
	/// `random_seed_bytes`.
	pub fn new(network_graph: G, logger: L, random_seed_bytes: [u8; 32]) -> Self {
 let random_seed_bytes = Mutex::new(random_seed_bytes);
 Self { network_graph, logger, random_seed_bytes }
	}
}

Expand All@@ -239,7 +243,12 @@ where L::Target: Logger {
 &self, payer: &PublicKey, params: &RouteParameters, _payment_hash: &PaymentHash,
 first_hops: Option<&[&ChannelDetails]>, scorer: &S
	) -> Result<Route, LightningError> {
 find_route(payer, params, &*self.network_graph, first_hops, &*self.logger, scorer)
 let random_seed_bytes = {
 let mut locked_random_seed_bytes = self.random_seed_bytes.lock().unwrap();
 *locked_random_seed_bytes = sha256::Hash::hash(&*locked_random_seed_bytes).into_inner();
 *locked_random_seed_bytes
 };
 find_route(payer, params, &*self.network_graph, first_hops, &*self.logger, scorer, &random_seed_bytes)
	}
}

Expand DownExpand Up@@ -299,6 +308,7 @@ mod test {
	use lightning::util::enforcing_trait_impls::EnforcingSigner;
	use lightning::util::events::{MessageSendEvent, MessageSendEventsProvider, Event};
	use lightning::util::test_utils;
	use lightning::chain::keysinterface::KeysInterface;
	use utils::create_invoice_from_channelmanager_and_duration_since_epoch;

	#[test]
Expand DownExpand Up@@ -327,9 +337,10 @@ mod test {
 let network_graph = node_cfgs[0].network_graph;
 let logger = test_utils::TestLogger::new();
 let scorer = test_utils::TestScorer::with_penalty(0);
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
 let route = find_route(
 &nodes[0].node.get_our_node_id(), &route_params, network_graph,
 Some(&first_hops.iter().collect::<Vec<_>>()), &logger, &scorer,
 Some(&first_hops.iter().collect::<Vec<_>>()), &logger, &scorer, &random_seed_bytes
 ).unwrap();

 let payment_event = {
Expand DownExpand Up@@ -415,9 +426,10 @@ mod test {
 let network_graph = node_cfgs[0].network_graph;
 let logger = test_utils::TestLogger::new();
 let scorer = test_utils::TestScorer::with_penalty(0);
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
 let route = find_route(
 &nodes[0].node.get_our_node_id(), &params, network_graph,
 Some(&first_hops.iter().collect::<Vec<_>>()), &logger, &scorer,
 Some(&first_hops.iter().collect::<Vec<_>>()), &logger, &scorer, &random_seed_bytes
 ).unwrap();
 let (payment_event, fwd_idx) = {
 let mut payment_hash = PaymentHash([0; 32]);
Expand Down

23 changes: 15 additions & 8 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6844,6 +6844,7 @@ mod tests {
	use util::errors::APIError;
	use util::events::{Event, MessageSendEvent, MessageSendEventsProvider};
	use util::test_utils;
	use chain::keysinterface::KeysInterface;

	#[cfg(feature = "std")]
	#[test]
Expand DownExpand Up@@ -7097,6 +7098,7 @@ mod tests {
 let nodes = create_network(2, &node_cfgs, &node_chanmgrs);
 create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known());
 let scorer = test_utils::TestScorer::with_penalty(0);
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();

 // To start (1), send a regular payment but don't claim it.
 let expected_route = [&nodes[1]];
Expand All@@ -7110,7 +7112,7 @@ mod tests {
 };
 let route = find_route(
 &nodes[0].node.get_our_node_id(), &route_params, nodes[0].network_graph, None,
 nodes[0].logger, &scorer
 nodes[0].logger, &scorer, &random_seed_bytes
 ).unwrap();
 nodes[0].node.send_spontaneous_payment(&route, Some(payment_preimage)).unwrap();
 check_added_monitors!(nodes[0], 1);
Expand DownExpand Up@@ -7141,7 +7143,7 @@ mod tests {
 let payment_preimage = PaymentPreimage([42; 32]);
 let route = find_route(
 &nodes[0].node.get_our_node_id(), &route_params, nodes[0].network_graph, None,
 nodes[0].logger, &scorer
 nodes[0].logger, &scorer, &random_seed_bytes
 ).unwrap();
 let (payment_hash, _) = nodes[0].node.send_spontaneous_payment(&route, Some(payment_preimage)).unwrap();
 check_added_monitors!(nodes[0], 1);
Expand DownExpand Up@@ -7202,9 +7204,10 @@ mod tests {
 let network_graph = nodes[0].network_graph;
 let first_hops = nodes[0].node.list_usable_channels();
 let scorer = test_utils::TestScorer::with_penalty(0);
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
 let route = find_route(
 &payer_pubkey, &route_params, network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
 nodes[0].logger, &scorer
 nodes[0].logger, &scorer, &random_seed_bytes
 ).unwrap();

 let test_preimage = PaymentPreimage([42; 32]);
Expand DownExpand Up@@ -7245,9 +7248,10 @@ mod tests {
 let network_graph = nodes[0].network_graph;
 let first_hops = nodes[0].node.list_usable_channels();
 let scorer = test_utils::TestScorer::with_penalty(0);
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
 let route = find_route(
 &payer_pubkey, &route_params, network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
 nodes[0].logger, &scorer
 nodes[0].logger, &scorer, &random_seed_bytes
 ).unwrap();

 let test_preimage = PaymentPreimage([42; 32]);
Expand DownExpand Up@@ -7331,7 +7335,7 @@ mod tests {
pub mod bench {
	use chain::Listen;
	use chain::chainmonitor::{ChainMonitor, Persist};
	use chain::keysinterface::{KeysManager, InMemorySigner};
	use chain::keysinterface::{KeysManager, KeysInterface, InMemorySigner};
	use ln::channelmanager::{BestBlock, ChainParameters, ChannelManager, PaymentHash, PaymentPreimage};
	use ln::features::{InitFeatures, InvoiceFeatures};
	use ln::functional_test_utils::*;
Expand All@@ -7340,7 +7344,7 @@ pub mod bench {
	use routing::router::{PaymentParameters, get_route};
	use util::test_utils;
	use util::config::UserConfig;
	use util::events::{Event, MessageSendEvent, MessageSendEventsProvider, PaymentPurpose};
	use util::events::{Event, MessageSendEvent, MessageSendEventsProvider};

	use bitcoin::hashes::Hash;
	use bitcoin::hashes::sha256::Hash as Sha256;
Expand DownExpand Up@@ -7448,8 +7452,11 @@ pub mod bench {
 let payment_params = PaymentParameters::from_node_id($node_b.get_our_node_id())
 .with_features(InvoiceFeatures::known());
 let scorer = test_utils::TestScorer::with_penalty(0);
 let route = get_route(&$node_a.get_our_node_id(), &payment_params, &dummy_graph,
 Some(&usable_channels.iter().map(|r| r).collect::<Vec<_>>()), 10_000, TEST_FINAL_CLTV, &logger_a, &scorer).unwrap();
 let seed = [3u8; 32];
 let keys_manager = KeysManager::new(&seed, 42, 42);
 let random_seed_bytes = keys_manager.get_secure_random_bytes();
 let route = get_route(&$node_a.get_our_node_id(), &payment_params, &dummy_graph.read_only(),
 Some(&usable_channels.iter().map(|r| r).collect::<Vec<_>>()), 10_000, TEST_FINAL_CLTV, &logger_a, &scorer, &random_seed_bytes).unwrap();

 let mut payment_preimage = PaymentPreimage([0; 32]);
 payment_preimage.0[0..8].copy_from_slice(&payment_count.to_le_bytes());
Expand Down

25 changes: 18 additions & 7 deletions
lightning/src/ln/functional_test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@
//! A bunch of useful utilities for building networks of nodes and exchanging messages between
//! nodes for functional tests.

use chain::{BestBlock, Confirm, Listen, Watch};
use chain::{BestBlock, Confirm, Listen, Watch, keysinterface::KeysInterface};
use chain::channelmonitor::ChannelMonitor;
use chain::transaction::OutPoint;
use ln::{PaymentPreimage, PaymentHash, PaymentSecret};
Expand DownExpand Up@@ -1094,15 +1094,18 @@ macro_rules! get_route_and_payment_hash {
 $crate::get_route_and_payment_hash!($send_node, $recv_node, vec![], $recv_value, TEST_FINAL_CLTV)
	}};
	($send_node: expr, $recv_node: expr, $last_hops: expr, $recv_value: expr, $cltv: expr) => {{
 use $crate::chain::keysinterface::KeysInterface;
 let (payment_preimage, payment_hash, payment_secret) = $crate::get_payment_preimage_hash!($recv_node, Some($recv_value));
 let payment_params = $crate::routing::router::PaymentParameters::from_node_id($recv_node.node.get_our_node_id())
 .with_features($crate::ln::features::InvoiceFeatures::known())
 .with_route_hints($last_hops);
 let scorer = $crate::util::test_utils::TestScorer::with_penalty(0);
 let keys_manager = $crate::util::test_utils::TestKeysInterface::new(&[0u8; 32], bitcoin::network::constants::Network::Testnet);
 let random_seed_bytes = keys_manager.get_secure_random_bytes();
 let route = $crate::routing::router::get_route(
 &$send_node.node.get_our_node_id(), &payment_params, $send_node.network_graph,
 &$send_node.node.get_our_node_id(), &payment_params, &$send_node.network_graph.read_only(),
 Some(&$send_node.node.list_usable_channels().iter().collect::<Vec<_>>()),
 $recv_value, $cltv, $send_node.logger, &scorer
 $recv_value, $cltv, $send_node.logger, &scorer, &random_seed_bytes
 ).unwrap();
 (route, payment_hash, payment_preimage, payment_secret)
	}}
Expand DownExpand Up@@ -1557,11 +1560,15 @@ pub const TEST_FINAL_CLTV: u32 = 70;
pub fn route_payment<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route: &[&Node<'a, 'b, 'c>], recv_value: u64) -> (PaymentPreimage, PaymentHash, PaymentSecret) {
	let payment_params = PaymentParameters::from_node_id(expected_route.last().unwrap().node.get_our_node_id())
 .with_features(InvoiceFeatures::known());
	let network_graph = origin_node.network_graph.read_only();
	let scorer = test_utils::TestScorer::with_penalty(0);
	let seed = [0u8; 32];
	let keys_manager = test_utils::TestKeysInterface::new(&seed, Network::Testnet);
	let random_seed_bytes = keys_manager.get_secure_random_bytes();
	let route = get_route(
 &origin_node.node.get_our_node_id(), &payment_params, &origin_node.network_graph,
 &origin_node.node.get_our_node_id(), &payment_params, &network_graph,
 Some(&origin_node.node.list_usable_channels().iter().collect::<Vec<_>>()),
 recv_value, TEST_FINAL_CLTV, origin_node.logger, &scorer).unwrap();
 recv_value, TEST_FINAL_CLTV, origin_node.logger, &scorer, &random_seed_bytes).unwrap();
	assert_eq!(route.paths.len(), 1);
	assert_eq!(route.paths[0].len(), expected_route.len());
	for (node, hop) in expected_route.iter().zip(route.paths[0].iter()) {
Expand All@@ -1575,10 +1582,14 @@ pub fn route_payment<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route:
pub fn route_over_limit<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route: &[&Node<'a, 'b, 'c>], recv_value: u64) {
	let payment_params = PaymentParameters::from_node_id(expected_route.last().unwrap().node.get_our_node_id())
 .with_features(InvoiceFeatures::known());
	let network_graph = origin_node.network_graph.read_only();
	let scorer = test_utils::TestScorer::with_penalty(0);
	let seed = [0u8; 32];
	let keys_manager = test_utils::TestKeysInterface::new(&seed, Network::Testnet);
	let random_seed_bytes = keys_manager.get_secure_random_bytes();
	let route = get_route(
 &origin_node.node.get_our_node_id(), &payment_params, origin_node.network_graph,
 None, recv_value, TEST_FINAL_CLTV, origin_node.logger, &scorer).unwrap();
 &origin_node.node.get_our_node_id(), &payment_params, &network_graph,
 None, recv_value, TEST_FINAL_CLTV, origin_node.logger, &scorer, &random_seed_bytes).unwrap();
	assert_eq!(route.paths.len(), 1);
	assert_eq!(route.paths[0].len(), expected_route.len());
	for (node, hop) in expected_route.iter().zip(route.paths[0].iter()) {
Expand Down
Loading

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

Skip to content
Add random 'shadow route' CLTV delta offsets to improve privacy.#1286

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

jkczyz
merged 1 commit into

from

Mar 9, 2022
 Merged


Add random 'shadow route' CLTV delta offsets to improve privacy.
#1286
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


6 changes: 4 additions & 2 deletions
fuzz/src/full_stack.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -459,7 +459,8 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
 final_value_msat,
 final_cltv_expiry_delta: 42,
 };
 let route = match find_route(&our_id, &params, &network_graph, None, Arc::clone(&logger), &scorer) {
 let random_seed_bytes: [u8; 32] = keys_manager.get_secure_random_bytes();
 let route = match find_route(&our_id, &params, &network_graph, None, Arc::clone(&logger), &scorer, &random_seed_bytes) {
 Ok(route) => route,
 Err(_) => return,
 };
Expand All@@ -482,7 +483,8 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
 final_value_msat,
 final_cltv_expiry_delta: 42,
 };
 let mut route = match find_route(&our_id, &params, &network_graph, None, Arc::clone(&logger), &scorer) {
 let random_seed_bytes: [u8; 32] = keys_manager.get_secure_random_bytes();
 let mut route = match find_route(&our_id, &params, &network_graph, None, Arc::clone(&logger), &scorer, &random_seed_bytes) {
 Ok(route) => route,
 Err(_) => return,
 };
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -250,6 +250,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 }
 }
 let scorer = FixedPenaltyScorer::with_penalty(0);
 let random_seed_bytes: [u8; 32] = [get_slice!(1)[0]; 32];
 for target in node_pks.iter() {
 let route_params = RouteParameters {
 payment_params: PaymentParameters::from_node_id(*target).with_route_hints(last_hops.clone()),
Expand All@@ -258,7 +259,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 };
 let _ = find_route(&our_pubkey, &route_params, &net_graph,
 first_hops.map(|c| c.iter().collect::<Vec<_>>()).as_ref().map(|a| a.as_slice()),
 Arc::clone(&logger), &scorer);
 Arc::clone(&logger), &scorer, &random_seed_bytes);
 }
 },
 }
Expand Down

4 changes: 3 additions & 1 deletion
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -669,13 +669,15 @@ mod tests {

	#[test]
	fn test_invoice_payer() {
 let keys_manager = test_utils::TestKeysInterface::new(&[0u8; 32], Network::Testnet);
 let random_seed_bytes = keys_manager.get_secure_random_bytes();
 let nodes = create_nodes(2, "test_invoice_payer".to_string());

 // Initiate the background processors to watch each node.
 let data_dir = nodes[0].persister.get_data_dir();
 let persister = move |node: &ChannelManager<InMemorySigner, Arc<ChainMonitor>, Arc<test_utils::TestBroadcaster>, Arc<KeysManager>, Arc<test_utils::TestFeeEstimator>, Arc<test_utils::TestLogger>>| FilesystemPersister::persist_manager(data_dir.clone(), node);
 let router = DefaultRouter::new(Arc::clone(&nodes[0].network_graph), Arc::clone(&nodes[0].logger));
 let scorer = Arc::new(Mutex::new(test_utils::TestScorer::with_penalty(0)));
 let router = DefaultRouter::new(Arc::clone(&nodes[0].network_graph), Arc::clone(&nodes[0].logger), random_seed_bytes);
 let invoice_payer = Arc::new(InvoicePayer::new(Arc::clone(&nodes[0].node), router, scorer, Arc::clone(&nodes[0].logger), |_: &_| {}, RetryAttempts(2)));
 let event_handler = Arc::clone(&invoice_payer);
 let bg_processor = BackgroundProcessor::start(persister, event_handler, nodes[0].chain_monitor.clone(), nodes[0].node.clone(), nodes[0].net_graph_msg_handler.clone(), nodes[0].peer_manager.clone(), nodes[0].logger.clone());
Expand Down

26 changes: 19 additions & 7 deletions
lightning-invoice/src/utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ use {CreationError, Currency, DEFAULT_EXPIRY_TIME, Invoice, InvoiceBuilder, Sign
use payment::{Payer, Router};

use bech32::ToBase32;
use bitcoin_hashes::Hash;
use bitcoin_hashes::{Hash, sha256};
use crate::prelude::*;
use lightning::chain;
use lightning::chain::chaininterface::{BroadcasterInterface, FeeEstimator};
Expand All@@ -22,6 +22,7 @@ use secp256k1::key::PublicKey;
use core::convert::TryInto;
use core::ops::Deref;
use core::time::Duration;
use sync::Mutex;

#[cfg(feature = "std")]
/// Utility to create an invoice that can be paid to one of multiple nodes, or a "phantom invoice."
Expand DownExpand Up@@ -224,12 +225,15 @@ where
pub struct DefaultRouter<G: Deref<Target = NetworkGraph>, L: Deref> where L::Target: Logger {
	network_graph: G,
	logger: L,
	random_seed_bytes: Mutex<[u8; 32]>,
}

impl<G: Deref<Target = NetworkGraph>, L: Deref> DefaultRouter<G, L> where L::Target: Logger {
	/// Creates a new router using the given [`NetworkGraph`] and [`Logger`].
	pub fn new(network_graph: G, logger: L) -> Self {
 Self { network_graph, logger }
	/// Creates a new router using the given [`NetworkGraph`], a [`Logger`], and a randomness source
	/// `random_seed_bytes`.
	pub fn new(network_graph: G, logger: L, random_seed_bytes: [u8; 32]) -> Self {
 let random_seed_bytes = Mutex::new(random_seed_bytes);
 Self { network_graph, logger, random_seed_bytes }
	}
}

Expand All@@ -239,7 +243,12 @@ where L::Target: Logger {
 &self, payer: &PublicKey, params: &RouteParameters, _payment_hash: &PaymentHash,
 first_hops: Option<&[&ChannelDetails]>, scorer: &S
	) -> Result<Route, LightningError> {
 find_route(payer, params, &*self.network_graph, first_hops, &*self.logger, scorer)
 let random_seed_bytes = {
 let mut locked_random_seed_bytes = self.random_seed_bytes.lock().unwrap();
 *locked_random_seed_bytes = sha256::Hash::hash(&*locked_random_seed_bytes).into_inner();
 *locked_random_seed_bytes
 };
 find_route(payer, params, &*self.network_graph, first_hops, &*self.logger, scorer, &random_seed_bytes)
	}
}

Expand DownExpand Up@@ -299,6 +308,7 @@ mod test {
	use lightning::util::enforcing_trait_impls::EnforcingSigner;
	use lightning::util::events::{MessageSendEvent, MessageSendEventsProvider, Event};
	use lightning::util::test_utils;
	use lightning::chain::keysinterface::KeysInterface;
	use utils::create_invoice_from_channelmanager_and_duration_since_epoch;

	#[test]
Expand DownExpand Up@@ -327,9 +337,10 @@ mod test {
 let network_graph = node_cfgs[0].network_graph;
 let logger = test_utils::TestLogger::new();
 let scorer = test_utils::TestScorer::with_penalty(0);
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
 let route = find_route(
 &nodes[0].node.get_our_node_id(), &route_params, network_graph,
 Some(&first_hops.iter().collect::<Vec<_>>()), &logger, &scorer,
 Some(&first_hops.iter().collect::<Vec<_>>()), &logger, &scorer, &random_seed_bytes
 ).unwrap();

 let payment_event = {
Expand DownExpand Up@@ -415,9 +426,10 @@ mod test {
 let network_graph = node_cfgs[0].network_graph;
 let logger = test_utils::TestLogger::new();
 let scorer = test_utils::TestScorer::with_penalty(0);
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
 let route = find_route(
 &nodes[0].node.get_our_node_id(), &params, network_graph,
 Some(&first_hops.iter().collect::<Vec<_>>()), &logger, &scorer,
 Some(&first_hops.iter().collect::<Vec<_>>()), &logger, &scorer, &random_seed_bytes
 ).unwrap();
 let (payment_event, fwd_idx) = {
 let mut payment_hash = PaymentHash([0; 32]);
Expand Down

23 changes: 15 additions & 8 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6844,6 +6844,7 @@ mod tests {
	use util::errors::APIError;
	use util::events::{Event, MessageSendEvent, MessageSendEventsProvider};
	use util::test_utils;
	use chain::keysinterface::KeysInterface;

	#[cfg(feature = "std")]
	#[test]
Expand DownExpand Up@@ -7097,6 +7098,7 @@ mod tests {
 let nodes = create_network(2, &node_cfgs, &node_chanmgrs);
 create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known());
 let scorer = test_utils::TestScorer::with_penalty(0);
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();

 // To start (1), send a regular payment but don't claim it.
 let expected_route = [&nodes[1]];
Expand All@@ -7110,7 +7112,7 @@ mod tests {
 };
 let route = find_route(
 &nodes[0].node.get_our_node_id(), &route_params, nodes[0].network_graph, None,
 nodes[0].logger, &scorer
 nodes[0].logger, &scorer, &random_seed_bytes
 ).unwrap();
 nodes[0].node.send_spontaneous_payment(&route, Some(payment_preimage)).unwrap();
 check_added_monitors!(nodes[0], 1);
Expand DownExpand Up@@ -7141,7 +7143,7 @@ mod tests {
 let payment_preimage = PaymentPreimage([42; 32]);
 let route = find_route(
 &nodes[0].node.get_our_node_id(), &route_params, nodes[0].network_graph, None,
 nodes[0].logger, &scorer
 nodes[0].logger, &scorer, &random_seed_bytes
 ).unwrap();
 let (payment_hash, _) = nodes[0].node.send_spontaneous_payment(&route, Some(payment_preimage)).unwrap();
 check_added_monitors!(nodes[0], 1);
Expand DownExpand Up@@ -7202,9 +7204,10 @@ mod tests {
 let network_graph = nodes[0].network_graph;
 let first_hops = nodes[0].node.list_usable_channels();
 let scorer = test_utils::TestScorer::with_penalty(0);
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
 let route = find_route(
 &payer_pubkey, &route_params, network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
 nodes[0].logger, &scorer
 nodes[0].logger, &scorer, &random_seed_bytes
 ).unwrap();

 let test_preimage = PaymentPreimage([42; 32]);
Expand DownExpand Up@@ -7245,9 +7248,10 @@ mod tests {
 let network_graph = nodes[0].network_graph;
 let first_hops = nodes[0].node.list_usable_channels();
 let scorer = test_utils::TestScorer::with_penalty(0);
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
 let route = find_route(
 &payer_pubkey, &route_params, network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
 nodes[0].logger, &scorer
 nodes[0].logger, &scorer, &random_seed_bytes
 ).unwrap();

 let test_preimage = PaymentPreimage([42; 32]);
Expand DownExpand Up@@ -7331,7 +7335,7 @@ mod tests {
pub mod bench {
	use chain::Listen;
	use chain::chainmonitor::{ChainMonitor, Persist};
	use chain::keysinterface::{KeysManager, InMemorySigner};
	use chain::keysinterface::{KeysManager, KeysInterface, InMemorySigner};
	use ln::channelmanager::{BestBlock, ChainParameters, ChannelManager, PaymentHash, PaymentPreimage};
	use ln::features::{InitFeatures, InvoiceFeatures};
	use ln::functional_test_utils::*;
Expand All@@ -7340,7 +7344,7 @@ pub mod bench {
	use routing::router::{PaymentParameters, get_route};
	use util::test_utils;
	use util::config::UserConfig;
	use util::events::{Event, MessageSendEvent, MessageSendEventsProvider, PaymentPurpose};
	use util::events::{Event, MessageSendEvent, MessageSendEventsProvider};

	use bitcoin::hashes::Hash;
	use bitcoin::hashes::sha256::Hash as Sha256;
Expand DownExpand Up@@ -7448,8 +7452,11 @@ pub mod bench {
 let payment_params = PaymentParameters::from_node_id($node_b.get_our_node_id())
 .with_features(InvoiceFeatures::known());
 let scorer = test_utils::TestScorer::with_penalty(0);
 let route = get_route(&$node_a.get_our_node_id(), &payment_params, &dummy_graph,
 Some(&usable_channels.iter().map(|r| r).collect::<Vec<_>>()), 10_000, TEST_FINAL_CLTV, &logger_a, &scorer).unwrap();
 let seed = [3u8; 32];
 let keys_manager = KeysManager::new(&seed, 42, 42);
 let random_seed_bytes = keys_manager.get_secure_random_bytes();
 let route = get_route(&$node_a.get_our_node_id(), &payment_params, &dummy_graph.read_only(),
 Some(&usable_channels.iter().map(|r| r).collect::<Vec<_>>()), 10_000, TEST_FINAL_CLTV, &logger_a, &scorer, &random_seed_bytes).unwrap();

 let mut payment_preimage = PaymentPreimage([0; 32]);
 payment_preimage.0[0..8].copy_from_slice(&payment_count.to_le_bytes());
Expand Down

25 changes: 18 additions & 7 deletions
lightning/src/ln/functional_test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@
//! A bunch of useful utilities for building networks of nodes and exchanging messages between
//! nodes for functional tests.

use chain::{BestBlock, Confirm, Listen, Watch};
use chain::{BestBlock, Confirm, Listen, Watch, keysinterface::KeysInterface};
use chain::channelmonitor::ChannelMonitor;
use chain::transaction::OutPoint;
use ln::{PaymentPreimage, PaymentHash, PaymentSecret};
Expand DownExpand Up@@ -1094,15 +1094,18 @@ macro_rules! get_route_and_payment_hash {
 $crate::get_route_and_payment_hash!($send_node, $recv_node, vec![], $recv_value, TEST_FINAL_CLTV)
	}};
	($send_node: expr, $recv_node: expr, $last_hops: expr, $recv_value: expr, $cltv: expr) => {{
 use $crate::chain::keysinterface::KeysInterface;
 let (payment_preimage, payment_hash, payment_secret) = $crate::get_payment_preimage_hash!($recv_node, Some($recv_value));
 let payment_params = $crate::routing::router::PaymentParameters::from_node_id($recv_node.node.get_our_node_id())
 .with_features($crate::ln::features::InvoiceFeatures::known())
 .with_route_hints($last_hops);
 let scorer = $crate::util::test_utils::TestScorer::with_penalty(0);
 let keys_manager = $crate::util::test_utils::TestKeysInterface::new(&[0u8; 32], bitcoin::network::constants::Network::Testnet);
 let random_seed_bytes = keys_manager.get_secure_random_bytes();
 let route = $crate::routing::router::get_route(
 &$send_node.node.get_our_node_id(), &payment_params, $send_node.network_graph,
 &$send_node.node.get_our_node_id(), &payment_params, &$send_node.network_graph.read_only(),
 Some(&$send_node.node.list_usable_channels().iter().collect::<Vec<_>>()),
 $recv_value, $cltv, $send_node.logger, &scorer
 $recv_value, $cltv, $send_node.logger, &scorer, &random_seed_bytes
 ).unwrap();
 (route, payment_hash, payment_preimage, payment_secret)
	}}
Expand DownExpand Up@@ -1557,11 +1560,15 @@ pub const TEST_FINAL_CLTV: u32 = 70;
pub fn route_payment<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route: &[&Node<'a, 'b, 'c>], recv_value: u64) -> (PaymentPreimage, PaymentHash, PaymentSecret) {
	let payment_params = PaymentParameters::from_node_id(expected_route.last().unwrap().node.get_our_node_id())
 .with_features(InvoiceFeatures::known());
	let network_graph = origin_node.network_graph.read_only();
	let scorer = test_utils::TestScorer::with_penalty(0);
	let seed = [0u8; 32];
	let keys_manager = test_utils::TestKeysInterface::new(&seed, Network::Testnet);
	let random_seed_bytes = keys_manager.get_secure_random_bytes();
	let route = get_route(
 &origin_node.node.get_our_node_id(), &payment_params, &origin_node.network_graph,
 &origin_node.node.get_our_node_id(), &payment_params, &network_graph,
 Some(&origin_node.node.list_usable_channels().iter().collect::<Vec<_>>()),
 recv_value, TEST_FINAL_CLTV, origin_node.logger, &scorer).unwrap();
 recv_value, TEST_FINAL_CLTV, origin_node.logger, &scorer, &random_seed_bytes).unwrap();
	assert_eq!(route.paths.len(), 1);
	assert_eq!(route.paths[0].len(), expected_route.len());
	for (node, hop) in expected_route.iter().zip(route.paths[0].iter()) {
Expand All@@ -1575,10 +1582,14 @@ pub fn route_payment<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route:
pub fn route_over_limit<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route: &[&Node<'a, 'b, 'c>], recv_value: u64) {
	let payment_params = PaymentParameters::from_node_id(expected_route.last().unwrap().node.get_our_node_id())
 .with_features(InvoiceFeatures::known());
	let network_graph = origin_node.network_graph.read_only();
	let scorer = test_utils::TestScorer::with_penalty(0);
	let seed = [0u8; 32];
	let keys_manager = test_utils::TestKeysInterface::new(&seed, Network::Testnet);
	let random_seed_bytes = keys_manager.get_secure_random_bytes();
	let route = get_route(
 &origin_node.node.get_our_node_id(), &payment_params, origin_node.network_graph,
 None, recv_value, TEST_FINAL_CLTV, origin_node.logger, &scorer).unwrap();
 &origin_node.node.get_our_node_id(), &payment_params, &network_graph,
 None, recv_value, TEST_FINAL_CLTV, origin_node.logger, &scorer, &random_seed_bytes).unwrap();
	assert_eq!(route.paths.len(), 1);
	assert_eq!(route.paths[0].len(), expected_route.len());
	for (node, hop) in expected_route.iter().zip(route.paths[0].iter()) {
Expand Down
Loading

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

Skip to content
Add random 'shadow route' CLTV delta offsets to improve privacy.#1286

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

jkczyz
merged 1 commit into

from

Mar 9, 2022
 Merged


Add random 'shadow route' CLTV delta offsets to improve privacy.
#1286
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


6 changes: 4 additions & 2 deletions
fuzz/src/full_stack.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -459,7 +459,8 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
 final_value_msat,
 final_cltv_expiry_delta: 42,
 };
 let route = match find_route(&our_id, &params, &network_graph, None, Arc::clone(&logger), &scorer) {
 let random_seed_bytes: [u8; 32] = keys_manager.get_secure_random_bytes();
 let route = match find_route(&our_id, &params, &network_graph, None, Arc::clone(&logger), &scorer, &random_seed_bytes) {
 Ok(route) => route,
 Err(_) => return,
 };
Expand All@@ -482,7 +483,8 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
 final_value_msat,
 final_cltv_expiry_delta: 42,
 };
 let mut route = match find_route(&our_id, &params, &network_graph, None, Arc::clone(&logger), &scorer) {
 let random_seed_bytes: [u8; 32] = keys_manager.get_secure_random_bytes();
 let mut route = match find_route(&our_id, &params, &network_graph, None, Arc::clone(&logger), &scorer, &random_seed_bytes) {
 Ok(route) => route,
 Err(_) => return,
 };
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -250,6 +250,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 }
 }
 let scorer = FixedPenaltyScorer::with_penalty(0);
 let random_seed_bytes: [u8; 32] = [get_slice!(1)[0]; 32];
 for target in node_pks.iter() {
 let route_params = RouteParameters {
 payment_params: PaymentParameters::from_node_id(*target).with_route_hints(last_hops.clone()),
Expand All@@ -258,7 +259,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 };
 let _ = find_route(&our_pubkey, &route_params, &net_graph,
 first_hops.map(|c| c.iter().collect::<Vec<_>>()).as_ref().map(|a| a.as_slice()),
 Arc::clone(&logger), &scorer);
 Arc::clone(&logger), &scorer, &random_seed_bytes);
 }
 },
 }
Expand Down

4 changes: 3 additions & 1 deletion
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -669,13 +669,15 @@ mod tests {

	#[test]
	fn test_invoice_payer() {
 let keys_manager = test_utils::TestKeysInterface::new(&[0u8; 32], Network::Testnet);
 let random_seed_bytes = keys_manager.get_secure_random_bytes();
 let nodes = create_nodes(2, "test_invoice_payer".to_string());

 // Initiate the background processors to watch each node.
 let data_dir = nodes[0].persister.get_data_dir();
 let persister = move |node: &ChannelManager<InMemorySigner, Arc<ChainMonitor>, Arc<test_utils::TestBroadcaster>, Arc<KeysManager>, Arc<test_utils::TestFeeEstimator>, Arc<test_utils::TestLogger>>| FilesystemPersister::persist_manager(data_dir.clone(), node);
 let router = DefaultRouter::new(Arc::clone(&nodes[0].network_graph), Arc::clone(&nodes[0].logger));
 let scorer = Arc::new(Mutex::new(test_utils::TestScorer::with_penalty(0)));
 let router = DefaultRouter::new(Arc::clone(&nodes[0].network_graph), Arc::clone(&nodes[0].logger), random_seed_bytes);
 let invoice_payer = Arc::new(InvoicePayer::new(Arc::clone(&nodes[0].node), router, scorer, Arc::clone(&nodes[0].logger), |_: &_| {}, RetryAttempts(2)));
 let event_handler = Arc::clone(&invoice_payer);
 let bg_processor = BackgroundProcessor::start(persister, event_handler, nodes[0].chain_monitor.clone(), nodes[0].node.clone(), nodes[0].net_graph_msg_handler.clone(), nodes[0].peer_manager.clone(), nodes[0].logger.clone());
Expand Down

26 changes: 19 additions & 7 deletions
lightning-invoice/src/utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ use {CreationError, Currency, DEFAULT_EXPIRY_TIME, Invoice, InvoiceBuilder, Sign
use payment::{Payer, Router};

use bech32::ToBase32;
use bitcoin_hashes::Hash;
use bitcoin_hashes::{Hash, sha256};
use crate::prelude::*;
use lightning::chain;
use lightning::chain::chaininterface::{BroadcasterInterface, FeeEstimator};
Expand All@@ -22,6 +22,7 @@ use secp256k1::key::PublicKey;
use core::convert::TryInto;
use core::ops::Deref;
use core::time::Duration;
use sync::Mutex;

#[cfg(feature = "std")]
/// Utility to create an invoice that can be paid to one of multiple nodes, or a "phantom invoice."
Expand DownExpand Up@@ -224,12 +225,15 @@ where
pub struct DefaultRouter<G: Deref<Target = NetworkGraph>, L: Deref> where L::Target: Logger {
	network_graph: G,
	logger: L,
	random_seed_bytes: Mutex<[u8; 32]>,
}

impl<G: Deref<Target = NetworkGraph>, L: Deref> DefaultRouter<G, L> where L::Target: Logger {
	/// Creates a new router using the given [`NetworkGraph`] and [`Logger`].
	pub fn new(network_graph: G, logger: L) -> Self {
 Self { network_graph, logger }
	/// Creates a new router using the given [`NetworkGraph`], a [`Logger`], and a randomness source
	/// `random_seed_bytes`.
	pub fn new(network_graph: G, logger: L, random_seed_bytes: [u8; 32]) -> Self {
 let random_seed_bytes = Mutex::new(random_seed_bytes);
 Self { network_graph, logger, random_seed_bytes }
	}
}

Expand All@@ -239,7 +243,12 @@ where L::Target: Logger {
 &self, payer: &PublicKey, params: &RouteParameters, _payment_hash: &PaymentHash,
 first_hops: Option<&[&ChannelDetails]>, scorer: &S
	) -> Result<Route, LightningError> {
 find_route(payer, params, &*self.network_graph, first_hops, &*self.logger, scorer)
 let random_seed_bytes = {
 let mut locked_random_seed_bytes = self.random_seed_bytes.lock().unwrap();
 *locked_random_seed_bytes = sha256::Hash::hash(&*locked_random_seed_bytes).into_inner();
 *locked_random_seed_bytes
 };
 find_route(payer, params, &*self.network_graph, first_hops, &*self.logger, scorer, &random_seed_bytes)
	}
}

Expand DownExpand Up@@ -299,6 +308,7 @@ mod test {
	use lightning::util::enforcing_trait_impls::EnforcingSigner;
	use lightning::util::events::{MessageSendEvent, MessageSendEventsProvider, Event};
	use lightning::util::test_utils;
	use lightning::chain::keysinterface::KeysInterface;
	use utils::create_invoice_from_channelmanager_and_duration_since_epoch;

	#[test]
Expand DownExpand Up@@ -327,9 +337,10 @@ mod test {
 let network_graph = node_cfgs[0].network_graph;
 let logger = test_utils::TestLogger::new();
 let scorer = test_utils::TestScorer::with_penalty(0);
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
 let route = find_route(
 &nodes[0].node.get_our_node_id(), &route_params, network_graph,
 Some(&first_hops.iter().collect::<Vec<_>>()), &logger, &scorer,
 Some(&first_hops.iter().collect::<Vec<_>>()), &logger, &scorer, &random_seed_bytes
 ).unwrap();

 let payment_event = {
Expand DownExpand Up@@ -415,9 +426,10 @@ mod test {
 let network_graph = node_cfgs[0].network_graph;
 let logger = test_utils::TestLogger::new();
 let scorer = test_utils::TestScorer::with_penalty(0);
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
 let route = find_route(
 &nodes[0].node.get_our_node_id(), &params, network_graph,
 Some(&first_hops.iter().collect::<Vec<_>>()), &logger, &scorer,
 Some(&first_hops.iter().collect::<Vec<_>>()), &logger, &scorer, &random_seed_bytes
 ).unwrap();
 let (payment_event, fwd_idx) = {
 let mut payment_hash = PaymentHash([0; 32]);
Expand Down

23 changes: 15 additions & 8 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6844,6 +6844,7 @@ mod tests {
	use util::errors::APIError;
	use util::events::{Event, MessageSendEvent, MessageSendEventsProvider};
	use util::test_utils;
	use chain::keysinterface::KeysInterface;

	#[cfg(feature = "std")]
	#[test]
Expand DownExpand Up@@ -7097,6 +7098,7 @@ mod tests {
 let nodes = create_network(2, &node_cfgs, &node_chanmgrs);
 create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known());
 let scorer = test_utils::TestScorer::with_penalty(0);
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();

 // To start (1), send a regular payment but don't claim it.
 let expected_route = [&nodes[1]];
Expand All@@ -7110,7 +7112,7 @@ mod tests {
 };
 let route = find_route(
 &nodes[0].node.get_our_node_id(), &route_params, nodes[0].network_graph, None,
 nodes[0].logger, &scorer
 nodes[0].logger, &scorer, &random_seed_bytes
 ).unwrap();
 nodes[0].node.send_spontaneous_payment(&route, Some(payment_preimage)).unwrap();
 check_added_monitors!(nodes[0], 1);
Expand DownExpand Up@@ -7141,7 +7143,7 @@ mod tests {
 let payment_preimage = PaymentPreimage([42; 32]);
 let route = find_route(
 &nodes[0].node.get_our_node_id(), &route_params, nodes[0].network_graph, None,
 nodes[0].logger, &scorer
 nodes[0].logger, &scorer, &random_seed_bytes
 ).unwrap();
 let (payment_hash, _) = nodes[0].node.send_spontaneous_payment(&route, Some(payment_preimage)).unwrap();
 check_added_monitors!(nodes[0], 1);
Expand DownExpand Up@@ -7202,9 +7204,10 @@ mod tests {
 let network_graph = nodes[0].network_graph;
 let first_hops = nodes[0].node.list_usable_channels();
 let scorer = test_utils::TestScorer::with_penalty(0);
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
 let route = find_route(
 &payer_pubkey, &route_params, network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
 nodes[0].logger, &scorer
 nodes[0].logger, &scorer, &random_seed_bytes
 ).unwrap();

 let test_preimage = PaymentPreimage([42; 32]);
Expand DownExpand Up@@ -7245,9 +7248,10 @@ mod tests {
 let network_graph = nodes[0].network_graph;
 let first_hops = nodes[0].node.list_usable_channels();
 let scorer = test_utils::TestScorer::with_penalty(0);
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
 let route = find_route(
 &payer_pubkey, &route_params, network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
 nodes[0].logger, &scorer
 nodes[0].logger, &scorer, &random_seed_bytes
 ).unwrap();

 let test_preimage = PaymentPreimage([42; 32]);
Expand DownExpand Up@@ -7331,7 +7335,7 @@ mod tests {
pub mod bench {
	use chain::Listen;
	use chain::chainmonitor::{ChainMonitor, Persist};
	use chain::keysinterface::{KeysManager, InMemorySigner};
	use chain::keysinterface::{KeysManager, KeysInterface, InMemorySigner};
	use ln::channelmanager::{BestBlock, ChainParameters, ChannelManager, PaymentHash, PaymentPreimage};
	use ln::features::{InitFeatures, InvoiceFeatures};
	use ln::functional_test_utils::*;
Expand All@@ -7340,7 +7344,7 @@ pub mod bench {
	use routing::router::{PaymentParameters, get_route};
	use util::test_utils;
	use util::config::UserConfig;
	use util::events::{Event, MessageSendEvent, MessageSendEventsProvider, PaymentPurpose};
	use util::events::{Event, MessageSendEvent, MessageSendEventsProvider};

	use bitcoin::hashes::Hash;
	use bitcoin::hashes::sha256::Hash as Sha256;
Expand DownExpand Up@@ -7448,8 +7452,11 @@ pub mod bench {
 let payment_params = PaymentParameters::from_node_id($node_b.get_our_node_id())
 .with_features(InvoiceFeatures::known());
 let scorer = test_utils::TestScorer::with_penalty(0);
 let route = get_route(&$node_a.get_our_node_id(), &payment_params, &dummy_graph,
 Some(&usable_channels.iter().map(|r| r).collect::<Vec<_>>()), 10_000, TEST_FINAL_CLTV, &logger_a, &scorer).unwrap();
 let seed = [3u8; 32];
 let keys_manager = KeysManager::new(&seed, 42, 42);
 let random_seed_bytes = keys_manager.get_secure_random_bytes();
 let route = get_route(&$node_a.get_our_node_id(), &payment_params, &dummy_graph.read_only(),
 Some(&usable_channels.iter().map(|r| r).collect::<Vec<_>>()), 10_000, TEST_FINAL_CLTV, &logger_a, &scorer, &random_seed_bytes).unwrap();

 let mut payment_preimage = PaymentPreimage([0; 32]);
 payment_preimage.0[0..8].copy_from_slice(&payment_count.to_le_bytes());
Expand Down

25 changes: 18 additions & 7 deletions
lightning/src/ln/functional_test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@
//! A bunch of useful utilities for building networks of nodes and exchanging messages between
//! nodes for functional tests.

use chain::{BestBlock, Confirm, Listen, Watch};
use chain::{BestBlock, Confirm, Listen, Watch, keysinterface::KeysInterface};
use chain::channelmonitor::ChannelMonitor;
use chain::transaction::OutPoint;
use ln::{PaymentPreimage, PaymentHash, PaymentSecret};
Expand DownExpand Up@@ -1094,15 +1094,18 @@ macro_rules! get_route_and_payment_hash {
 $crate::get_route_and_payment_hash!($send_node, $recv_node, vec![], $recv_value, TEST_FINAL_CLTV)
	}};
	($send_node: expr, $recv_node: expr, $last_hops: expr, $recv_value: expr, $cltv: expr) => {{
 use $crate::chain::keysinterface::KeysInterface;
 let (payment_preimage, payment_hash, payment_secret) = $crate::get_payment_preimage_hash!($recv_node, Some($recv_value));
 let payment_params = $crate::routing::router::PaymentParameters::from_node_id($recv_node.node.get_our_node_id())
 .with_features($crate::ln::features::InvoiceFeatures::known())
 .with_route_hints($last_hops);
 let scorer = $crate::util::test_utils::TestScorer::with_penalty(0);
 let keys_manager = $crate::util::test_utils::TestKeysInterface::new(&[0u8; 32], bitcoin::network::constants::Network::Testnet);
 let random_seed_bytes = keys_manager.get_secure_random_bytes();
 let route = $crate::routing::router::get_route(
 &$send_node.node.get_our_node_id(), &payment_params, $send_node.network_graph,
 &$send_node.node.get_our_node_id(), &payment_params, &$send_node.network_graph.read_only(),
 Some(&$send_node.node.list_usable_channels().iter().collect::<Vec<_>>()),
 $recv_value, $cltv, $send_node.logger, &scorer
 $recv_value, $cltv, $send_node.logger, &scorer, &random_seed_bytes
 ).unwrap();
 (route, payment_hash, payment_preimage, payment_secret)
	}}
Expand DownExpand Up@@ -1557,11 +1560,15 @@ pub const TEST_FINAL_CLTV: u32 = 70;
pub fn route_payment<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route: &[&Node<'a, 'b, 'c>], recv_value: u64) -> (PaymentPreimage, PaymentHash, PaymentSecret) {
	let payment_params = PaymentParameters::from_node_id(expected_route.last().unwrap().node.get_our_node_id())
 .with_features(InvoiceFeatures::known());
	let network_graph = origin_node.network_graph.read_only();
	let scorer = test_utils::TestScorer::with_penalty(0);
	let seed = [0u8; 32];
	let keys_manager = test_utils::TestKeysInterface::new(&seed, Network::Testnet);
	let random_seed_bytes = keys_manager.get_secure_random_bytes();
	let route = get_route(
 &origin_node.node.get_our_node_id(), &payment_params, &origin_node.network_graph,
 &origin_node.node.get_our_node_id(), &payment_params, &network_graph,
 Some(&origin_node.node.list_usable_channels().iter().collect::<Vec<_>>()),
 recv_value, TEST_FINAL_CLTV, origin_node.logger, &scorer).unwrap();
 recv_value, TEST_FINAL_CLTV, origin_node.logger, &scorer, &random_seed_bytes).unwrap();
	assert_eq!(route.paths.len(), 1);
	assert_eq!(route.paths[0].len(), expected_route.len());
	for (node, hop) in expected_route.iter().zip(route.paths[0].iter()) {
Expand All@@ -1575,10 +1582,14 @@ pub fn route_payment<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route:
pub fn route_over_limit<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route: &[&Node<'a, 'b, 'c>], recv_value: u64) {
	let payment_params = PaymentParameters::from_node_id(expected_route.last().unwrap().node.get_our_node_id())
 .with_features(InvoiceFeatures::known());
	let network_graph = origin_node.network_graph.read_only();
	let scorer = test_utils::TestScorer::with_penalty(0);
	let seed = [0u8; 32];
	let keys_manager = test_utils::TestKeysInterface::new(&seed, Network::Testnet);
	let random_seed_bytes = keys_manager.get_secure_random_bytes();
	let route = get_route(
 &origin_node.node.get_our_node_id(), &payment_params, origin_node.network_graph,
 None, recv_value, TEST_FINAL_CLTV, origin_node.logger, &scorer).unwrap();
 &origin_node.node.get_our_node_id(), &payment_params, &network_graph,
 None, recv_value, TEST_FINAL_CLTV, origin_node.logger, &scorer, &random_seed_bytes).unwrap();
	assert_eq!(route.paths.len(), 1);
	assert_eq!(route.paths[0].len(), expected_route.len());
	for (node, hop) in expected_route.iter().zip(route.paths[0].iter()) {
Expand Down
Loading

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

Skip to content
Add random 'shadow route' CLTV delta offsets to improve privacy.#1286

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

jkczyz
merged 1 commit into

from

Mar 9, 2022
 Merged


Add random 'shadow route' CLTV delta offsets to improve privacy.
#1286
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


6 changes: 4 additions & 2 deletions
fuzz/src/full_stack.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -459,7 +459,8 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
 final_value_msat,
 final_cltv_expiry_delta: 42,
 };
 let route = match find_route(&our_id, &params, &network_graph, None, Arc::clone(&logger), &scorer) {
 let random_seed_bytes: [u8; 32] = keys_manager.get_secure_random_bytes();
 let route = match find_route(&our_id, &params, &network_graph, None, Arc::clone(&logger), &scorer, &random_seed_bytes) {
 Ok(route) => route,
 Err(_) => return,
 };
Expand All@@ -482,7 +483,8 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
 final_value_msat,
 final_cltv_expiry_delta: 42,
 };
 let mut route = match find_route(&our_id, &params, &network_graph, None, Arc::clone(&logger), &scorer) {
 let random_seed_bytes: [u8; 32] = keys_manager.get_secure_random_bytes();
 let mut route = match find_route(&our_id, &params, &network_graph, None, Arc::clone(&logger), &scorer, &random_seed_bytes) {
 Ok(route) => route,
 Err(_) => return,
 };
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -250,6 +250,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 }
 }
 let scorer = FixedPenaltyScorer::with_penalty(0);
 let random_seed_bytes: [u8; 32] = [get_slice!(1)[0]; 32];
 for target in node_pks.iter() {
 let route_params = RouteParameters {
 payment_params: PaymentParameters::from_node_id(*target).with_route_hints(last_hops.clone()),
Expand All@@ -258,7 +259,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 };
 let _ = find_route(&our_pubkey, &route_params, &net_graph,
 first_hops.map(|c| c.iter().collect::<Vec<_>>()).as_ref().map(|a| a.as_slice()),
 Arc::clone(&logger), &scorer);
 Arc::clone(&logger), &scorer, &random_seed_bytes);
 }
 },
 }
Expand Down

4 changes: 3 additions & 1 deletion
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -669,13 +669,15 @@ mod tests {

	#[test]
	fn test_invoice_payer() {
 let keys_manager = test_utils::TestKeysInterface::new(&[0u8; 32], Network::Testnet);
 let random_seed_bytes = keys_manager.get_secure_random_bytes();
 let nodes = create_nodes(2, "test_invoice_payer".to_string());

 // Initiate the background processors to watch each node.
 let data_dir = nodes[0].persister.get_data_dir();
 let persister = move |node: &ChannelManager<InMemorySigner, Arc<ChainMonitor>, Arc<test_utils::TestBroadcaster>, Arc<KeysManager>, Arc<test_utils::TestFeeEstimator>, Arc<test_utils::TestLogger>>| FilesystemPersister::persist_manager(data_dir.clone(), node);
 let router = DefaultRouter::new(Arc::clone(&nodes[0].network_graph), Arc::clone(&nodes[0].logger));
 let scorer = Arc::new(Mutex::new(test_utils::TestScorer::with_penalty(0)));
 let router = DefaultRouter::new(Arc::clone(&nodes[0].network_graph), Arc::clone(&nodes[0].logger), random_seed_bytes);
 let invoice_payer = Arc::new(InvoicePayer::new(Arc::clone(&nodes[0].node), router, scorer, Arc::clone(&nodes[0].logger), |_: &_| {}, RetryAttempts(2)));
 let event_handler = Arc::clone(&invoice_payer);
 let bg_processor = BackgroundProcessor::start(persister, event_handler, nodes[0].chain_monitor.clone(), nodes[0].node.clone(), nodes[0].net_graph_msg_handler.clone(), nodes[0].peer_manager.clone(), nodes[0].logger.clone());
Expand Down

26 changes: 19 additions & 7 deletions
lightning-invoice/src/utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ use {CreationError, Currency, DEFAULT_EXPIRY_TIME, Invoice, InvoiceBuilder, Sign
use payment::{Payer, Router};

use bech32::ToBase32;
use bitcoin_hashes::Hash;
use bitcoin_hashes::{Hash, sha256};
use crate::prelude::*;
use lightning::chain;
use lightning::chain::chaininterface::{BroadcasterInterface, FeeEstimator};
Expand All@@ -22,6 +22,7 @@ use secp256k1::key::PublicKey;
use core::convert::TryInto;
use core::ops::Deref;
use core::time::Duration;
use sync::Mutex;

#[cfg(feature = "std")]
/// Utility to create an invoice that can be paid to one of multiple nodes, or a "phantom invoice."
Expand DownExpand Up@@ -224,12 +225,15 @@ where
pub struct DefaultRouter<G: Deref<Target = NetworkGraph>, L: Deref> where L::Target: Logger {
	network_graph: G,
	logger: L,
	random_seed_bytes: Mutex<[u8; 32]>,
}

impl<G: Deref<Target = NetworkGraph>, L: Deref> DefaultRouter<G, L> where L::Target: Logger {
	/// Creates a new router using the given [`NetworkGraph`] and [`Logger`].
	pub fn new(network_graph: G, logger: L) -> Self {
 Self { network_graph, logger }
	/// Creates a new router using the given [`NetworkGraph`], a [`Logger`], and a randomness source
	/// `random_seed_bytes`.
	pub fn new(network_graph: G, logger: L, random_seed_bytes: [u8; 32]) -> Self {
 let random_seed_bytes = Mutex::new(random_seed_bytes);
 Self { network_graph, logger, random_seed_bytes }
	}
}

Expand All@@ -239,7 +243,12 @@ where L::Target: Logger {
 &self, payer: &PublicKey, params: &RouteParameters, _payment_hash: &PaymentHash,
 first_hops: Option<&[&ChannelDetails]>, scorer: &S
	) -> Result<Route, LightningError> {
 find_route(payer, params, &*self.network_graph, first_hops, &*self.logger, scorer)
 let random_seed_bytes = {
 let mut locked_random_seed_bytes = self.random_seed_bytes.lock().unwrap();
 *locked_random_seed_bytes = sha256::Hash::hash(&*locked_random_seed_bytes).into_inner();
 *locked_random_seed_bytes
 };
 find_route(payer, params, &*self.network_graph, first_hops, &*self.logger, scorer, &random_seed_bytes)
	}
}

Expand DownExpand Up@@ -299,6 +308,7 @@ mod test {
	use lightning::util::enforcing_trait_impls::EnforcingSigner;
	use lightning::util::events::{MessageSendEvent, MessageSendEventsProvider, Event};
	use lightning::util::test_utils;
	use lightning::chain::keysinterface::KeysInterface;
	use utils::create_invoice_from_channelmanager_and_duration_since_epoch;

	#[test]
Expand DownExpand Up@@ -327,9 +337,10 @@ mod test {
 let network_graph = node_cfgs[0].network_graph;
 let logger = test_utils::TestLogger::new();
 let scorer = test_utils::TestScorer::with_penalty(0);
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
 let route = find_route(
 &nodes[0].node.get_our_node_id(), &route_params, network_graph,
 Some(&first_hops.iter().collect::<Vec<_>>()), &logger, &scorer,
 Some(&first_hops.iter().collect::<Vec<_>>()), &logger, &scorer, &random_seed_bytes
 ).unwrap();

 let payment_event = {
Expand DownExpand Up@@ -415,9 +426,10 @@ mod test {
 let network_graph = node_cfgs[0].network_graph;
 let logger = test_utils::TestLogger::new();
 let scorer = test_utils::TestScorer::with_penalty(0);
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
 let route = find_route(
 &nodes[0].node.get_our_node_id(), &params, network_graph,
 Some(&first_hops.iter().collect::<Vec<_>>()), &logger, &scorer,
 Some(&first_hops.iter().collect::<Vec<_>>()), &logger, &scorer, &random_seed_bytes
 ).unwrap();
 let (payment_event, fwd_idx) = {
 let mut payment_hash = PaymentHash([0; 32]);
Expand Down

23 changes: 15 additions & 8 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6844,6 +6844,7 @@ mod tests {
	use util::errors::APIError;
	use util::events::{Event, MessageSendEvent, MessageSendEventsProvider};
	use util::test_utils;
	use chain::keysinterface::KeysInterface;

	#[cfg(feature = "std")]
	#[test]
Expand DownExpand Up@@ -7097,6 +7098,7 @@ mod tests {
 let nodes = create_network(2, &node_cfgs, &node_chanmgrs);
 create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known());
 let scorer = test_utils::TestScorer::with_penalty(0);
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();

 // To start (1), send a regular payment but don't claim it.
 let expected_route = [&nodes[1]];
Expand All@@ -7110,7 +7112,7 @@ mod tests {
 };
 let route = find_route(
 &nodes[0].node.get_our_node_id(), &route_params, nodes[0].network_graph, None,
 nodes[0].logger, &scorer
 nodes[0].logger, &scorer, &random_seed_bytes
 ).unwrap();
 nodes[0].node.send_spontaneous_payment(&route, Some(payment_preimage)).unwrap();
 check_added_monitors!(nodes[0], 1);
Expand DownExpand Up@@ -7141,7 +7143,7 @@ mod tests {
 let payment_preimage = PaymentPreimage([42; 32]);
 let route = find_route(
 &nodes[0].node.get_our_node_id(), &route_params, nodes[0].network_graph, None,
 nodes[0].logger, &scorer
 nodes[0].logger, &scorer, &random_seed_bytes
 ).unwrap();
 let (payment_hash, _) = nodes[0].node.send_spontaneous_payment(&route, Some(payment_preimage)).unwrap();
 check_added_monitors!(nodes[0], 1);
Expand DownExpand Up@@ -7202,9 +7204,10 @@ mod tests {
 let network_graph = nodes[0].network_graph;
 let first_hops = nodes[0].node.list_usable_channels();
 let scorer = test_utils::TestScorer::with_penalty(0);
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
 let route = find_route(
 &payer_pubkey, &route_params, network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
 nodes[0].logger, &scorer
 nodes[0].logger, &scorer, &random_seed_bytes
 ).unwrap();

 let test_preimage = PaymentPreimage([42; 32]);
Expand DownExpand Up@@ -7245,9 +7248,10 @@ mod tests {
 let network_graph = nodes[0].network_graph;
 let first_hops = nodes[0].node.list_usable_channels();
 let scorer = test_utils::TestScorer::with_penalty(0);
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
 let route = find_route(
 &payer_pubkey, &route_params, network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
 nodes[0].logger, &scorer
 nodes[0].logger, &scorer, &random_seed_bytes
 ).unwrap();

 let test_preimage = PaymentPreimage([42; 32]);
Expand DownExpand Up@@ -7331,7 +7335,7 @@ mod tests {
pub mod bench {
	use chain::Listen;
	use chain::chainmonitor::{ChainMonitor, Persist};
	use chain::keysinterface::{KeysManager, InMemorySigner};
	use chain::keysinterface::{KeysManager, KeysInterface, InMemorySigner};
	use ln::channelmanager::{BestBlock, ChainParameters, ChannelManager, PaymentHash, PaymentPreimage};
	use ln::features::{InitFeatures, InvoiceFeatures};
	use ln::functional_test_utils::*;
Expand All@@ -7340,7 +7344,7 @@ pub mod bench {
	use routing::router::{PaymentParameters, get_route};
	use util::test_utils;
	use util::config::UserConfig;
	use util::events::{Event, MessageSendEvent, MessageSendEventsProvider, PaymentPurpose};
	use util::events::{Event, MessageSendEvent, MessageSendEventsProvider};

	use bitcoin::hashes::Hash;
	use bitcoin::hashes::sha256::Hash as Sha256;
Expand DownExpand Up@@ -7448,8 +7452,11 @@ pub mod bench {
 let payment_params = PaymentParameters::from_node_id($node_b.get_our_node_id())
 .with_features(InvoiceFeatures::known());
 let scorer = test_utils::TestScorer::with_penalty(0);
 let route = get_route(&$node_a.get_our_node_id(), &payment_params, &dummy_graph,
 Some(&usable_channels.iter().map(|r| r).collect::<Vec<_>>()), 10_000, TEST_FINAL_CLTV, &logger_a, &scorer).unwrap();
 let seed = [3u8; 32];
 let keys_manager = KeysManager::new(&seed, 42, 42);
 let random_seed_bytes = keys_manager.get_secure_random_bytes();
 let route = get_route(&$node_a.get_our_node_id(), &payment_params, &dummy_graph.read_only(),
 Some(&usable_channels.iter().map(|r| r).collect::<Vec<_>>()), 10_000, TEST_FINAL_CLTV, &logger_a, &scorer, &random_seed_bytes).unwrap();

 let mut payment_preimage = PaymentPreimage([0; 32]);
 payment_preimage.0[0..8].copy_from_slice(&payment_count.to_le_bytes());
Expand Down

25 changes: 18 additions & 7 deletions
lightning/src/ln/functional_test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@
//! A bunch of useful utilities for building networks of nodes and exchanging messages between
//! nodes for functional tests.

use chain::{BestBlock, Confirm, Listen, Watch};
use chain::{BestBlock, Confirm, Listen, Watch, keysinterface::KeysInterface};
use chain::channelmonitor::ChannelMonitor;
use chain::transaction::OutPoint;
use ln::{PaymentPreimage, PaymentHash, PaymentSecret};
Expand DownExpand Up@@ -1094,15 +1094,18 @@ macro_rules! get_route_and_payment_hash {
 $crate::get_route_and_payment_hash!($send_node, $recv_node, vec![], $recv_value, TEST_FINAL_CLTV)
	}};
	($send_node: expr, $recv_node: expr, $last_hops: expr, $recv_value: expr, $cltv: expr) => {{
 use $crate::chain::keysinterface::KeysInterface;
 let (payment_preimage, payment_hash, payment_secret) = $crate::get_payment_preimage_hash!($recv_node, Some($recv_value));
 let payment_params = $crate::routing::router::PaymentParameters::from_node_id($recv_node.node.get_our_node_id())
 .with_features($crate::ln::features::InvoiceFeatures::known())
 .with_route_hints($last_hops);
 let scorer = $crate::util::test_utils::TestScorer::with_penalty(0);
 let keys_manager = $crate::util::test_utils::TestKeysInterface::new(&[0u8; 32], bitcoin::network::constants::Network::Testnet);
 let random_seed_bytes = keys_manager.get_secure_random_bytes();
 let route = $crate::routing::router::get_route(
 &$send_node.node.get_our_node_id(), &payment_params, $send_node.network_graph,
 &$send_node.node.get_our_node_id(), &payment_params, &$send_node.network_graph.read_only(),
 Some(&$send_node.node.list_usable_channels().iter().collect::<Vec<_>>()),
 $recv_value, $cltv, $send_node.logger, &scorer
 $recv_value, $cltv, $send_node.logger, &scorer, &random_seed_bytes
 ).unwrap();
 (route, payment_hash, payment_preimage, payment_secret)
	}}
Expand DownExpand Up@@ -1557,11 +1560,15 @@ pub const TEST_FINAL_CLTV: u32 = 70;
pub fn route_payment<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route: &[&Node<'a, 'b, 'c>], recv_value: u64) -> (PaymentPreimage, PaymentHash, PaymentSecret) {
	let payment_params = PaymentParameters::from_node_id(expected_route.last().unwrap().node.get_our_node_id())
 .with_features(InvoiceFeatures::known());
	let network_graph = origin_node.network_graph.read_only();
	let scorer = test_utils::TestScorer::with_penalty(0);
	let seed = [0u8; 32];
	let keys_manager = test_utils::TestKeysInterface::new(&seed, Network::Testnet);
	let random_seed_bytes = keys_manager.get_secure_random_bytes();
	let route = get_route(
 &origin_node.node.get_our_node_id(), &payment_params, &origin_node.network_graph,
 &origin_node.node.get_our_node_id(), &payment_params, &network_graph,
 Some(&origin_node.node.list_usable_channels().iter().collect::<Vec<_>>()),
 recv_value, TEST_FINAL_CLTV, origin_node.logger, &scorer).unwrap();
 recv_value, TEST_FINAL_CLTV, origin_node.logger, &scorer, &random_seed_bytes).unwrap();
	assert_eq!(route.paths.len(), 1);
	assert_eq!(route.paths[0].len(), expected_route.len());
	for (node, hop) in expected_route.iter().zip(route.paths[0].iter()) {
Expand All@@ -1575,10 +1582,14 @@ pub fn route_payment<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route:
pub fn route_over_limit<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route: &[&Node<'a, 'b, 'c>], recv_value: u64) {
	let payment_params = PaymentParameters::from_node_id(expected_route.last().unwrap().node.get_our_node_id())
 .with_features(InvoiceFeatures::known());
	let network_graph = origin_node.network_graph.read_only();
	let scorer = test_utils::TestScorer::with_penalty(0);
	let seed = [0u8; 32];
	let keys_manager = test_utils::TestKeysInterface::new(&seed, Network::Testnet);
	let random_seed_bytes = keys_manager.get_secure_random_bytes();
	let route = get_route(
 &origin_node.node.get_our_node_id(), &payment_params, origin_node.network_graph,
 None, recv_value, TEST_FINAL_CLTV, origin_node.logger, &scorer).unwrap();
 &origin_node.node.get_our_node_id(), &payment_params, &network_graph,
 None, recv_value, TEST_FINAL_CLTV, origin_node.logger, &scorer, &random_seed_bytes).unwrap();
	assert_eq!(route.paths.len(), 1);
	assert_eq!(route.paths[0].len(), expected_route.len());
	for (node, hop) in expected_route.iter().zip(route.paths[0].iter()) {
Expand Down
Loading

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

Skip to content
Add random 'shadow route' CLTV delta offsets to improve privacy.#1286

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

jkczyz
merged 1 commit into

from

Mar 9, 2022
 Merged


Add random 'shadow route' CLTV delta offsets to improve privacy.
#1286
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


6 changes: 4 additions & 2 deletions
fuzz/src/full_stack.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -459,7 +459,8 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
 final_value_msat,
 final_cltv_expiry_delta: 42,
 };
 let route = match find_route(&our_id, &params, &network_graph, None, Arc::clone(&logger), &scorer) {
 let random_seed_bytes: [u8; 32] = keys_manager.get_secure_random_bytes();
 let route = match find_route(&our_id, &params, &network_graph, None, Arc::clone(&logger), &scorer, &random_seed_bytes) {
 Ok(route) => route,
 Err(_) => return,
 };
Expand All@@ -482,7 +483,8 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
 final_value_msat,
 final_cltv_expiry_delta: 42,
 };
 let mut route = match find_route(&our_id, &params, &network_graph, None, Arc::clone(&logger), &scorer) {
 let random_seed_bytes: [u8; 32] = keys_manager.get_secure_random_bytes();
 let mut route = match find_route(&our_id, &params, &network_graph, None, Arc::clone(&logger), &scorer, &random_seed_bytes) {
 Ok(route) => route,
 Err(_) => return,
 };
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -250,6 +250,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 }
 }
 let scorer = FixedPenaltyScorer::with_penalty(0);
 let random_seed_bytes: [u8; 32] = [get_slice!(1)[0]; 32];
 for target in node_pks.iter() {
 let route_params = RouteParameters {
 payment_params: PaymentParameters::from_node_id(*target).with_route_hints(last_hops.clone()),
Expand All@@ -258,7 +259,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 };
 let _ = find_route(&our_pubkey, &route_params, &net_graph,
 first_hops.map(|c| c.iter().collect::<Vec<_>>()).as_ref().map(|a| a.as_slice()),
 Arc::clone(&logger), &scorer);
 Arc::clone(&logger), &scorer, &random_seed_bytes);
 }
 },
 }
Expand Down

4 changes: 3 additions & 1 deletion
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -669,13 +669,15 @@ mod tests {

	#[test]
	fn test_invoice_payer() {
 let keys_manager = test_utils::TestKeysInterface::new(&[0u8; 32], Network::Testnet);
 let random_seed_bytes = keys_manager.get_secure_random_bytes();
 let nodes = create_nodes(2, "test_invoice_payer".to_string());

 // Initiate the background processors to watch each node.
 let data_dir = nodes[0].persister.get_data_dir();
 let persister = move |node: &ChannelManager<InMemorySigner, Arc<ChainMonitor>, Arc<test_utils::TestBroadcaster>, Arc<KeysManager>, Arc<test_utils::TestFeeEstimator>, Arc<test_utils::TestLogger>>| FilesystemPersister::persist_manager(data_dir.clone(), node);
 let router = DefaultRouter::new(Arc::clone(&nodes[0].network_graph), Arc::clone(&nodes[0].logger));
 let scorer = Arc::new(Mutex::new(test_utils::TestScorer::with_penalty(0)));
 let router = DefaultRouter::new(Arc::clone(&nodes[0].network_graph), Arc::clone(&nodes[0].logger), random_seed_bytes);
 let invoice_payer = Arc::new(InvoicePayer::new(Arc::clone(&nodes[0].node), router, scorer, Arc::clone(&nodes[0].logger), |_: &_| {}, RetryAttempts(2)));
 let event_handler = Arc::clone(&invoice_payer);
 let bg_processor = BackgroundProcessor::start(persister, event_handler, nodes[0].chain_monitor.clone(), nodes[0].node.clone(), nodes[0].net_graph_msg_handler.clone(), nodes[0].peer_manager.clone(), nodes[0].logger.clone());
Expand Down

26 changes: 19 additions & 7 deletions
lightning-invoice/src/utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ use {CreationError, Currency, DEFAULT_EXPIRY_TIME, Invoice, InvoiceBuilder, Sign
use payment::{Payer, Router};

use bech32::ToBase32;
use bitcoin_hashes::Hash;
use bitcoin_hashes::{Hash, sha256};
use crate::prelude::*;
use lightning::chain;
use lightning::chain::chaininterface::{BroadcasterInterface, FeeEstimator};
Expand All@@ -22,6 +22,7 @@ use secp256k1::key::PublicKey;
use core::convert::TryInto;
use core::ops::Deref;
use core::time::Duration;
use sync::Mutex;

#[cfg(feature = "std")]
/// Utility to create an invoice that can be paid to one of multiple nodes, or a "phantom invoice."
Expand DownExpand Up@@ -224,12 +225,15 @@ where
pub struct DefaultRouter<G: Deref<Target = NetworkGraph>, L: Deref> where L::Target: Logger {
	network_graph: G,
	logger: L,
	random_seed_bytes: Mutex<[u8; 32]>,
}

impl<G: Deref<Target = NetworkGraph>, L: Deref> DefaultRouter<G, L> where L::Target: Logger {
	/// Creates a new router using the given [`NetworkGraph`] and [`Logger`].
	pub fn new(network_graph: G, logger: L) -> Self {
 Self { network_graph, logger }
	/// Creates a new router using the given [`NetworkGraph`], a [`Logger`], and a randomness source
	/// `random_seed_bytes`.
	pub fn new(network_graph: G, logger: L, random_seed_bytes: [u8; 32]) -> Self {
 let random_seed_bytes = Mutex::new(random_seed_bytes);
 Self { network_graph, logger, random_seed_bytes }
	}
}

Expand All@@ -239,7 +243,12 @@ where L::Target: Logger {
 &self, payer: &PublicKey, params: &RouteParameters, _payment_hash: &PaymentHash,
 first_hops: Option<&[&ChannelDetails]>, scorer: &S
	) -> Result<Route, LightningError> {
 find_route(payer, params, &*self.network_graph, first_hops, &*self.logger, scorer)
 let random_seed_bytes = {
 let mut locked_random_seed_bytes = self.random_seed_bytes.lock().unwrap();
 *locked_random_seed_bytes = sha256::Hash::hash(&*locked_random_seed_bytes).into_inner();
 *locked_random_seed_bytes
 };
 find_route(payer, params, &*self.network_graph, first_hops, &*self.logger, scorer, &random_seed_bytes)
	}
}

Expand DownExpand Up@@ -299,6 +308,7 @@ mod test {
	use lightning::util::enforcing_trait_impls::EnforcingSigner;
	use lightning::util::events::{MessageSendEvent, MessageSendEventsProvider, Event};
	use lightning::util::test_utils;
	use lightning::chain::keysinterface::KeysInterface;
	use utils::create_invoice_from_channelmanager_and_duration_since_epoch;

	#[test]
Expand DownExpand Up@@ -327,9 +337,10 @@ mod test {
 let network_graph = node_cfgs[0].network_graph;
 let logger = test_utils::TestLogger::new();
 let scorer = test_utils::TestScorer::with_penalty(0);
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
 let route = find_route(
 &nodes[0].node.get_our_node_id(), &route_params, network_graph,
 Some(&first_hops.iter().collect::<Vec<_>>()), &logger, &scorer,
 Some(&first_hops.iter().collect::<Vec<_>>()), &logger, &scorer, &random_seed_bytes
 ).unwrap();

 let payment_event = {
Expand DownExpand Up@@ -415,9 +426,10 @@ mod test {
 let network_graph = node_cfgs[0].network_graph;
 let logger = test_utils::TestLogger::new();
 let scorer = test_utils::TestScorer::with_penalty(0);
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
 let route = find_route(
 &nodes[0].node.get_our_node_id(), &params, network_graph,
 Some(&first_hops.iter().collect::<Vec<_>>()), &logger, &scorer,
 Some(&first_hops.iter().collect::<Vec<_>>()), &logger, &scorer, &random_seed_bytes
 ).unwrap();
 let (payment_event, fwd_idx) = {
 let mut payment_hash = PaymentHash([0; 32]);
Expand Down

23 changes: 15 additions & 8 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6844,6 +6844,7 @@ mod tests {
	use util::errors::APIError;
	use util::events::{Event, MessageSendEvent, MessageSendEventsProvider};
	use util::test_utils;
	use chain::keysinterface::KeysInterface;

	#[cfg(feature = "std")]
	#[test]
Expand DownExpand Up@@ -7097,6 +7098,7 @@ mod tests {
 let nodes = create_network(2, &node_cfgs, &node_chanmgrs);
 create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known());
 let scorer = test_utils::TestScorer::with_penalty(0);
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();

 // To start (1), send a regular payment but don't claim it.
 let expected_route = [&nodes[1]];
Expand All@@ -7110,7 +7112,7 @@ mod tests {
 };
 let route = find_route(
 &nodes[0].node.get_our_node_id(), &route_params, nodes[0].network_graph, None,
 nodes[0].logger, &scorer
 nodes[0].logger, &scorer, &random_seed_bytes
 ).unwrap();
 nodes[0].node.send_spontaneous_payment(&route, Some(payment_preimage)).unwrap();
 check_added_monitors!(nodes[0], 1);
Expand DownExpand Up@@ -7141,7 +7143,7 @@ mod tests {
 let payment_preimage = PaymentPreimage([42; 32]);
 let route = find_route(
 &nodes[0].node.get_our_node_id(), &route_params, nodes[0].network_graph, None,
 nodes[0].logger, &scorer
 nodes[0].logger, &scorer, &random_seed_bytes
 ).unwrap();
 let (payment_hash, _) = nodes[0].node.send_spontaneous_payment(&route, Some(payment_preimage)).unwrap();
 check_added_monitors!(nodes[0], 1);
Expand DownExpand Up@@ -7202,9 +7204,10 @@ mod tests {
 let network_graph = nodes[0].network_graph;
 let first_hops = nodes[0].node.list_usable_channels();
 let scorer = test_utils::TestScorer::with_penalty(0);
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
 let route = find_route(
 &payer_pubkey, &route_params, network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
 nodes[0].logger, &scorer
 nodes[0].logger, &scorer, &random_seed_bytes
 ).unwrap();

 let test_preimage = PaymentPreimage([42; 32]);
Expand DownExpand Up@@ -7245,9 +7248,10 @@ mod tests {
 let network_graph = nodes[0].network_graph;
 let first_hops = nodes[0].node.list_usable_channels();
 let scorer = test_utils::TestScorer::with_penalty(0);
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
 let route = find_route(
 &payer_pubkey, &route_params, network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
 nodes[0].logger, &scorer
 nodes[0].logger, &scorer, &random_seed_bytes
 ).unwrap();

 let test_preimage = PaymentPreimage([42; 32]);
Expand DownExpand Up@@ -7331,7 +7335,7 @@ mod tests {
pub mod bench {
	use chain::Listen;
	use chain::chainmonitor::{ChainMonitor, Persist};
	use chain::keysinterface::{KeysManager, InMemorySigner};
	use chain::keysinterface::{KeysManager, KeysInterface, InMemorySigner};
	use ln::channelmanager::{BestBlock, ChainParameters, ChannelManager, PaymentHash, PaymentPreimage};
	use ln::features::{InitFeatures, InvoiceFeatures};
	use ln::functional_test_utils::*;
Expand All@@ -7340,7 +7344,7 @@ pub mod bench {
	use routing::router::{PaymentParameters, get_route};
	use util::test_utils;
	use util::config::UserConfig;
	use util::events::{Event, MessageSendEvent, MessageSendEventsProvider, PaymentPurpose};
	use util::events::{Event, MessageSendEvent, MessageSendEventsProvider};

	use bitcoin::hashes::Hash;
	use bitcoin::hashes::sha256::Hash as Sha256;
Expand DownExpand Up@@ -7448,8 +7452,11 @@ pub mod bench {
 let payment_params = PaymentParameters::from_node_id($node_b.get_our_node_id())
 .with_features(InvoiceFeatures::known());
 let scorer = test_utils::TestScorer::with_penalty(0);
 let route = get_route(&$node_a.get_our_node_id(), &payment_params, &dummy_graph,
 Some(&usable_channels.iter().map(|r| r).collect::<Vec<_>>()), 10_000, TEST_FINAL_CLTV, &logger_a, &scorer).unwrap();
 let seed = [3u8; 32];
 let keys_manager = KeysManager::new(&seed, 42, 42);
 let random_seed_bytes = keys_manager.get_secure_random_bytes();
 let route = get_route(&$node_a.get_our_node_id(), &payment_params, &dummy_graph.read_only(),
 Some(&usable_channels.iter().map(|r| r).collect::<Vec<_>>()), 10_000, TEST_FINAL_CLTV, &logger_a, &scorer, &random_seed_bytes).unwrap();

 let mut payment_preimage = PaymentPreimage([0; 32]);
 payment_preimage.0[0..8].copy_from_slice(&payment_count.to_le_bytes());
Expand Down

25 changes: 18 additions & 7 deletions
lightning/src/ln/functional_test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@
//! A bunch of useful utilities for building networks of nodes and exchanging messages between
//! nodes for functional tests.

use chain::{BestBlock, Confirm, Listen, Watch};
use chain::{BestBlock, Confirm, Listen, Watch, keysinterface::KeysInterface};
use chain::channelmonitor::ChannelMonitor;
use chain::transaction::OutPoint;
use ln::{PaymentPreimage, PaymentHash, PaymentSecret};
Expand DownExpand Up@@ -1094,15 +1094,18 @@ macro_rules! get_route_and_payment_hash {
 $crate::get_route_and_payment_hash!($send_node, $recv_node, vec![], $recv_value, TEST_FINAL_CLTV)
	}};
	($send_node: expr, $recv_node: expr, $last_hops: expr, $recv_value: expr, $cltv: expr) => {{
 use $crate::chain::keysinterface::KeysInterface;
 let (payment_preimage, payment_hash, payment_secret) = $crate::get_payment_preimage_hash!($recv_node, Some($recv_value));
 let payment_params = $crate::routing::router::PaymentParameters::from_node_id($recv_node.node.get_our_node_id())
 .with_features($crate::ln::features::InvoiceFeatures::known())
 .with_route_hints($last_hops);
 let scorer = $crate::util::test_utils::TestScorer::with_penalty(0);
 let keys_manager = $crate::util::test_utils::TestKeysInterface::new(&[0u8; 32], bitcoin::network::constants::Network::Testnet);
 let random_seed_bytes = keys_manager.get_secure_random_bytes();
 let route = $crate::routing::router::get_route(
 &$send_node.node.get_our_node_id(), &payment_params, $send_node.network_graph,
 &$send_node.node.get_our_node_id(), &payment_params, &$send_node.network_graph.read_only(),
 Some(&$send_node.node.list_usable_channels().iter().collect::<Vec<_>>()),
 $recv_value, $cltv, $send_node.logger, &scorer
 $recv_value, $cltv, $send_node.logger, &scorer, &random_seed_bytes
 ).unwrap();
 (route, payment_hash, payment_preimage, payment_secret)
	}}
Expand DownExpand Up@@ -1557,11 +1560,15 @@ pub const TEST_FINAL_CLTV: u32 = 70;
pub fn route_payment<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route: &[&Node<'a, 'b, 'c>], recv_value: u64) -> (PaymentPreimage, PaymentHash, PaymentSecret) {
	let payment_params = PaymentParameters::from_node_id(expected_route.last().unwrap().node.get_our_node_id())
 .with_features(InvoiceFeatures::known());
	let network_graph = origin_node.network_graph.read_only();
	let scorer = test_utils::TestScorer::with_penalty(0);
	let seed = [0u8; 32];
	let keys_manager = test_utils::TestKeysInterface::new(&seed, Network::Testnet);
	let random_seed_bytes = keys_manager.get_secure_random_bytes();
	let route = get_route(
 &origin_node.node.get_our_node_id(), &payment_params, &origin_node.network_graph,
 &origin_node.node.get_our_node_id(), &payment_params, &network_graph,
 Some(&origin_node.node.list_usable_channels().iter().collect::<Vec<_>>()),
 recv_value, TEST_FINAL_CLTV, origin_node.logger, &scorer).unwrap();
 recv_value, TEST_FINAL_CLTV, origin_node.logger, &scorer, &random_seed_bytes).unwrap();
	assert_eq!(route.paths.len(), 1);
	assert_eq!(route.paths[0].len(), expected_route.len());
	for (node, hop) in expected_route.iter().zip(route.paths[0].iter()) {
Expand All@@ -1575,10 +1582,14 @@ pub fn route_payment<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route:
pub fn route_over_limit<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route: &[&Node<'a, 'b, 'c>], recv_value: u64) {
	let payment_params = PaymentParameters::from_node_id(expected_route.last().unwrap().node.get_our_node_id())
 .with_features(InvoiceFeatures::known());
	let network_graph = origin_node.network_graph.read_only();
	let scorer = test_utils::TestScorer::with_penalty(0);
	let seed = [0u8; 32];
	let keys_manager = test_utils::TestKeysInterface::new(&seed, Network::Testnet);
	let random_seed_bytes = keys_manager.get_secure_random_bytes();
	let route = get_route(
 &origin_node.node.get_our_node_id(), &payment_params, origin_node.network_graph,
 None, recv_value, TEST_FINAL_CLTV, origin_node.logger, &scorer).unwrap();
 &origin_node.node.get_our_node_id(), &payment_params, &network_graph,
 None, recv_value, TEST_FINAL_CLTV, origin_node.logger, &scorer, &random_seed_bytes).unwrap();
	assert_eq!(route.paths.len(), 1);
	assert_eq!(route.paths[0].len(), expected_route.len());
	for (node, hop) in expected_route.iter().zip(route.paths[0].iter()) {
Expand Down
Loading

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

Skip to content
Add random 'shadow route' CLTV delta offsets to improve privacy.#1286

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

jkczyz
merged 1 commit into

from

Mar 9, 2022
 Merged


Add random 'shadow route' CLTV delta offsets to improve privacy.
#1286
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


6 changes: 4 additions & 2 deletions
fuzz/src/full_stack.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -459,7 +459,8 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
 final_value_msat,
 final_cltv_expiry_delta: 42,
 };
 let route = match find_route(&our_id, &params, &network_graph, None, Arc::clone(&logger), &scorer) {
 let random_seed_bytes: [u8; 32] = keys_manager.get_secure_random_bytes();
 let route = match find_route(&our_id, &params, &network_graph, None, Arc::clone(&logger), &scorer, &random_seed_bytes) {
 Ok(route) => route,
 Err(_) => return,
 };
Expand All@@ -482,7 +483,8 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
 final_value_msat,
 final_cltv_expiry_delta: 42,
 };
 let mut route = match find_route(&our_id, &params, &network_graph, None, Arc::clone(&logger), &scorer) {
 let random_seed_bytes: [u8; 32] = keys_manager.get_secure_random_bytes();
 let mut route = match find_route(&our_id, &params, &network_graph, None, Arc::clone(&logger), &scorer, &random_seed_bytes) {
 Ok(route) => route,
 Err(_) => return,
 };
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -250,6 +250,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 }
 }
 let scorer = FixedPenaltyScorer::with_penalty(0);
 let random_seed_bytes: [u8; 32] = [get_slice!(1)[0]; 32];
 for target in node_pks.iter() {
 let route_params = RouteParameters {
 payment_params: PaymentParameters::from_node_id(*target).with_route_hints(last_hops.clone()),
Expand All@@ -258,7 +259,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 };
 let _ = find_route(&our_pubkey, &route_params, &net_graph,
 first_hops.map(|c| c.iter().collect::<Vec<_>>()).as_ref().map(|a| a.as_slice()),
 Arc::clone(&logger), &scorer);
 Arc::clone(&logger), &scorer, &random_seed_bytes);
 }
 },
 }
Expand Down

4 changes: 3 additions & 1 deletion
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -669,13 +669,15 @@ mod tests {

	#[test]
	fn test_invoice_payer() {
 let keys_manager = test_utils::TestKeysInterface::new(&[0u8; 32], Network::Testnet);
 let random_seed_bytes = keys_manager.get_secure_random_bytes();
 let nodes = create_nodes(2, "test_invoice_payer".to_string());

 // Initiate the background processors to watch each node.
 let data_dir = nodes[0].persister.get_data_dir();
 let persister = move |node: &ChannelManager<InMemorySigner, Arc<ChainMonitor>, Arc<test_utils::TestBroadcaster>, Arc<KeysManager>, Arc<test_utils::TestFeeEstimator>, Arc<test_utils::TestLogger>>| FilesystemPersister::persist_manager(data_dir.clone(), node);
 let router = DefaultRouter::new(Arc::clone(&nodes[0].network_graph), Arc::clone(&nodes[0].logger));
 let scorer = Arc::new(Mutex::new(test_utils::TestScorer::with_penalty(0)));
 let router = DefaultRouter::new(Arc::clone(&nodes[0].network_graph), Arc::clone(&nodes[0].logger), random_seed_bytes);
 let invoice_payer = Arc::new(InvoicePayer::new(Arc::clone(&nodes[0].node), router, scorer, Arc::clone(&nodes[0].logger), |_: &_| {}, RetryAttempts(2)));
 let event_handler = Arc::clone(&invoice_payer);
 let bg_processor = BackgroundProcessor::start(persister, event_handler, nodes[0].chain_monitor.clone(), nodes[0].node.clone(), nodes[0].net_graph_msg_handler.clone(), nodes[0].peer_manager.clone(), nodes[0].logger.clone());
Expand Down

26 changes: 19 additions & 7 deletions
lightning-invoice/src/utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ use {CreationError, Currency, DEFAULT_EXPIRY_TIME, Invoice, InvoiceBuilder, Sign
use payment::{Payer, Router};

use bech32::ToBase32;
use bitcoin_hashes::Hash;
use bitcoin_hashes::{Hash, sha256};
use crate::prelude::*;
use lightning::chain;
use lightning::chain::chaininterface::{BroadcasterInterface, FeeEstimator};
Expand All@@ -22,6 +22,7 @@ use secp256k1::key::PublicKey;
use core::convert::TryInto;
use core::ops::Deref;
use core::time::Duration;
use sync::Mutex;

#[cfg(feature = "std")]
/// Utility to create an invoice that can be paid to one of multiple nodes, or a "phantom invoice."
Expand DownExpand Up@@ -224,12 +225,15 @@ where
pub struct DefaultRouter<G: Deref<Target = NetworkGraph>, L: Deref> where L::Target: Logger {
	network_graph: G,
	logger: L,
	random_seed_bytes: Mutex<[u8; 32]>,
}

impl<G: Deref<Target = NetworkGraph>, L: Deref> DefaultRouter<G, L> where L::Target: Logger {
	/// Creates a new router using the given [`NetworkGraph`] and [`Logger`].
	pub fn new(network_graph: G, logger: L) -> Self {
 Self { network_graph, logger }
	/// Creates a new router using the given [`NetworkGraph`], a [`Logger`], and a randomness source
	/// `random_seed_bytes`.
	pub fn new(network_graph: G, logger: L, random_seed_bytes: [u8; 32]) -> Self {
 let random_seed_bytes = Mutex::new(random_seed_bytes);
 Self { network_graph, logger, random_seed_bytes }
	}
}

Expand All@@ -239,7 +243,12 @@ where L::Target: Logger {
 &self, payer: &PublicKey, params: &RouteParameters, _payment_hash: &PaymentHash,
 first_hops: Option<&[&ChannelDetails]>, scorer: &S
	) -> Result<Route, LightningError> {
 find_route(payer, params, &*self.network_graph, first_hops, &*self.logger, scorer)
 let random_seed_bytes = {
 let mut locked_random_seed_bytes = self.random_seed_bytes.lock().unwrap();
 *locked_random_seed_bytes = sha256::Hash::hash(&*locked_random_seed_bytes).into_inner();
 *locked_random_seed_bytes
 };
 find_route(payer, params, &*self.network_graph, first_hops, &*self.logger, scorer, &random_seed_bytes)
	}
}

Expand DownExpand Up@@ -299,6 +308,7 @@ mod test {
	use lightning::util::enforcing_trait_impls::EnforcingSigner;
	use lightning::util::events::{MessageSendEvent, MessageSendEventsProvider, Event};
	use lightning::util::test_utils;
	use lightning::chain::keysinterface::KeysInterface;
	use utils::create_invoice_from_channelmanager_and_duration_since_epoch;

	#[test]
Expand DownExpand Up@@ -327,9 +337,10 @@ mod test {
 let network_graph = node_cfgs[0].network_graph;
 let logger = test_utils::TestLogger::new();
 let scorer = test_utils::TestScorer::with_penalty(0);
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
 let route = find_route(
 &nodes[0].node.get_our_node_id(), &route_params, network_graph,
 Some(&first_hops.iter().collect::<Vec<_>>()), &logger, &scorer,
 Some(&first_hops.iter().collect::<Vec<_>>()), &logger, &scorer, &random_seed_bytes
 ).unwrap();

 let payment_event = {
Expand DownExpand Up@@ -415,9 +426,10 @@ mod test {
 let network_graph = node_cfgs[0].network_graph;
 let logger = test_utils::TestLogger::new();
 let scorer = test_utils::TestScorer::with_penalty(0);
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
 let route = find_route(
 &nodes[0].node.get_our_node_id(), &params, network_graph,
 Some(&first_hops.iter().collect::<Vec<_>>()), &logger, &scorer,
 Some(&first_hops.iter().collect::<Vec<_>>()), &logger, &scorer, &random_seed_bytes
 ).unwrap();
 let (payment_event, fwd_idx) = {
 let mut payment_hash = PaymentHash([0; 32]);
Expand Down

23 changes: 15 additions & 8 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6844,6 +6844,7 @@ mod tests {
	use util::errors::APIError;
	use util::events::{Event, MessageSendEvent, MessageSendEventsProvider};
	use util::test_utils;
	use chain::keysinterface::KeysInterface;

	#[cfg(feature = "std")]
	#[test]
Expand DownExpand Up@@ -7097,6 +7098,7 @@ mod tests {
 let nodes = create_network(2, &node_cfgs, &node_chanmgrs);
 create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known());
 let scorer = test_utils::TestScorer::with_penalty(0);
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();

 // To start (1), send a regular payment but don't claim it.
 let expected_route = [&nodes[1]];
Expand All@@ -7110,7 +7112,7 @@ mod tests {
 };
 let route = find_route(
 &nodes[0].node.get_our_node_id(), &route_params, nodes[0].network_graph, None,
 nodes[0].logger, &scorer
 nodes[0].logger, &scorer, &random_seed_bytes
 ).unwrap();
 nodes[0].node.send_spontaneous_payment(&route, Some(payment_preimage)).unwrap();
 check_added_monitors!(nodes[0], 1);
Expand DownExpand Up@@ -7141,7 +7143,7 @@ mod tests {
 let payment_preimage = PaymentPreimage([42; 32]);
 let route = find_route(
 &nodes[0].node.get_our_node_id(), &route_params, nodes[0].network_graph, None,
 nodes[0].logger, &scorer
 nodes[0].logger, &scorer, &random_seed_bytes
 ).unwrap();
 let (payment_hash, _) = nodes[0].node.send_spontaneous_payment(&route, Some(payment_preimage)).unwrap();
 check_added_monitors!(nodes[0], 1);
Expand DownExpand Up@@ -7202,9 +7204,10 @@ mod tests {
 let network_graph = nodes[0].network_graph;
 let first_hops = nodes[0].node.list_usable_channels();
 let scorer = test_utils::TestScorer::with_penalty(0);
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
 let route = find_route(
 &payer_pubkey, &route_params, network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
 nodes[0].logger, &scorer
 nodes[0].logger, &scorer, &random_seed_bytes
 ).unwrap();

 let test_preimage = PaymentPreimage([42; 32]);
Expand DownExpand Up@@ -7245,9 +7248,10 @@ mod tests {
 let network_graph = nodes[0].network_graph;
 let first_hops = nodes[0].node.list_usable_channels();
 let scorer = test_utils::TestScorer::with_penalty(0);
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
 let route = find_route(
 &payer_pubkey, &route_params, network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
 nodes[0].logger, &scorer
 nodes[0].logger, &scorer, &random_seed_bytes
 ).unwrap();

 let test_preimage = PaymentPreimage([42; 32]);
Expand DownExpand Up@@ -7331,7 +7335,7 @@ mod tests {
pub mod bench {
	use chain::Listen;
	use chain::chainmonitor::{ChainMonitor, Persist};
	use chain::keysinterface::{KeysManager, InMemorySigner};
	use chain::keysinterface::{KeysManager, KeysInterface, InMemorySigner};
	use ln::channelmanager::{BestBlock, ChainParameters, ChannelManager, PaymentHash, PaymentPreimage};
	use ln::features::{InitFeatures, InvoiceFeatures};
	use ln::functional_test_utils::*;
Expand All@@ -7340,7 +7344,7 @@ pub mod bench {
	use routing::router::{PaymentParameters, get_route};
	use util::test_utils;
	use util::config::UserConfig;
	use util::events::{Event, MessageSendEvent, MessageSendEventsProvider, PaymentPurpose};
	use util::events::{Event, MessageSendEvent, MessageSendEventsProvider};

	use bitcoin::hashes::Hash;
	use bitcoin::hashes::sha256::Hash as Sha256;
Expand DownExpand Up@@ -7448,8 +7452,11 @@ pub mod bench {
 let payment_params = PaymentParameters::from_node_id($node_b.get_our_node_id())
 .with_features(InvoiceFeatures::known());
 let scorer = test_utils::TestScorer::with_penalty(0);
 let route = get_route(&$node_a.get_our_node_id(), &payment_params, &dummy_graph,
 Some(&usable_channels.iter().map(|r| r).collect::<Vec<_>>()), 10_000, TEST_FINAL_CLTV, &logger_a, &scorer).unwrap();
 let seed = [3u8; 32];
 let keys_manager = KeysManager::new(&seed, 42, 42);
 let random_seed_bytes = keys_manager.get_secure_random_bytes();
 let route = get_route(&$node_a.get_our_node_id(), &payment_params, &dummy_graph.read_only(),
 Some(&usable_channels.iter().map(|r| r).collect::<Vec<_>>()), 10_000, TEST_FINAL_CLTV, &logger_a, &scorer, &random_seed_bytes).unwrap();

 let mut payment_preimage = PaymentPreimage([0; 32]);
 payment_preimage.0[0..8].copy_from_slice(&payment_count.to_le_bytes());
Expand Down

25 changes: 18 additions & 7 deletions
lightning/src/ln/functional_test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@
//! A bunch of useful utilities for building networks of nodes and exchanging messages between
//! nodes for functional tests.

use chain::{BestBlock, Confirm, Listen, Watch};
use chain::{BestBlock, Confirm, Listen, Watch, keysinterface::KeysInterface};
use chain::channelmonitor::ChannelMonitor;
use chain::transaction::OutPoint;
use ln::{PaymentPreimage, PaymentHash, PaymentSecret};
Expand DownExpand Up@@ -1094,15 +1094,18 @@ macro_rules! get_route_and_payment_hash {
 $crate::get_route_and_payment_hash!($send_node, $recv_node, vec![], $recv_value, TEST_FINAL_CLTV)
	}};
	($send_node: expr, $recv_node: expr, $last_hops: expr, $recv_value: expr, $cltv: expr) => {{
 use $crate::chain::keysinterface::KeysInterface;
 let (payment_preimage, payment_hash, payment_secret) = $crate::get_payment_preimage_hash!($recv_node, Some($recv_value));
 let payment_params = $crate::routing::router::PaymentParameters::from_node_id($recv_node.node.get_our_node_id())
 .with_features($crate::ln::features::InvoiceFeatures::known())
 .with_route_hints($last_hops);
 let scorer = $crate::util::test_utils::TestScorer::with_penalty(0);
 let keys_manager = $crate::util::test_utils::TestKeysInterface::new(&[0u8; 32], bitcoin::network::constants::Network::Testnet);
 let random_seed_bytes = keys_manager.get_secure_random_bytes();
 let route = $crate::routing::router::get_route(
 &$send_node.node.get_our_node_id(), &payment_params, $send_node.network_graph,
 &$send_node.node.get_our_node_id(), &payment_params, &$send_node.network_graph.read_only(),
 Some(&$send_node.node.list_usable_channels().iter().collect::<Vec<_>>()),
 $recv_value, $cltv, $send_node.logger, &scorer
 $recv_value, $cltv, $send_node.logger, &scorer, &random_seed_bytes
 ).unwrap();
 (route, payment_hash, payment_preimage, payment_secret)
	}}
Expand DownExpand Up@@ -1557,11 +1560,15 @@ pub const TEST_FINAL_CLTV: u32 = 70;
pub fn route_payment<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route: &[&Node<'a, 'b, 'c>], recv_value: u64) -> (PaymentPreimage, PaymentHash, PaymentSecret) {
	let payment_params = PaymentParameters::from_node_id(expected_route.last().unwrap().node.get_our_node_id())
 .with_features(InvoiceFeatures::known());
	let network_graph = origin_node.network_graph.read_only();
	let scorer = test_utils::TestScorer::with_penalty(0);
	let seed = [0u8; 32];
	let keys_manager = test_utils::TestKeysInterface::new(&seed, Network::Testnet);
	let random_seed_bytes = keys_manager.get_secure_random_bytes();
	let route = get_route(
 &origin_node.node.get_our_node_id(), &payment_params, &origin_node.network_graph,
 &origin_node.node.get_our_node_id(), &payment_params, &network_graph,
 Some(&origin_node.node.list_usable_channels().iter().collect::<Vec<_>>()),
 recv_value, TEST_FINAL_CLTV, origin_node.logger, &scorer).unwrap();
 recv_value, TEST_FINAL_CLTV, origin_node.logger, &scorer, &random_seed_bytes).unwrap();
	assert_eq!(route.paths.len(), 1);
	assert_eq!(route.paths[0].len(), expected_route.len());
	for (node, hop) in expected_route.iter().zip(route.paths[0].iter()) {
Expand All@@ -1575,10 +1582,14 @@ pub fn route_payment<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route:
pub fn route_over_limit<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route: &[&Node<'a, 'b, 'c>], recv_value: u64) {
	let payment_params = PaymentParameters::from_node_id(expected_route.last().unwrap().node.get_our_node_id())
 .with_features(InvoiceFeatures::known());
	let network_graph = origin_node.network_graph.read_only();
	let scorer = test_utils::TestScorer::with_penalty(0);
	let seed = [0u8; 32];
	let keys_manager = test_utils::TestKeysInterface::new(&seed, Network::Testnet);
	let random_seed_bytes = keys_manager.get_secure_random_bytes();
	let route = get_route(
 &origin_node.node.get_our_node_id(), &payment_params, origin_node.network_graph,
 None, recv_value, TEST_FINAL_CLTV, origin_node.logger, &scorer).unwrap();
 &origin_node.node.get_our_node_id(), &payment_params, &network_graph,
 None, recv_value, TEST_FINAL_CLTV, origin_node.logger, &scorer, &random_seed_bytes).unwrap();
	assert_eq!(route.paths.len(), 1);
	assert_eq!(route.paths[0].len(), expected_route.len());
	for (node, hop) in expected_route.iter().zip(route.paths[0].iter()) {
Expand Down
Loading

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

Skip to content
Add random 'shadow route' CLTV delta offsets to improve privacy.#1286

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

jkczyz
merged 1 commit into

from

Mar 9, 2022
 Merged


Add random 'shadow route' CLTV delta offsets to improve privacy.
#1286
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


6 changes: 4 additions & 2 deletions
fuzz/src/full_stack.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -459,7 +459,8 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
 final_value_msat,
 final_cltv_expiry_delta: 42,
 };
 let route = match find_route(&our_id, &params, &network_graph, None, Arc::clone(&logger), &scorer) {
 let random_seed_bytes: [u8; 32] = keys_manager.get_secure_random_bytes();
 let route = match find_route(&our_id, &params, &network_graph, None, Arc::clone(&logger), &scorer, &random_seed_bytes) {
 Ok(route) => route,
 Err(_) => return,
 };
Expand All@@ -482,7 +483,8 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
 final_value_msat,
 final_cltv_expiry_delta: 42,
 };
 let mut route = match find_route(&our_id, &params, &network_graph, None, Arc::clone(&logger), &scorer) {
 let random_seed_bytes: [u8; 32] = keys_manager.get_secure_random_bytes();
 let mut route = match find_route(&our_id, &params, &network_graph, None, Arc::clone(&logger), &scorer, &random_seed_bytes) {
 Ok(route) => route,
 Err(_) => return,
 };
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -250,6 +250,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 }
 }
 let scorer = FixedPenaltyScorer::with_penalty(0);
 let random_seed_bytes: [u8; 32] = [get_slice!(1)[0]; 32];
 for target in node_pks.iter() {
 let route_params = RouteParameters {
 payment_params: PaymentParameters::from_node_id(*target).with_route_hints(last_hops.clone()),
Expand All@@ -258,7 +259,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 };
 let _ = find_route(&our_pubkey, &route_params, &net_graph,
 first_hops.map(|c| c.iter().collect::<Vec<_>>()).as_ref().map(|a| a.as_slice()),
 Arc::clone(&logger), &scorer);
 Arc::clone(&logger), &scorer, &random_seed_bytes);
 }
 },
 }
Expand Down

4 changes: 3 additions & 1 deletion
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -669,13 +669,15 @@ mod tests {

	#[test]
	fn test_invoice_payer() {
 let keys_manager = test_utils::TestKeysInterface::new(&[0u8; 32], Network::Testnet);
 let random_seed_bytes = keys_manager.get_secure_random_bytes();
 let nodes = create_nodes(2, "test_invoice_payer".to_string());

 // Initiate the background processors to watch each node.
 let data_dir = nodes[0].persister.get_data_dir();
 let persister = move |node: &ChannelManager<InMemorySigner, Arc<ChainMonitor>, Arc<test_utils::TestBroadcaster>, Arc<KeysManager>, Arc<test_utils::TestFeeEstimator>, Arc<test_utils::TestLogger>>| FilesystemPersister::persist_manager(data_dir.clone(), node);
 let router = DefaultRouter::new(Arc::clone(&nodes[0].network_graph), Arc::clone(&nodes[0].logger));
 let scorer = Arc::new(Mutex::new(test_utils::TestScorer::with_penalty(0)));
 let router = DefaultRouter::new(Arc::clone(&nodes[0].network_graph), Arc::clone(&nodes[0].logger), random_seed_bytes);
 let invoice_payer = Arc::new(InvoicePayer::new(Arc::clone(&nodes[0].node), router, scorer, Arc::clone(&nodes[0].logger), |_: &_| {}, RetryAttempts(2)));
 let event_handler = Arc::clone(&invoice_payer);
 let bg_processor = BackgroundProcessor::start(persister, event_handler, nodes[0].chain_monitor.clone(), nodes[0].node.clone(), nodes[0].net_graph_msg_handler.clone(), nodes[0].peer_manager.clone(), nodes[0].logger.clone());
Expand Down

26 changes: 19 additions & 7 deletions
lightning-invoice/src/utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ use {CreationError, Currency, DEFAULT_EXPIRY_TIME, Invoice, InvoiceBuilder, Sign
use payment::{Payer, Router};

use bech32::ToBase32;
use bitcoin_hashes::Hash;
use bitcoin_hashes::{Hash, sha256};
use crate::prelude::*;
use lightning::chain;
use lightning::chain::chaininterface::{BroadcasterInterface, FeeEstimator};
Expand All@@ -22,6 +22,7 @@ use secp256k1::key::PublicKey;
use core::convert::TryInto;
use core::ops::Deref;
use core::time::Duration;
use sync::Mutex;

#[cfg(feature = "std")]
/// Utility to create an invoice that can be paid to one of multiple nodes, or a "phantom invoice."
Expand DownExpand Up@@ -224,12 +225,15 @@ where
pub struct DefaultRouter<G: Deref<Target = NetworkGraph>, L: Deref> where L::Target: Logger {
	network_graph: G,
	logger: L,
	random_seed_bytes: Mutex<[u8; 32]>,
}

impl<G: Deref<Target = NetworkGraph>, L: Deref> DefaultRouter<G, L> where L::Target: Logger {
	/// Creates a new router using the given [`NetworkGraph`] and [`Logger`].
	pub fn new(network_graph: G, logger: L) -> Self {
 Self { network_graph, logger }
	/// Creates a new router using the given [`NetworkGraph`], a [`Logger`], and a randomness source
	/// `random_seed_bytes`.
	pub fn new(network_graph: G, logger: L, random_seed_bytes: [u8; 32]) -> Self {
 let random_seed_bytes = Mutex::new(random_seed_bytes);
 Self { network_graph, logger, random_seed_bytes }
	}
}

Expand All@@ -239,7 +243,12 @@ where L::Target: Logger {
 &self, payer: &PublicKey, params: &RouteParameters, _payment_hash: &PaymentHash,
 first_hops: Option<&[&ChannelDetails]>, scorer: &S
	) -> Result<Route, LightningError> {
 find_route(payer, params, &*self.network_graph, first_hops, &*self.logger, scorer)
 let random_seed_bytes = {
 let mut locked_random_seed_bytes = self.random_seed_bytes.lock().unwrap();
 *locked_random_seed_bytes = sha256::Hash::hash(&*locked_random_seed_bytes).into_inner();
 *locked_random_seed_bytes
 };
 find_route(payer, params, &*self.network_graph, first_hops, &*self.logger, scorer, &random_seed_bytes)
	}
}

Expand DownExpand Up@@ -299,6 +308,7 @@ mod test {
	use lightning::util::enforcing_trait_impls::EnforcingSigner;
	use lightning::util::events::{MessageSendEvent, MessageSendEventsProvider, Event};
	use lightning::util::test_utils;
	use lightning::chain::keysinterface::KeysInterface;
	use utils::create_invoice_from_channelmanager_and_duration_since_epoch;

	#[test]
Expand DownExpand Up@@ -327,9 +337,10 @@ mod test {
 let network_graph = node_cfgs[0].network_graph;
 let logger = test_utils::TestLogger::new();
 let scorer = test_utils::TestScorer::with_penalty(0);
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
 let route = find_route(
 &nodes[0].node.get_our_node_id(), &route_params, network_graph,
 Some(&first_hops.iter().collect::<Vec<_>>()), &logger, &scorer,
 Some(&first_hops.iter().collect::<Vec<_>>()), &logger, &scorer, &random_seed_bytes
 ).unwrap();

 let payment_event = {
Expand DownExpand Up@@ -415,9 +426,10 @@ mod test {
 let network_graph = node_cfgs[0].network_graph;
 let logger = test_utils::TestLogger::new();
 let scorer = test_utils::TestScorer::with_penalty(0);
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
 let route = find_route(
 &nodes[0].node.get_our_node_id(), &params, network_graph,
 Some(&first_hops.iter().collect::<Vec<_>>()), &logger, &scorer,
 Some(&first_hops.iter().collect::<Vec<_>>()), &logger, &scorer, &random_seed_bytes
 ).unwrap();
 let (payment_event, fwd_idx) = {
 let mut payment_hash = PaymentHash([0; 32]);
Expand Down

23 changes: 15 additions & 8 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6844,6 +6844,7 @@ mod tests {
	use util::errors::APIError;
	use util::events::{Event, MessageSendEvent, MessageSendEventsProvider};
	use util::test_utils;
	use chain::keysinterface::KeysInterface;

	#[cfg(feature = "std")]
	#[test]
Expand DownExpand Up@@ -7097,6 +7098,7 @@ mod tests {
 let nodes = create_network(2, &node_cfgs, &node_chanmgrs);
 create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known());
 let scorer = test_utils::TestScorer::with_penalty(0);
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();

 // To start (1), send a regular payment but don't claim it.
 let expected_route = [&nodes[1]];
Expand All@@ -7110,7 +7112,7 @@ mod tests {
 };
 let route = find_route(
 &nodes[0].node.get_our_node_id(), &route_params, nodes[0].network_graph, None,
 nodes[0].logger, &scorer
 nodes[0].logger, &scorer, &random_seed_bytes
 ).unwrap();
 nodes[0].node.send_spontaneous_payment(&route, Some(payment_preimage)).unwrap();
 check_added_monitors!(nodes[0], 1);
Expand DownExpand Up@@ -7141,7 +7143,7 @@ mod tests {
 let payment_preimage = PaymentPreimage([42; 32]);
 let route = find_route(
 &nodes[0].node.get_our_node_id(), &route_params, nodes[0].network_graph, None,
 nodes[0].logger, &scorer
 nodes[0].logger, &scorer, &random_seed_bytes
 ).unwrap();
 let (payment_hash, _) = nodes[0].node.send_spontaneous_payment(&route, Some(payment_preimage)).unwrap();
 check_added_monitors!(nodes[0], 1);
Expand DownExpand Up@@ -7202,9 +7204,10 @@ mod tests {
 let network_graph = nodes[0].network_graph;
 let first_hops = nodes[0].node.list_usable_channels();
 let scorer = test_utils::TestScorer::with_penalty(0);
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
 let route = find_route(
 &payer_pubkey, &route_params, network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
 nodes[0].logger, &scorer
 nodes[0].logger, &scorer, &random_seed_bytes
 ).unwrap();

 let test_preimage = PaymentPreimage([42; 32]);
Expand DownExpand Up@@ -7245,9 +7248,10 @@ mod tests {
 let network_graph = nodes[0].network_graph;
 let first_hops = nodes[0].node.list_usable_channels();
 let scorer = test_utils::TestScorer::with_penalty(0);
 let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
 let route = find_route(
 &payer_pubkey, &route_params, network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
 nodes[0].logger, &scorer
 nodes[0].logger, &scorer, &random_seed_bytes
 ).unwrap();

 let test_preimage = PaymentPreimage([42; 32]);
Expand DownExpand Up@@ -7331,7 +7335,7 @@ mod tests {
pub mod bench {
	use chain::Listen;
	use chain::chainmonitor::{ChainMonitor, Persist};
	use chain::keysinterface::{KeysManager, InMemorySigner};
	use chain::keysinterface::{KeysManager, KeysInterface, InMemorySigner};
	use ln::channelmanager::{BestBlock, ChainParameters, ChannelManager, PaymentHash, PaymentPreimage};
	use ln::features::{InitFeatures, InvoiceFeatures};
	use ln::functional_test_utils::*;
Expand All@@ -7340,7 +7344,7 @@ pub mod bench {
	use routing::router::{PaymentParameters, get_route};
	use util::test_utils;
	use util::config::UserConfig;
	use util::events::{Event, MessageSendEvent, MessageSendEventsProvider, PaymentPurpose};
	use util::events::{Event, MessageSendEvent, MessageSendEventsProvider};

	use bitcoin::hashes::Hash;
	use bitcoin::hashes::sha256::Hash as Sha256;
Expand DownExpand Up@@ -7448,8 +7452,11 @@ pub mod bench {
 let payment_params = PaymentParameters::from_node_id($node_b.get_our_node_id())
 .with_features(InvoiceFeatures::known());
 let scorer = test_utils::TestScorer::with_penalty(0);
 let route = get_route(&$node_a.get_our_node_id(), &payment_params, &dummy_graph,
 Some(&usable_channels.iter().map(|r| r).collect::<Vec<_>>()), 10_000, TEST_FINAL_CLTV, &logger_a, &scorer).unwrap();
 let seed = [3u8; 32];
 let keys_manager = KeysManager::new(&seed, 42, 42);
 let random_seed_bytes = keys_manager.get_secure_random_bytes();
 let route = get_route(&$node_a.get_our_node_id(), &payment_params, &dummy_graph.read_only(),
 Some(&usable_channels.iter().map(|r| r).collect::<Vec<_>>()), 10_000, TEST_FINAL_CLTV, &logger_a, &scorer, &random_seed_bytes).unwrap();

 let mut payment_preimage = PaymentPreimage([0; 32]);
 payment_preimage.0[0..8].copy_from_slice(&payment_count.to_le_bytes());
Expand Down

25 changes: 18 additions & 7 deletions
lightning/src/ln/functional_test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@
//! A bunch of useful utilities for building networks of nodes and exchanging messages between
//! nodes for functional tests.

use chain::{BestBlock, Confirm, Listen, Watch};
use chain::{BestBlock, Confirm, Listen, Watch, keysinterface::KeysInterface};
use chain::channelmonitor::ChannelMonitor;
use chain::transaction::OutPoint;
use ln::{PaymentPreimage, PaymentHash, PaymentSecret};
Expand DownExpand Up@@ -1094,15 +1094,18 @@ macro_rules! get_route_and_payment_hash {
 $crate::get_route_and_payment_hash!($send_node, $recv_node, vec![], $recv_value, TEST_FINAL_CLTV)
	}};
	($send_node: expr, $recv_node: expr, $last_hops: expr, $recv_value: expr, $cltv: expr) => {{
 use $crate::chain::keysinterface::KeysInterface;
 let (payment_preimage, payment_hash, payment_secret) = $crate::get_payment_preimage_hash!($recv_node, Some($recv_value));
 let payment_params = $crate::routing::router::PaymentParameters::from_node_id($recv_node.node.get_our_node_id())
 .with_features($crate::ln::features::InvoiceFeatures::known())
 .with_route_hints($last_hops);
 let scorer = $crate::util::test_utils::TestScorer::with_penalty(0);
 let keys_manager = $crate::util::test_utils::TestKeysInterface::new(&[0u8; 32], bitcoin::network::constants::Network::Testnet);
 let random_seed_bytes = keys_manager.get_secure_random_bytes();
 let route = $crate::routing::router::get_route(
 &$send_node.node.get_our_node_id(), &payment_params, $send_node.network_graph,
 &$send_node.node.get_our_node_id(), &payment_params, &$send_node.network_graph.read_only(),
 Some(&$send_node.node.list_usable_channels().iter().collect::<Vec<_>>()),
 $recv_value, $cltv, $send_node.logger, &scorer
 $recv_value, $cltv, $send_node.logger, &scorer, &random_seed_bytes
 ).unwrap();
 (route, payment_hash, payment_preimage, payment_secret)
	}}
Expand DownExpand Up@@ -1557,11 +1560,15 @@ pub const TEST_FINAL_CLTV: u32 = 70;
pub fn route_payment<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route: &[&Node<'a, 'b, 'c>], recv_value: u64) -> (PaymentPreimage, PaymentHash, PaymentSecret) {
	let payment_params = PaymentParameters::from_node_id(expected_route.last().unwrap().node.get_our_node_id())
 .with_features(InvoiceFeatures::known());
	let network_graph = origin_node.network_graph.read_only();
	let scorer = test_utils::TestScorer::with_penalty(0);
	let seed = [0u8; 32];
	let keys_manager = test_utils::TestKeysInterface::new(&seed, Network::Testnet);
	let random_seed_bytes = keys_manager.get_secure_random_bytes();
	let route = get_route(
 &origin_node.node.get_our_node_id(), &payment_params, &origin_node.network_graph,
 &origin_node.node.get_our_node_id(), &payment_params, &network_graph,
 Some(&origin_node.node.list_usable_channels().iter().collect::<Vec<_>>()),
 recv_value, TEST_FINAL_CLTV, origin_node.logger, &scorer).unwrap();
 recv_value, TEST_FINAL_CLTV, origin_node.logger, &scorer, &random_seed_bytes).unwrap();
	assert_eq!(route.paths.len(), 1);
	assert_eq!(route.paths[0].len(), expected_route.len());
	for (node, hop) in expected_route.iter().zip(route.paths[0].iter()) {
Expand All@@ -1575,10 +1582,14 @@ pub fn route_payment<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route:
pub fn route_over_limit<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route: &[&Node<'a, 'b, 'c>], recv_value: u64) {
	let payment_params = PaymentParameters::from_node_id(expected_route.last().unwrap().node.get_our_node_id())
 .with_features(InvoiceFeatures::known());
	let network_graph = origin_node.network_graph.read_only();
	let scorer = test_utils::TestScorer::with_penalty(0);
	let seed = [0u8; 32];
	let keys_manager = test_utils::TestKeysInterface::new(&seed, Network::Testnet);
	let random_seed_bytes = keys_manager.get_secure_random_bytes();
	let route = get_route(
 &origin_node.node.get_our_node_id(), &payment_params, origin_node.network_graph,
 None, recv_value, TEST_FINAL_CLTV, origin_node.logger, &scorer).unwrap();
 &origin_node.node.get_our_node_id(), &payment_params, &network_graph,
 None, recv_value, TEST_FINAL_CLTV, origin_node.logger, &scorer, &random_seed_bytes).unwrap();
	assert_eq!(route.paths.len(), 1);
	assert_eq!(route.paths[0].len(), expected_route.len());
	for (node, hop) in expected_route.iter().zip(route.paths[0].iter()) {
Expand Down
Loading