X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Flib.rs;h=64f0ff24616ec619cd95cbebe71b8808feb06f88;hb=81c27c87b10f2e097eef99e0766d1bcef2ebef60;hp=1852911a68a02b18e32bc7bc2a4a7c86d9b1b667;hpb=ae2225c925e537bc8f701886385d9450fe6a94a1;p=rapid-gossip-sync-server diff --git a/src/lib.rs b/src/lib.rs index 1852911..64f0ff2 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -14,6 +14,7 @@ use std::fs::File; use std::io::BufReader; use std::ops::Deref; use std::sync::Arc; +use bitcoin::blockdata::constants::ChainHash; use lightning::log_info; use lightning::routing::gossip::{NetworkGraph, NodeId}; @@ -157,8 +158,7 @@ fn serialize_empty_blob(current_timestamp: u64) -> Vec { let mut blob = GOSSIP_PREFIX.to_vec(); let network = config::network(); - let genesis_block = bitcoin::blockdata::constants::genesis_block(network); - let chain_hash = genesis_block.block_hash(); + let chain_hash = ChainHash::using_genesis_block(network); chain_hash.write(&mut blob).unwrap(); let blob_timestamp = Snapshotter::>::round_down_to_nearest_multiple(current_timestamp, SYMLINK_GRANULARITY_INTERVAL as u64) as u32; @@ -171,7 +171,7 @@ fn serialize_empty_blob(current_timestamp: u64) -> Vec { blob } -async fn serialize_delta(network_graph: Arc>, last_sync_timestamp: u32, logger: L) -> SerializedResponse where L::Target: Logger { +async fn serialize_delta(network_graph: Arc>, last_sync_timestamp: u32, snapshot_reference_timestamp: Option, logger: L) -> SerializedResponse where L::Target: Logger { let client = connect_to_db().await; network_graph.remove_stale_channels_and_tracking(); @@ -200,7 +200,7 @@ async fn serialize_delta(network_graph: Arc>, }; let mut delta_set = DeltaSet::new(); - lookup::fetch_channel_announcements(&mut delta_set, network_graph, &client, last_sync_timestamp, logger.clone()).await; + lookup::fetch_channel_announcements(&mut delta_set, network_graph, &client, last_sync_timestamp, snapshot_reference_timestamp, logger.clone()).await; log_info!(logger, "announcement channel count: {}", delta_set.len()); lookup::fetch_channel_updates(&mut delta_set, &client, last_sync_timestamp, logger.clone()).await; log_info!(logger, "update-fetched channel count: {}", delta_set.len());