Skip to content

Commit f592044

Browse files
tnulltnull
committed
Add a random per-path CLTV offset for privacy.
1 parent 8e7f241 commit f592044

File tree

11 files changed

+271
-102
lines changed

11 files changed

+271
-102
lines changed

‎fuzz/src/full_stack.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,8 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
456456
final_value_msat,
457457
final_cltv_expiry_delta: 42,
458458
};
459-
let route = match find_route(&our_id, &params, &network_graph, None, Arc::clone(&logger), &scorer) {
459+
let random_seed_bytes: [u8; 32] = get_slice!(32).try_into().unwrap();
460+
let route = match find_route(&our_id, &params, &network_graph, None, Arc::clone(&logger), &scorer, &random_seed_bytes) {
460461
Ok(route) => route,
461462
Err(_) => return,
462463
};
@@ -479,7 +480,8 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
479480
final_value_msat,
480481
final_cltv_expiry_delta: 42,
481482
};
482-
let mut route = match find_route(&our_id, &params, &network_graph, None, Arc::clone(&logger), &scorer) {
483+
let random_seed_bytes: [u8; 32] = get_slice!(32).try_into().unwrap();
484+
let mut route = match find_route(&our_id, &params, &network_graph, None, Arc::clone(&logger), &scorer, &random_seed_bytes) {
483485
Ok(route) => route,
484486
Err(_) => return,
485487
};

‎fuzz/src/router.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ use utils::test_logger;
3232
use std::collections::HashSet;
3333
use std::sync::Arc;
3434
use std::sync::atomic::{AtomicUsize, Ordering};
35+
use std::convert::TryInto;
3536

3637
#[inline]
3738
pub fn slice_to_be16(v: &[u8]) -> u16 {
@@ -250,6 +251,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
250251
}
251252
}
252253
let scorer = FixedPenaltyScorer::with_penalty(0);
254+
let random_seed_bytes: [u8; 32] = get_slice!(32).try_into().unwrap();
253255
for target in node_pks.iter() {
254256
let route_params = RouteParameters {
255257
payment_params: PaymentParameters::from_node_id(*target).with_route_hints(last_hops.clone()),
@@ -258,7 +260,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
258260
};
259261
let _ = find_route(&our_pubkey, &route_params, &net_graph,
260262
first_hops.map(|c| c.iter().collect::<Vec<_>>()).as_ref().map(|a| a.as_slice()),
261-
Arc::clone(&logger), &scorer);
263+
Arc::clone(&logger), &scorer, &random_seed_bytes);
262264
}
263265
},
264266
}

‎lightning-background-processor/src/lib.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -667,13 +667,15 @@ mod tests {
667667

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

672674
// Initiate the background processors to watch each node.
673675
let data_dir = nodes[0].persister.get_data_dir();
674676
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);
675-
let router = DefaultRouter::new(Arc::clone(&nodes[0].network_graph), Arc::clone(&nodes[0].logger));
676677
let scorer = Arc::new(Mutex::new(test_utils::TestScorer::with_penalty(0)));
678+
let router = DefaultRouter::new(Arc::clone(&nodes[0].network_graph), Arc::clone(&nodes[0].logger), random_seed_bytes);
677679
let invoice_payer = Arc::new(InvoicePayer::new(Arc::clone(&nodes[0].node), router, scorer, Arc::clone(&nodes[0].logger), |_: &_| {}, RetryAttempts(2)));
678680
let event_handler = Arc::clone(&invoice_payer);
679681
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());

‎lightning-invoice/src/utils.rs

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,12 @@ use lightning::routing::scoring::Score;
1616
use lightning::routing::network_graph::{NetworkGraph, RoutingFees};
1717
use lightning::routing::router::{Route, RouteHint, RouteHintHop, RouteParameters, find_route};
1818
use lightning::util::logger::Logger;
19+
use lightning::util::chacha20::ChaCha20;
1920
use secp256k1::key::PublicKey;
2021
use core::convert::TryInto;
2122
use core::ops::Deref;
2223
use core::time::Duration;
24+
use sync::Mutex;
2325

2426
#[cfg(feature = "std")]
2527
/// Utility to create an invoice that can be paid to one of multiple nodes, or a "phantom invoice."
@@ -222,12 +224,14 @@ where
222224
pub struct DefaultRouter<G: Deref<Target = NetworkGraph>, L: Deref> where L::Target: Logger {
223225
network_graph: G,
224226
logger: L,
227+
prng: Mutex<ChaCha20>,
225228
}
226229

227230
impl<G: Deref<Target = NetworkGraph>, L: Deref> DefaultRouter<G, L> where L::Target: Logger {
228-
/// Creates a new router using the given [`NetworkGraph`] and [`Logger`].
229-
pub fn new(network_graph: G, logger: L) -> Self {
230-
Self { network_graph, logger }
231+
/// Creates a new router using the given [`NetworkGraph`], a [`Logger`], and a randomness source `random_seed_bytes`.
232+
pub fn new(network_graph: G, logger: L, random_seed_bytes: [u8; 32]) -> Self {
233+
let prng = Mutex::new(ChaCha20::new(&random_seed_bytes, &[0; 8]));
234+
Self { network_graph, logger, prng }
231235
}
232236
}
233237

@@ -237,7 +241,9 @@ where L::Target: Logger {
237241
&self, payer: &PublicKey, params: &RouteParameters, _payment_hash: &PaymentHash,
238242
first_hops: Option<&[&ChannelDetails]>, scorer: &S
239243
) -> Result<Route, LightningError> {
240-
find_route(payer, params, &*self.network_graph, first_hops, &*self.logger, scorer)
244+
let mut random_seed_bytes = [0u8; 32];
245+
self.prng.lock().unwrap().process_in_place(&mut random_seed_bytes);
246+
find_route(payer, params, &*self.network_graph, first_hops, &*self.logger, scorer, &random_seed_bytes)
241247
}
242248
}
243249

@@ -297,6 +303,7 @@ mod test {
297303
use lightning::util::enforcing_trait_impls::EnforcingSigner;
298304
use lightning::util::events::{MessageSendEvent, MessageSendEventsProvider, Event};
299305
use lightning::util::test_utils;
306+
use lightning::chain::keysinterface::KeysInterface;
300307
use utils::create_invoice_from_channelmanager_and_duration_since_epoch;
301308

302309
#[test]
@@ -325,9 +332,10 @@ mod test {
325332
let network_graph = node_cfgs[0].network_graph;
326333
let logger = test_utils::TestLogger::new();
327334
let scorer = test_utils::TestScorer::with_penalty(0);
335+
let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
328336
let route = find_route(
329337
&nodes[0].node.get_our_node_id(), &route_params, network_graph,
330-
Some(&first_hops.iter().collect::<Vec<_>>()), &logger, &scorer,
338+
Some(&first_hops.iter().collect::<Vec<_>>()), &logger, &scorer, &random_seed_bytes
331339
).unwrap();
332340

333341
let payment_event = {

‎lightning/src/ln/channelmanager.rs

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6824,6 +6824,7 @@ mod tests {
68246824
use util::errors::APIError;
68256825
use util::events::{Event, MessageSendEvent, MessageSendEventsProvider};
68266826
use util::test_utils;
6827+
use chain::keysinterface::KeysInterface;
68276828

68286829
#[cfg(feature = "std")]
68296830
#[test]
@@ -7077,6 +7078,7 @@ mod tests {
70777078
let nodes = create_network(2, &node_cfgs, &node_chanmgrs);
70787079
create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known());
70797080
let scorer = test_utils::TestScorer::with_penalty(0);
7081+
let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
70807082

70817083
// To start (1), send a regular payment but don't claim it.
70827084
let expected_route = [&nodes[1]];
@@ -7090,7 +7092,7 @@ mod tests {
70907092
};
70917093
let route = find_route(
70927094
&nodes[0].node.get_our_node_id(), &route_params, nodes[0].network_graph, None,
7093-
nodes[0].logger, &scorer
7095+
nodes[0].logger, &scorer, &random_seed_bytes
70947096
).unwrap();
70957097
nodes[0].node.send_spontaneous_payment(&route, Some(payment_preimage)).unwrap();
70967098
check_added_monitors!(nodes[0], 1);
@@ -7121,7 +7123,7 @@ mod tests {
71217123
let payment_preimage = PaymentPreimage([42; 32]);
71227124
let route = find_route(
71237125
&nodes[0].node.get_our_node_id(), &route_params, nodes[0].network_graph, None,
7124-
nodes[0].logger, &scorer
7126+
nodes[0].logger, &scorer, &random_seed_bytes
71257127
).unwrap();
71267128
let (payment_hash, _) = nodes[0].node.send_spontaneous_payment(&route, Some(payment_preimage)).unwrap();
71277129
check_added_monitors!(nodes[0], 1);
@@ -7182,9 +7184,10 @@ mod tests {
71827184
let network_graph = nodes[0].network_graph;
71837185
let first_hops = nodes[0].node.list_usable_channels();
71847186
let scorer = test_utils::TestScorer::with_penalty(0);
7187+
let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
71857188
let route = find_route(
71867189
&payer_pubkey, &route_params, network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
7187-
nodes[0].logger, &scorer
7190+
nodes[0].logger, &scorer, &random_seed_bytes
71887191
).unwrap();
71897192

71907193
let test_preimage = PaymentPreimage([42; 32]);
@@ -7225,9 +7228,10 @@ mod tests {
72257228
let network_graph = nodes[0].network_graph;
72267229
let first_hops = nodes[0].node.list_usable_channels();
72277230
let scorer = test_utils::TestScorer::with_penalty(0);
7231+
let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
72287232
let route = find_route(
72297233
&payer_pubkey, &route_params, network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
7230-
nodes[0].logger, &scorer
7234+
nodes[0].logger, &scorer, &random_seed_bytes
72317235
).unwrap();
72327236

72337237
let test_preimage = PaymentPreimage([42; 32]);

‎lightning/src/ln/functional_test_utils.rs

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
//! A bunch of useful utilities for building networks of nodes and exchanging messages between
1111
//! nodes for functional tests.
1212
13-
use chain::{BestBlock, Confirm, Listen, Watch};
13+
use chain::{BestBlock, Confirm, Listen, Watch, keysinterface::KeysInterface};
1414
use chain::channelmonitor::ChannelMonitor;
1515
use chain::transaction::OutPoint;
1616
use ln::{PaymentPreimage, PaymentHash, PaymentSecret};
@@ -1081,15 +1081,18 @@ macro_rules! get_route_and_payment_hash {
10811081
$crate::get_route_and_payment_hash!($send_node, $recv_node, vec![], $recv_value, TEST_FINAL_CLTV)
10821082
}};
10831083
($send_node: expr, $recv_node: expr, $last_hops: expr, $recv_value: expr, $cltv: expr) => {{
1084+
use $crate::chain::keysinterface::KeysInterface;
10841085
let (payment_preimage, payment_hash, payment_secret) = $crate::get_payment_preimage_hash!($recv_node, Some($recv_value));
10851086
let payment_params = $crate::routing::router::PaymentParameters::from_node_id($recv_node.node.get_our_node_id())
10861087
.with_features($crate::ln::features::InvoiceFeatures::known())
10871088
.with_route_hints($last_hops);
10881089
let scorer = $crate::util::test_utils::TestScorer::with_penalty(0);
1090+
let keys_manager = $crate::util::test_utils::TestKeysInterface::new(&[0u8;32], bitcoin::network::constants::Network::Testnet);
1091+
let random_seed_bytes = keys_manager.get_secure_random_bytes();
10891092
let route = $crate::routing::router::get_route(
10901093
&$send_node.node.get_our_node_id(), &payment_params, $send_node.network_graph,
10911094
Some(&$send_node.node.list_usable_channels().iter().collect::<Vec<_>>()),
1092-
$recv_value, $cltv, $send_node.logger, &scorer
1095+
$recv_value, $cltv, $send_node.logger, &scorer, &random_seed_bytes
10931096
).unwrap();
10941097
(route, payment_hash, payment_preimage, payment_secret)
10951098
}}
@@ -1545,10 +1548,13 @@ pub fn route_payment<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_route:
15451548
let payment_params = PaymentParameters::from_node_id(expected_route.last().unwrap().node.get_our_node_id())
15461549
.with_features(InvoiceFeatures::known());
15471550
let scorer = test_utils::TestScorer::with_penalty(0);
1551+
let seed = [0u8; 32];
1552+
let keys_manager = test_utils::TestKeysInterface::new(&seed, Network::Testnet);
1553+
let random_seed_bytes = keys_manager.get_secure_random_bytes();
15481554
let route = get_route(
15491555
&origin_node.node.get_our_node_id(), &payment_params, &origin_node.network_graph,
15501556
Some(&origin_node.node.list_usable_channels().iter().collect::<Vec<_>>()),
1551-
recv_value, TEST_FINAL_CLTV, origin_node.logger, &scorer).unwrap();
1557+
recv_value, TEST_FINAL_CLTV, origin_node.logger, &scorer, &random_seed_bytes).unwrap();
15521558
assert_eq!(route.paths.len(), 1);
15531559
assert_eq!(route.paths[0].len(), expected_route.len());
15541560
for (node, hop) in expected_route.iter().zip(route.paths[0].iter()) {
@@ -1563,9 +1569,12 @@ pub fn route_over_limit<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_rou
15631569
let payment_params = PaymentParameters::from_node_id(expected_route.last().unwrap().node.get_our_node_id())
15641570
.with_features(InvoiceFeatures::known());
15651571
let scorer = test_utils::TestScorer::with_penalty(0);
1572+
let seed = [0u8; 32];
1573+
let keys_manager = test_utils::TestKeysInterface::new(&seed, Network::Testnet);
1574+
let random_seed_bytes = keys_manager.get_secure_random_bytes();
15661575
let route = get_route(
1567-
&origin_node.node.get_our_node_id(), &payment_params, origin_node.network_graph,
1568-
None, recv_value, TEST_FINAL_CLTV, origin_node.logger, &scorer).unwrap();
1576+
&origin_node.node.get_our_node_id(), &payment_params, origin_node.network_graph,
1577+
None, recv_value, TEST_FINAL_CLTV, origin_node.logger, &scorer, &random_seed_bytes).unwrap();
15691578
assert_eq!(route.paths.len(), 1);
15701579
assert_eq!(route.paths[0].len(), expected_route.len());
15711580
for (node, hop) in expected_route.iter().zip(route.paths[0].iter()) {

‎lightning/src/ln/functional_tests.rs

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use chain::{Confirm, Listen, Watch};
1616
use chain::channelmonitor;
1717
use chain::channelmonitor::{ChannelMonitor, CLTV_CLAIM_BUFFER, LATENCY_GRACE_PERIOD_BLOCKS, ANTI_REORG_DELAY};
1818
use chain::transaction::OutPoint;
19-
use chain::keysinterface::BaseSign;
19+
use chain::keysinterface::{BaseSign, KeysInterface};
2020
use ln::{PaymentPreimage, PaymentSecret, PaymentHash};
2121
use ln::channel::{commitment_tx_base_weight, COMMITMENT_TX_WEIGHT_PER_HTLC, CONCURRENT_INBOUND_HTLC_FEE_BUFFER, FEE_SPIKE_BUFFER_FEE_INCREASE_MULTIPLE, MIN_AFFORDABLE_HTLC_COUNT};
2222
use ln::channelmanager::{ChannelManager, ChannelManagerReadArgs, PaymentId, RAACommitmentOrder, PaymentSendFailure, BREAKDOWN_TIMEOUT, MIN_CLTV_EXPIRY_DELTA, PAYMENT_EXPIRY_BLOCKS };
@@ -7440,8 +7440,9 @@ fn test_check_htlc_underpaying() {
74407440
create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known());
74417441

74427442
let scorer = test_utils::TestScorer::with_penalty(0);
7443+
let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
74437444
let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id()).with_features(InvoiceFeatures::known());
7444-
let route = get_route(&nodes[0].node.get_our_node_id(), &payment_params, nodes[0].network_graph, None, 10_000, TEST_FINAL_CLTV, nodes[0].logger, &scorer).unwrap();
7445+
let route = get_route(&nodes[0].node.get_our_node_id(), &payment_params, nodes[0].network_graph, None, 10_000, TEST_FINAL_CLTV, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
74457446
let (_, our_payment_hash, _) = get_payment_preimage_hash!(nodes[0]);
74467447
let our_payment_secret = nodes[1].node.create_inbound_payment_for_hash(our_payment_hash, Some(100_000), 7200).unwrap();
74477448
nodes[0].node.send_payment(&route, our_payment_hash, &Some(our_payment_secret)).unwrap();
@@ -7843,12 +7844,13 @@ fn test_bump_penalty_txn_on_revoked_htlcs() {
78437844
// Lock HTLC in both directions (using a slightly lower CLTV delay to provide timely RBF bumps)
78447845
let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id()).with_features(InvoiceFeatures::known());
78457846
let scorer = test_utils::TestScorer::with_penalty(0);
7847+
let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
78467848
let route = get_route(&nodes[0].node.get_our_node_id(), &payment_params, &nodes[0].network_graph, None,
7847-
3_000_000, 50, nodes[0].logger, &scorer).unwrap();
7849+
3_000_000, 50, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
78487850
let payment_preimage = send_along_route(&nodes[0], route, &[&nodes[1]], 3_000_000).0;
78497851
let payment_params = PaymentParameters::from_node_id(nodes[0].node.get_our_node_id()).with_features(InvoiceFeatures::known());
78507852
let route = get_route(&nodes[1].node.get_our_node_id(), &payment_params, nodes[1].network_graph, None,
7851-
3_000_000, 50, nodes[0].logger, &scorer).unwrap();
7853+
3_000_000, 50, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
78527854
send_along_route(&nodes[1], route, &[&nodes[0]], 3_000_000);
78537855

78547856
let revoked_local_txn = get_local_commitment_txn!(nodes[1], chan.2);
@@ -9618,7 +9620,8 @@ fn test_keysend_payments_to_public_node() {
96189620
final_cltv_expiry_delta: 40,
96199621
};
96209622
let scorer = test_utils::TestScorer::with_penalty(0);
9621-
let route = find_route(&payer_pubkey, &route_params, network_graph, None, nodes[0].logger, &scorer).unwrap();
9623+
let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
9624+
let route = find_route(&payer_pubkey, &route_params, network_graph, None, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
96229625

96239626
let test_preimage = PaymentPreimage([42; 32]);
96249627
let (payment_hash, _) = nodes[0].node.send_spontaneous_payment(&route, Some(test_preimage)).unwrap();
@@ -9652,9 +9655,10 @@ fn test_keysend_payments_to_private_node() {
96529655
let network_graph = nodes[0].network_graph;
96539656
let first_hops = nodes[0].node.list_usable_channels();
96549657
let scorer = test_utils::TestScorer::with_penalty(0);
9658+
let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
96559659
let route = find_route(
96569660
&payer_pubkey, &route_params, network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
9657-
nodes[0].logger, &scorer
9661+
nodes[0].logger, &scorer, &random_seed_bytes
96589662
).unwrap();
96599663

96609664
let test_preimage = PaymentPreimage([42; 32]);

‎lightning/src/ln/payment_tests.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
use chain::{ChannelMonitorUpdateErr, Confirm, Listen, Watch};
1515
use chain::channelmonitor::{ANTI_REORG_DELAY, ChannelMonitor, LATENCY_GRACE_PERIOD_BLOCKS};
1616
use chain::transaction::OutPoint;
17+
use chain::keysinterface::KeysInterface;
1718
use ln::channelmanager::{BREAKDOWN_TIMEOUT, ChannelManager, ChannelManagerReadArgs, PaymentId, PaymentSendFailure};
1819
use ln::features::{InitFeatures, InvoiceFeatures};
1920
use ln::msgs;
@@ -27,6 +28,7 @@ use util::ser::{ReadableArgs, Writeable};
2728
use io;
2829

2930
use bitcoin::{Block, BlockHeader, BlockHash};
31+
use bitcoin::network::constants::Network;
3032

3133
use prelude::*;
3234

@@ -724,10 +726,12 @@ fn get_ldk_payment_preimage() {
724726
let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id())
725727
.with_features(InvoiceFeatures::known());
726728
let scorer = test_utils::TestScorer::with_penalty(0);
729+
let keys_manager = test_utils::TestKeysInterface::new(&[0u8;32], Network::Testnet);
730+
let random_seed_bytes = keys_manager.get_secure_random_bytes();
727731
let route = get_route(
728732
&nodes[0].node.get_our_node_id(), &payment_params, &nodes[0].network_graph,
729733
Some(&nodes[0].node.list_usable_channels().iter().collect::<Vec<_>>()),
730-
amt_msat, TEST_FINAL_CLTV, nodes[0].logger, &scorer).unwrap();
734+
amt_msat, TEST_FINAL_CLTV, nodes[0].logger, &scorer, &random_seed_bytes).unwrap();
731735
let _payment_id = nodes[0].node.send_payment(&route, payment_hash, &Some(payment_secret)).unwrap();
732736
check_added_monitors!(nodes[0], 1);
733737

‎lightning/src/ln/shutdown_tests.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ use util::config::UserConfig;
2525

2626
use bitcoin::blockdata::script::Builder;
2727
use bitcoin::blockdata::opcodes;
28+
use bitcoin::network::constants::Network;
2829

2930
use regex;
3031

@@ -77,6 +78,8 @@ fn updates_shutdown_wait() {
7778
let chan_2 = create_announced_chan_between_nodes(&nodes, 1, 2, InitFeatures::known(), InitFeatures::known());
7879
let logger = test_utils::TestLogger::new();
7980
let scorer = test_utils::TestScorer::with_penalty(0);
81+
let keys_manager = test_utils::TestKeysInterface::new(&[0u8;32], Network::Testnet);
82+
let random_seed_bytes = keys_manager.get_secure_random_bytes();
8083

8184
let (payment_preimage, _, _) = route_payment(&nodes[0], &[&nodes[1], &nodes[2]], 100000);
8285

@@ -92,9 +95,9 @@ fn updates_shutdown_wait() {
9295
let (_, payment_hash, payment_secret) = get_payment_preimage_hash!(nodes[0]);
9396

9497
let payment_params_1 = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id()).with_features(InvoiceFeatures::known());
95-
let route_1 = get_route(&nodes[0].node.get_our_node_id(), &payment_params_1, nodes[0].network_graph, None, 100000, TEST_FINAL_CLTV, &logger, &scorer).unwrap();
98+
let route_1 = get_route(&nodes[0].node.get_our_node_id(), &payment_params_1, nodes[0].network_graph, None, 100000, TEST_FINAL_CLTV, &logger, &scorer, &random_seed_bytes).unwrap();
9699
let payment_params_2 = PaymentParameters::from_node_id(nodes[0].node.get_our_node_id()).with_features(InvoiceFeatures::known());
97-
let route_2 = get_route(&nodes[1].node.get_our_node_id(), &payment_params_2, nodes[1].network_graph, None, 100000, TEST_FINAL_CLTV, &logger, &scorer).unwrap();
100+
let route_2 = get_route(&nodes[1].node.get_our_node_id(), &payment_params_2, nodes[1].network_graph, None, 100000, TEST_FINAL_CLTV, &logger, &scorer, &random_seed_bytes).unwrap();
98101
unwrap_send_err!(nodes[0].node.send_payment(&route_1, payment_hash, &Some(payment_secret)), true, APIError::ChannelUnavailable {..}, {});
99102
unwrap_send_err!(nodes[1].node.send_payment(&route_2, payment_hash, &Some(payment_secret)), true, APIError::ChannelUnavailable {..}, {});
100103

0 commit comments

Comments
 (0)