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

Author: SWvheerden

src/ln/msgs.rs

@@ -327,7 +327,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 {
@@ -374,7 +374,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 {
@@ -391,6 +391,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,
@@ -591,6 +592,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: u64, batch_amount: u8)->(Vec<(ChannelAnnouncement, ChannelUpdate, NodeAnnouncement, NodeAnnouncement)>, u64);
 }
 
 pub(crate) struct OnionRealm0HopData {

src/ln/peer_handler.rs

@@ -19,6 +19,7 @@ use std::collections::{HashMap,hash_map,LinkedList};
 use std::sync::{Arc, Mutex};
 use std::sync::atomic::{AtomicUsize, Ordering};
 use std::{cmp,error,mem,hash,fmt};
+use std::{thread, time};
 
 /// Provides references to trait impls which handle different types of messages.
 pub struct MessageHandler {
@@ -102,6 +103,7 @@ struct Peer {
 	pending_read_buffer: Vec<u8>,
 	pending_read_buffer_pos: usize,
 	pending_read_is_header: bool,
+	last_synced_channel : u64,
 }
 
 struct PeerHolder<Descriptor: SocketDescriptor> {
@@ -214,6 +216,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 : 0,
 		}).is_some() {
 			panic!("PeerManager driver duplicated descriptors!");
 		};
@@ -248,6 +251,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 : 0,
 		}).is_some() {
 			panic!("PeerManager driver duplicated descriptors!");
 		};
@@ -507,6 +511,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);
 
@@ -516,10 +521,30 @@ impl<Descriptor: SocketDescriptor> PeerManager<Descriptor> {
 														self.initial_syncs_sent.fetch_add(1, Ordering::AcqRel);
 														local_features.set_initial_routing_sync();
 													}
+													//we need to let them know about us, before we can send stuff to them
 													encode_and_send_msg!(msgs::Init {
 														global_features: msgs::GlobalFeatures::new(),
 														local_features,
 													}, 16);
+													if do_they_require_sync {
+														peer.last_synced_channel = 0;
+														let all_messages_tuple = self.message_handler.route_handler.get_next_announcements(peer.last_synced_channel,5);
+														while (all_messages_tuple.0).len()>0 {
+															for i in 0..all_messages_tuple.0.len(){
+																encode_and_send_msg!(all_messages_tuple.0[i].0.clone(), 256);
+																encode_and_send_msg!(all_messages_tuple.0[i].2.clone(), 257);
+																encode_and_send_msg!(all_messages_tuple.0[i].3.clone(), 257);
+																encode_and_send_msg!(all_messages_tuple.0[i].1.clone(), 258);
+															}
+															//we wait to see if the buffer clears before we retrieve more message to send
+															//we push up to 15 message out, 5 remaining means they have cleared 2/3rds
+															while peer.pending_outbound_buffer.len()>5{
+																thread::sleep(time::Duration::from_millis(50));
+															};
+															let all_messages_tuple = self.message_handler.route_handler.get_next_announcements(peer.last_synced_channel,5);
+															peer.last_synced_channel = all_messages_tuple.1;
+														}
+													}
 												}
 
 												for msg in self.message_handler.chan_handler.peer_connected(&peer.their_node_id.unwrap()) {