Skip to content

Commit 16b3c72

Browse files
TheBlueMattTheBlueMatt
authored
Merge pull request #2025 from TheBlueMatt/2023-02-no-pub-genesis-hashes
Remove genesis block hash from public API
2 parents f71daed + d7c818a commit 16b3c72

File tree

19 files changed

+55
-90
lines changed

19 files changed

+55
-90
lines changed

‎fuzz/src/chanmon_consistency.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out) {
418418
let network = Network::Bitcoin;
419419
let params = ChainParameters {
420420
network,
421-
best_block: BestBlock::from_genesis(network),
421+
best_block: BestBlock::from_network(network),
422422
};
423423
(ChannelManager::new($fee_estimator.clone(), monitor.clone(), broadcast.clone(), &router, Arc::clone(&logger), keys_manager.clone(), keys_manager.clone(), keys_manager.clone(), config, params),
424424
monitor, keys_manager)

‎fuzz/src/full_stack.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -442,15 +442,15 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
442442
let network = Network::Bitcoin;
443443
let params = ChainParameters {
444444
network,
445-
best_block: BestBlock::from_genesis(network),
445+
best_block: BestBlock::from_network(network),
446446
};
447447
let channelmanager = Arc::new(ChannelManager::new(fee_est.clone(), monitor.clone(), broadcast.clone(), &router, Arc::clone(&logger), keys_manager.clone(), keys_manager.clone(), keys_manager.clone(), config, params));
448448
// Adding new calls to `EntropySource::get_secure_random_bytes` during startup can change all the
449449
// keys subsequently generated in this test. Rather than regenerating all the messages manually,
450450
// it's easier to just increment the counter here so the keys don't change.
451451
keys_manager.counter.fetch_sub(3, Ordering::AcqRel);
452452
let our_id = &keys_manager.get_node_id(Recipient::Node).unwrap();
453-
let network_graph = Arc::new(NetworkGraph::new(genesis_block(network).block_hash(), Arc::clone(&logger)));
453+
let network_graph = Arc::new(NetworkGraph::new(network, Arc::clone(&logger)));
454454
let gossip_sync = Arc::new(P2PGossipSync::new(Arc::clone(&network_graph), None, Arc::clone(&logger)));
455455
let scorer = FixedPenaltyScorer::with_penalty(0);
456456

‎fuzz/src/process_network_graph.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
// Imports that need to be added manually
22
use lightning_rapid_gossip_sync::RapidGossipSync;
3-
use bitcoin::hashes::Hash as TraitImport;
43

54
use crate::utils::test_logger;
65

76
/// Actual fuzz test, method signature and name are fixed
87
fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
9-
let block_hash = bitcoin::BlockHash::all_zeros();
108
let logger = test_logger::TestLogger::new("".to_owned(), out);
11-
let network_graph = lightning::routing::gossip::NetworkGraph::new(block_hash, &logger);
9+
let network_graph = lightning::routing::gossip::NetworkGraph::new(bitcoin::Network::Bitcoin, &logger);
1210
let rapid_sync = RapidGossipSync::new(&network_graph);
1311
let _ = rapid_sync.update_network_graph(data);
1412
}

‎fuzz/src/router.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ use lightning::util::ser::Readable;
2424
use bitcoin::hashes::Hash;
2525
use bitcoin::secp256k1::PublicKey;
2626
use bitcoin::network::constants::Network;
27-
use bitcoin::blockdata::constants::genesis_block;
2827

2928
use crate::utils::test_logger;
3029

@@ -189,7 +188,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
189188
let logger = test_logger::TestLogger::new("".to_owned(), out);
190189

191190
let our_pubkey = get_pubkey!();
192-
let net_graph = NetworkGraph::new(genesis_block(Network::Bitcoin).header.block_hash(), &logger);
191+
let net_graph = NetworkGraph::new(Network::Bitcoin, &logger);
193192
let chain_source = FuzzChainSource {
194193
input: Arc::clone(&input),
195194
net_graph: &net_graph,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -940,7 +940,7 @@ mod tests {
940940
let logger = Arc::new(test_utils::TestLogger::with_id(format!("node {}", i)));
941941
let network = Network::Testnet;
942942
let genesis_block = genesis_block(network);
943-
let network_graph = Arc::new(NetworkGraph::new(genesis_block.header.block_hash(), logger.clone()));
943+
let network_graph = Arc::new(NetworkGraph::new(network, logger.clone()));
944944
let scorer = Arc::new(Mutex::new(TestScorer::new()));
945945
let seed = [i as u8; 32];
946946
let router = Arc::new(DefaultRouter::new(network_graph.clone(), logger.clone(), seed, scorer.clone()));
@@ -949,7 +949,7 @@ mod tests {
949949
let now = Duration::from_secs(genesis_block.header.time as u64);
950950
let keys_manager = Arc::new(KeysManager::new(&seed, now.as_secs(), now.subsec_nanos()));
951951
let chain_monitor = Arc::new(chainmonitor::ChainMonitor::new(Some(chain_source.clone()), tx_broadcaster.clone(), logger.clone(), fee_estimator.clone(), persister.clone()));
952-
let best_block = BestBlock::from_genesis(network);
952+
let best_block = BestBlock::from_network(network);
953953
let params = ChainParameters { network, best_block };
954954
let manager = Arc::new(ChannelManager::new(fee_estimator.clone(), chain_monitor.clone(), tx_broadcaster.clone(), router.clone(), logger.clone(), keys_manager.clone(), keys_manager.clone(), keys_manager.clone(), UserConfig::default(), params));
955955
let p2p_gossip_sync = Arc::new(P2PGossipSync::new(network_graph.clone(), Some(chain_source.clone()), logger.clone()));

‎lightning-rapid-gossip-sync/src/lib.rs

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,7 @@
5353
//! # }
5454
//! # let logger = FakeLogger {};
5555
//!
56-
//! let block_hash = genesis_block(Network::Bitcoin).header.block_hash();
57-
//! let network_graph = NetworkGraph::new(block_hash, &logger);
56+
//! let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
5857
//! let rapid_sync = RapidGossipSync::new(&network_graph);
5958
//! let snapshot_contents: &[u8] = &[0; 0];
6059
//! let new_last_sync_timestamp_result = rapid_sync.update_network_graph(snapshot_contents);
@@ -161,7 +160,6 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L
161160
mod tests {
162161
use std::fs;
163162

164-
use bitcoin::blockdata::constants::genesis_block;
165163
use bitcoin::Network;
166164

167165
use lightning::ln::msgs::DecodeError;
@@ -225,9 +223,8 @@ mod tests {
225223
let sync_test = FileSyncTest::new(tmp_directory, &valid_response);
226224
let graph_sync_test_file = sync_test.get_test_file_path();
227225

228-
let block_hash = genesis_block(Network::Bitcoin).block_hash();
229226
let logger = TestLogger::new();
230-
let network_graph = NetworkGraph::new(block_hash, &logger);
227+
let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
231228

232229
assert_eq!(network_graph.read_only().channels().len(), 0);
233230

@@ -258,9 +255,8 @@ mod tests {
258255

259256
#[test]
260257
fn measure_native_read_from_file() {
261-
let block_hash = genesis_block(Network::Bitcoin).block_hash();
262258
let logger = TestLogger::new();
263-
let network_graph = NetworkGraph::new(block_hash, &logger);
259+
let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
264260

265261
assert_eq!(network_graph.read_only().channels().len(), 0);
266262

@@ -290,7 +286,6 @@ mod tests {
290286
pub mod bench {
291287
use test::Bencher;
292288

293-
use bitcoin::blockdata::constants::genesis_block;
294289
use bitcoin::Network;
295290

296291
use lightning::ln::msgs::DecodeError;
@@ -301,10 +296,9 @@ pub mod bench {
301296

302297
#[bench]
303298
fn bench_reading_full_graph_from_file(b: &mut Bencher) {
304-
let block_hash = genesis_block(Network::Bitcoin).block_hash();
305299
let logger = TestLogger::new();
306300
b.iter(|| {
307-
let network_graph = NetworkGraph::new(block_hash, &logger);
301+
let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
308302
let rapid_sync = RapidGossipSync::new(&network_graph);
309303
let sync_result = rapid_sync.sync_network_graph_with_file_path("./res/full_graph.lngossip");
310304
if let Err(crate::error::GraphSyncError::DecodeError(DecodeError::Io(io_error))) = &sync_result {

‎lightning-rapid-gossip-sync/src/processing.rs

Lines changed: 11 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,6 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L
237237

238238
#[cfg(test)]
239239
mod tests {
240-
use bitcoin::blockdata::constants::genesis_block;
241240
use bitcoin::Network;
242241

243242
use lightning::ln::msgs::DecodeError;
@@ -269,9 +268,8 @@ mod tests {
269268

270269
#[test]
271270
fn network_graph_fails_to_update_from_clipped_input() {
272-
let block_hash = genesis_block(Network::Bitcoin).block_hash();
273271
let logger = TestLogger::new();
274-
let network_graph = NetworkGraph::new(block_hash, &logger);
272+
let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
275273

276274
let example_input = vec![
277275
76, 68, 75, 1, 111, 226, 140, 10, 182, 241, 179, 114, 193, 166, 162, 70, 174, 99, 247,
@@ -309,9 +307,8 @@ mod tests {
309307
68, 226, 0, 6, 11, 0, 1, 128,
310308
];
311309

312-
let block_hash = genesis_block(Network::Bitcoin).block_hash();
313310
let logger = TestLogger::new();
314-
let network_graph = NetworkGraph::new(block_hash, &logger);
311+
let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
315312

316313
assert_eq!(network_graph.read_only().channels().len(), 0);
317314

@@ -338,9 +335,8 @@ mod tests {
338335
2, 68, 226, 0, 6, 11, 0, 1, 128,
339336
];
340337

341-
let block_hash = genesis_block(Network::Bitcoin).block_hash();
342338
let logger = TestLogger::new();
343-
let network_graph = NetworkGraph::new(block_hash, &logger);
339+
let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
344340

345341
assert_eq!(network_graph.read_only().channels().len(), 0);
346342

@@ -375,9 +371,8 @@ mod tests {
375371
0, 1, 0, 0, 0, 125, 255, 2, 68, 226, 0, 6, 11, 0, 1, 5, 0, 0, 0, 0, 29, 129, 25, 192,
376372
];
377373

378-
let block_hash = genesis_block(Network::Bitcoin).block_hash();
379374
let logger = TestLogger::new();
380-
let network_graph = NetworkGraph::new(block_hash, &logger);
375+
let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
381376

382377
assert_eq!(network_graph.read_only().channels().len(), 0);
383378

@@ -442,9 +437,8 @@ mod tests {
442437
25, 192,
443438
];
444439

445-
let block_hash = genesis_block(Network::Bitcoin).block_hash();
446440
let logger = TestLogger::new();
447-
let network_graph = NetworkGraph::new(block_hash, &logger);
441+
let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
448442

449443
assert_eq!(network_graph.read_only().channels().len(), 0);
450444

@@ -502,9 +496,8 @@ mod tests {
502496
25, 192,
503497
];
504498

505-
let block_hash = genesis_block(Network::Bitcoin).block_hash();
506499
let logger = TestLogger::new();
507-
let network_graph = NetworkGraph::new(block_hash, &logger);
500+
let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
508501

509502
assert_eq!(network_graph.read_only().channels().len(), 0);
510503

@@ -528,9 +521,8 @@ mod tests {
528521

529522
#[test]
530523
fn full_update_succeeds() {
531-
let block_hash = genesis_block(Network::Bitcoin).block_hash();
532524
let logger = TestLogger::new();
533-
let network_graph = NetworkGraph::new(block_hash, &logger);
525+
let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
534526

535527
assert_eq!(network_graph.read_only().channels().len(), 0);
536528

@@ -560,9 +552,8 @@ mod tests {
560552

561553
#[test]
562554
fn full_update_succeeds_at_the_beginning_of_the_unix_era() {
563-
let block_hash = genesis_block(Network::Bitcoin).block_hash();
564555
let logger = TestLogger::new();
565-
let network_graph = NetworkGraph::new(block_hash, &logger);
556+
let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
566557

567558
assert_eq!(network_graph.read_only().channels().len(), 0);
568559

@@ -576,14 +567,13 @@ mod tests {
576567
#[test]
577568
fn timestamp_edge_cases_are_handled_correctly() {
578569
// this is the timestamp encoded in the binary data of valid_input below
579-
let block_hash = genesis_block(Network::Bitcoin).block_hash();
580570
let logger = TestLogger::new();
581571

582572
let latest_succeeding_time = VALID_BINARY_TIMESTAMP + STALE_RGS_UPDATE_AGE_LIMIT_SECS;
583573
let earliest_failing_time = latest_succeeding_time + 1;
584574

585575
{
586-
let network_graph = NetworkGraph::new(block_hash, &logger);
576+
let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
587577
assert_eq!(network_graph.read_only().channels().len(), 0);
588578

589579
let rapid_sync = RapidGossipSync::new(&network_graph);
@@ -593,7 +583,7 @@ mod tests {
593583
}
594584

595585
{
596-
let network_graph = NetworkGraph::new(block_hash, &logger);
586+
let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
597587
assert_eq!(network_graph.read_only().channels().len(), 0);
598588

599589
let rapid_sync = RapidGossipSync::new(&network_graph);
@@ -630,9 +620,8 @@ mod tests {
630620
0, 0, 1,
631621
];
632622

633-
let block_hash = genesis_block(Network::Bitcoin).block_hash();
634623
let logger = TestLogger::new();
635-
let network_graph = NetworkGraph::new(block_hash, &logger);
624+
let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
636625
let rapid_sync = RapidGossipSync::new(&network_graph);
637626
let update_result = rapid_sync.update_network_graph(&unknown_version_input[..]);
638627

‎lightning/src/chain/channelmonitor.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4155,7 +4155,7 @@ mod tests {
41554155
// Prune with one old state and a holder commitment tx holding a few overlaps with the
41564156
// old state.
41574157
let shutdown_pubkey = PublicKey::from_secret_key(&secp_ctx, &SecretKey::from_slice(&[42; 32]).unwrap());
4158-
let best_block = BestBlock::from_genesis(Network::Testnet);
4158+
let best_block = BestBlock::from_network(Network::Testnet);
41594159
let monitor = ChannelMonitor::new(Secp256k1::new(), keys,
41604160
Some(ShutdownScript::new_p2wpkh_from_pubkey(shutdown_pubkey).into_inner()), 0, &Script::new(),
41614161
(OutPoint { txid: Txid::from_slice(&[43; 32]).unwrap(), index: 0 }, Script::new()),

‎lightning/src/chain/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ pub struct BestBlock {
4040
impl BestBlock {
4141
/// Constructs a `BestBlock` that represents the genesis block at height 0 of the given
4242
/// network.
43-
pub fn from_genesis(network: Network) -> Self {
43+
pub fn from_network(network: Network) -> Self {
4444
BestBlock {
4545
block_hash: genesis_block(network).header.block_hash(),
4646
height: 0,

‎lightning/src/ln/channel.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7175,7 +7175,7 @@ mod tests {
71757175
let secp_ctx = Secp256k1::new();
71767176
let seed = [42; 32];
71777177
let network = Network::Testnet;
7178-
let best_block = BestBlock::from_genesis(network);
7178+
let best_block = BestBlock::from_network(network);
71797179
let chain_hash = best_block.block_hash();
71807180
let keys_provider = test_utils::TestKeysInterface::new(&seed, network);
71817181

0 commit comments

Comments
 (0)