Initiate sync only after receiving GossipTimestampFilter.

Author: tnull

lightning/src/ln/peer_handler.rs

@@ -339,6 +339,7 @@ struct Peer {
 	msgs_sent_since_pong: usize,
 	awaiting_pong_timer_tick_intervals: i8,
 	received_message_since_timer_tick: bool,
+	sent_gossip_timestamp_filter: bool,
 }
 
 impl Peer {
@@ -348,7 +349,11 @@ impl Peer {
 	/// announcements/updates for the given channel_id then we will send it when we get to that
 	/// point and we shouldn't send it yet to avoid sending duplicate updates. If we've already
 	/// sent the old versions, we should send the update, and so return true here.
-	fn should_forward_channel_announcement(&self, channel_id: u64)->bool{
+	fn should_forward_channel_announcement(&self, channel_id: u64) -> bool {
+		if self.their_features.as_ref().unwrap().supports_gossip_queries() &&
+			!self.sent_gossip_timestamp_filter {
+				return false;
+			}
 		match self.sync_status {
 			InitSyncTracker::NoSyncRequested => true,
 			InitSyncTracker::ChannelsSyncing(i) => i < channel_id,
@@ -358,6 +363,10 @@ impl Peer {
 
 	/// Similar to the above, but for node announcements indexed by node_id.
 	fn should_forward_node_announcement(&self, node_id: PublicKey) -> bool {
+		if self.their_features.as_ref().unwrap().supports_gossip_queries() &&
+			!self.sent_gossip_timestamp_filter {
+				return false;
+			}
 		match self.sync_status {
 			InitSyncTracker::NoSyncRequested => true,
 			InitSyncTracker::ChannelsSyncing(_) => false,
@@ -619,6 +628,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, L: Deref, CMH: Deref> P
 			msgs_sent_since_pong: 0,
 			awaiting_pong_timer_tick_intervals: 0,
 			received_message_since_timer_tick: false,
+			sent_gossip_timestamp_filter: false,
 		}).is_some() {
 			panic!("PeerManager driver duplicated descriptors!");
 		};
@@ -665,6 +675,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, L: Deref, CMH: Deref> P
 			msgs_sent_since_pong: 0,
 			awaiting_pong_timer_tick_intervals: 0,
 			received_message_since_timer_tick: false,
+			sent_gossip_timestamp_filter: false,
 		}).is_some() {
 			panic!("PeerManager driver duplicated descriptors!");
 		};
@@ -1058,7 +1069,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, L: Deref, CMH: Deref> P
 
 				log_info!(self.logger, "Received peer Init message from {}: {}", log_pubkey!(peer.their_node_id.unwrap()), msg.features);
 
-				if msg.features.initial_routing_sync() {
+				if msg.features.initial_routing_sync() && !msg.features.supports_gossip_queries() {
 					peer.sync_status = InitSyncTracker::ChannelsSyncing(0);
 				}
 				if !msg.features.supports_static_remote_key() {
@@ -1205,7 +1216,13 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, L: Deref, CMH: Deref> P
 				self.message_handler.route_handler.handle_reply_channel_range(&peer.their_node_id.unwrap(), msg)?;
 			},
 			wire::Message::GossipTimestampFilter(_msg) => {
-				// TODO: handle message
+				// When supporting gossip messages, start inital gossip sync only after we receive
+				// a GossipTimestampFilter 
+				if peer.their_features.as_ref().unwrap().supports_gossip_queries() &&
+					!peer.sent_gossip_timestamp_filter {
+					peer.sent_gossip_timestamp_filter = true;
+					peer.sync_status = InitSyncTracker::ChannelsSyncing(0);
+				}
 			},
 
 			// Unknown messages: