Handle query_channel_range message from peer
[rust-lightning] / lightning / src / routing / network_graph.rs
index 54783dd1dc3cdf633efcf19d49092c03ec0a7f78..34859cf07c462311ee1623bae195e7527ddb4205 100644 (file)
@@ -18,27 +18,37 @@ use bitcoin::hashes::Hash;
 use bitcoin::blockdata::script::Builder;
 use bitcoin::blockdata::transaction::TxOut;
 use bitcoin::blockdata::opcodes;
+use bitcoin::hash_types::BlockHash;
 
 use chain;
 use chain::Access;
 use ln::features::{ChannelFeatures, NodeFeatures};
-use ln::msgs::{DecodeError, ErrorAction, LightningError, RoutingMessageHandler, NetAddress, MAX_VALUE_MSAT};
+use ln::msgs::{DecodeError, ErrorAction, Init, LightningError, RoutingMessageHandler, NetAddress, MAX_VALUE_MSAT};
 use ln::msgs::{ChannelAnnouncement, ChannelUpdate, NodeAnnouncement, OptionalField};
+use ln::msgs::{QueryChannelRange, ReplyChannelRange, QueryShortChannelIds, ReplyShortChannelIdsEnd};
 use ln::msgs;
 use util::ser::{Writeable, Readable, Writer};
 use util::logger::Logger;
+use util::events::{MessageSendEvent, MessageSendEventsProvider};
+use util::scid_utils::{block_from_scid, scid_from_parts};
 
 use std::{cmp, fmt};
 use std::sync::{RwLock, RwLockReadGuard};
 use std::sync::atomic::{AtomicUsize, Ordering};
+use std::sync::Mutex;
 use std::collections::BTreeMap;
 use std::collections::btree_map::Entry as BtreeEntry;
 use std::ops::Deref;
 use bitcoin::hashes::hex::ToHex;
 
+/// The maximum number of extra bytes which we do not understand in a gossip message before we will
+/// refuse to relay the message.
+const MAX_EXCESS_BYTES_FOR_RELAY: usize = 1024;
+
 /// Represents the network as nodes and channels between them
-#[derive(PartialEq)]
+#[derive(Clone, PartialEq)]
 pub struct NetworkGraph {
+       genesis_hash: BlockHash,
        channels: BTreeMap<u64, ChannelInfo>,
        nodes: BTreeMap<PublicKey, NodeInfo>,
 }
@@ -59,7 +69,13 @@ pub struct NetGraphMsgHandler<C: Deref, L: Deref> where C::Target: chain::Access
        pub network_graph: RwLock<NetworkGraph>,
        chain_access: Option<C>,
        full_syncs_requested: AtomicUsize,
+       pending_events: Mutex<Vec<MessageSendEvent>>,
        logger: L,
+
+       /// Maximum number of short_channel_ids that will be encoded in one gossip reply message.
+       /// Default is 8000 which ensures a reply fits within the 65k payload limit and is
+       /// consistent with other implementations.
+       max_reply_scids: usize,
 }
 
 impl<C: Deref, L: Deref> NetGraphMsgHandler<C, L> where C::Target: chain::Access, L::Target: Logger {
@@ -68,16 +84,15 @@ impl<C: Deref, L: Deref> NetGraphMsgHandler<C, L> where C::Target: chain::Access
        /// Chain monitor is used to make sure announced channels exist on-chain,
        /// channel data is correct, and that the announcement is signed with
        /// channel owners' keys.
-       pub fn new(chain_access: Option<C>, logger: L) -> Self {
+       pub fn new(genesis_hash: BlockHash, chain_access: Option<C>, logger: L) -> Self {
                NetGraphMsgHandler {
                        secp_ctx: Secp256k1::verification_only(),
-                       network_graph: RwLock::new(NetworkGraph {
-                               channels: BTreeMap::new(),
-                               nodes: BTreeMap::new(),
-                       }),
+                       network_graph: RwLock::new(NetworkGraph::new(genesis_hash)),
                        full_syncs_requested: AtomicUsize::new(0),
                        chain_access,
+                       pending_events: Mutex::new(vec![]),
                        logger,
+                       max_reply_scids: 8000,
                }
        }
 
@@ -89,10 +104,19 @@ impl<C: Deref, L: Deref> NetGraphMsgHandler<C, L> where C::Target: chain::Access
                        network_graph: RwLock::new(network_graph),
                        full_syncs_requested: AtomicUsize::new(0),
                        chain_access,
+                       pending_events: Mutex::new(vec![]),
                        logger,
+                       max_reply_scids: 8000,
                }
        }
 
+       /// Adds a provider used to check new announcements. Does not affect
+       /// existing announcements unless they are updated.
+       /// Add, update or remove the provider would replace the current one.
+       pub fn add_chain_access(&mut self, chain_access: Option<C>) {
+               self.chain_access = chain_access;
+       }
+
        /// Take a read lock on the network_graph and return it in the C-bindings
        /// newtype helper. This is likely only useful when called via the C
        /// bindings as you can call `self.network_graph.read().unwrap()` in Rust
@@ -100,6 +124,18 @@ impl<C: Deref, L: Deref> NetGraphMsgHandler<C, L> where C::Target: chain::Access
        pub fn read_locked_graph<'a>(&'a self) -> LockedNetworkGraph<'a> {
                LockedNetworkGraph(self.network_graph.read().unwrap())
        }
+
+       /// Returns true when a full routing table sync should be performed with a peer.
+       fn should_request_full_sync(&self, _node_id: &PublicKey) -> bool {
+               //TODO: Determine whether to request a full sync based on the network map.
+               const FULL_SYNCS_TO_REQUEST: usize = 5;
+               if self.full_syncs_requested.load(Ordering::Acquire) < FULL_SYNCS_TO_REQUEST {
+                       self.full_syncs_requested.fetch_add(1, Ordering::AcqRel);
+                       true
+               } else {
+                       false
+               }
+       }
 }
 
 impl<'a> LockedNetworkGraph<'a> {
@@ -122,13 +158,15 @@ macro_rules! secp_verify_sig {
 impl<C: Deref + Sync + Send, L: Deref + Sync + Send> RoutingMessageHandler for NetGraphMsgHandler<C, L> where C::Target: chain::Access, L::Target: Logger {
        fn handle_node_announcement(&self, msg: &msgs::NodeAnnouncement) -> Result<bool, LightningError> {
                self.network_graph.write().unwrap().update_node_from_announcement(msg, &self.secp_ctx)?;
-               Ok(msg.contents.excess_data.is_empty() && msg.contents.excess_address_data.is_empty())
+               Ok(msg.contents.excess_data.len() <=  MAX_EXCESS_BYTES_FOR_RELAY &&
+                  msg.contents.excess_address_data.len() <= MAX_EXCESS_BYTES_FOR_RELAY &&
+                  msg.contents.excess_data.len() + msg.contents.excess_address_data.len() <= MAX_EXCESS_BYTES_FOR_RELAY)
        }
 
        fn handle_channel_announcement(&self, msg: &msgs::ChannelAnnouncement) -> Result<bool, LightningError> {
                self.network_graph.write().unwrap().update_channel_from_announcement(msg, &self.chain_access, &self.secp_ctx)?;
                log_trace!(self.logger, "Added channel_announcement for {}{}", msg.contents.short_channel_id, if !msg.contents.excess_data.is_empty() { " with excess uninterpreted data!" } else { "" });
-               Ok(msg.contents.excess_data.is_empty())
+               Ok(msg.contents.excess_data.len() <= MAX_EXCESS_BYTES_FOR_RELAY)
        }
 
        fn handle_htlc_fail_channel_update(&self, update: &msgs::HTLCFailChannelUpdate) {
@@ -147,7 +185,7 @@ impl<C: Deref + Sync + Send, L: Deref + Sync + Send> RoutingMessageHandler for N
 
        fn handle_channel_update(&self, msg: &msgs::ChannelUpdate) -> Result<bool, LightningError> {
                self.network_graph.write().unwrap().update_channel(msg, &self.secp_ctx)?;
-               Ok(msg.contents.excess_data.is_empty())
+               Ok(msg.contents.excess_data.len() <= MAX_EXCESS_BYTES_FOR_RELAY)
        }
 
        fn get_next_channel_announcements(&self, starting_point: u64, batch_amount: u8) -> Vec<(ChannelAnnouncement, Option<ChannelUpdate>, Option<ChannelUpdate>)> {
@@ -202,19 +240,205 @@ impl<C: Deref + Sync + Send, L: Deref + Sync + Send> RoutingMessageHandler for N
                result
        }
 
-       fn should_request_full_sync(&self, _node_id: &PublicKey) -> bool {
-               //TODO: Determine whether to request a full sync based on the network map.
-               const FULL_SYNCS_TO_REQUEST: usize = 5;
-               if self.full_syncs_requested.load(Ordering::Acquire) < FULL_SYNCS_TO_REQUEST {
-                       self.full_syncs_requested.fetch_add(1, Ordering::AcqRel);
-                       true
-               } else {
-                       false
+       /// Initiates a stateless sync of routing gossip information with a peer
+       /// using gossip_queries. The default strategy used by this implementation
+       /// is to sync the full block range with several peers.
+       ///
+       /// We should expect one or more reply_channel_range messages in response
+       /// to our query_channel_range. Each reply will enqueue a query_scid message
+       /// to request gossip messages for each channel. The sync is considered complete
+       /// when the final reply_scids_end message is received, though we are not
+       /// tracking this directly.
+       fn sync_routing_table(&self, their_node_id: &PublicKey, init_msg: &Init) {
+
+               // We will only perform a sync with peers that support gossip_queries.
+               if !init_msg.features.supports_gossip_queries() {
+                       return ();
+               }
+
+               // Check if we need to perform a full synchronization with this peer
+               if !self.should_request_full_sync(their_node_id) {
+                       return ();
+               }
+
+               let first_blocknum = 0;
+               let number_of_blocks = 0xffffffff;
+               log_debug!(self.logger, "Sending query_channel_range peer={}, first_blocknum={}, number_of_blocks={}", log_pubkey!(their_node_id), first_blocknum, number_of_blocks);
+               let mut pending_events = self.pending_events.lock().unwrap();
+               pending_events.push(MessageSendEvent::SendChannelRangeQuery {
+                       node_id: their_node_id.clone(),
+                       msg: QueryChannelRange {
+                               chain_hash: self.network_graph.read().unwrap().genesis_hash,
+                               first_blocknum,
+                               number_of_blocks,
+                       },
+               });
+       }
+
+       /// Statelessly processes a reply to a channel range query by immediately
+       /// sending an SCID query with SCIDs in the reply. To keep this handler
+       /// stateless, it does not validate the sequencing of replies for multi-
+       /// reply ranges. It does not validate whether the reply(ies) cover the
+       /// queried range. It also does not filter SCIDs to only those in the
+       /// original query range. We also do not validate that the chain_hash
+       /// matches the chain_hash of the NetworkGraph. Any chan_ann message that
+       /// does not match our chain_hash will be rejected when the announcement is
+       /// processed.
+       fn handle_reply_channel_range(&self, their_node_id: &PublicKey, msg: ReplyChannelRange) -> Result<(), LightningError> {
+               log_debug!(self.logger, "Handling reply_channel_range peer={}, first_blocknum={}, number_of_blocks={}, sync_complete={}, scids={}", log_pubkey!(their_node_id), msg.first_blocknum, msg.number_of_blocks, msg.sync_complete, msg.short_channel_ids.len(),);
+
+               log_debug!(self.logger, "Sending query_short_channel_ids peer={}, batch_size={}", log_pubkey!(their_node_id), msg.short_channel_ids.len());
+               let mut pending_events = self.pending_events.lock().unwrap();
+               pending_events.push(MessageSendEvent::SendShortIdsQuery {
+                       node_id: their_node_id.clone(),
+                       msg: QueryShortChannelIds {
+                               chain_hash: msg.chain_hash,
+                               short_channel_ids: msg.short_channel_ids,
+                       }
+               });
+
+               Ok(())
+       }
+
+       /// When an SCID query is initiated the remote peer will begin streaming
+       /// gossip messages. In the event of a failure, we may have received
+       /// some channel information. Before trying with another peer, the
+       /// caller should update its set of SCIDs that need to be queried.
+       fn handle_reply_short_channel_ids_end(&self, their_node_id: &PublicKey, msg: ReplyShortChannelIdsEnd) -> Result<(), LightningError> {
+               log_debug!(self.logger, "Handling reply_short_channel_ids_end peer={}, full_information={}", log_pubkey!(their_node_id), msg.full_information);
+
+               // If the remote node does not have up-to-date information for the
+               // chain_hash they will set full_information=false. We can fail
+               // the result and try again with a different peer.
+               if !msg.full_information {
+                       return Err(LightningError {
+                               err: String::from("Received reply_short_channel_ids_end with no information"),
+                               action: ErrorAction::IgnoreError
+                       });
+               }
+
+               Ok(())
+       }
+
+       /// Processes a query from a peer by finding channels whose funding UTXOs
+       /// are in the specified block range. Due to message size limits, large range
+       /// queries may result in several reply messages. This implementation enqueues
+       /// all reply messages into pending events.
+       fn handle_query_channel_range(&self, their_node_id: &PublicKey, msg: QueryChannelRange) -> Result<(), LightningError> {
+               log_debug!(self.logger, "Handling query_channel_range peer={}, first_blocknum={}, number_of_blocks={}", log_pubkey!(their_node_id), msg.first_blocknum, msg.number_of_blocks);
+
+               let network_graph = self.network_graph.read().unwrap();
+
+               let start_scid = scid_from_parts(msg.first_blocknum, 0, 0);
+
+               // We receive valid queries with end_blocknum that would overflow SCID conversion.
+               // Manually cap the ending block to avoid this overflow.
+               let exclusive_end_scid = scid_from_parts(cmp::min(msg.end_blocknum(), 0xffffff), 0, 0);
+
+               // Per spec, we must reply to a query. Send an empty message when things are invalid.
+               if msg.chain_hash != network_graph.genesis_hash || start_scid.is_err() || exclusive_end_scid.is_err() {
+                       let mut pending_events = self.pending_events.lock().unwrap();
+                       pending_events.push(MessageSendEvent::SendReplyChannelRange {
+                               node_id: their_node_id.clone(),
+                               msg: ReplyChannelRange {
+                                       chain_hash: msg.chain_hash.clone(),
+                                       first_blocknum: msg.first_blocknum,
+                                       number_of_blocks: msg.number_of_blocks,
+                                       sync_complete: true,
+                                       short_channel_ids: vec![],
+                               }
+                       });
+                       return Ok(());
                }
+
+               // Creates channel batches. We are not checking if the channel is routable
+               // (has at least one update). A peer may still want to know the channel
+               // exists even if its not yet routable.
+               let mut batches: Vec<Vec<u64>> = vec![Vec::with_capacity(self.max_reply_scids)];
+               for (_, ref chan) in network_graph.get_channels().range(start_scid.unwrap()..exclusive_end_scid.unwrap()) {
+                       if let Some(chan_announcement) = &chan.announcement_message {
+                               // Construct a new batch if last one is full
+                               if batches.last().unwrap().len() == batches.last().unwrap().capacity() {
+                                       batches.push(Vec::with_capacity(self.max_reply_scids));
+                               }
+
+                               let batch = batches.last_mut().unwrap();
+                               batch.push(chan_announcement.contents.short_channel_id);
+                       }
+               }
+               drop(network_graph);
+
+               let mut pending_events = self.pending_events.lock().unwrap();
+               let mut batch_index = 0;
+               let batch_count = batches.len();
+               for batch in batches.into_iter() {
+                       // Per spec, the initial first_blocknum needs to be <= the query's first_blocknum.
+                       // Use the query's values since we don't use pre-processed reply ranges.
+                       let first_blocknum = if batch_index == 0 {
+                               msg.first_blocknum
+                       }
+                       // Subsequent replies must be >= the last sent first_blocknum. Use the first block
+                       // in the new batch.
+                       else {
+                               block_from_scid(batch.first().unwrap())
+                       };
+
+                       // Per spec, the last end_block needs to be >= the query's end_block. Last
+                       // reply calculates difference between the query's end_blocknum and the start of the reply.
+                       // Overflow safe since end_blocknum=msg.first_block_num+msg.number_of_blocks and first_blocknum
+                       // will be either msg.first_blocknum or a higher block height.
+                       let number_of_blocks = if batch_index == batch_count-1 {
+                               msg.end_blocknum() - first_blocknum
+                       }
+                       // Prior replies should use the number of blocks that fit into the reply. Overflow
+                       // safe since first_blocknum is always <= last SCID's block.
+                       else {
+                               block_from_scid(batch.last().unwrap()) - first_blocknum + 1
+                       };
+
+                       // Only true for the last message in a sequence
+                       let sync_complete = batch_index == batch_count - 1;
+
+                       pending_events.push(MessageSendEvent::SendReplyChannelRange {
+                               node_id: their_node_id.clone(),
+                               msg: ReplyChannelRange {
+                                       chain_hash: msg.chain_hash.clone(),
+                                       first_blocknum,
+                                       number_of_blocks,
+                                       sync_complete,
+                                       short_channel_ids: batch,
+                               }
+                       });
+
+                       batch_index += 1;
+               }
+
+               Ok(())
+       }
+
+       fn handle_query_short_channel_ids(&self, _their_node_id: &PublicKey, _msg: QueryShortChannelIds) -> Result<(), LightningError> {
+               // TODO
+               Err(LightningError {
+                       err: String::from("Not implemented"),
+                       action: ErrorAction::IgnoreError,
+               })
+       }
+}
+
+impl<C: Deref, L: Deref> MessageSendEventsProvider for NetGraphMsgHandler<C, L>
+where
+       C::Target: chain::Access,
+       L::Target: Logger,
+{
+       fn get_and_clear_pending_msg_events(&self) -> Vec<MessageSendEvent> {
+               let mut ret = Vec::new();
+               let mut pending_events = self.pending_events.lock().unwrap();
+               std::mem::swap(&mut ret, &mut pending_events);
+               ret
        }
 }
 
-#[derive(PartialEq, Debug)]
+#[derive(Clone, Debug, PartialEq)]
 /// Details about one direction of a channel. Received
 /// within a channel update.
 pub struct DirectionalChannelInfo {
@@ -255,7 +479,7 @@ impl_writeable!(DirectionalChannelInfo, 0, {
        last_update_message
 });
 
-#[derive(PartialEq)]
+#[derive(Clone, Debug, PartialEq)]
 /// Details about a channel (both directions).
 /// Received within a channel announcement.
 pub struct ChannelInfo {
@@ -326,7 +550,7 @@ impl Writeable for RoutingFees {
        }
 }
 
-#[derive(PartialEq, Debug)]
+#[derive(Clone, Debug, PartialEq)]
 /// Information received in the latest node_announcement from this node.
 pub struct NodeAnnouncementInfo {
        /// Protocol features the node announced support for
@@ -392,7 +616,7 @@ impl Readable for NodeAnnouncementInfo {
        }
 }
 
-#[derive(PartialEq)]
+#[derive(Clone, Debug, PartialEq)]
 /// Details about a node in the network, known from the network announcement.
 pub struct NodeInfo {
        /// All valid channels a node has announced
@@ -448,6 +672,7 @@ impl Readable for NodeInfo {
 
 impl Writeable for NetworkGraph {
        fn write<W: Writer>(&self, writer: &mut W) -> Result<(), ::std::io::Error> {
+               self.genesis_hash.write(writer)?;
                (self.channels.len() as u64).write(writer)?;
                for (ref chan_id, ref chan_info) in self.channels.iter() {
                        (*chan_id).write(writer)?;
@@ -464,6 +689,7 @@ impl Writeable for NetworkGraph {
 
 impl Readable for NetworkGraph {
        fn read<R: ::std::io::Read>(reader: &mut R) -> Result<NetworkGraph, DecodeError> {
+               let genesis_hash: BlockHash = Readable::read(reader)?;
                let channels_count: u64 = Readable::read(reader)?;
                let mut channels = BTreeMap::new();
                for _ in 0..channels_count {
@@ -479,6 +705,7 @@ impl Readable for NetworkGraph {
                        nodes.insert(node_id, node_info);
                }
                Ok(NetworkGraph {
+                       genesis_hash,
                        channels,
                        nodes,
                })
@@ -524,8 +751,9 @@ impl NetworkGraph {
        }
 
        /// Creates a new, empty, network graph.
-       pub fn new() -> NetworkGraph {
+       pub fn new(genesis_hash: BlockHash) -> NetworkGraph {
                Self {
+                       genesis_hash,
                        channels: BTreeMap::new(),
                        nodes: BTreeMap::new(),
                }
@@ -561,7 +789,10 @@ impl NetworkGraph {
                                        }
                                }
 
-                               let should_relay = msg.excess_data.is_empty() && msg.excess_address_data.is_empty();
+                               let should_relay =
+                                       msg.excess_data.len() <= MAX_EXCESS_BYTES_FOR_RELAY &&
+                                       msg.excess_address_data.len() <= MAX_EXCESS_BYTES_FOR_RELAY &&
+                                       msg.excess_data.len() + msg.excess_address_data.len() <= MAX_EXCESS_BYTES_FOR_RELAY;
                                node.announcement_info = Some(NodeAnnouncementInfo {
                                        features: msg.features.clone(),
                                        last_update: msg.timestamp,
@@ -654,7 +885,8 @@ impl NetworkGraph {
                                node_two: msg.node_id_2.clone(),
                                two_to_one: None,
                                capacity_sats: utxo_value,
-                               announcement_message: if msg.excess_data.is_empty() { full_msg.cloned() } else { None },
+                               announcement_message: if msg.excess_data.len() <= MAX_EXCESS_BYTES_FOR_RELAY
+                                       { full_msg.cloned() } else { None },
                        };
 
                match self.channels.entry(msg.short_channel_id) {
@@ -783,7 +1015,8 @@ impl NetworkGraph {
                                                        chan_was_enabled = false;
                                                }
 
-                                               let last_update_message = if msg.excess_data.is_empty() { full_msg.cloned() } else { None };
+                                               let last_update_message = if msg.excess_data.len() <= MAX_EXCESS_BYTES_FOR_RELAY
+                                                       { full_msg.cloned() } else { None };
 
                                                let updated_channel_dir_info = DirectionalChannelInfo {
                                                        enabled: chan_enabled,
@@ -882,14 +1115,15 @@ impl NetworkGraph {
 #[cfg(test)]
 mod tests {
        use chain;
-       use ln::features::{ChannelFeatures, NodeFeatures};
-       use routing::network_graph::{NetGraphMsgHandler, NetworkGraph};
-       use ln::msgs::{OptionalField, RoutingMessageHandler, UnsignedNodeAnnouncement, NodeAnnouncement,
+       use ln::features::{ChannelFeatures, InitFeatures, NodeFeatures};
+       use routing::network_graph::{NetGraphMsgHandler, NetworkGraph, MAX_EXCESS_BYTES_FOR_RELAY};
+       use ln::msgs::{Init, OptionalField, RoutingMessageHandler, UnsignedNodeAnnouncement, NodeAnnouncement,
                UnsignedChannelAnnouncement, ChannelAnnouncement, UnsignedChannelUpdate, ChannelUpdate, HTLCFailChannelUpdate,
-               MAX_VALUE_MSAT};
+               ReplyChannelRange, ReplyShortChannelIdsEnd, QueryChannelRange, QueryShortChannelIds, MAX_VALUE_MSAT};
        use util::test_utils;
        use util::logger::Logger;
        use util::ser::{Readable, Writeable};
+       use util::events::{MessageSendEvent, MessageSendEventsProvider};
 
        use bitcoin::hashes::sha256d::Hash as Sha256dHash;
        use bitcoin::hashes::Hash;
@@ -909,7 +1143,8 @@ mod tests {
        fn create_net_graph_msg_handler() -> (Secp256k1<All>, NetGraphMsgHandler<Arc<test_utils::TestChainSource>, Arc<test_utils::TestLogger>>) {
                let secp_ctx = Secp256k1::new();
                let logger = Arc::new(test_utils::TestLogger::new());
-               let net_graph_msg_handler = NetGraphMsgHandler::new(None, Arc::clone(&logger));
+               let genesis_hash = genesis_block(Network::Testnet).header.block_hash();
+               let net_graph_msg_handler = NetGraphMsgHandler::new(genesis_hash, None, Arc::clone(&logger));
                (secp_ctx, net_graph_msg_handler)
        }
 
@@ -1003,7 +1238,7 @@ mod tests {
                };
 
                unsigned_announcement.timestamp += 1000;
-               unsigned_announcement.excess_data.push(1);
+               unsigned_announcement.excess_data.resize(MAX_EXCESS_BYTES_FOR_RELAY + 1, 0);
                msghash = hash_to_message!(&Sha256dHash::hash(&unsigned_announcement.encode()[..])[..]);
                let announcement_with_data = NodeAnnouncement {
                        signature: secp_ctx.sign(&msghash, node_1_privkey),
@@ -1070,7 +1305,7 @@ mod tests {
                };
 
                // Test if the UTXO lookups were not supported
-               let mut net_graph_msg_handler = NetGraphMsgHandler::new(None, Arc::clone(&logger));
+               let mut net_graph_msg_handler = NetGraphMsgHandler::new(genesis_block(Network::Testnet).header.block_hash(), None, Arc::clone(&logger));
                match net_graph_msg_handler.handle_channel_announcement(&valid_announcement) {
                        Ok(res) => assert!(res),
                        _ => panic!()
@@ -1094,7 +1329,7 @@ mod tests {
                // Test if an associated transaction were not on-chain (or not confirmed).
                let chain_source = Arc::new(test_utils::TestChainSource::new(Network::Testnet));
                *chain_source.utxo_ret.lock().unwrap() = Err(chain::AccessError::UnknownTx);
-               net_graph_msg_handler = NetGraphMsgHandler::new(Some(chain_source.clone()), Arc::clone(&logger));
+               net_graph_msg_handler = NetGraphMsgHandler::new(chain_source.clone().genesis_hash, Some(chain_source.clone()), Arc::clone(&logger));
                unsigned_announcement.short_channel_id += 1;
 
                msghash = hash_to_message!(&Sha256dHash::hash(&unsigned_announcement.encode()[..])[..]);
@@ -1171,7 +1406,7 @@ mod tests {
 
                // Don't relay valid channels with excess data
                unsigned_announcement.short_channel_id += 1;
-               unsigned_announcement.excess_data.push(1);
+               unsigned_announcement.excess_data.resize(MAX_EXCESS_BYTES_FOR_RELAY + 1, 0);
                msghash = hash_to_message!(&Sha256dHash::hash(&unsigned_announcement.encode()[..])[..]);
                let valid_announcement = ChannelAnnouncement {
                        node_signature_1: secp_ctx.sign(&msghash, node_1_privkey),
@@ -1218,7 +1453,7 @@ mod tests {
                let secp_ctx = Secp256k1::new();
                let logger: Arc<Logger> = Arc::new(test_utils::TestLogger::new());
                let chain_source = Arc::new(test_utils::TestChainSource::new(Network::Testnet));
-               let net_graph_msg_handler = NetGraphMsgHandler::new(Some(chain_source.clone()), Arc::clone(&logger));
+               let net_graph_msg_handler = NetGraphMsgHandler::new(genesis_block(Network::Testnet).header.block_hash(), Some(chain_source.clone()), Arc::clone(&logger));
 
                let node_1_privkey = &SecretKey::from_slice(&[42; 32]).unwrap();
                let node_2_privkey = &SecretKey::from_slice(&[41; 32]).unwrap();
@@ -1301,7 +1536,7 @@ mod tests {
                }
 
                unsigned_channel_update.timestamp += 100;
-               unsigned_channel_update.excess_data.push(1);
+               unsigned_channel_update.excess_data.resize(MAX_EXCESS_BYTES_FOR_RELAY + 1, 0);
                let msghash = hash_to_message!(&Sha256dHash::hash(&unsigned_channel_update.encode()[..])[..]);
                let valid_channel_update = ChannelUpdate {
                        signature: secp_ctx.sign(&msghash, node_1_privkey),
@@ -1601,7 +1836,7 @@ mod tests {
                                htlc_maximum_msat: OptionalField::Absent,
                                fee_base_msat: 10000,
                                fee_proportional_millionths: 20,
-                               excess_data: [1; 3].to_vec()
+                               excess_data: [1; MAX_EXCESS_BYTES_FOR_RELAY + 1].to_vec()
                        };
                        let msghash = hash_to_message!(&Sha256dHash::hash(&unsigned_channel_update.encode()[..])[..]);
                        let valid_channel_update = ChannelUpdate {
@@ -1730,7 +1965,7 @@ mod tests {
                                alias: [0; 32],
                                addresses: Vec::new(),
                                excess_address_data: Vec::new(),
-                               excess_data: [1; 3].to_vec(),
+                               excess_data: [1; MAX_EXCESS_BYTES_FOR_RELAY + 1].to_vec(),
                        };
                        let msghash = hash_to_message!(&Sha256dHash::hash(&unsigned_announcement.encode()[..])[..]);
                        let valid_announcement = NodeAnnouncement {
@@ -1813,4 +2048,501 @@ mod tests {
                network.write(&mut w).unwrap();
                assert!(<NetworkGraph>::read(&mut ::std::io::Cursor::new(&w.0)).unwrap() == *network);
        }
+
+       #[test]
+       fn calling_sync_routing_table() {
+               let (secp_ctx, net_graph_msg_handler) = create_net_graph_msg_handler();
+               let node_privkey_1 = &SecretKey::from_slice(&[42; 32]).unwrap();
+               let node_id_1 = PublicKey::from_secret_key(&secp_ctx, node_privkey_1);
+
+               let chain_hash = genesis_block(Network::Testnet).header.block_hash();
+               let first_blocknum = 0;
+               let number_of_blocks = 0xffff_ffff;
+
+               // It should ignore if gossip_queries feature is not enabled
+               {
+                       let init_msg = Init { features: InitFeatures::known().clear_gossip_queries() };
+                       net_graph_msg_handler.sync_routing_table(&node_id_1, &init_msg);
+                       let events = net_graph_msg_handler.get_and_clear_pending_msg_events();
+                       assert_eq!(events.len(), 0);
+               }
+
+               // It should send a query_channel_message with the correct information
+               {
+                       let init_msg = Init { features: InitFeatures::known() };
+                       net_graph_msg_handler.sync_routing_table(&node_id_1, &init_msg);
+                       let events = net_graph_msg_handler.get_and_clear_pending_msg_events();
+                       assert_eq!(events.len(), 1);
+                       match &events[0] {
+                               MessageSendEvent::SendChannelRangeQuery{ node_id, msg } => {
+                                       assert_eq!(node_id, &node_id_1);
+                                       assert_eq!(msg.chain_hash, chain_hash);
+                                       assert_eq!(msg.first_blocknum, first_blocknum);
+                                       assert_eq!(msg.number_of_blocks, number_of_blocks);
+                               },
+                               _ => panic!("Expected MessageSendEvent::SendChannelRangeQuery")
+                       };
+               }
+
+               // It should not enqueue a query when should_request_full_sync return false.
+               // The initial implementation allows syncing with the first 5 peers after
+               // which should_request_full_sync will return false
+               {
+                       let (secp_ctx, net_graph_msg_handler) = create_net_graph_msg_handler();
+                       let init_msg = Init { features: InitFeatures::known() };
+                       for n in 1..7 {
+                               let node_privkey = &SecretKey::from_slice(&[n; 32]).unwrap();
+                               let node_id = PublicKey::from_secret_key(&secp_ctx, node_privkey);
+                               net_graph_msg_handler.sync_routing_table(&node_id, &init_msg);
+                               let events = net_graph_msg_handler.get_and_clear_pending_msg_events();
+                               if n <= 5 {
+                                       assert_eq!(events.len(), 1);
+                               } else {
+                                       assert_eq!(events.len(), 0);
+                               }
+
+                       }
+               }
+       }
+
+       #[test]
+       fn handling_reply_channel_range() {
+               let (secp_ctx, net_graph_msg_handler) = create_net_graph_msg_handler();
+               let node_privkey_1 = &SecretKey::from_slice(&[42; 32]).unwrap();
+               let node_id_1 = PublicKey::from_secret_key(&secp_ctx, node_privkey_1);
+
+               let chain_hash = genesis_block(Network::Testnet).header.block_hash();
+
+               // Test receipt of a single reply that should enqueue an SCID query
+               // matching the SCIDs in the reply
+               {
+                       let result = net_graph_msg_handler.handle_reply_channel_range(&node_id_1, ReplyChannelRange {
+                               chain_hash,
+                               sync_complete: true,
+                               first_blocknum: 0,
+                               number_of_blocks: 2000,
+                               short_channel_ids: vec![
+                                       0x0003e0_000000_0000, // 992x0x0
+                                       0x0003e8_000000_0000, // 1000x0x0
+                                       0x0003e9_000000_0000, // 1001x0x0
+                                       0x0003f0_000000_0000, // 1008x0x0
+                                       0x00044c_000000_0000, // 1100x0x0
+                                       0x0006e0_000000_0000, // 1760x0x0
+                               ],
+                       });
+                       assert!(result.is_ok());
+
+                       // We expect to emit a query_short_channel_ids message with the received scids
+                       let events = net_graph_msg_handler.get_and_clear_pending_msg_events();
+                       assert_eq!(events.len(), 1);
+                       match &events[0] {
+                               MessageSendEvent::SendShortIdsQuery { node_id, msg } => {
+                                       assert_eq!(node_id, &node_id_1);
+                                       assert_eq!(msg.chain_hash, chain_hash);
+                                       assert_eq!(msg.short_channel_ids, vec![
+                                               0x0003e0_000000_0000, // 992x0x0
+                                               0x0003e8_000000_0000, // 1000x0x0
+                                               0x0003e9_000000_0000, // 1001x0x0
+                                               0x0003f0_000000_0000, // 1008x0x0
+                                               0x00044c_000000_0000, // 1100x0x0
+                                               0x0006e0_000000_0000, // 1760x0x0
+                                       ]);
+                               },
+                               _ => panic!("expected MessageSendEvent::SendShortIdsQuery"),
+                       }
+               }
+       }
+
+       #[test]
+       fn handling_reply_short_channel_ids() {
+               let (secp_ctx, net_graph_msg_handler) = create_net_graph_msg_handler();
+               let node_privkey = &SecretKey::from_slice(&[41; 32]).unwrap();
+               let node_id = PublicKey::from_secret_key(&secp_ctx, node_privkey);
+
+               let chain_hash = genesis_block(Network::Testnet).header.block_hash();
+
+               // Test receipt of a successful reply
+               {
+                       let result = net_graph_msg_handler.handle_reply_short_channel_ids_end(&node_id, ReplyShortChannelIdsEnd {
+                               chain_hash,
+                               full_information: true,
+                       });
+                       assert!(result.is_ok());
+               }
+
+               // Test receipt of a reply that indicates the peer does not maintain up-to-date information
+               // for the chain_hash requested in the query.
+               {
+                       let result = net_graph_msg_handler.handle_reply_short_channel_ids_end(&node_id, ReplyShortChannelIdsEnd {
+                               chain_hash,
+                               full_information: false,
+                       });
+                       assert!(result.is_err());
+                       assert_eq!(result.err().unwrap().err, "Received reply_short_channel_ids_end with no information");
+               }
+       }
+
+       #[test]
+       fn handling_query_channel_range() {
+               let (secp_ctx, mut net_graph_msg_handler) = create_net_graph_msg_handler();
+
+               let chain_hash = genesis_block(Network::Testnet).header.block_hash();
+               let node_1_privkey = &SecretKey::from_slice(&[42; 32]).unwrap();
+               let node_2_privkey = &SecretKey::from_slice(&[41; 32]).unwrap();
+               let node_1_btckey = &SecretKey::from_slice(&[40; 32]).unwrap();
+               let node_2_btckey = &SecretKey::from_slice(&[39; 32]).unwrap();
+               let node_id_1 = PublicKey::from_secret_key(&secp_ctx, node_1_privkey);
+               let node_id_2 = PublicKey::from_secret_key(&secp_ctx, node_2_privkey);
+               let bitcoin_key_1 = PublicKey::from_secret_key(&secp_ctx, node_1_btckey);
+               let bitcoin_key_2 = PublicKey::from_secret_key(&secp_ctx, node_2_btckey);
+
+               let scids: Vec<u64> = vec![
+                       0x000000_000000_0000, // 0x0x0
+                       0x000001_000000_0000, // 1x0x0
+                       0x000002_000000_0000, // 2x0x0
+                       0x000002_000001_0000, // 2x1x0
+                       0x000100_000000_0000, // 256x0x0
+                       0x000101_000000_0000, // 257x0x0
+                       0xfffffe_ffffff_ffff, // max
+                       0xffffff_ffffff_ffff, // never
+               ];
+
+               for scid in scids {
+                       let unsigned_announcement = UnsignedChannelAnnouncement {
+                               features: ChannelFeatures::known(),
+                               chain_hash: chain_hash.clone(),
+                               short_channel_id: scid,
+                               node_id_1,
+                               node_id_2,
+                               bitcoin_key_1,
+                               bitcoin_key_2,
+                               excess_data: Vec::new(),
+                       };
+
+                       let msghash = hash_to_message!(&Sha256dHash::hash(&unsigned_announcement.encode()[..])[..]);
+                       let valid_announcement = ChannelAnnouncement {
+                               node_signature_1: secp_ctx.sign(&msghash, node_1_privkey),
+                               node_signature_2: secp_ctx.sign(&msghash, node_2_privkey),
+                               bitcoin_signature_1: secp_ctx.sign(&msghash, node_1_btckey),
+                               bitcoin_signature_2: secp_ctx.sign(&msghash, node_2_btckey),
+                               contents: unsigned_announcement.clone(),
+                       };
+                       match net_graph_msg_handler.handle_channel_announcement(&valid_announcement) {
+                               Ok(_) => (),
+                               _ => panic!()
+                       };
+               }
+
+               // Empty reply when number_of_blocks=0
+               test_handling_query_channel_range(
+                       &net_graph_msg_handler,
+                       &node_id_2,
+                       QueryChannelRange {
+                               chain_hash: chain_hash.clone(),
+                               first_blocknum: 0,
+                               number_of_blocks: 0,
+                       },
+                       vec![ReplyChannelRange {
+                               chain_hash: chain_hash.clone(),
+                               first_blocknum: 0,
+                               number_of_blocks: 0,
+                               sync_complete: true,
+                               short_channel_ids: vec![]
+                       }]
+               );
+
+               // Empty when wrong chain
+               test_handling_query_channel_range(
+                       &net_graph_msg_handler,
+                       &node_id_2,
+                       QueryChannelRange {
+                               chain_hash: genesis_block(Network::Bitcoin).header.block_hash(),
+                               first_blocknum: 0,
+                               number_of_blocks: 0xffff_ffff,
+                       },
+                       vec![ReplyChannelRange {
+                               chain_hash: genesis_block(Network::Bitcoin).header.block_hash(),
+                               first_blocknum: 0,
+                               number_of_blocks: 0xffff_ffff,
+                               sync_complete: true,
+                               short_channel_ids: vec![],
+                       }]
+               );
+
+               // Empty reply when first_blocknum > 0xffffff
+               test_handling_query_channel_range(
+                       &net_graph_msg_handler,
+                       &node_id_2,
+                       QueryChannelRange {
+                               chain_hash: chain_hash.clone(),
+                               first_blocknum: 0x01000000,
+                               number_of_blocks: 0xffffffff,
+                       },
+                       vec![ReplyChannelRange {
+                               chain_hash: chain_hash.clone(),
+                               first_blocknum: 0x01000000,
+                               number_of_blocks: 0xffffffff,
+                               sync_complete: true,
+                               short_channel_ids: vec![]
+                       }]
+               );
+
+               // Empty reply when max valid SCID block num.
+               // Unlike prior test this is a valid but no results are found
+               test_handling_query_channel_range(
+                       &net_graph_msg_handler,
+                       &node_id_2,
+                       QueryChannelRange {
+                               chain_hash: chain_hash.clone(),
+                               first_blocknum: 0xffffff,
+                               number_of_blocks: 1,
+                       },
+                       vec![
+                               ReplyChannelRange {
+                                       chain_hash: chain_hash.clone(),
+                                       first_blocknum: 0xffffff,
+                                       number_of_blocks: 1,
+                                       sync_complete: true,
+                                       short_channel_ids: vec![]
+                               },
+                       ]
+               );
+
+               // No results in valid query range
+               test_handling_query_channel_range(
+                       &net_graph_msg_handler,
+                       &node_id_2,
+                       QueryChannelRange {
+                               chain_hash: chain_hash.clone(),
+                               first_blocknum: 0x00100000,
+                               number_of_blocks: 1000,
+                       },
+                       vec![
+                               ReplyChannelRange {
+                                       chain_hash: chain_hash.clone(),
+                                       first_blocknum: 0x00100000,
+                                       number_of_blocks: 1000,
+                                       sync_complete: true,
+                                       short_channel_ids: vec![],
+                               }
+                       ]
+               );
+
+               // Single reply - all blocks
+               test_handling_query_channel_range(
+                       &net_graph_msg_handler,
+                       &node_id_2,
+                       QueryChannelRange {
+                               chain_hash: chain_hash.clone(),
+                               first_blocknum: 0,
+                               number_of_blocks: 0xffffffff,
+                       },
+                       vec![
+                               ReplyChannelRange {
+                                       chain_hash: chain_hash.clone(),
+                                       first_blocknum: 0,
+                                       number_of_blocks: 0xffffffff,
+                                       sync_complete: true,
+                                       short_channel_ids: vec![
+                                               0x000000_000000_0000, // 0x0x0
+                                               0x000001_000000_0000, // 1x0x0
+                                               0x000002_000000_0000, // 2x0x0
+                                               0x000002_000001_0000, // 2x1x0
+                                               0x000100_000000_0000, // 256x0x0
+                                               0x000101_000000_0000, // 257x0x0
+                                               0xfffffe_ffffff_ffff, // max
+                                       ]
+                               }
+                       ]
+               );
+
+               // Single reply - overflow of first_blocknum + number_of_blocks
+               test_handling_query_channel_range(
+                       &net_graph_msg_handler,
+                       &node_id_2,
+                       QueryChannelRange {
+                               chain_hash: chain_hash.clone(),
+                               first_blocknum: 1,
+                               number_of_blocks: 0xffffffff,
+                       },
+                       vec![
+                               ReplyChannelRange {
+                                       chain_hash: chain_hash.clone(),
+                                       first_blocknum: 1,
+                                       number_of_blocks: 0xfffffffe,
+                                       sync_complete: true,
+                                       short_channel_ids: vec![
+                                               0x000001_000000_0000, // 1x0x0
+                                               0x000002_000000_0000, // 2x0x0
+                                               0x000002_000001_0000, // 2x1x0
+                                               0x000100_000000_0000, // 256x0x0
+                                               0x000101_000000_0000, // 257x0x0
+                                               0xfffffe_ffffff_ffff, // max
+                                       ]
+                               }
+                       ]
+               );
+
+               // Single reply - query larger than found results
+               test_handling_query_channel_range(
+                       &net_graph_msg_handler,
+                       &node_id_2,
+                       QueryChannelRange {
+                               chain_hash: chain_hash.clone(),
+                               first_blocknum: 100,
+                               number_of_blocks: 1000,
+                       },
+                       vec![
+                               ReplyChannelRange {
+                                       chain_hash: chain_hash.clone(),
+                                       first_blocknum: 100,
+                                       number_of_blocks: 1000,
+                                       sync_complete: true,
+                                       short_channel_ids: vec![
+                                               0x000100_000000_0000, // 256x0x0
+                                               0x000101_000000_0000, // 257x0x0
+                                       ]
+                               }
+                       ]
+               );
+
+               // Tests below here will chunk replies
+               net_graph_msg_handler.max_reply_scids = 1;
+
+               // Multipart - new block per messages
+               test_handling_query_channel_range(
+                       &net_graph_msg_handler,
+                       &node_id_2,
+                       QueryChannelRange {
+                               chain_hash: chain_hash.clone(),
+                               first_blocknum: 0,
+                               number_of_blocks: 2,
+                       },
+                       vec![
+                               ReplyChannelRange {
+                                       chain_hash: chain_hash.clone(),
+                                       first_blocknum: 0,
+                                       number_of_blocks: 1,
+                                       sync_complete: false,
+                                       short_channel_ids: vec![
+                                               0x000000_000000_0000, // 0x0x0
+                                       ]
+                               },
+                               ReplyChannelRange {
+                                       chain_hash: chain_hash.clone(),
+                                       first_blocknum: 1,
+                                       number_of_blocks: 1,
+                                       sync_complete: true,
+                                       short_channel_ids: vec![
+                                               0x000001_000000_0000, // 1x0x0
+                                       ]
+                               },
+                       ]
+               );
+
+               // Multiplart - resumption of same block
+               test_handling_query_channel_range(
+                       &net_graph_msg_handler,
+                       &node_id_2,
+                       QueryChannelRange {
+                               chain_hash: chain_hash.clone(),
+                               first_blocknum: 2,
+                               number_of_blocks: 1,
+                       },
+                       vec![
+                               ReplyChannelRange {
+                                       chain_hash: chain_hash.clone(),
+                                       first_blocknum: 2,
+                                       number_of_blocks: 1,
+                                       sync_complete: false,
+                                       short_channel_ids: vec![
+                                               0x000002_000000_0000, // 2x0x0
+                                       ]
+                               },
+                               ReplyChannelRange {
+                                       chain_hash: chain_hash.clone(),
+                                       first_blocknum: 2,
+                                       number_of_blocks: 1,
+                                       sync_complete: true,
+                                       short_channel_ids: vec![
+                                               0x000002_000001_0000, // 2x1x0
+                                       ]
+                               }
+                       ]
+               );
+
+               // Multipart - query larger than found results, similar to single reply
+               test_handling_query_channel_range(
+                       &net_graph_msg_handler,
+                       &node_id_2,
+                       QueryChannelRange {
+                               chain_hash: chain_hash.clone(),
+                               first_blocknum: 100,
+                               number_of_blocks: 1000,
+                       },
+                       vec![
+                               ReplyChannelRange {
+                                       chain_hash: chain_hash.clone(),
+                                       first_blocknum: 100,    // <=  query first_blocknum
+                                       number_of_blocks: 157,
+                                       sync_complete: false,
+                                       short_channel_ids: vec![
+                                               0x000100_000000_0000, // 256x0x0
+                                       ]
+                               },
+                               ReplyChannelRange {
+                                       chain_hash: chain_hash.clone(),
+                                       first_blocknum: 257,
+                                       number_of_blocks: 843, // >= query first_blocknum+number_of_blocks
+                                       sync_complete: true,
+                                       short_channel_ids: vec![
+                                               0x000101_000000_0000, // 257x0x0
+                                       ]
+                               }
+                       ]
+               );
+       }
+
+       fn test_handling_query_channel_range(
+               net_graph_msg_handler: &NetGraphMsgHandler<Arc<test_utils::TestChainSource>, Arc<test_utils::TestLogger>>,
+               test_node_id: &PublicKey,
+               msg: QueryChannelRange,
+               expected_replies: Vec<ReplyChannelRange>
+       ) {
+               let result = net_graph_msg_handler.handle_query_channel_range(test_node_id, msg);
+               assert!(result.is_ok());
+
+               let events = net_graph_msg_handler.get_and_clear_pending_msg_events();
+               assert_eq!(events.len(), expected_replies.len());
+
+               for i in 0..events.len() {
+                       let expected_reply = &expected_replies[i];
+                       match &events[i] {
+                               MessageSendEvent::SendReplyChannelRange { node_id, msg } => {
+                                       assert_eq!(node_id, test_node_id);
+                                       assert_eq!(msg.chain_hash, expected_reply.chain_hash);
+                                       assert_eq!(msg.first_blocknum, expected_reply.first_blocknum);
+                                       assert_eq!(msg.number_of_blocks, expected_reply.number_of_blocks);
+                                       assert_eq!(msg.sync_complete, expected_reply.sync_complete);
+                                       assert_eq!(msg.short_channel_ids, expected_reply.short_channel_ids);
+                               },
+                               _ => panic!("expected MessageSendEvent::SendReplyChannelRange"),
+                       }
+               }
+       }
+
+       #[test]
+       fn handling_query_short_channel_ids() {
+               let (secp_ctx, net_graph_msg_handler) = create_net_graph_msg_handler();
+               let node_privkey = &SecretKey::from_slice(&[41; 32]).unwrap();
+               let node_id = PublicKey::from_secret_key(&secp_ctx, node_privkey);
+
+               let chain_hash = genesis_block(Network::Testnet).header.block_hash();
+
+               let result = net_graph_msg_handler.handle_query_short_channel_ids(&node_id, QueryShortChannelIds {
+                       chain_hash,
+                       short_channel_ids: vec![0x0003e8_000000_0000],
+               });
+               assert!(result.is_err());
+       }
 }