Remove genesis block hash from public API#2025

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TheBlueMatt merged 2 commits into from
Feb 27, 2023
Merged

Remove genesis block hash from public API #2025

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c3e12e
Remove genesis block hash from public API
TheBlueMatt Feb 9, 2023
d7c818a
Rename `BestBlock::from_genesis` to `from_network` for clarity
TheBlueMatt Feb 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion fuzz/src/chanmon_consistency.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -418,7 +418,7 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out) {
let network = Network::Bitcoin;
let params = ChainParameters {
network,
best_block: BestBlock::from_genesis(network),
best_block: BestBlock::from_network(network),
};
(ChannelManager::new($fee_estimator.clone(), monitor.clone(), broadcast.clone(), &router, Arc::clone(&logger), keys_manager.clone(), keys_manager.clone(), keys_manager.clone(), config, params),
monitor, keys_manager)
Expand Down
4 changes: 2 additions & 2 deletions fuzz/src/full_stack.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -442,15 +442,15 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
let network = Network::Bitcoin;
let params = ChainParameters {
network,
best_block: BestBlock::from_genesis(network),
best_block: BestBlock::from_network(network),
};
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));
// Adding new calls to `EntropySource::get_secure_random_bytes` during startup can change all the
// keys subsequently generated in this test. Rather than regenerating all the messages manually,
// it's easier to just increment the counter here so the keys don't change.
keys_manager.counter.fetch_sub(3, Ordering::AcqRel);
let our_id = &keys_manager.get_node_id(Recipient::Node).unwrap();
let network_graph = Arc::new(NetworkGraph::new(genesis_block(network).block_hash(), Arc::clone(&logger)));
let network_graph = Arc::new(NetworkGraph::new(network, Arc::clone(&logger)));
let gossip_sync = Arc::new(P2PGossipSync::new(Arc::clone(&network_graph), None, Arc::clone(&logger)));
let scorer = FixedPenaltyScorer::with_penalty(0);

Expand Down
4 changes: 1 addition & 3 deletions fuzz/src/process_network_graph.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
// Imports that need to be added manually
use lightning_rapid_gossip_sync::RapidGossipSync;
use bitcoin::hashes::Hash as TraitImport;

use crate::utils::test_logger;

/// Actual fuzz test, method signature and name are fixed
fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
let block_hash = bitcoin::BlockHash::all_zeros();
let logger = test_logger::TestLogger::new("".to_owned(), out);
let network_graph = lightning::routing::gossip::NetworkGraph::new(block_hash, &logger);
let network_graph = lightning::routing::gossip::NetworkGraph::new(bitcoin::Network::Bitcoin, &logger);
let rapid_sync = RapidGossipSync::new(&network_graph);
let _ = rapid_sync.update_network_graph(data);
}
Expand Down
3 changes: 1 addition & 2 deletions fuzz/src/router.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,6 @@ use lightning::util::ser::Readable;
use bitcoin::hashes::Hash;
use bitcoin::secp256k1::PublicKey;
use bitcoin::network::constants::Network;
use bitcoin::blockdata::constants::genesis_block;

use crate::utils::test_logger;

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

let our_pubkey = get_pubkey!();
let net_graph = NetworkGraph::new(genesis_block(Network::Bitcoin).header.block_hash(), &logger);
let net_graph = NetworkGraph::new(Network::Bitcoin, &logger);
let chain_source = FuzzChainSource {
input: Arc::clone(&input),
net_graph: &net_graph,
Expand Down
4 changes: 2 additions & 2 deletions lightning-background-processor/src/lib.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -941,7 +941,7 @@ mod tests {
let logger = Arc::new(test_utils::TestLogger::with_id(format!("node {}", i)));
let network = Network::Testnet;
let genesis_block = genesis_block(network);
let network_graph = Arc::new(NetworkGraph::new(genesis_block.header.block_hash(), logger.clone()));
let network_graph = Arc::new(NetworkGraph::new(network, logger.clone()));
let scorer = Arc::new(Mutex::new(TestScorer::new()));
let seed = [i as u8; 32];
let router = Arc::new(DefaultRouter::new(network_graph.clone(), logger.clone(), seed, scorer.clone()));
Expand All@@ -950,7 +950,7 @@ mod tests {
let now = Duration::from_secs(genesis_block.header.time as u64);
let keys_manager = Arc::new(KeysManager::new(&seed, now.as_secs(), now.subsec_nanos()));
let chain_monitor = Arc::new(chainmonitor::ChainMonitor::new(Some(chain_source.clone()), tx_broadcaster.clone(), logger.clone(), fee_estimator.clone(), persister.clone()));
let best_block = BestBlock::from_genesis(network);
let best_block = BestBlock::from_network(network);
let params = ChainParameters { network, best_block };
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));
let p2p_gossip_sync = Arc::new(P2PGossipSync::new(network_graph.clone(), Some(chain_source.clone()), logger.clone()));
Expand Down
14 changes: 4 additions & 10 deletions lightning-rapid-gossip-sync/src/lib.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -53,8 +53,7 @@
//! # }
//! # let logger = FakeLogger {};
//!
//! let block_hash = genesis_block(Network::Bitcoin).header.block_hash();
//! let network_graph = NetworkGraph::new(block_hash, &logger);
//! let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
//! let rapid_sync = RapidGossipSync::new(&network_graph);
//! let snapshot_contents: &[u8] = &[0; 0];
//! let new_last_sync_timestamp_result = rapid_sync.update_network_graph(snapshot_contents);
Expand DownExpand Up@@ -161,7 +160,6 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L
mod tests {
use std::fs;

use bitcoin::blockdata::constants::genesis_block;
use bitcoin::Network;

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

let block_hash = genesis_block(Network::Bitcoin).block_hash();
let logger = TestLogger::new();
let network_graph = NetworkGraph::new(block_hash, &logger);
let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

Expand DownExpand Up@@ -258,9 +255,8 @@ mod tests {

#[test]
fn measure_native_read_from_file() {
let block_hash = genesis_block(Network::Bitcoin).block_hash();
let logger = TestLogger::new();
let network_graph = NetworkGraph::new(block_hash, &logger);
let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

Expand DownExpand Up@@ -290,7 +286,6 @@ mod tests {
pub mod bench {
use test::Bencher;

use bitcoin::blockdata::constants::genesis_block;
use bitcoin::Network;

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

#[bench]
fn bench_reading_full_graph_from_file(b: &mut Bencher) {
let block_hash = genesis_block(Network::Bitcoin).block_hash();
let logger = TestLogger::new();
b.iter(|| {
let network_graph = NetworkGraph::new(block_hash, &logger);
let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
let rapid_sync = RapidGossipSync::new(&network_graph);
let sync_result = rapid_sync.sync_network_graph_with_file_path("./res/full_graph.lngossip");
if let Err(crate::error::GraphSyncError::DecodeError(DecodeError::Io(io_error))) = &sync_result {
Expand Down
33 changes: 11 additions & 22 deletions lightning-rapid-gossip-sync/src/processing.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -237,7 +237,6 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L

#[cfg(test)]
mod tests {
use bitcoin::blockdata::constants::genesis_block;
use bitcoin::Network;

use lightning::ln::msgs::DecodeError;
Expand DownExpand Up@@ -269,9 +268,8 @@ mod tests {

#[test]
fn network_graph_fails_to_update_from_clipped_input() {
let block_hash = genesis_block(Network::Bitcoin).block_hash();
let logger = TestLogger::new();
let network_graph = NetworkGraph::new(block_hash, &logger);
let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

let block_hash = genesis_block(Network::Bitcoin).block_hash();
let logger = TestLogger::new();
let network_graph = NetworkGraph::new(block_hash, &logger);
let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

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

let block_hash = genesis_block(Network::Bitcoin).block_hash();
let logger = TestLogger::new();
let network_graph = NetworkGraph::new(block_hash, &logger);
let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

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

let block_hash = genesis_block(Network::Bitcoin).block_hash();
let logger = TestLogger::new();
let network_graph = NetworkGraph::new(block_hash, &logger);
let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

Expand DownExpand Up@@ -442,9 +437,8 @@ mod tests {
25, 192,
];

let block_hash = genesis_block(Network::Bitcoin).block_hash();
let logger = TestLogger::new();
let network_graph = NetworkGraph::new(block_hash, &logger);
let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

Expand DownExpand Up@@ -502,9 +496,8 @@ mod tests {
25, 192,
];

let block_hash = genesis_block(Network::Bitcoin).block_hash();
let logger = TestLogger::new();
let network_graph = NetworkGraph::new(block_hash, &logger);
let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

Expand All@@ -528,9 +521,8 @@ mod tests {

#[test]
fn full_update_succeeds() {
let block_hash = genesis_block(Network::Bitcoin).block_hash();
let logger = TestLogger::new();
let network_graph = NetworkGraph::new(block_hash, &logger);
let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

Expand DownExpand Up@@ -560,9 +552,8 @@ mod tests {

#[test]
fn full_update_succeeds_at_the_beginning_of_the_unix_era() {
let block_hash = genesis_block(Network::Bitcoin).block_hash();
let logger = TestLogger::new();
let network_graph = NetworkGraph::new(block_hash, &logger);
let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

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

let latest_succeeding_time = VALID_BINARY_TIMESTAMP + STALE_RGS_UPDATE_AGE_LIMIT_SECS;
let earliest_failing_time = latest_succeeding_time + 1;

{
let network_graph = NetworkGraph::new(block_hash, &logger);
let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
assert_eq!(network_graph.read_only().channels().len(), 0);

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

{
let network_graph = NetworkGraph::new(block_hash, &logger);
let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
assert_eq!(network_graph.read_only().channels().len(), 0);

let rapid_sync = RapidGossipSync::new(&network_graph);
Expand DownExpand Up@@ -630,9 +620,8 @@ mod tests {
0, 0, 1,
];

let block_hash = genesis_block(Network::Bitcoin).block_hash();
let logger = TestLogger::new();
let network_graph = NetworkGraph::new(block_hash, &logger);
let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
let rapid_sync = RapidGossipSync::new(&network_graph);
let update_result = rapid_sync.update_network_graph(&unknown_version_input[..]);

Expand Down
2 changes: 1 addition & 1 deletion lightning/src/chain/channelmonitor.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4155,7 +4155,7 @@ mod tests {
// Prune with one old state and a holder commitment tx holding a few overlaps with the
// old state.
let shutdown_pubkey = PublicKey::from_secret_key(&secp_ctx, &SecretKey::from_slice(&[42; 32]).unwrap());
let best_block = BestBlock::from_genesis(Network::Testnet);
let best_block = BestBlock::from_network(Network::Testnet);
let monitor = ChannelMonitor::new(Secp256k1::new(), keys,
Some(ShutdownScript::new_p2wpkh_from_pubkey(shutdown_pubkey).into_inner()), 0, &Script::new(),
(OutPoint { txid: Txid::from_slice(&[43; 32]).unwrap(), index: 0 }, Script::new()),
Expand Down
2 changes: 1 addition & 1 deletion lightning/src/chain/mod.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,7 @@ pub struct BestBlock {
impl BestBlock {
/// Constructs a `BestBlock` that represents the genesis block at height 0 of the given
/// network.
pub fn from_genesis(network: Network) -> Self {
pub fn from_network(network: Network) -> Self {
BestBlock {
block_hash: genesis_block(network).header.block_hash(),
height: 0,
Expand Down
2 changes: 1 addition & 1 deletion lightning/src/ln/channel.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7175,7 +7175,7 @@ mod tests {
let secp_ctx = Secp256k1::new();
let seed = [42; 32];
let network = Network::Testnet;
let best_block = BestBlock::from_genesis(network);
let best_block = BestBlock::from_network(network);
let chain_hash = best_block.block_hash();
let keys_provider = test_utils::TestKeysInterface::new(&seed, network);

Expand Down
11 changes: 5 additions & 6 deletions lightning/src/ln/channelmanager.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8672,13 +8672,12 @@ pub mod bench {
// Note that this is unrealistic as each payment send will require at least two fsync
// calls per node.
let network = bitcoin::Network::Testnet;
let genesis_hash = bitcoin::blockdata::constants::genesis_block(network).header.block_hash();

let tx_broadcaster = test_utils::TestBroadcaster{txn_broadcasted: Mutex::new(Vec::new()), blocks: Arc::new(Mutex::new(Vec::new()))};
let fee_estimator = test_utils::TestFeeEstimator { sat_per_kw: Mutex::new(253) };
let logger_a = test_utils::TestLogger::with_id("node a".to_owned());
let scorer = Mutex::new(test_utils::TestScorer::new());
let router = test_utils::TestRouter::new(Arc::new(NetworkGraph::new(genesis_hash, &logger_a)), &scorer);
let router = test_utils::TestRouter::new(Arc::new(NetworkGraph::new(network, &logger_a)), &scorer);

let mut config: UserConfig = Default::default();
config.channel_handshake_config.minimum_depth = 1;
Expand All@@ -8688,7 +8687,7 @@ pub mod bench {
let keys_manager_a = KeysManager::new(&seed_a, 42, 42);
let node_a = ChannelManager::new(&fee_estimator, &chain_monitor_a, &tx_broadcaster, &router, &logger_a, &keys_manager_a, &keys_manager_a, &keys_manager_a, config.clone(), ChainParameters {
network,
best_block: BestBlock::from_genesis(network),
best_block: BestBlock::from_network(network),
});
let node_a_holder = NodeHolder { node: &node_a };

Expand All@@ -8698,7 +8697,7 @@ pub mod bench {
let keys_manager_b = KeysManager::new(&seed_b, 42, 42);
let node_b = ChannelManager::new(&fee_estimator, &chain_monitor_b, &tx_broadcaster, &router, &logger_b, &keys_manager_b, &keys_manager_b, &keys_manager_b, config.clone(), ChainParameters {
network,
best_block: BestBlock::from_genesis(network),
best_block: BestBlock::from_network(network),
});
let node_b_holder = NodeHolder { node: &node_b };

Expand All@@ -8722,7 +8721,7 @@ pub mod bench {
assert_eq!(&tx_broadcaster.txn_broadcasted.lock().unwrap()[..], &[tx.clone()]);

let block = Block {
header: BlockHeader { version: 0x20000000, prev_blockhash: genesis_hash, merkle_root: TxMerkleNode::all_zeros(), time: 42, bits: 42, nonce: 42 },
header: BlockHeader { version: 0x20000000, prev_blockhash: BestBlock::from_network(network).block_hash(), merkle_root: TxMerkleNode::all_zeros(), time: 42, bits: 42, nonce: 42 },
txdata: vec![tx],
};
Listen::block_connected(&node_a, &block, 1);
Expand DownExpand Up@@ -8761,7 +8760,7 @@ pub mod bench {
_ => panic!("Unexpected event"),
}

let dummy_graph = NetworkGraph::new(genesis_hash, &logger_a);
let dummy_graph = NetworkGraph::new(network, &logger_a);

let mut payment_count: u64 = 0;
macro_rules! send_payment {
Expand Down
4 changes: 2 additions & 2 deletions lightning/src/ln/functional_test_utils.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2300,7 +2300,7 @@ pub fn create_node_cfgs<'a>(node_count: usize, chanmon_cfgs: &'a Vec<TestChanMon

for i in 0..node_count {
let chain_monitor = test_utils::TestChainMonitor::new(Some(&chanmon_cfgs[i].chain_source), &chanmon_cfgs[i].tx_broadcaster, &chanmon_cfgs[i].logger, &chanmon_cfgs[i].fee_estimator, &chanmon_cfgs[i].persister, &chanmon_cfgs[i].keys_manager);
let network_graph = Arc::new(NetworkGraph::new(chanmon_cfgs[i].chain_source.genesis_hash, &chanmon_cfgs[i].logger));
let network_graph = Arc::new(NetworkGraph::new(Network::Testnet, &chanmon_cfgs[i].logger));
let seed = [i as u8; 32];
nodes.push(NodeCfg {
chain_source: &chanmon_cfgs[i].chain_source,
Expand DownExpand Up@@ -2341,7 +2341,7 @@ pub fn create_node_chanmgrs<'a, 'b>(node_count: usize, cfgs: &'a Vec<NodeCfg<'b>
let network = Network::Testnet;
let params = ChainParameters {
network,
best_block: BestBlock::from_genesis(network),
best_block: BestBlock::from_network(network),
};
let node = ChannelManager::new(cfgs[i].fee_estimator, &cfgs[i].chain_monitor, cfgs[i].tx_broadcaster, &cfgs[i].router, cfgs[i].logger, cfgs[i].keys_manager,
cfgs[i].keys_manager, cfgs[i].keys_manager, if node_config[i].is_some() { node_config[i].clone().unwrap() } else { test_default_channel_config() }, params);
Expand Down
2 changes: 1 addition & 1 deletion lightning/src/ln/functional_tests.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5280,7 +5280,7 @@ fn test_key_derivation_params() {
let seed = [42; 32];
let keys_manager = test_utils::TestKeysInterface::new(&seed, Network::Testnet);
let chain_monitor = test_utils::TestChainMonitor::new(Some(&chanmon_cfgs[0].chain_source), &chanmon_cfgs[0].tx_broadcaster, &chanmon_cfgs[0].logger, &chanmon_cfgs[0].fee_estimator, &chanmon_cfgs[0].persister, &keys_manager);
let network_graph = Arc::new(NetworkGraph::new(chanmon_cfgs[0].chain_source.genesis_hash, &chanmon_cfgs[0].logger));
let network_graph = Arc::new(NetworkGraph::new(Network::Testnet, &chanmon_cfgs[0].logger));
let scorer = Mutex::new(test_utils::TestScorer::new());
let router = test_utils::TestRouter::new(network_graph.clone(), &scorer);
let node = NodeCfg { chain_source: &chanmon_cfgs[0].chain_source, logger: &chanmon_cfgs[0].logger, tx_broadcaster: &chanmon_cfgs[0].tx_broadcaster, fee_estimator: &chanmon_cfgs[0].fee_estimator, router, chain_monitor, keys_manager: &keys_manager, network_graph, node_seed: seed, override_init_features: alloc::rc::Rc::new(core::cell::RefCell::new(None)) };
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
Remove genesis block hash from public API#2025

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 2 commits into

from

Feb 27, 2023
 Merged


Remove genesis block hash from public API
#2025
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
2c3e12e

Remove genesis block hash from public API


TheBlueMatt Feb 9, 2023
d7c818a

Rename `BestBlock::from_genesis` to `from_network` for clarity


TheBlueMatt Feb 15, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -418,7 +418,7 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out) {
 let network = Network::Bitcoin;
 let params = ChainParameters {
 network,
 best_block: BestBlock::from_genesis(network),
 best_block: BestBlock::from_network(network),
 };
 (ChannelManager::new($fee_estimator.clone(), monitor.clone(), broadcast.clone(), &router, Arc::clone(&logger), keys_manager.clone(), keys_manager.clone(), keys_manager.clone(), config, params),
 monitor, keys_manager)
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -442,15 +442,15 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
	let network = Network::Bitcoin;
	let params = ChainParameters {
 network,
 best_block: BestBlock::from_genesis(network),
 best_block: BestBlock::from_network(network),
	};
	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));
	// Adding new calls to `EntropySource::get_secure_random_bytes` during startup can change all the
	// keys subsequently generated in this test. Rather than regenerating all the messages manually,
	// it's easier to just increment the counter here so the keys don't change.
	keys_manager.counter.fetch_sub(3, Ordering::AcqRel);
	let our_id = &keys_manager.get_node_id(Recipient::Node).unwrap();
	let network_graph = Arc::new(NetworkGraph::new(genesis_block(network).block_hash(), Arc::clone(&logger)));
	let network_graph = Arc::new(NetworkGraph::new(network, Arc::clone(&logger)));
	let gossip_sync = Arc::new(P2PGossipSync::new(Arc::clone(&network_graph), None, Arc::clone(&logger)));
	let scorer = FixedPenaltyScorer::with_penalty(0);

Expand Down

4 changes: 1 addition & 3 deletions
fuzz/src/process_network_graph.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
// Imports that need to be added manually
use lightning_rapid_gossip_sync::RapidGossipSync;
use bitcoin::hashes::Hash as TraitImport;

use crate::utils::test_logger;

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

3 changes: 1 addition & 2 deletions
fuzz/src/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,6 @@ use lightning::util::ser::Readable;
use bitcoin::hashes::Hash;
use bitcoin::secp256k1::PublicKey;
use bitcoin::network::constants::Network;
use bitcoin::blockdata::constants::genesis_block;

use crate::utils::test_logger;

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

	let our_pubkey = get_pubkey!();
	let net_graph = NetworkGraph::new(genesis_block(Network::Bitcoin).header.block_hash(), &logger);
	let net_graph = NetworkGraph::new(Network::Bitcoin, &logger);
	let chain_source = FuzzChainSource {
 input: Arc::clone(&input),
 net_graph: &net_graph,
Expand Down

4 changes: 2 additions & 2 deletions
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -941,7 +941,7 @@ mod tests {
 let logger = Arc::new(test_utils::TestLogger::with_id(format!("node {}", i)));
 let network = Network::Testnet;
 let genesis_block = genesis_block(network);
 let network_graph = Arc::new(NetworkGraph::new(genesis_block.header.block_hash(), logger.clone()));
 let network_graph = Arc::new(NetworkGraph::new(network, logger.clone()));
 let scorer = Arc::new(Mutex::new(TestScorer::new()));
 let seed = [i as u8; 32];
 let router = Arc::new(DefaultRouter::new(network_graph.clone(), logger.clone(), seed, scorer.clone()));
Expand All@@ -950,7 +950,7 @@ mod tests {
 let now = Duration::from_secs(genesis_block.header.time as u64);
 let keys_manager = Arc::new(KeysManager::new(&seed, now.as_secs(), now.subsec_nanos()));
 let chain_monitor = Arc::new(chainmonitor::ChainMonitor::new(Some(chain_source.clone()), tx_broadcaster.clone(), logger.clone(), fee_estimator.clone(), persister.clone()));
 let best_block = BestBlock::from_genesis(network);
 let best_block = BestBlock::from_network(network);
 let params = ChainParameters { network, best_block };
 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));
 let p2p_gossip_sync = Arc::new(P2PGossipSync::new(network_graph.clone(), Some(chain_source.clone()), logger.clone()));
Expand Down

14 changes: 4 additions & 10 deletions
lightning-rapid-gossip-sync/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,8 +53,7 @@
//! # }
//! # let logger = FakeLogger {};
//!
//! let block_hash = genesis_block(Network::Bitcoin).header.block_hash();
//! let network_graph = NetworkGraph::new(block_hash, &logger);
//! let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
//! let rapid_sync = RapidGossipSync::new(&network_graph);
//! let snapshot_contents: &[u8] = &[0; 0];
//! let new_last_sync_timestamp_result = rapid_sync.update_network_graph(snapshot_contents);
Expand DownExpand Up@@ -161,7 +160,6 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L
mod tests {
	use std::fs;

	use bitcoin::blockdata::constants::genesis_block;
	use bitcoin::Network;

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

 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

Expand DownExpand Up@@ -258,9 +255,8 @@ mod tests {

	#[test]
	fn measure_native_read_from_file() {
 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

Expand DownExpand Up@@ -290,7 +286,6 @@ mod tests {
pub mod bench {
	use test::Bencher;

	use bitcoin::blockdata::constants::genesis_block;
	use bitcoin::Network;

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

	#[bench]
	fn bench_reading_full_graph_from_file(b: &mut Bencher) {
 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 b.iter(|| {
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 let rapid_sync = RapidGossipSync::new(&network_graph);
 let sync_result = rapid_sync.sync_network_graph_with_file_path("./res/full_graph.lngossip");
 if let Err(crate::error::GraphSyncError::DecodeError(DecodeError::Io(io_error))) = &sync_result {
Expand Down

33 changes: 11 additions & 22 deletions
lightning-rapid-gossip-sync/src/processing.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -237,7 +237,6 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L

#[cfg(test)]
mod tests {
	use bitcoin::blockdata::constants::genesis_block;
	use bitcoin::Network;

	use lightning::ln::msgs::DecodeError;
Expand DownExpand Up@@ -269,9 +268,8 @@ mod tests {

	#[test]
	fn network_graph_fails_to_update_from_clipped_input() {
 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

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

 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

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

 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

Expand DownExpand Up@@ -442,9 +437,8 @@ mod tests {
 25, 192,
 ];

 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

Expand DownExpand Up@@ -502,9 +496,8 @@ mod tests {
 25, 192,
 ];

 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

Expand All@@ -528,9 +521,8 @@ mod tests {

	#[test]
	fn full_update_succeeds() {
 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

Expand DownExpand Up@@ -560,9 +552,8 @@ mod tests {

	#[test]
	fn full_update_succeeds_at_the_beginning_of_the_unix_era() {
 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

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

 let latest_succeeding_time = VALID_BINARY_TIMESTAMP + STALE_RGS_UPDATE_AGE_LIMIT_SECS;
 let earliest_failing_time = latest_succeeding_time + 1;

 {
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 assert_eq!(network_graph.read_only().channels().len(), 0);

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

 {
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
Expand DownExpand Up@@ -630,9 +620,8 @@ mod tests {
 0, 0, 1,
 ];

 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 let rapid_sync = RapidGossipSync::new(&network_graph);
 let update_result = rapid_sync.update_network_graph(&unknown_version_input[..]);

Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

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

2 changes: 1 addition & 1 deletion
lightning/src/chain/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,7 @@ pub struct BestBlock {
impl BestBlock {
	/// Constructs a `BestBlock` that represents the genesis block at height 0 of the given
	/// network.
	pub fn from_genesis(network: Network) -> Self {
	pub fn from_network(network: Network) -> Self {
 BestBlock {
 block_hash: genesis_block(network).header.block_hash(),
 height: 0,
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7175,7 +7175,7 @@ mod tests {
 let secp_ctx = Secp256k1::new();
 let seed = [42; 32];
 let network = Network::Testnet;
 let best_block = BestBlock::from_genesis(network);
 let best_block = BestBlock::from_network(network);
 let chain_hash = best_block.block_hash();
 let keys_provider = test_utils::TestKeysInterface::new(&seed, network);

Expand Down

11 changes: 5 additions & 6 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8672,13 +8672,12 @@ pub mod bench {
 // Note that this is unrealistic as each payment send will require at least two fsync
 // calls per node.
 let network = bitcoin::Network::Testnet;
 let genesis_hash = bitcoin::blockdata::constants::genesis_block(network).header.block_hash();

 let tx_broadcaster = test_utils::TestBroadcaster{txn_broadcasted: Mutex::new(Vec::new()), blocks: Arc::new(Mutex::new(Vec::new()))};
 let fee_estimator = test_utils::TestFeeEstimator { sat_per_kw: Mutex::new(253) };
 let logger_a = test_utils::TestLogger::with_id("node a".to_owned());
 let scorer = Mutex::new(test_utils::TestScorer::new());
 let router = test_utils::TestRouter::new(Arc::new(NetworkGraph::new(genesis_hash, &logger_a)), &scorer);
 let router = test_utils::TestRouter::new(Arc::new(NetworkGraph::new(network, &logger_a)), &scorer);

 let mut config: UserConfig = Default::default();
 config.channel_handshake_config.minimum_depth = 1;
Expand All@@ -8688,7 +8687,7 @@ pub mod bench {
 let keys_manager_a = KeysManager::new(&seed_a, 42, 42);
 let node_a = ChannelManager::new(&fee_estimator, &chain_monitor_a, &tx_broadcaster, &router, &logger_a, &keys_manager_a, &keys_manager_a, &keys_manager_a, config.clone(), ChainParameters {
 network,
 best_block: BestBlock::from_genesis(network),
 best_block: BestBlock::from_network(network),
 });
 let node_a_holder = NodeHolder { node: &node_a };

Expand All@@ -8698,7 +8697,7 @@ pub mod bench {
 let keys_manager_b = KeysManager::new(&seed_b, 42, 42);
 let node_b = ChannelManager::new(&fee_estimator, &chain_monitor_b, &tx_broadcaster, &router, &logger_b, &keys_manager_b, &keys_manager_b, &keys_manager_b, config.clone(), ChainParameters {
 network,
 best_block: BestBlock::from_genesis(network),
 best_block: BestBlock::from_network(network),
 });
 let node_b_holder = NodeHolder { node: &node_b };

Expand All@@ -8722,7 +8721,7 @@ pub mod bench {
 assert_eq!(&tx_broadcaster.txn_broadcasted.lock().unwrap()[..], &[tx.clone()]);

 let block = Block {
 header: BlockHeader { version: 0x20000000, prev_blockhash: genesis_hash, merkle_root: TxMerkleNode::all_zeros(), time: 42, bits: 42, nonce: 42 },
 header: BlockHeader { version: 0x20000000, prev_blockhash: BestBlock::from_network(network).block_hash(), merkle_root: TxMerkleNode::all_zeros(), time: 42, bits: 42, nonce: 42 },
 txdata: vec![tx],
 };
 Listen::block_connected(&node_a, &block, 1);
Expand DownExpand Up@@ -8761,7 +8760,7 @@ pub mod bench {
 _ => panic!("Unexpected event"),
 }

 let dummy_graph = NetworkGraph::new(genesis_hash, &logger_a);
 let dummy_graph = NetworkGraph::new(network, &logger_a);

 let mut payment_count: u64 = 0;
 macro_rules! send_payment {
Expand Down

4 changes: 2 additions & 2 deletions
lightning/src/ln/functional_test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2300,7 +2300,7 @@ pub fn create_node_cfgs<'a>(node_count: usize, chanmon_cfgs: &'a Vec<TestChanMon

	for i in 0..node_count {
 let chain_monitor = test_utils::TestChainMonitor::new(Some(&chanmon_cfgs[i].chain_source), &chanmon_cfgs[i].tx_broadcaster, &chanmon_cfgs[i].logger, &chanmon_cfgs[i].fee_estimator, &chanmon_cfgs[i].persister, &chanmon_cfgs[i].keys_manager);
 let network_graph = Arc::new(NetworkGraph::new(chanmon_cfgs[i].chain_source.genesis_hash, &chanmon_cfgs[i].logger));
 let network_graph = Arc::new(NetworkGraph::new(Network::Testnet, &chanmon_cfgs[i].logger));
 let seed = [i as u8; 32];
 nodes.push(NodeCfg {
 chain_source: &chanmon_cfgs[i].chain_source,
Expand DownExpand Up@@ -2341,7 +2341,7 @@ pub fn create_node_chanmgrs<'a, 'b>(node_count: usize, cfgs: &'a Vec<NodeCfg<'b>
 let network = Network::Testnet;
 let params = ChainParameters {
 network,
 best_block: BestBlock::from_genesis(network),
 best_block: BestBlock::from_network(network),
 };
 let node = ChannelManager::new(cfgs[i].fee_estimator, &cfgs[i].chain_monitor, cfgs[i].tx_broadcaster, &cfgs[i].router, cfgs[i].logger, cfgs[i].keys_manager,
 cfgs[i].keys_manager, cfgs[i].keys_manager, if node_config[i].is_some() { node_config[i].clone().unwrap() } else { test_default_channel_config() }, params);
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5280,7 +5280,7 @@ fn test_key_derivation_params() {
	let seed = [42; 32];
	let keys_manager = test_utils::TestKeysInterface::new(&seed, Network::Testnet);
	let chain_monitor = test_utils::TestChainMonitor::new(Some(&chanmon_cfgs[0].chain_source), &chanmon_cfgs[0].tx_broadcaster, &chanmon_cfgs[0].logger, &chanmon_cfgs[0].fee_estimator, &chanmon_cfgs[0].persister, &keys_manager);
	let network_graph = Arc::new(NetworkGraph::new(chanmon_cfgs[0].chain_source.genesis_hash, &chanmon_cfgs[0].logger));
	let network_graph = Arc::new(NetworkGraph::new(Network::Testnet, &chanmon_cfgs[0].logger));
	let scorer = Mutex::new(test_utils::TestScorer::new());
	let router = test_utils::TestRouter::new(network_graph.clone(), &scorer);
	let node = NodeCfg { chain_source: &chanmon_cfgs[0].chain_source, logger: &chanmon_cfgs[0].logger, tx_broadcaster: &chanmon_cfgs[0].tx_broadcaster, fee_estimator: &chanmon_cfgs[0].fee_estimator, router, chain_monitor, keys_manager: &keys_manager, network_graph, node_seed: seed, override_init_features: alloc::rc::Rc::new(core::cell::RefCell::new(None)) };
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
Remove genesis block hash from public API#2025

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 2 commits into

from

Feb 27, 2023
 Merged


Remove genesis block hash from public API
#2025
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
2c3e12e

Remove genesis block hash from public API


TheBlueMatt Feb 9, 2023
d7c818a

Rename `BestBlock::from_genesis` to `from_network` for clarity


TheBlueMatt Feb 15, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -418,7 +418,7 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out) {
 let network = Network::Bitcoin;
 let params = ChainParameters {
 network,
 best_block: BestBlock::from_genesis(network),
 best_block: BestBlock::from_network(network),
 };
 (ChannelManager::new($fee_estimator.clone(), monitor.clone(), broadcast.clone(), &router, Arc::clone(&logger), keys_manager.clone(), keys_manager.clone(), keys_manager.clone(), config, params),
 monitor, keys_manager)
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -442,15 +442,15 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
	let network = Network::Bitcoin;
	let params = ChainParameters {
 network,
 best_block: BestBlock::from_genesis(network),
 best_block: BestBlock::from_network(network),
	};
	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));
	// Adding new calls to `EntropySource::get_secure_random_bytes` during startup can change all the
	// keys subsequently generated in this test. Rather than regenerating all the messages manually,
	// it's easier to just increment the counter here so the keys don't change.
	keys_manager.counter.fetch_sub(3, Ordering::AcqRel);
	let our_id = &keys_manager.get_node_id(Recipient::Node).unwrap();
	let network_graph = Arc::new(NetworkGraph::new(genesis_block(network).block_hash(), Arc::clone(&logger)));
	let network_graph = Arc::new(NetworkGraph::new(network, Arc::clone(&logger)));
	let gossip_sync = Arc::new(P2PGossipSync::new(Arc::clone(&network_graph), None, Arc::clone(&logger)));
	let scorer = FixedPenaltyScorer::with_penalty(0);

Expand Down

4 changes: 1 addition & 3 deletions
fuzz/src/process_network_graph.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
// Imports that need to be added manually
use lightning_rapid_gossip_sync::RapidGossipSync;
use bitcoin::hashes::Hash as TraitImport;

use crate::utils::test_logger;

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

3 changes: 1 addition & 2 deletions
fuzz/src/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,6 @@ use lightning::util::ser::Readable;
use bitcoin::hashes::Hash;
use bitcoin::secp256k1::PublicKey;
use bitcoin::network::constants::Network;
use bitcoin::blockdata::constants::genesis_block;

use crate::utils::test_logger;

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

	let our_pubkey = get_pubkey!();
	let net_graph = NetworkGraph::new(genesis_block(Network::Bitcoin).header.block_hash(), &logger);
	let net_graph = NetworkGraph::new(Network::Bitcoin, &logger);
	let chain_source = FuzzChainSource {
 input: Arc::clone(&input),
 net_graph: &net_graph,
Expand Down

4 changes: 2 additions & 2 deletions
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -941,7 +941,7 @@ mod tests {
 let logger = Arc::new(test_utils::TestLogger::with_id(format!("node {}", i)));
 let network = Network::Testnet;
 let genesis_block = genesis_block(network);
 let network_graph = Arc::new(NetworkGraph::new(genesis_block.header.block_hash(), logger.clone()));
 let network_graph = Arc::new(NetworkGraph::new(network, logger.clone()));
 let scorer = Arc::new(Mutex::new(TestScorer::new()));
 let seed = [i as u8; 32];
 let router = Arc::new(DefaultRouter::new(network_graph.clone(), logger.clone(), seed, scorer.clone()));
Expand All@@ -950,7 +950,7 @@ mod tests {
 let now = Duration::from_secs(genesis_block.header.time as u64);
 let keys_manager = Arc::new(KeysManager::new(&seed, now.as_secs(), now.subsec_nanos()));
 let chain_monitor = Arc::new(chainmonitor::ChainMonitor::new(Some(chain_source.clone()), tx_broadcaster.clone(), logger.clone(), fee_estimator.clone(), persister.clone()));
 let best_block = BestBlock::from_genesis(network);
 let best_block = BestBlock::from_network(network);
 let params = ChainParameters { network, best_block };
 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));
 let p2p_gossip_sync = Arc::new(P2PGossipSync::new(network_graph.clone(), Some(chain_source.clone()), logger.clone()));
Expand Down

14 changes: 4 additions & 10 deletions
lightning-rapid-gossip-sync/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,8 +53,7 @@
//! # }
//! # let logger = FakeLogger {};
//!
//! let block_hash = genesis_block(Network::Bitcoin).header.block_hash();
//! let network_graph = NetworkGraph::new(block_hash, &logger);
//! let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
//! let rapid_sync = RapidGossipSync::new(&network_graph);
//! let snapshot_contents: &[u8] = &[0; 0];
//! let new_last_sync_timestamp_result = rapid_sync.update_network_graph(snapshot_contents);
Expand DownExpand Up@@ -161,7 +160,6 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L
mod tests {
	use std::fs;

	use bitcoin::blockdata::constants::genesis_block;
	use bitcoin::Network;

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

 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

Expand DownExpand Up@@ -258,9 +255,8 @@ mod tests {

	#[test]
	fn measure_native_read_from_file() {
 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

Expand DownExpand Up@@ -290,7 +286,6 @@ mod tests {
pub mod bench {
	use test::Bencher;

	use bitcoin::blockdata::constants::genesis_block;
	use bitcoin::Network;

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

	#[bench]
	fn bench_reading_full_graph_from_file(b: &mut Bencher) {
 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 b.iter(|| {
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 let rapid_sync = RapidGossipSync::new(&network_graph);
 let sync_result = rapid_sync.sync_network_graph_with_file_path("./res/full_graph.lngossip");
 if let Err(crate::error::GraphSyncError::DecodeError(DecodeError::Io(io_error))) = &sync_result {
Expand Down

33 changes: 11 additions & 22 deletions
lightning-rapid-gossip-sync/src/processing.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -237,7 +237,6 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L

#[cfg(test)]
mod tests {
	use bitcoin::blockdata::constants::genesis_block;
	use bitcoin::Network;

	use lightning::ln::msgs::DecodeError;
Expand DownExpand Up@@ -269,9 +268,8 @@ mod tests {

	#[test]
	fn network_graph_fails_to_update_from_clipped_input() {
 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

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

 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

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

 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

Expand DownExpand Up@@ -442,9 +437,8 @@ mod tests {
 25, 192,
 ];

 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

Expand DownExpand Up@@ -502,9 +496,8 @@ mod tests {
 25, 192,
 ];

 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

Expand All@@ -528,9 +521,8 @@ mod tests {

	#[test]
	fn full_update_succeeds() {
 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

Expand DownExpand Up@@ -560,9 +552,8 @@ mod tests {

	#[test]
	fn full_update_succeeds_at_the_beginning_of_the_unix_era() {
 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

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

 let latest_succeeding_time = VALID_BINARY_TIMESTAMP + STALE_RGS_UPDATE_AGE_LIMIT_SECS;
 let earliest_failing_time = latest_succeeding_time + 1;

 {
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 assert_eq!(network_graph.read_only().channels().len(), 0);

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

 {
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
Expand DownExpand Up@@ -630,9 +620,8 @@ mod tests {
 0, 0, 1,
 ];

 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 let rapid_sync = RapidGossipSync::new(&network_graph);
 let update_result = rapid_sync.update_network_graph(&unknown_version_input[..]);

Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

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

2 changes: 1 addition & 1 deletion
lightning/src/chain/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,7 @@ pub struct BestBlock {
impl BestBlock {
	/// Constructs a `BestBlock` that represents the genesis block at height 0 of the given
	/// network.
	pub fn from_genesis(network: Network) -> Self {
	pub fn from_network(network: Network) -> Self {
 BestBlock {
 block_hash: genesis_block(network).header.block_hash(),
 height: 0,
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7175,7 +7175,7 @@ mod tests {
 let secp_ctx = Secp256k1::new();
 let seed = [42; 32];
 let network = Network::Testnet;
 let best_block = BestBlock::from_genesis(network);
 let best_block = BestBlock::from_network(network);
 let chain_hash = best_block.block_hash();
 let keys_provider = test_utils::TestKeysInterface::new(&seed, network);

Expand Down

11 changes: 5 additions & 6 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8672,13 +8672,12 @@ pub mod bench {
 // Note that this is unrealistic as each payment send will require at least two fsync
 // calls per node.
 let network = bitcoin::Network::Testnet;
 let genesis_hash = bitcoin::blockdata::constants::genesis_block(network).header.block_hash();

 let tx_broadcaster = test_utils::TestBroadcaster{txn_broadcasted: Mutex::new(Vec::new()), blocks: Arc::new(Mutex::new(Vec::new()))};
 let fee_estimator = test_utils::TestFeeEstimator { sat_per_kw: Mutex::new(253) };
 let logger_a = test_utils::TestLogger::with_id("node a".to_owned());
 let scorer = Mutex::new(test_utils::TestScorer::new());
 let router = test_utils::TestRouter::new(Arc::new(NetworkGraph::new(genesis_hash, &logger_a)), &scorer);
 let router = test_utils::TestRouter::new(Arc::new(NetworkGraph::new(network, &logger_a)), &scorer);

 let mut config: UserConfig = Default::default();
 config.channel_handshake_config.minimum_depth = 1;
Expand All@@ -8688,7 +8687,7 @@ pub mod bench {
 let keys_manager_a = KeysManager::new(&seed_a, 42, 42);
 let node_a = ChannelManager::new(&fee_estimator, &chain_monitor_a, &tx_broadcaster, &router, &logger_a, &keys_manager_a, &keys_manager_a, &keys_manager_a, config.clone(), ChainParameters {
 network,
 best_block: BestBlock::from_genesis(network),
 best_block: BestBlock::from_network(network),
 });
 let node_a_holder = NodeHolder { node: &node_a };

Expand All@@ -8698,7 +8697,7 @@ pub mod bench {
 let keys_manager_b = KeysManager::new(&seed_b, 42, 42);
 let node_b = ChannelManager::new(&fee_estimator, &chain_monitor_b, &tx_broadcaster, &router, &logger_b, &keys_manager_b, &keys_manager_b, &keys_manager_b, config.clone(), ChainParameters {
 network,
 best_block: BestBlock::from_genesis(network),
 best_block: BestBlock::from_network(network),
 });
 let node_b_holder = NodeHolder { node: &node_b };

Expand All@@ -8722,7 +8721,7 @@ pub mod bench {
 assert_eq!(&tx_broadcaster.txn_broadcasted.lock().unwrap()[..], &[tx.clone()]);

 let block = Block {
 header: BlockHeader { version: 0x20000000, prev_blockhash: genesis_hash, merkle_root: TxMerkleNode::all_zeros(), time: 42, bits: 42, nonce: 42 },
 header: BlockHeader { version: 0x20000000, prev_blockhash: BestBlock::from_network(network).block_hash(), merkle_root: TxMerkleNode::all_zeros(), time: 42, bits: 42, nonce: 42 },
 txdata: vec![tx],
 };
 Listen::block_connected(&node_a, &block, 1);
Expand DownExpand Up@@ -8761,7 +8760,7 @@ pub mod bench {
 _ => panic!("Unexpected event"),
 }

 let dummy_graph = NetworkGraph::new(genesis_hash, &logger_a);
 let dummy_graph = NetworkGraph::new(network, &logger_a);

 let mut payment_count: u64 = 0;
 macro_rules! send_payment {
Expand Down

4 changes: 2 additions & 2 deletions
lightning/src/ln/functional_test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2300,7 +2300,7 @@ pub fn create_node_cfgs<'a>(node_count: usize, chanmon_cfgs: &'a Vec<TestChanMon

	for i in 0..node_count {
 let chain_monitor = test_utils::TestChainMonitor::new(Some(&chanmon_cfgs[i].chain_source), &chanmon_cfgs[i].tx_broadcaster, &chanmon_cfgs[i].logger, &chanmon_cfgs[i].fee_estimator, &chanmon_cfgs[i].persister, &chanmon_cfgs[i].keys_manager);
 let network_graph = Arc::new(NetworkGraph::new(chanmon_cfgs[i].chain_source.genesis_hash, &chanmon_cfgs[i].logger));
 let network_graph = Arc::new(NetworkGraph::new(Network::Testnet, &chanmon_cfgs[i].logger));
 let seed = [i as u8; 32];
 nodes.push(NodeCfg {
 chain_source: &chanmon_cfgs[i].chain_source,
Expand DownExpand Up@@ -2341,7 +2341,7 @@ pub fn create_node_chanmgrs<'a, 'b>(node_count: usize, cfgs: &'a Vec<NodeCfg<'b>
 let network = Network::Testnet;
 let params = ChainParameters {
 network,
 best_block: BestBlock::from_genesis(network),
 best_block: BestBlock::from_network(network),
 };
 let node = ChannelManager::new(cfgs[i].fee_estimator, &cfgs[i].chain_monitor, cfgs[i].tx_broadcaster, &cfgs[i].router, cfgs[i].logger, cfgs[i].keys_manager,
 cfgs[i].keys_manager, cfgs[i].keys_manager, if node_config[i].is_some() { node_config[i].clone().unwrap() } else { test_default_channel_config() }, params);
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5280,7 +5280,7 @@ fn test_key_derivation_params() {
	let seed = [42; 32];
	let keys_manager = test_utils::TestKeysInterface::new(&seed, Network::Testnet);
	let chain_monitor = test_utils::TestChainMonitor::new(Some(&chanmon_cfgs[0].chain_source), &chanmon_cfgs[0].tx_broadcaster, &chanmon_cfgs[0].logger, &chanmon_cfgs[0].fee_estimator, &chanmon_cfgs[0].persister, &keys_manager);
	let network_graph = Arc::new(NetworkGraph::new(chanmon_cfgs[0].chain_source.genesis_hash, &chanmon_cfgs[0].logger));
	let network_graph = Arc::new(NetworkGraph::new(Network::Testnet, &chanmon_cfgs[0].logger));
	let scorer = Mutex::new(test_utils::TestScorer::new());
	let router = test_utils::TestRouter::new(network_graph.clone(), &scorer);
	let node = NodeCfg { chain_source: &chanmon_cfgs[0].chain_source, logger: &chanmon_cfgs[0].logger, tx_broadcaster: &chanmon_cfgs[0].tx_broadcaster, fee_estimator: &chanmon_cfgs[0].fee_estimator, router, chain_monitor, keys_manager: &keys_manager, network_graph, node_seed: seed, override_init_features: alloc::rc::Rc::new(core::cell::RefCell::new(None)) };
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
Remove genesis block hash from public API#2025

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 2 commits into

from

Feb 27, 2023
 Merged


Remove genesis block hash from public API
#2025
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
2c3e12e

Remove genesis block hash from public API


TheBlueMatt Feb 9, 2023
d7c818a

Rename `BestBlock::from_genesis` to `from_network` for clarity


TheBlueMatt Feb 15, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -418,7 +418,7 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out) {
 let network = Network::Bitcoin;
 let params = ChainParameters {
 network,
 best_block: BestBlock::from_genesis(network),
 best_block: BestBlock::from_network(network),
 };
 (ChannelManager::new($fee_estimator.clone(), monitor.clone(), broadcast.clone(), &router, Arc::clone(&logger), keys_manager.clone(), keys_manager.clone(), keys_manager.clone(), config, params),
 monitor, keys_manager)
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -442,15 +442,15 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
	let network = Network::Bitcoin;
	let params = ChainParameters {
 network,
 best_block: BestBlock::from_genesis(network),
 best_block: BestBlock::from_network(network),
	};
	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));
	// Adding new calls to `EntropySource::get_secure_random_bytes` during startup can change all the
	// keys subsequently generated in this test. Rather than regenerating all the messages manually,
	// it's easier to just increment the counter here so the keys don't change.
	keys_manager.counter.fetch_sub(3, Ordering::AcqRel);
	let our_id = &keys_manager.get_node_id(Recipient::Node).unwrap();
	let network_graph = Arc::new(NetworkGraph::new(genesis_block(network).block_hash(), Arc::clone(&logger)));
	let network_graph = Arc::new(NetworkGraph::new(network, Arc::clone(&logger)));
	let gossip_sync = Arc::new(P2PGossipSync::new(Arc::clone(&network_graph), None, Arc::clone(&logger)));
	let scorer = FixedPenaltyScorer::with_penalty(0);

Expand Down

4 changes: 1 addition & 3 deletions
fuzz/src/process_network_graph.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
// Imports that need to be added manually
use lightning_rapid_gossip_sync::RapidGossipSync;
use bitcoin::hashes::Hash as TraitImport;

use crate::utils::test_logger;

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

3 changes: 1 addition & 2 deletions
fuzz/src/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,6 @@ use lightning::util::ser::Readable;
use bitcoin::hashes::Hash;
use bitcoin::secp256k1::PublicKey;
use bitcoin::network::constants::Network;
use bitcoin::blockdata::constants::genesis_block;

use crate::utils::test_logger;

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

	let our_pubkey = get_pubkey!();
	let net_graph = NetworkGraph::new(genesis_block(Network::Bitcoin).header.block_hash(), &logger);
	let net_graph = NetworkGraph::new(Network::Bitcoin, &logger);
	let chain_source = FuzzChainSource {
 input: Arc::clone(&input),
 net_graph: &net_graph,
Expand Down

4 changes: 2 additions & 2 deletions
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -941,7 +941,7 @@ mod tests {
 let logger = Arc::new(test_utils::TestLogger::with_id(format!("node {}", i)));
 let network = Network::Testnet;
 let genesis_block = genesis_block(network);
 let network_graph = Arc::new(NetworkGraph::new(genesis_block.header.block_hash(), logger.clone()));
 let network_graph = Arc::new(NetworkGraph::new(network, logger.clone()));
 let scorer = Arc::new(Mutex::new(TestScorer::new()));
 let seed = [i as u8; 32];
 let router = Arc::new(DefaultRouter::new(network_graph.clone(), logger.clone(), seed, scorer.clone()));
Expand All@@ -950,7 +950,7 @@ mod tests {
 let now = Duration::from_secs(genesis_block.header.time as u64);
 let keys_manager = Arc::new(KeysManager::new(&seed, now.as_secs(), now.subsec_nanos()));
 let chain_monitor = Arc::new(chainmonitor::ChainMonitor::new(Some(chain_source.clone()), tx_broadcaster.clone(), logger.clone(), fee_estimator.clone(), persister.clone()));
 let best_block = BestBlock::from_genesis(network);
 let best_block = BestBlock::from_network(network);
 let params = ChainParameters { network, best_block };
 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));
 let p2p_gossip_sync = Arc::new(P2PGossipSync::new(network_graph.clone(), Some(chain_source.clone()), logger.clone()));
Expand Down

14 changes: 4 additions & 10 deletions
lightning-rapid-gossip-sync/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,8 +53,7 @@
//! # }
//! # let logger = FakeLogger {};
//!
//! let block_hash = genesis_block(Network::Bitcoin).header.block_hash();
//! let network_graph = NetworkGraph::new(block_hash, &logger);
//! let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
//! let rapid_sync = RapidGossipSync::new(&network_graph);
//! let snapshot_contents: &[u8] = &[0; 0];
//! let new_last_sync_timestamp_result = rapid_sync.update_network_graph(snapshot_contents);
Expand DownExpand Up@@ -161,7 +160,6 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L
mod tests {
	use std::fs;

	use bitcoin::blockdata::constants::genesis_block;
	use bitcoin::Network;

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

 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

Expand DownExpand Up@@ -258,9 +255,8 @@ mod tests {

	#[test]
	fn measure_native_read_from_file() {
 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

Expand DownExpand Up@@ -290,7 +286,6 @@ mod tests {
pub mod bench {
	use test::Bencher;

	use bitcoin::blockdata::constants::genesis_block;
	use bitcoin::Network;

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

	#[bench]
	fn bench_reading_full_graph_from_file(b: &mut Bencher) {
 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 b.iter(|| {
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 let rapid_sync = RapidGossipSync::new(&network_graph);
 let sync_result = rapid_sync.sync_network_graph_with_file_path("./res/full_graph.lngossip");
 if let Err(crate::error::GraphSyncError::DecodeError(DecodeError::Io(io_error))) = &sync_result {
Expand Down

33 changes: 11 additions & 22 deletions
lightning-rapid-gossip-sync/src/processing.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -237,7 +237,6 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L

#[cfg(test)]
mod tests {
	use bitcoin::blockdata::constants::genesis_block;
	use bitcoin::Network;

	use lightning::ln::msgs::DecodeError;
Expand DownExpand Up@@ -269,9 +268,8 @@ mod tests {

	#[test]
	fn network_graph_fails_to_update_from_clipped_input() {
 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

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

 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

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

 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

Expand DownExpand Up@@ -442,9 +437,8 @@ mod tests {
 25, 192,
 ];

 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

Expand DownExpand Up@@ -502,9 +496,8 @@ mod tests {
 25, 192,
 ];

 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

Expand All@@ -528,9 +521,8 @@ mod tests {

	#[test]
	fn full_update_succeeds() {
 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

Expand DownExpand Up@@ -560,9 +552,8 @@ mod tests {

	#[test]
	fn full_update_succeeds_at_the_beginning_of_the_unix_era() {
 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

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

 let latest_succeeding_time = VALID_BINARY_TIMESTAMP + STALE_RGS_UPDATE_AGE_LIMIT_SECS;
 let earliest_failing_time = latest_succeeding_time + 1;

 {
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 assert_eq!(network_graph.read_only().channels().len(), 0);

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

 {
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
Expand DownExpand Up@@ -630,9 +620,8 @@ mod tests {
 0, 0, 1,
 ];

 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 let rapid_sync = RapidGossipSync::new(&network_graph);
 let update_result = rapid_sync.update_network_graph(&unknown_version_input[..]);

Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

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

2 changes: 1 addition & 1 deletion
lightning/src/chain/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,7 @@ pub struct BestBlock {
impl BestBlock {
	/// Constructs a `BestBlock` that represents the genesis block at height 0 of the given
	/// network.
	pub fn from_genesis(network: Network) -> Self {
	pub fn from_network(network: Network) -> Self {
 BestBlock {
 block_hash: genesis_block(network).header.block_hash(),
 height: 0,
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7175,7 +7175,7 @@ mod tests {
 let secp_ctx = Secp256k1::new();
 let seed = [42; 32];
 let network = Network::Testnet;
 let best_block = BestBlock::from_genesis(network);
 let best_block = BestBlock::from_network(network);
 let chain_hash = best_block.block_hash();
 let keys_provider = test_utils::TestKeysInterface::new(&seed, network);

Expand Down

11 changes: 5 additions & 6 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8672,13 +8672,12 @@ pub mod bench {
 // Note that this is unrealistic as each payment send will require at least two fsync
 // calls per node.
 let network = bitcoin::Network::Testnet;
 let genesis_hash = bitcoin::blockdata::constants::genesis_block(network).header.block_hash();

 let tx_broadcaster = test_utils::TestBroadcaster{txn_broadcasted: Mutex::new(Vec::new()), blocks: Arc::new(Mutex::new(Vec::new()))};
 let fee_estimator = test_utils::TestFeeEstimator { sat_per_kw: Mutex::new(253) };
 let logger_a = test_utils::TestLogger::with_id("node a".to_owned());
 let scorer = Mutex::new(test_utils::TestScorer::new());
 let router = test_utils::TestRouter::new(Arc::new(NetworkGraph::new(genesis_hash, &logger_a)), &scorer);
 let router = test_utils::TestRouter::new(Arc::new(NetworkGraph::new(network, &logger_a)), &scorer);

 let mut config: UserConfig = Default::default();
 config.channel_handshake_config.minimum_depth = 1;
Expand All@@ -8688,7 +8687,7 @@ pub mod bench {
 let keys_manager_a = KeysManager::new(&seed_a, 42, 42);
 let node_a = ChannelManager::new(&fee_estimator, &chain_monitor_a, &tx_broadcaster, &router, &logger_a, &keys_manager_a, &keys_manager_a, &keys_manager_a, config.clone(), ChainParameters {
 network,
 best_block: BestBlock::from_genesis(network),
 best_block: BestBlock::from_network(network),
 });
 let node_a_holder = NodeHolder { node: &node_a };

Expand All@@ -8698,7 +8697,7 @@ pub mod bench {
 let keys_manager_b = KeysManager::new(&seed_b, 42, 42);
 let node_b = ChannelManager::new(&fee_estimator, &chain_monitor_b, &tx_broadcaster, &router, &logger_b, &keys_manager_b, &keys_manager_b, &keys_manager_b, config.clone(), ChainParameters {
 network,
 best_block: BestBlock::from_genesis(network),
 best_block: BestBlock::from_network(network),
 });
 let node_b_holder = NodeHolder { node: &node_b };

Expand All@@ -8722,7 +8721,7 @@ pub mod bench {
 assert_eq!(&tx_broadcaster.txn_broadcasted.lock().unwrap()[..], &[tx.clone()]);

 let block = Block {
 header: BlockHeader { version: 0x20000000, prev_blockhash: genesis_hash, merkle_root: TxMerkleNode::all_zeros(), time: 42, bits: 42, nonce: 42 },
 header: BlockHeader { version: 0x20000000, prev_blockhash: BestBlock::from_network(network).block_hash(), merkle_root: TxMerkleNode::all_zeros(), time: 42, bits: 42, nonce: 42 },
 txdata: vec![tx],
 };
 Listen::block_connected(&node_a, &block, 1);
Expand DownExpand Up@@ -8761,7 +8760,7 @@ pub mod bench {
 _ => panic!("Unexpected event"),
 }

 let dummy_graph = NetworkGraph::new(genesis_hash, &logger_a);
 let dummy_graph = NetworkGraph::new(network, &logger_a);

 let mut payment_count: u64 = 0;
 macro_rules! send_payment {
Expand Down

4 changes: 2 additions & 2 deletions
lightning/src/ln/functional_test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2300,7 +2300,7 @@ pub fn create_node_cfgs<'a>(node_count: usize, chanmon_cfgs: &'a Vec<TestChanMon

	for i in 0..node_count {
 let chain_monitor = test_utils::TestChainMonitor::new(Some(&chanmon_cfgs[i].chain_source), &chanmon_cfgs[i].tx_broadcaster, &chanmon_cfgs[i].logger, &chanmon_cfgs[i].fee_estimator, &chanmon_cfgs[i].persister, &chanmon_cfgs[i].keys_manager);
 let network_graph = Arc::new(NetworkGraph::new(chanmon_cfgs[i].chain_source.genesis_hash, &chanmon_cfgs[i].logger));
 let network_graph = Arc::new(NetworkGraph::new(Network::Testnet, &chanmon_cfgs[i].logger));
 let seed = [i as u8; 32];
 nodes.push(NodeCfg {
 chain_source: &chanmon_cfgs[i].chain_source,
Expand DownExpand Up@@ -2341,7 +2341,7 @@ pub fn create_node_chanmgrs<'a, 'b>(node_count: usize, cfgs: &'a Vec<NodeCfg<'b>
 let network = Network::Testnet;
 let params = ChainParameters {
 network,
 best_block: BestBlock::from_genesis(network),
 best_block: BestBlock::from_network(network),
 };
 let node = ChannelManager::new(cfgs[i].fee_estimator, &cfgs[i].chain_monitor, cfgs[i].tx_broadcaster, &cfgs[i].router, cfgs[i].logger, cfgs[i].keys_manager,
 cfgs[i].keys_manager, cfgs[i].keys_manager, if node_config[i].is_some() { node_config[i].clone().unwrap() } else { test_default_channel_config() }, params);
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5280,7 +5280,7 @@ fn test_key_derivation_params() {
	let seed = [42; 32];
	let keys_manager = test_utils::TestKeysInterface::new(&seed, Network::Testnet);
	let chain_monitor = test_utils::TestChainMonitor::new(Some(&chanmon_cfgs[0].chain_source), &chanmon_cfgs[0].tx_broadcaster, &chanmon_cfgs[0].logger, &chanmon_cfgs[0].fee_estimator, &chanmon_cfgs[0].persister, &keys_manager);
	let network_graph = Arc::new(NetworkGraph::new(chanmon_cfgs[0].chain_source.genesis_hash, &chanmon_cfgs[0].logger));
	let network_graph = Arc::new(NetworkGraph::new(Network::Testnet, &chanmon_cfgs[0].logger));
	let scorer = Mutex::new(test_utils::TestScorer::new());
	let router = test_utils::TestRouter::new(network_graph.clone(), &scorer);
	let node = NodeCfg { chain_source: &chanmon_cfgs[0].chain_source, logger: &chanmon_cfgs[0].logger, tx_broadcaster: &chanmon_cfgs[0].tx_broadcaster, fee_estimator: &chanmon_cfgs[0].fee_estimator, router, chain_monitor, keys_manager: &keys_manager, network_graph, node_seed: seed, override_init_features: alloc::rc::Rc::new(core::cell::RefCell::new(None)) };
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
Remove genesis block hash from public API#2025

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 2 commits into

from

Feb 27, 2023
 Merged


Remove genesis block hash from public API
#2025
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
2c3e12e

Remove genesis block hash from public API


TheBlueMatt Feb 9, 2023
d7c818a

Rename `BestBlock::from_genesis` to `from_network` for clarity


TheBlueMatt Feb 15, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -418,7 +418,7 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out) {
 let network = Network::Bitcoin;
 let params = ChainParameters {
 network,
 best_block: BestBlock::from_genesis(network),
 best_block: BestBlock::from_network(network),
 };
 (ChannelManager::new($fee_estimator.clone(), monitor.clone(), broadcast.clone(), &router, Arc::clone(&logger), keys_manager.clone(), keys_manager.clone(), keys_manager.clone(), config, params),
 monitor, keys_manager)
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -442,15 +442,15 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
	let network = Network::Bitcoin;
	let params = ChainParameters {
 network,
 best_block: BestBlock::from_genesis(network),
 best_block: BestBlock::from_network(network),
	};
	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));
	// Adding new calls to `EntropySource::get_secure_random_bytes` during startup can change all the
	// keys subsequently generated in this test. Rather than regenerating all the messages manually,
	// it's easier to just increment the counter here so the keys don't change.
	keys_manager.counter.fetch_sub(3, Ordering::AcqRel);
	let our_id = &keys_manager.get_node_id(Recipient::Node).unwrap();
	let network_graph = Arc::new(NetworkGraph::new(genesis_block(network).block_hash(), Arc::clone(&logger)));
	let network_graph = Arc::new(NetworkGraph::new(network, Arc::clone(&logger)));
	let gossip_sync = Arc::new(P2PGossipSync::new(Arc::clone(&network_graph), None, Arc::clone(&logger)));
	let scorer = FixedPenaltyScorer::with_penalty(0);

Expand Down

4 changes: 1 addition & 3 deletions
fuzz/src/process_network_graph.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
// Imports that need to be added manually
use lightning_rapid_gossip_sync::RapidGossipSync;
use bitcoin::hashes::Hash as TraitImport;

use crate::utils::test_logger;

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

3 changes: 1 addition & 2 deletions
fuzz/src/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,6 @@ use lightning::util::ser::Readable;
use bitcoin::hashes::Hash;
use bitcoin::secp256k1::PublicKey;
use bitcoin::network::constants::Network;
use bitcoin::blockdata::constants::genesis_block;

use crate::utils::test_logger;

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

	let our_pubkey = get_pubkey!();
	let net_graph = NetworkGraph::new(genesis_block(Network::Bitcoin).header.block_hash(), &logger);
	let net_graph = NetworkGraph::new(Network::Bitcoin, &logger);
	let chain_source = FuzzChainSource {
 input: Arc::clone(&input),
 net_graph: &net_graph,
Expand Down

4 changes: 2 additions & 2 deletions
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -941,7 +941,7 @@ mod tests {
 let logger = Arc::new(test_utils::TestLogger::with_id(format!("node {}", i)));
 let network = Network::Testnet;
 let genesis_block = genesis_block(network);
 let network_graph = Arc::new(NetworkGraph::new(genesis_block.header.block_hash(), logger.clone()));
 let network_graph = Arc::new(NetworkGraph::new(network, logger.clone()));
 let scorer = Arc::new(Mutex::new(TestScorer::new()));
 let seed = [i as u8; 32];
 let router = Arc::new(DefaultRouter::new(network_graph.clone(), logger.clone(), seed, scorer.clone()));
Expand All@@ -950,7 +950,7 @@ mod tests {
 let now = Duration::from_secs(genesis_block.header.time as u64);
 let keys_manager = Arc::new(KeysManager::new(&seed, now.as_secs(), now.subsec_nanos()));
 let chain_monitor = Arc::new(chainmonitor::ChainMonitor::new(Some(chain_source.clone()), tx_broadcaster.clone(), logger.clone(), fee_estimator.clone(), persister.clone()));
 let best_block = BestBlock::from_genesis(network);
 let best_block = BestBlock::from_network(network);
 let params = ChainParameters { network, best_block };
 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));
 let p2p_gossip_sync = Arc::new(P2PGossipSync::new(network_graph.clone(), Some(chain_source.clone()), logger.clone()));
Expand Down

14 changes: 4 additions & 10 deletions
lightning-rapid-gossip-sync/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,8 +53,7 @@
//! # }
//! # let logger = FakeLogger {};
//!
//! let block_hash = genesis_block(Network::Bitcoin).header.block_hash();
//! let network_graph = NetworkGraph::new(block_hash, &logger);
//! let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
//! let rapid_sync = RapidGossipSync::new(&network_graph);
//! let snapshot_contents: &[u8] = &[0; 0];
//! let new_last_sync_timestamp_result = rapid_sync.update_network_graph(snapshot_contents);
Expand DownExpand Up@@ -161,7 +160,6 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L
mod tests {
	use std::fs;

	use bitcoin::blockdata::constants::genesis_block;
	use bitcoin::Network;

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

 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

Expand DownExpand Up@@ -258,9 +255,8 @@ mod tests {

	#[test]
	fn measure_native_read_from_file() {
 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

Expand DownExpand Up@@ -290,7 +286,6 @@ mod tests {
pub mod bench {
	use test::Bencher;

	use bitcoin::blockdata::constants::genesis_block;
	use bitcoin::Network;

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

	#[bench]
	fn bench_reading_full_graph_from_file(b: &mut Bencher) {
 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 b.iter(|| {
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 let rapid_sync = RapidGossipSync::new(&network_graph);
 let sync_result = rapid_sync.sync_network_graph_with_file_path("./res/full_graph.lngossip");
 if let Err(crate::error::GraphSyncError::DecodeError(DecodeError::Io(io_error))) = &sync_result {
Expand Down

33 changes: 11 additions & 22 deletions
lightning-rapid-gossip-sync/src/processing.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -237,7 +237,6 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L

#[cfg(test)]
mod tests {
	use bitcoin::blockdata::constants::genesis_block;
	use bitcoin::Network;

	use lightning::ln::msgs::DecodeError;
Expand DownExpand Up@@ -269,9 +268,8 @@ mod tests {

	#[test]
	fn network_graph_fails_to_update_from_clipped_input() {
 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

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

 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

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

 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

Expand DownExpand Up@@ -442,9 +437,8 @@ mod tests {
 25, 192,
 ];

 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

Expand DownExpand Up@@ -502,9 +496,8 @@ mod tests {
 25, 192,
 ];

 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

Expand All@@ -528,9 +521,8 @@ mod tests {

	#[test]
	fn full_update_succeeds() {
 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

Expand DownExpand Up@@ -560,9 +552,8 @@ mod tests {

	#[test]
	fn full_update_succeeds_at_the_beginning_of_the_unix_era() {
 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

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

 let latest_succeeding_time = VALID_BINARY_TIMESTAMP + STALE_RGS_UPDATE_AGE_LIMIT_SECS;
 let earliest_failing_time = latest_succeeding_time + 1;

 {
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 assert_eq!(network_graph.read_only().channels().len(), 0);

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

 {
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
Expand DownExpand Up@@ -630,9 +620,8 @@ mod tests {
 0, 0, 1,
 ];

 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 let rapid_sync = RapidGossipSync::new(&network_graph);
 let update_result = rapid_sync.update_network_graph(&unknown_version_input[..]);

Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

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

2 changes: 1 addition & 1 deletion
lightning/src/chain/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,7 @@ pub struct BestBlock {
impl BestBlock {
	/// Constructs a `BestBlock` that represents the genesis block at height 0 of the given
	/// network.
	pub fn from_genesis(network: Network) -> Self {
	pub fn from_network(network: Network) -> Self {
 BestBlock {
 block_hash: genesis_block(network).header.block_hash(),
 height: 0,
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7175,7 +7175,7 @@ mod tests {
 let secp_ctx = Secp256k1::new();
 let seed = [42; 32];
 let network = Network::Testnet;
 let best_block = BestBlock::from_genesis(network);
 let best_block = BestBlock::from_network(network);
 let chain_hash = best_block.block_hash();
 let keys_provider = test_utils::TestKeysInterface::new(&seed, network);

Expand Down

11 changes: 5 additions & 6 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8672,13 +8672,12 @@ pub mod bench {
 // Note that this is unrealistic as each payment send will require at least two fsync
 // calls per node.
 let network = bitcoin::Network::Testnet;
 let genesis_hash = bitcoin::blockdata::constants::genesis_block(network).header.block_hash();

 let tx_broadcaster = test_utils::TestBroadcaster{txn_broadcasted: Mutex::new(Vec::new()), blocks: Arc::new(Mutex::new(Vec::new()))};
 let fee_estimator = test_utils::TestFeeEstimator { sat_per_kw: Mutex::new(253) };
 let logger_a = test_utils::TestLogger::with_id("node a".to_owned());
 let scorer = Mutex::new(test_utils::TestScorer::new());
 let router = test_utils::TestRouter::new(Arc::new(NetworkGraph::new(genesis_hash, &logger_a)), &scorer);
 let router = test_utils::TestRouter::new(Arc::new(NetworkGraph::new(network, &logger_a)), &scorer);

 let mut config: UserConfig = Default::default();
 config.channel_handshake_config.minimum_depth = 1;
Expand All@@ -8688,7 +8687,7 @@ pub mod bench {
 let keys_manager_a = KeysManager::new(&seed_a, 42, 42);
 let node_a = ChannelManager::new(&fee_estimator, &chain_monitor_a, &tx_broadcaster, &router, &logger_a, &keys_manager_a, &keys_manager_a, &keys_manager_a, config.clone(), ChainParameters {
 network,
 best_block: BestBlock::from_genesis(network),
 best_block: BestBlock::from_network(network),
 });
 let node_a_holder = NodeHolder { node: &node_a };

Expand All@@ -8698,7 +8697,7 @@ pub mod bench {
 let keys_manager_b = KeysManager::new(&seed_b, 42, 42);
 let node_b = ChannelManager::new(&fee_estimator, &chain_monitor_b, &tx_broadcaster, &router, &logger_b, &keys_manager_b, &keys_manager_b, &keys_manager_b, config.clone(), ChainParameters {
 network,
 best_block: BestBlock::from_genesis(network),
 best_block: BestBlock::from_network(network),
 });
 let node_b_holder = NodeHolder { node: &node_b };

Expand All@@ -8722,7 +8721,7 @@ pub mod bench {
 assert_eq!(&tx_broadcaster.txn_broadcasted.lock().unwrap()[..], &[tx.clone()]);

 let block = Block {
 header: BlockHeader { version: 0x20000000, prev_blockhash: genesis_hash, merkle_root: TxMerkleNode::all_zeros(), time: 42, bits: 42, nonce: 42 },
 header: BlockHeader { version: 0x20000000, prev_blockhash: BestBlock::from_network(network).block_hash(), merkle_root: TxMerkleNode::all_zeros(), time: 42, bits: 42, nonce: 42 },
 txdata: vec![tx],
 };
 Listen::block_connected(&node_a, &block, 1);
Expand DownExpand Up@@ -8761,7 +8760,7 @@ pub mod bench {
 _ => panic!("Unexpected event"),
 }

 let dummy_graph = NetworkGraph::new(genesis_hash, &logger_a);
 let dummy_graph = NetworkGraph::new(network, &logger_a);

 let mut payment_count: u64 = 0;
 macro_rules! send_payment {
Expand Down

4 changes: 2 additions & 2 deletions
lightning/src/ln/functional_test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2300,7 +2300,7 @@ pub fn create_node_cfgs<'a>(node_count: usize, chanmon_cfgs: &'a Vec<TestChanMon

	for i in 0..node_count {
 let chain_monitor = test_utils::TestChainMonitor::new(Some(&chanmon_cfgs[i].chain_source), &chanmon_cfgs[i].tx_broadcaster, &chanmon_cfgs[i].logger, &chanmon_cfgs[i].fee_estimator, &chanmon_cfgs[i].persister, &chanmon_cfgs[i].keys_manager);
 let network_graph = Arc::new(NetworkGraph::new(chanmon_cfgs[i].chain_source.genesis_hash, &chanmon_cfgs[i].logger));
 let network_graph = Arc::new(NetworkGraph::new(Network::Testnet, &chanmon_cfgs[i].logger));
 let seed = [i as u8; 32];
 nodes.push(NodeCfg {
 chain_source: &chanmon_cfgs[i].chain_source,
Expand DownExpand Up@@ -2341,7 +2341,7 @@ pub fn create_node_chanmgrs<'a, 'b>(node_count: usize, cfgs: &'a Vec<NodeCfg<'b>
 let network = Network::Testnet;
 let params = ChainParameters {
 network,
 best_block: BestBlock::from_genesis(network),
 best_block: BestBlock::from_network(network),
 };
 let node = ChannelManager::new(cfgs[i].fee_estimator, &cfgs[i].chain_monitor, cfgs[i].tx_broadcaster, &cfgs[i].router, cfgs[i].logger, cfgs[i].keys_manager,
 cfgs[i].keys_manager, cfgs[i].keys_manager, if node_config[i].is_some() { node_config[i].clone().unwrap() } else { test_default_channel_config() }, params);
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5280,7 +5280,7 @@ fn test_key_derivation_params() {
	let seed = [42; 32];
	let keys_manager = test_utils::TestKeysInterface::new(&seed, Network::Testnet);
	let chain_monitor = test_utils::TestChainMonitor::new(Some(&chanmon_cfgs[0].chain_source), &chanmon_cfgs[0].tx_broadcaster, &chanmon_cfgs[0].logger, &chanmon_cfgs[0].fee_estimator, &chanmon_cfgs[0].persister, &keys_manager);
	let network_graph = Arc::new(NetworkGraph::new(chanmon_cfgs[0].chain_source.genesis_hash, &chanmon_cfgs[0].logger));
	let network_graph = Arc::new(NetworkGraph::new(Network::Testnet, &chanmon_cfgs[0].logger));
	let scorer = Mutex::new(test_utils::TestScorer::new());
	let router = test_utils::TestRouter::new(network_graph.clone(), &scorer);
	let node = NodeCfg { chain_source: &chanmon_cfgs[0].chain_source, logger: &chanmon_cfgs[0].logger, tx_broadcaster: &chanmon_cfgs[0].tx_broadcaster, fee_estimator: &chanmon_cfgs[0].fee_estimator, router, chain_monitor, keys_manager: &keys_manager, network_graph, node_seed: seed, override_init_features: alloc::rc::Rc::new(core::cell::RefCell::new(None)) };
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
Remove genesis block hash from public API#2025

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 2 commits into

from

Feb 27, 2023
 Merged


Remove genesis block hash from public API
#2025
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
2c3e12e

Remove genesis block hash from public API


TheBlueMatt Feb 9, 2023
d7c818a

Rename `BestBlock::from_genesis` to `from_network` for clarity


TheBlueMatt Feb 15, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -418,7 +418,7 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out) {
 let network = Network::Bitcoin;
 let params = ChainParameters {
 network,
 best_block: BestBlock::from_genesis(network),
 best_block: BestBlock::from_network(network),
 };
 (ChannelManager::new($fee_estimator.clone(), monitor.clone(), broadcast.clone(), &router, Arc::clone(&logger), keys_manager.clone(), keys_manager.clone(), keys_manager.clone(), config, params),
 monitor, keys_manager)
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -442,15 +442,15 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
	let network = Network::Bitcoin;
	let params = ChainParameters {
 network,
 best_block: BestBlock::from_genesis(network),
 best_block: BestBlock::from_network(network),
	};
	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));
	// Adding new calls to `EntropySource::get_secure_random_bytes` during startup can change all the
	// keys subsequently generated in this test. Rather than regenerating all the messages manually,
	// it's easier to just increment the counter here so the keys don't change.
	keys_manager.counter.fetch_sub(3, Ordering::AcqRel);
	let our_id = &keys_manager.get_node_id(Recipient::Node).unwrap();
	let network_graph = Arc::new(NetworkGraph::new(genesis_block(network).block_hash(), Arc::clone(&logger)));
	let network_graph = Arc::new(NetworkGraph::new(network, Arc::clone(&logger)));
	let gossip_sync = Arc::new(P2PGossipSync::new(Arc::clone(&network_graph), None, Arc::clone(&logger)));
	let scorer = FixedPenaltyScorer::with_penalty(0);

Expand Down

4 changes: 1 addition & 3 deletions
fuzz/src/process_network_graph.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
// Imports that need to be added manually
use lightning_rapid_gossip_sync::RapidGossipSync;
use bitcoin::hashes::Hash as TraitImport;

use crate::utils::test_logger;

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

3 changes: 1 addition & 2 deletions
fuzz/src/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,6 @@ use lightning::util::ser::Readable;
use bitcoin::hashes::Hash;
use bitcoin::secp256k1::PublicKey;
use bitcoin::network::constants::Network;
use bitcoin::blockdata::constants::genesis_block;

use crate::utils::test_logger;

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

	let our_pubkey = get_pubkey!();
	let net_graph = NetworkGraph::new(genesis_block(Network::Bitcoin).header.block_hash(), &logger);
	let net_graph = NetworkGraph::new(Network::Bitcoin, &logger);
	let chain_source = FuzzChainSource {
 input: Arc::clone(&input),
 net_graph: &net_graph,
Expand Down

4 changes: 2 additions & 2 deletions
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -941,7 +941,7 @@ mod tests {
 let logger = Arc::new(test_utils::TestLogger::with_id(format!("node {}", i)));
 let network = Network::Testnet;
 let genesis_block = genesis_block(network);
 let network_graph = Arc::new(NetworkGraph::new(genesis_block.header.block_hash(), logger.clone()));
 let network_graph = Arc::new(NetworkGraph::new(network, logger.clone()));
 let scorer = Arc::new(Mutex::new(TestScorer::new()));
 let seed = [i as u8; 32];
 let router = Arc::new(DefaultRouter::new(network_graph.clone(), logger.clone(), seed, scorer.clone()));
Expand All@@ -950,7 +950,7 @@ mod tests {
 let now = Duration::from_secs(genesis_block.header.time as u64);
 let keys_manager = Arc::new(KeysManager::new(&seed, now.as_secs(), now.subsec_nanos()));
 let chain_monitor = Arc::new(chainmonitor::ChainMonitor::new(Some(chain_source.clone()), tx_broadcaster.clone(), logger.clone(), fee_estimator.clone(), persister.clone()));
 let best_block = BestBlock::from_genesis(network);
 let best_block = BestBlock::from_network(network);
 let params = ChainParameters { network, best_block };
 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));
 let p2p_gossip_sync = Arc::new(P2PGossipSync::new(network_graph.clone(), Some(chain_source.clone()), logger.clone()));
Expand Down

14 changes: 4 additions & 10 deletions
lightning-rapid-gossip-sync/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,8 +53,7 @@
//! # }
//! # let logger = FakeLogger {};
//!
//! let block_hash = genesis_block(Network::Bitcoin).header.block_hash();
//! let network_graph = NetworkGraph::new(block_hash, &logger);
//! let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
//! let rapid_sync = RapidGossipSync::new(&network_graph);
//! let snapshot_contents: &[u8] = &[0; 0];
//! let new_last_sync_timestamp_result = rapid_sync.update_network_graph(snapshot_contents);
Expand DownExpand Up@@ -161,7 +160,6 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L
mod tests {
	use std::fs;

	use bitcoin::blockdata::constants::genesis_block;
	use bitcoin::Network;

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

 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

Expand DownExpand Up@@ -258,9 +255,8 @@ mod tests {

	#[test]
	fn measure_native_read_from_file() {
 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

Expand DownExpand Up@@ -290,7 +286,6 @@ mod tests {
pub mod bench {
	use test::Bencher;

	use bitcoin::blockdata::constants::genesis_block;
	use bitcoin::Network;

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

	#[bench]
	fn bench_reading_full_graph_from_file(b: &mut Bencher) {
 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 b.iter(|| {
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 let rapid_sync = RapidGossipSync::new(&network_graph);
 let sync_result = rapid_sync.sync_network_graph_with_file_path("./res/full_graph.lngossip");
 if let Err(crate::error::GraphSyncError::DecodeError(DecodeError::Io(io_error))) = &sync_result {
Expand Down

33 changes: 11 additions & 22 deletions
lightning-rapid-gossip-sync/src/processing.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -237,7 +237,6 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L

#[cfg(test)]
mod tests {
	use bitcoin::blockdata::constants::genesis_block;
	use bitcoin::Network;

	use lightning::ln::msgs::DecodeError;
Expand DownExpand Up@@ -269,9 +268,8 @@ mod tests {

	#[test]
	fn network_graph_fails_to_update_from_clipped_input() {
 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

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

 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

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

 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

Expand DownExpand Up@@ -442,9 +437,8 @@ mod tests {
 25, 192,
 ];

 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

Expand DownExpand Up@@ -502,9 +496,8 @@ mod tests {
 25, 192,
 ];

 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

Expand All@@ -528,9 +521,8 @@ mod tests {

	#[test]
	fn full_update_succeeds() {
 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

Expand DownExpand Up@@ -560,9 +552,8 @@ mod tests {

	#[test]
	fn full_update_succeeds_at_the_beginning_of_the_unix_era() {
 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

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

 let latest_succeeding_time = VALID_BINARY_TIMESTAMP + STALE_RGS_UPDATE_AGE_LIMIT_SECS;
 let earliest_failing_time = latest_succeeding_time + 1;

 {
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 assert_eq!(network_graph.read_only().channels().len(), 0);

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

 {
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
Expand DownExpand Up@@ -630,9 +620,8 @@ mod tests {
 0, 0, 1,
 ];

 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 let rapid_sync = RapidGossipSync::new(&network_graph);
 let update_result = rapid_sync.update_network_graph(&unknown_version_input[..]);

Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

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

2 changes: 1 addition & 1 deletion
lightning/src/chain/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,7 @@ pub struct BestBlock {
impl BestBlock {
	/// Constructs a `BestBlock` that represents the genesis block at height 0 of the given
	/// network.
	pub fn from_genesis(network: Network) -> Self {
	pub fn from_network(network: Network) -> Self {
 BestBlock {
 block_hash: genesis_block(network).header.block_hash(),
 height: 0,
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7175,7 +7175,7 @@ mod tests {
 let secp_ctx = Secp256k1::new();
 let seed = [42; 32];
 let network = Network::Testnet;
 let best_block = BestBlock::from_genesis(network);
 let best_block = BestBlock::from_network(network);
 let chain_hash = best_block.block_hash();
 let keys_provider = test_utils::TestKeysInterface::new(&seed, network);

Expand Down

11 changes: 5 additions & 6 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8672,13 +8672,12 @@ pub mod bench {
 // Note that this is unrealistic as each payment send will require at least two fsync
 // calls per node.
 let network = bitcoin::Network::Testnet;
 let genesis_hash = bitcoin::blockdata::constants::genesis_block(network).header.block_hash();

 let tx_broadcaster = test_utils::TestBroadcaster{txn_broadcasted: Mutex::new(Vec::new()), blocks: Arc::new(Mutex::new(Vec::new()))};
 let fee_estimator = test_utils::TestFeeEstimator { sat_per_kw: Mutex::new(253) };
 let logger_a = test_utils::TestLogger::with_id("node a".to_owned());
 let scorer = Mutex::new(test_utils::TestScorer::new());
 let router = test_utils::TestRouter::new(Arc::new(NetworkGraph::new(genesis_hash, &logger_a)), &scorer);
 let router = test_utils::TestRouter::new(Arc::new(NetworkGraph::new(network, &logger_a)), &scorer);

 let mut config: UserConfig = Default::default();
 config.channel_handshake_config.minimum_depth = 1;
Expand All@@ -8688,7 +8687,7 @@ pub mod bench {
 let keys_manager_a = KeysManager::new(&seed_a, 42, 42);
 let node_a = ChannelManager::new(&fee_estimator, &chain_monitor_a, &tx_broadcaster, &router, &logger_a, &keys_manager_a, &keys_manager_a, &keys_manager_a, config.clone(), ChainParameters {
 network,
 best_block: BestBlock::from_genesis(network),
 best_block: BestBlock::from_network(network),
 });
 let node_a_holder = NodeHolder { node: &node_a };

Expand All@@ -8698,7 +8697,7 @@ pub mod bench {
 let keys_manager_b = KeysManager::new(&seed_b, 42, 42);
 let node_b = ChannelManager::new(&fee_estimator, &chain_monitor_b, &tx_broadcaster, &router, &logger_b, &keys_manager_b, &keys_manager_b, &keys_manager_b, config.clone(), ChainParameters {
 network,
 best_block: BestBlock::from_genesis(network),
 best_block: BestBlock::from_network(network),
 });
 let node_b_holder = NodeHolder { node: &node_b };

Expand All@@ -8722,7 +8721,7 @@ pub mod bench {
 assert_eq!(&tx_broadcaster.txn_broadcasted.lock().unwrap()[..], &[tx.clone()]);

 let block = Block {
 header: BlockHeader { version: 0x20000000, prev_blockhash: genesis_hash, merkle_root: TxMerkleNode::all_zeros(), time: 42, bits: 42, nonce: 42 },
 header: BlockHeader { version: 0x20000000, prev_blockhash: BestBlock::from_network(network).block_hash(), merkle_root: TxMerkleNode::all_zeros(), time: 42, bits: 42, nonce: 42 },
 txdata: vec![tx],
 };
 Listen::block_connected(&node_a, &block, 1);
Expand DownExpand Up@@ -8761,7 +8760,7 @@ pub mod bench {
 _ => panic!("Unexpected event"),
 }

 let dummy_graph = NetworkGraph::new(genesis_hash, &logger_a);
 let dummy_graph = NetworkGraph::new(network, &logger_a);

 let mut payment_count: u64 = 0;
 macro_rules! send_payment {
Expand Down

4 changes: 2 additions & 2 deletions
lightning/src/ln/functional_test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2300,7 +2300,7 @@ pub fn create_node_cfgs<'a>(node_count: usize, chanmon_cfgs: &'a Vec<TestChanMon

	for i in 0..node_count {
 let chain_monitor = test_utils::TestChainMonitor::new(Some(&chanmon_cfgs[i].chain_source), &chanmon_cfgs[i].tx_broadcaster, &chanmon_cfgs[i].logger, &chanmon_cfgs[i].fee_estimator, &chanmon_cfgs[i].persister, &chanmon_cfgs[i].keys_manager);
 let network_graph = Arc::new(NetworkGraph::new(chanmon_cfgs[i].chain_source.genesis_hash, &chanmon_cfgs[i].logger));
 let network_graph = Arc::new(NetworkGraph::new(Network::Testnet, &chanmon_cfgs[i].logger));
 let seed = [i as u8; 32];
 nodes.push(NodeCfg {
 chain_source: &chanmon_cfgs[i].chain_source,
Expand DownExpand Up@@ -2341,7 +2341,7 @@ pub fn create_node_chanmgrs<'a, 'b>(node_count: usize, cfgs: &'a Vec<NodeCfg<'b>
 let network = Network::Testnet;
 let params = ChainParameters {
 network,
 best_block: BestBlock::from_genesis(network),
 best_block: BestBlock::from_network(network),
 };
 let node = ChannelManager::new(cfgs[i].fee_estimator, &cfgs[i].chain_monitor, cfgs[i].tx_broadcaster, &cfgs[i].router, cfgs[i].logger, cfgs[i].keys_manager,
 cfgs[i].keys_manager, cfgs[i].keys_manager, if node_config[i].is_some() { node_config[i].clone().unwrap() } else { test_default_channel_config() }, params);
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5280,7 +5280,7 @@ fn test_key_derivation_params() {
	let seed = [42; 32];
	let keys_manager = test_utils::TestKeysInterface::new(&seed, Network::Testnet);
	let chain_monitor = test_utils::TestChainMonitor::new(Some(&chanmon_cfgs[0].chain_source), &chanmon_cfgs[0].tx_broadcaster, &chanmon_cfgs[0].logger, &chanmon_cfgs[0].fee_estimator, &chanmon_cfgs[0].persister, &keys_manager);
	let network_graph = Arc::new(NetworkGraph::new(chanmon_cfgs[0].chain_source.genesis_hash, &chanmon_cfgs[0].logger));
	let network_graph = Arc::new(NetworkGraph::new(Network::Testnet, &chanmon_cfgs[0].logger));
	let scorer = Mutex::new(test_utils::TestScorer::new());
	let router = test_utils::TestRouter::new(network_graph.clone(), &scorer);
	let node = NodeCfg { chain_source: &chanmon_cfgs[0].chain_source, logger: &chanmon_cfgs[0].logger, tx_broadcaster: &chanmon_cfgs[0].tx_broadcaster, fee_estimator: &chanmon_cfgs[0].fee_estimator, router, chain_monitor, keys_manager: &keys_manager, network_graph, node_seed: seed, override_init_features: alloc::rc::Rc::new(core::cell::RefCell::new(None)) };
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
Remove genesis block hash from public API#2025

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 2 commits into

from

Feb 27, 2023
 Merged


Remove genesis block hash from public API
#2025
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
2c3e12e

Remove genesis block hash from public API


TheBlueMatt Feb 9, 2023
d7c818a

Rename `BestBlock::from_genesis` to `from_network` for clarity


TheBlueMatt Feb 15, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -418,7 +418,7 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out) {
 let network = Network::Bitcoin;
 let params = ChainParameters {
 network,
 best_block: BestBlock::from_genesis(network),
 best_block: BestBlock::from_network(network),
 };
 (ChannelManager::new($fee_estimator.clone(), monitor.clone(), broadcast.clone(), &router, Arc::clone(&logger), keys_manager.clone(), keys_manager.clone(), keys_manager.clone(), config, params),
 monitor, keys_manager)
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -442,15 +442,15 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
	let network = Network::Bitcoin;
	let params = ChainParameters {
 network,
 best_block: BestBlock::from_genesis(network),
 best_block: BestBlock::from_network(network),
	};
	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));
	// Adding new calls to `EntropySource::get_secure_random_bytes` during startup can change all the
	// keys subsequently generated in this test. Rather than regenerating all the messages manually,
	// it's easier to just increment the counter here so the keys don't change.
	keys_manager.counter.fetch_sub(3, Ordering::AcqRel);
	let our_id = &keys_manager.get_node_id(Recipient::Node).unwrap();
	let network_graph = Arc::new(NetworkGraph::new(genesis_block(network).block_hash(), Arc::clone(&logger)));
	let network_graph = Arc::new(NetworkGraph::new(network, Arc::clone(&logger)));
	let gossip_sync = Arc::new(P2PGossipSync::new(Arc::clone(&network_graph), None, Arc::clone(&logger)));
	let scorer = FixedPenaltyScorer::with_penalty(0);

Expand Down

4 changes: 1 addition & 3 deletions
fuzz/src/process_network_graph.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
// Imports that need to be added manually
use lightning_rapid_gossip_sync::RapidGossipSync;
use bitcoin::hashes::Hash as TraitImport;

use crate::utils::test_logger;

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

3 changes: 1 addition & 2 deletions
fuzz/src/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,6 @@ use lightning::util::ser::Readable;
use bitcoin::hashes::Hash;
use bitcoin::secp256k1::PublicKey;
use bitcoin::network::constants::Network;
use bitcoin::blockdata::constants::genesis_block;

use crate::utils::test_logger;

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

	let our_pubkey = get_pubkey!();
	let net_graph = NetworkGraph::new(genesis_block(Network::Bitcoin).header.block_hash(), &logger);
	let net_graph = NetworkGraph::new(Network::Bitcoin, &logger);
	let chain_source = FuzzChainSource {
 input: Arc::clone(&input),
 net_graph: &net_graph,
Expand Down

4 changes: 2 additions & 2 deletions
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -941,7 +941,7 @@ mod tests {
 let logger = Arc::new(test_utils::TestLogger::with_id(format!("node {}", i)));
 let network = Network::Testnet;
 let genesis_block = genesis_block(network);
 let network_graph = Arc::new(NetworkGraph::new(genesis_block.header.block_hash(), logger.clone()));
 let network_graph = Arc::new(NetworkGraph::new(network, logger.clone()));
 let scorer = Arc::new(Mutex::new(TestScorer::new()));
 let seed = [i as u8; 32];
 let router = Arc::new(DefaultRouter::new(network_graph.clone(), logger.clone(), seed, scorer.clone()));
Expand All@@ -950,7 +950,7 @@ mod tests {
 let now = Duration::from_secs(genesis_block.header.time as u64);
 let keys_manager = Arc::new(KeysManager::new(&seed, now.as_secs(), now.subsec_nanos()));
 let chain_monitor = Arc::new(chainmonitor::ChainMonitor::new(Some(chain_source.clone()), tx_broadcaster.clone(), logger.clone(), fee_estimator.clone(), persister.clone()));
 let best_block = BestBlock::from_genesis(network);
 let best_block = BestBlock::from_network(network);
 let params = ChainParameters { network, best_block };
 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));
 let p2p_gossip_sync = Arc::new(P2PGossipSync::new(network_graph.clone(), Some(chain_source.clone()), logger.clone()));
Expand Down

14 changes: 4 additions & 10 deletions
lightning-rapid-gossip-sync/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,8 +53,7 @@
//! # }
//! # let logger = FakeLogger {};
//!
//! let block_hash = genesis_block(Network::Bitcoin).header.block_hash();
//! let network_graph = NetworkGraph::new(block_hash, &logger);
//! let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
//! let rapid_sync = RapidGossipSync::new(&network_graph);
//! let snapshot_contents: &[u8] = &[0; 0];
//! let new_last_sync_timestamp_result = rapid_sync.update_network_graph(snapshot_contents);
Expand DownExpand Up@@ -161,7 +160,6 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L
mod tests {
	use std::fs;

	use bitcoin::blockdata::constants::genesis_block;
	use bitcoin::Network;

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

 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

Expand DownExpand Up@@ -258,9 +255,8 @@ mod tests {

	#[test]
	fn measure_native_read_from_file() {
 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

Expand DownExpand Up@@ -290,7 +286,6 @@ mod tests {
pub mod bench {
	use test::Bencher;

	use bitcoin::blockdata::constants::genesis_block;
	use bitcoin::Network;

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

	#[bench]
	fn bench_reading_full_graph_from_file(b: &mut Bencher) {
 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 b.iter(|| {
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 let rapid_sync = RapidGossipSync::new(&network_graph);
 let sync_result = rapid_sync.sync_network_graph_with_file_path("./res/full_graph.lngossip");
 if let Err(crate::error::GraphSyncError::DecodeError(DecodeError::Io(io_error))) = &sync_result {
Expand Down

33 changes: 11 additions & 22 deletions
lightning-rapid-gossip-sync/src/processing.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -237,7 +237,6 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L

#[cfg(test)]
mod tests {
	use bitcoin::blockdata::constants::genesis_block;
	use bitcoin::Network;

	use lightning::ln::msgs::DecodeError;
Expand DownExpand Up@@ -269,9 +268,8 @@ mod tests {

	#[test]
	fn network_graph_fails_to_update_from_clipped_input() {
 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

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

 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

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

 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

Expand DownExpand Up@@ -442,9 +437,8 @@ mod tests {
 25, 192,
 ];

 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

Expand DownExpand Up@@ -502,9 +496,8 @@ mod tests {
 25, 192,
 ];

 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

Expand All@@ -528,9 +521,8 @@ mod tests {

	#[test]
	fn full_update_succeeds() {
 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

Expand DownExpand Up@@ -560,9 +552,8 @@ mod tests {

	#[test]
	fn full_update_succeeds_at_the_beginning_of_the_unix_era() {
 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

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

 let latest_succeeding_time = VALID_BINARY_TIMESTAMP + STALE_RGS_UPDATE_AGE_LIMIT_SECS;
 let earliest_failing_time = latest_succeeding_time + 1;

 {
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 assert_eq!(network_graph.read_only().channels().len(), 0);

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

 {
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
Expand DownExpand Up@@ -630,9 +620,8 @@ mod tests {
 0, 0, 1,
 ];

 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 let rapid_sync = RapidGossipSync::new(&network_graph);
 let update_result = rapid_sync.update_network_graph(&unknown_version_input[..]);

Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

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

2 changes: 1 addition & 1 deletion
lightning/src/chain/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,7 @@ pub struct BestBlock {
impl BestBlock {
	/// Constructs a `BestBlock` that represents the genesis block at height 0 of the given
	/// network.
	pub fn from_genesis(network: Network) -> Self {
	pub fn from_network(network: Network) -> Self {
 BestBlock {
 block_hash: genesis_block(network).header.block_hash(),
 height: 0,
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7175,7 +7175,7 @@ mod tests {
 let secp_ctx = Secp256k1::new();
 let seed = [42; 32];
 let network = Network::Testnet;
 let best_block = BestBlock::from_genesis(network);
 let best_block = BestBlock::from_network(network);
 let chain_hash = best_block.block_hash();
 let keys_provider = test_utils::TestKeysInterface::new(&seed, network);

Expand Down

11 changes: 5 additions & 6 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8672,13 +8672,12 @@ pub mod bench {
 // Note that this is unrealistic as each payment send will require at least two fsync
 // calls per node.
 let network = bitcoin::Network::Testnet;
 let genesis_hash = bitcoin::blockdata::constants::genesis_block(network).header.block_hash();

 let tx_broadcaster = test_utils::TestBroadcaster{txn_broadcasted: Mutex::new(Vec::new()), blocks: Arc::new(Mutex::new(Vec::new()))};
 let fee_estimator = test_utils::TestFeeEstimator { sat_per_kw: Mutex::new(253) };
 let logger_a = test_utils::TestLogger::with_id("node a".to_owned());
 let scorer = Mutex::new(test_utils::TestScorer::new());
 let router = test_utils::TestRouter::new(Arc::new(NetworkGraph::new(genesis_hash, &logger_a)), &scorer);
 let router = test_utils::TestRouter::new(Arc::new(NetworkGraph::new(network, &logger_a)), &scorer);

 let mut config: UserConfig = Default::default();
 config.channel_handshake_config.minimum_depth = 1;
Expand All@@ -8688,7 +8687,7 @@ pub mod bench {
 let keys_manager_a = KeysManager::new(&seed_a, 42, 42);
 let node_a = ChannelManager::new(&fee_estimator, &chain_monitor_a, &tx_broadcaster, &router, &logger_a, &keys_manager_a, &keys_manager_a, &keys_manager_a, config.clone(), ChainParameters {
 network,
 best_block: BestBlock::from_genesis(network),
 best_block: BestBlock::from_network(network),
 });
 let node_a_holder = NodeHolder { node: &node_a };

Expand All@@ -8698,7 +8697,7 @@ pub mod bench {
 let keys_manager_b = KeysManager::new(&seed_b, 42, 42);
 let node_b = ChannelManager::new(&fee_estimator, &chain_monitor_b, &tx_broadcaster, &router, &logger_b, &keys_manager_b, &keys_manager_b, &keys_manager_b, config.clone(), ChainParameters {
 network,
 best_block: BestBlock::from_genesis(network),
 best_block: BestBlock::from_network(network),
 });
 let node_b_holder = NodeHolder { node: &node_b };

Expand All@@ -8722,7 +8721,7 @@ pub mod bench {
 assert_eq!(&tx_broadcaster.txn_broadcasted.lock().unwrap()[..], &[tx.clone()]);

 let block = Block {
 header: BlockHeader { version: 0x20000000, prev_blockhash: genesis_hash, merkle_root: TxMerkleNode::all_zeros(), time: 42, bits: 42, nonce: 42 },
 header: BlockHeader { version: 0x20000000, prev_blockhash: BestBlock::from_network(network).block_hash(), merkle_root: TxMerkleNode::all_zeros(), time: 42, bits: 42, nonce: 42 },
 txdata: vec![tx],
 };
 Listen::block_connected(&node_a, &block, 1);
Expand DownExpand Up@@ -8761,7 +8760,7 @@ pub mod bench {
 _ => panic!("Unexpected event"),
 }

 let dummy_graph = NetworkGraph::new(genesis_hash, &logger_a);
 let dummy_graph = NetworkGraph::new(network, &logger_a);

 let mut payment_count: u64 = 0;
 macro_rules! send_payment {
Expand Down

4 changes: 2 additions & 2 deletions
lightning/src/ln/functional_test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2300,7 +2300,7 @@ pub fn create_node_cfgs<'a>(node_count: usize, chanmon_cfgs: &'a Vec<TestChanMon

	for i in 0..node_count {
 let chain_monitor = test_utils::TestChainMonitor::new(Some(&chanmon_cfgs[i].chain_source), &chanmon_cfgs[i].tx_broadcaster, &chanmon_cfgs[i].logger, &chanmon_cfgs[i].fee_estimator, &chanmon_cfgs[i].persister, &chanmon_cfgs[i].keys_manager);
 let network_graph = Arc::new(NetworkGraph::new(chanmon_cfgs[i].chain_source.genesis_hash, &chanmon_cfgs[i].logger));
 let network_graph = Arc::new(NetworkGraph::new(Network::Testnet, &chanmon_cfgs[i].logger));
 let seed = [i as u8; 32];
 nodes.push(NodeCfg {
 chain_source: &chanmon_cfgs[i].chain_source,
Expand DownExpand Up@@ -2341,7 +2341,7 @@ pub fn create_node_chanmgrs<'a, 'b>(node_count: usize, cfgs: &'a Vec<NodeCfg<'b>
 let network = Network::Testnet;
 let params = ChainParameters {
 network,
 best_block: BestBlock::from_genesis(network),
 best_block: BestBlock::from_network(network),
 };
 let node = ChannelManager::new(cfgs[i].fee_estimator, &cfgs[i].chain_monitor, cfgs[i].tx_broadcaster, &cfgs[i].router, cfgs[i].logger, cfgs[i].keys_manager,
 cfgs[i].keys_manager, cfgs[i].keys_manager, if node_config[i].is_some() { node_config[i].clone().unwrap() } else { test_default_channel_config() }, params);
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5280,7 +5280,7 @@ fn test_key_derivation_params() {
	let seed = [42; 32];
	let keys_manager = test_utils::TestKeysInterface::new(&seed, Network::Testnet);
	let chain_monitor = test_utils::TestChainMonitor::new(Some(&chanmon_cfgs[0].chain_source), &chanmon_cfgs[0].tx_broadcaster, &chanmon_cfgs[0].logger, &chanmon_cfgs[0].fee_estimator, &chanmon_cfgs[0].persister, &keys_manager);
	let network_graph = Arc::new(NetworkGraph::new(chanmon_cfgs[0].chain_source.genesis_hash, &chanmon_cfgs[0].logger));
	let network_graph = Arc::new(NetworkGraph::new(Network::Testnet, &chanmon_cfgs[0].logger));
	let scorer = Mutex::new(test_utils::TestScorer::new());
	let router = test_utils::TestRouter::new(network_graph.clone(), &scorer);
	let node = NodeCfg { chain_source: &chanmon_cfgs[0].chain_source, logger: &chanmon_cfgs[0].logger, tx_broadcaster: &chanmon_cfgs[0].tx_broadcaster, fee_estimator: &chanmon_cfgs[0].fee_estimator, router, chain_monitor, keys_manager: &keys_manager, network_graph, node_seed: seed, override_init_features: alloc::rc::Rc::new(core::cell::RefCell::new(None)) };
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
Remove genesis block hash from public API#2025

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 2 commits into

from

Feb 27, 2023
 Merged


Remove genesis block hash from public API
#2025
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
2c3e12e

Remove genesis block hash from public API


TheBlueMatt Feb 9, 2023
d7c818a

Rename `BestBlock::from_genesis` to `from_network` for clarity


TheBlueMatt Feb 15, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -418,7 +418,7 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out) {
 let network = Network::Bitcoin;
 let params = ChainParameters {
 network,
 best_block: BestBlock::from_genesis(network),
 best_block: BestBlock::from_network(network),
 };
 (ChannelManager::new($fee_estimator.clone(), monitor.clone(), broadcast.clone(), &router, Arc::clone(&logger), keys_manager.clone(), keys_manager.clone(), keys_manager.clone(), config, params),
 monitor, keys_manager)
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -442,15 +442,15 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
	let network = Network::Bitcoin;
	let params = ChainParameters {
 network,
 best_block: BestBlock::from_genesis(network),
 best_block: BestBlock::from_network(network),
	};
	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));
	// Adding new calls to `EntropySource::get_secure_random_bytes` during startup can change all the
	// keys subsequently generated in this test. Rather than regenerating all the messages manually,
	// it's easier to just increment the counter here so the keys don't change.
	keys_manager.counter.fetch_sub(3, Ordering::AcqRel);
	let our_id = &keys_manager.get_node_id(Recipient::Node).unwrap();
	let network_graph = Arc::new(NetworkGraph::new(genesis_block(network).block_hash(), Arc::clone(&logger)));
	let network_graph = Arc::new(NetworkGraph::new(network, Arc::clone(&logger)));
	let gossip_sync = Arc::new(P2PGossipSync::new(Arc::clone(&network_graph), None, Arc::clone(&logger)));
	let scorer = FixedPenaltyScorer::with_penalty(0);

Expand Down

4 changes: 1 addition & 3 deletions
fuzz/src/process_network_graph.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
// Imports that need to be added manually
use lightning_rapid_gossip_sync::RapidGossipSync;
use bitcoin::hashes::Hash as TraitImport;

use crate::utils::test_logger;

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

3 changes: 1 addition & 2 deletions
fuzz/src/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,6 @@ use lightning::util::ser::Readable;
use bitcoin::hashes::Hash;
use bitcoin::secp256k1::PublicKey;
use bitcoin::network::constants::Network;
use bitcoin::blockdata::constants::genesis_block;

use crate::utils::test_logger;

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

	let our_pubkey = get_pubkey!();
	let net_graph = NetworkGraph::new(genesis_block(Network::Bitcoin).header.block_hash(), &logger);
	let net_graph = NetworkGraph::new(Network::Bitcoin, &logger);
	let chain_source = FuzzChainSource {
 input: Arc::clone(&input),
 net_graph: &net_graph,
Expand Down

4 changes: 2 additions & 2 deletions
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -941,7 +941,7 @@ mod tests {
 let logger = Arc::new(test_utils::TestLogger::with_id(format!("node {}", i)));
 let network = Network::Testnet;
 let genesis_block = genesis_block(network);
 let network_graph = Arc::new(NetworkGraph::new(genesis_block.header.block_hash(), logger.clone()));
 let network_graph = Arc::new(NetworkGraph::new(network, logger.clone()));
 let scorer = Arc::new(Mutex::new(TestScorer::new()));
 let seed = [i as u8; 32];
 let router = Arc::new(DefaultRouter::new(network_graph.clone(), logger.clone(), seed, scorer.clone()));
Expand All@@ -950,7 +950,7 @@ mod tests {
 let now = Duration::from_secs(genesis_block.header.time as u64);
 let keys_manager = Arc::new(KeysManager::new(&seed, now.as_secs(), now.subsec_nanos()));
 let chain_monitor = Arc::new(chainmonitor::ChainMonitor::new(Some(chain_source.clone()), tx_broadcaster.clone(), logger.clone(), fee_estimator.clone(), persister.clone()));
 let best_block = BestBlock::from_genesis(network);
 let best_block = BestBlock::from_network(network);
 let params = ChainParameters { network, best_block };
 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));
 let p2p_gossip_sync = Arc::new(P2PGossipSync::new(network_graph.clone(), Some(chain_source.clone()), logger.clone()));
Expand Down

14 changes: 4 additions & 10 deletions
lightning-rapid-gossip-sync/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,8 +53,7 @@
//! # }
//! # let logger = FakeLogger {};
//!
//! let block_hash = genesis_block(Network::Bitcoin).header.block_hash();
//! let network_graph = NetworkGraph::new(block_hash, &logger);
//! let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
//! let rapid_sync = RapidGossipSync::new(&network_graph);
//! let snapshot_contents: &[u8] = &[0; 0];
//! let new_last_sync_timestamp_result = rapid_sync.update_network_graph(snapshot_contents);
Expand DownExpand Up@@ -161,7 +160,6 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L
mod tests {
	use std::fs;

	use bitcoin::blockdata::constants::genesis_block;
	use bitcoin::Network;

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

 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

Expand DownExpand Up@@ -258,9 +255,8 @@ mod tests {

	#[test]
	fn measure_native_read_from_file() {
 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

Expand DownExpand Up@@ -290,7 +286,6 @@ mod tests {
pub mod bench {
	use test::Bencher;

	use bitcoin::blockdata::constants::genesis_block;
	use bitcoin::Network;

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

	#[bench]
	fn bench_reading_full_graph_from_file(b: &mut Bencher) {
 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 b.iter(|| {
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 let rapid_sync = RapidGossipSync::new(&network_graph);
 let sync_result = rapid_sync.sync_network_graph_with_file_path("./res/full_graph.lngossip");
 if let Err(crate::error::GraphSyncError::DecodeError(DecodeError::Io(io_error))) = &sync_result {
Expand Down

33 changes: 11 additions & 22 deletions
lightning-rapid-gossip-sync/src/processing.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -237,7 +237,6 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L

#[cfg(test)]
mod tests {
	use bitcoin::blockdata::constants::genesis_block;
	use bitcoin::Network;

	use lightning::ln::msgs::DecodeError;
Expand DownExpand Up@@ -269,9 +268,8 @@ mod tests {

	#[test]
	fn network_graph_fails_to_update_from_clipped_input() {
 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

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

 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

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

 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

Expand DownExpand Up@@ -442,9 +437,8 @@ mod tests {
 25, 192,
 ];

 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

Expand DownExpand Up@@ -502,9 +496,8 @@ mod tests {
 25, 192,
 ];

 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

Expand All@@ -528,9 +521,8 @@ mod tests {

	#[test]
	fn full_update_succeeds() {
 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

Expand DownExpand Up@@ -560,9 +552,8 @@ mod tests {

	#[test]
	fn full_update_succeeds_at_the_beginning_of_the_unix_era() {
 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);

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

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

 let latest_succeeding_time = VALID_BINARY_TIMESTAMP + STALE_RGS_UPDATE_AGE_LIMIT_SECS;
 let earliest_failing_time = latest_succeeding_time + 1;

 {
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 assert_eq!(network_graph.read_only().channels().len(), 0);

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

 {
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 assert_eq!(network_graph.read_only().channels().len(), 0);

 let rapid_sync = RapidGossipSync::new(&network_graph);
Expand DownExpand Up@@ -630,9 +620,8 @@ mod tests {
 0, 0, 1,
 ];

 let block_hash = genesis_block(Network::Bitcoin).block_hash();
 let logger = TestLogger::new();
 let network_graph = NetworkGraph::new(block_hash, &logger);
 let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 let rapid_sync = RapidGossipSync::new(&network_graph);
 let update_result = rapid_sync.update_network_graph(&unknown_version_input[..]);

Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

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

2 changes: 1 addition & 1 deletion
lightning/src/chain/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,7 @@ pub struct BestBlock {
impl BestBlock {
	/// Constructs a `BestBlock` that represents the genesis block at height 0 of the given
	/// network.
	pub fn from_genesis(network: Network) -> Self {
	pub fn from_network(network: Network) -> Self {
 BestBlock {
 block_hash: genesis_block(network).header.block_hash(),
 height: 0,
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7175,7 +7175,7 @@ mod tests {
 let secp_ctx = Secp256k1::new();
 let seed = [42; 32];
 let network = Network::Testnet;
 let best_block = BestBlock::from_genesis(network);
 let best_block = BestBlock::from_network(network);
 let chain_hash = best_block.block_hash();
 let keys_provider = test_utils::TestKeysInterface::new(&seed, network);

Expand Down

11 changes: 5 additions & 6 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8672,13 +8672,12 @@ pub mod bench {
 // Note that this is unrealistic as each payment send will require at least two fsync
 // calls per node.
 let network = bitcoin::Network::Testnet;
 let genesis_hash = bitcoin::blockdata::constants::genesis_block(network).header.block_hash();

 let tx_broadcaster = test_utils::TestBroadcaster{txn_broadcasted: Mutex::new(Vec::new()), blocks: Arc::new(Mutex::new(Vec::new()))};
 let fee_estimator = test_utils::TestFeeEstimator { sat_per_kw: Mutex::new(253) };
 let logger_a = test_utils::TestLogger::with_id("node a".to_owned());
 let scorer = Mutex::new(test_utils::TestScorer::new());
 let router = test_utils::TestRouter::new(Arc::new(NetworkGraph::new(genesis_hash, &logger_a)), &scorer);
 let router = test_utils::TestRouter::new(Arc::new(NetworkGraph::new(network, &logger_a)), &scorer);

 let mut config: UserConfig = Default::default();
 config.channel_handshake_config.minimum_depth = 1;
Expand All@@ -8688,7 +8687,7 @@ pub mod bench {
 let keys_manager_a = KeysManager::new(&seed_a, 42, 42);
 let node_a = ChannelManager::new(&fee_estimator, &chain_monitor_a, &tx_broadcaster, &router, &logger_a, &keys_manager_a, &keys_manager_a, &keys_manager_a, config.clone(), ChainParameters {
 network,
 best_block: BestBlock::from_genesis(network),
 best_block: BestBlock::from_network(network),
 });
 let node_a_holder = NodeHolder { node: &node_a };

Expand All@@ -8698,7 +8697,7 @@ pub mod bench {
 let keys_manager_b = KeysManager::new(&seed_b, 42, 42);
 let node_b = ChannelManager::new(&fee_estimator, &chain_monitor_b, &tx_broadcaster, &router, &logger_b, &keys_manager_b, &keys_manager_b, &keys_manager_b, config.clone(), ChainParameters {
 network,
 best_block: BestBlock::from_genesis(network),
 best_block: BestBlock::from_network(network),
 });
 let node_b_holder = NodeHolder { node: &node_b };

Expand All@@ -8722,7 +8721,7 @@ pub mod bench {
 assert_eq!(&tx_broadcaster.txn_broadcasted.lock().unwrap()[..], &[tx.clone()]);

 let block = Block {
 header: BlockHeader { version: 0x20000000, prev_blockhash: genesis_hash, merkle_root: TxMerkleNode::all_zeros(), time: 42, bits: 42, nonce: 42 },
 header: BlockHeader { version: 0x20000000, prev_blockhash: BestBlock::from_network(network).block_hash(), merkle_root: TxMerkleNode::all_zeros(), time: 42, bits: 42, nonce: 42 },
 txdata: vec![tx],
 };
 Listen::block_connected(&node_a, &block, 1);
Expand DownExpand Up@@ -8761,7 +8760,7 @@ pub mod bench {
 _ => panic!("Unexpected event"),
 }

 let dummy_graph = NetworkGraph::new(genesis_hash, &logger_a);
 let dummy_graph = NetworkGraph::new(network, &logger_a);

 let mut payment_count: u64 = 0;
 macro_rules! send_payment {
Expand Down

4 changes: 2 additions & 2 deletions
lightning/src/ln/functional_test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2300,7 +2300,7 @@ pub fn create_node_cfgs<'a>(node_count: usize, chanmon_cfgs: &'a Vec<TestChanMon

	for i in 0..node_count {
 let chain_monitor = test_utils::TestChainMonitor::new(Some(&chanmon_cfgs[i].chain_source), &chanmon_cfgs[i].tx_broadcaster, &chanmon_cfgs[i].logger, &chanmon_cfgs[i].fee_estimator, &chanmon_cfgs[i].persister, &chanmon_cfgs[i].keys_manager);
 let network_graph = Arc::new(NetworkGraph::new(chanmon_cfgs[i].chain_source.genesis_hash, &chanmon_cfgs[i].logger));
 let network_graph = Arc::new(NetworkGraph::new(Network::Testnet, &chanmon_cfgs[i].logger));
 let seed = [i as u8; 32];
 nodes.push(NodeCfg {
 chain_source: &chanmon_cfgs[i].chain_source,
Expand DownExpand Up@@ -2341,7 +2341,7 @@ pub fn create_node_chanmgrs<'a, 'b>(node_count: usize, cfgs: &'a Vec<NodeCfg<'b>
 let network = Network::Testnet;
 let params = ChainParameters {
 network,
 best_block: BestBlock::from_genesis(network),
 best_block: BestBlock::from_network(network),
 };
 let node = ChannelManager::new(cfgs[i].fee_estimator, &cfgs[i].chain_monitor, cfgs[i].tx_broadcaster, &cfgs[i].router, cfgs[i].logger, cfgs[i].keys_manager,
 cfgs[i].keys_manager, cfgs[i].keys_manager, if node_config[i].is_some() { node_config[i].clone().unwrap() } else { test_default_channel_config() }, params);
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5280,7 +5280,7 @@ fn test_key_derivation_params() {
	let seed = [42; 32];
	let keys_manager = test_utils::TestKeysInterface::new(&seed, Network::Testnet);
	let chain_monitor = test_utils::TestChainMonitor::new(Some(&chanmon_cfgs[0].chain_source), &chanmon_cfgs[0].tx_broadcaster, &chanmon_cfgs[0].logger, &chanmon_cfgs[0].fee_estimator, &chanmon_cfgs[0].persister, &keys_manager);
	let network_graph = Arc::new(NetworkGraph::new(chanmon_cfgs[0].chain_source.genesis_hash, &chanmon_cfgs[0].logger));
	let network_graph = Arc::new(NetworkGraph::new(Network::Testnet, &chanmon_cfgs[0].logger));
	let scorer = Mutex::new(test_utils::TestScorer::new());
	let router = test_utils::TestRouter::new(network_graph.clone(), &scorer);
	let node = NodeCfg { chain_source: &chanmon_cfgs[0].chain_source, logger: &chanmon_cfgs[0].logger, tx_broadcaster: &chanmon_cfgs[0].tx_broadcaster, fee_estimator: &chanmon_cfgs[0].fee_estimator, router, chain_monitor, keys_manager: &keys_manager, network_graph, node_seed: seed, override_init_features: alloc::rc::Rc::new(core::cell::RefCell::new(None)) };
Expand Down
Loading