Handle-initial_routing_sync-requests-from-peers-in-their-Init-messages

Author: SWvheerden

src/ln/msgs.rs

@@ -333,7 +333,7 @@ pub struct AnnouncementSignatures {
 }
 
 /// An address which can be used to connect to a remote peer
-#[derive(Clone)]
+#[derive(Clone, PartialEq)]
 pub enum NetAddress {
 	/// An IPv4 address/port on which the peer is listenting.
 	IPv4 {
@@ -380,7 +380,7 @@ impl NetAddress {
 		}
 	}
 }
-
+#[derive(Clone, PartialEq)]
 // Only exposed as broadcast of node_announcement should be filtered by node_id
 /// The unsigned part of a node_announcement
 pub struct UnsignedNodeAnnouncement {
@@ -397,6 +397,7 @@ pub struct UnsignedNodeAnnouncement {
 	pub(crate) excess_address_data: Vec<u8>,
 	pub(crate) excess_data: Vec<u8>,
 }
+#[derive(Clone, PartialEq)]
 /// A node_announcement message to be sent or received from a peer
 pub struct NodeAnnouncement {
 	pub(crate) signature: Signature,
@@ -585,6 +586,8 @@ pub trait RoutingMessageHandler : Send + Sync {
 	fn handle_channel_update(&self, msg: &ChannelUpdate) -> Result<bool, HandleError>;
 	/// Handle some updates to the route graph that we learned due to an outbound failed payment.
 	fn handle_htlc_fail_channel_update(&self, update: &HTLCFailChannelUpdate);
+	///This returns a vec of vec's, one for ChannelAnnouncements, one for ChannelUpdates and one for NodeAnnouncements. It also returns the id of the last channel passed through
+	fn get_next_announcements(&self, starting_point: i64, batch_amount: u8)->(Vec<(ChannelAnnouncement, ChannelUpdate, NodeAnnouncement, NodeAnnouncement)>, i64);
 }
 
 pub(crate) struct OnionRealm0HopData {

src/ln/peer_handler.rs

@@ -102,6 +102,7 @@ struct Peer {
 	pending_read_buffer: Vec<u8>,
 	pending_read_buffer_pos: usize,
 	pending_read_is_header: bool,
+	last_synced_channel : i64,
 }
 
 struct PeerHolder<Descriptor: SocketDescriptor> {
@@ -221,6 +222,7 @@ impl<Descriptor: SocketDescriptor> PeerManager<Descriptor> {
 			pending_read_buffer: pending_read_buffer,
 			pending_read_buffer_pos: 0,
 			pending_read_is_header: false,
+			last_synced_channel : -1,
 		}).is_some() {
 			panic!("PeerManager driver duplicated descriptors!");
 		};
@@ -255,6 +257,7 @@ impl<Descriptor: SocketDescriptor> PeerManager<Descriptor> {
 			pending_read_buffer: pending_read_buffer,
 			pending_read_buffer_pos: 0,
 			pending_read_is_header: false,
+			last_synced_channel : -1,
 		}).is_some() {
 			panic!("PeerManager driver duplicated descriptors!");
 		};
@@ -348,6 +351,22 @@ impl<Descriptor: SocketDescriptor> PeerManager<Descriptor> {
 							peer.pending_read_buffer_pos = 0;
 
 							macro_rules! encode_and_send_msg {
+								($msg: expr, $msg_code: expr) => {
+									{
+										encode_and_send_actual_msg!($msg, $msg_code);
+										if peer.last_synced_channel > -1{
+											let all_messages_tuple = self.message_handler.route_handler.get_next_announcements(peer.last_synced_channel,5);
+											for i in 0..all_messages_tuple.0.len(){
+												encode_and_send_actual_msg!(all_messages_tuple.0[i].0.clone(), 256);
+												encode_and_send_actual_msg!(all_messages_tuple.0[i].2.clone(), 257);
+												encode_and_send_actual_msg!(all_messages_tuple.0[i].3.clone(), 257);
+												encode_and_send_actual_msg!(all_messages_tuple.0[i].1.clone(), 258);
+											}
+											peer.last_synced_channel = all_messages_tuple.1;
+										}
+									}
+								}
+							}macro_rules! encode_and_send_actual_msg {
 								($msg: expr, $msg_code: expr) => {
 									{
 										log_trace!(self, "Encoding and sending message of type {} to {}", $msg_code, log_pubkey!(peer.their_node_id.unwrap()));
@@ -511,6 +530,7 @@ impl<Descriptor: SocketDescriptor> PeerManager<Descriptor> {
 													if msg.local_features.supports_unknown_bits() { "present" } else { "none" },
 													if msg.global_features.supports_unknown_bits() { "present" } else { "none" });
 
+												let do_they_require_sync = msg.local_features.initial_routing_sync();
 												peer.their_global_features = Some(msg.global_features);
 												peer.their_local_features = Some(msg.local_features);
 
@@ -520,6 +540,10 @@ impl<Descriptor: SocketDescriptor> PeerManager<Descriptor> {
 														self.initial_syncs_sent.fetch_add(1, Ordering::AcqRel);
 														local_features.set_initial_routing_sync();
 													}
+
+													if do_they_require_sync {
+														peer.last_synced_channel = 0; //set to larger than -1, means next sent message will trigger slow trickle of sync data
+													}
 													encode_and_send_msg!(msgs::Init {
 														global_features: msgs::GlobalFeatures::new(),
 														local_features,