fixed message type (+1 squashed commit)

Squashed commits:
[c45601f] Added new fields to unit tests (+1 squashed commit)
Squashed commits:
[c45601f] Added new fields to unit tests (+1 squashed commit)
Squashed commits:
[bf7f98e] Added update channel
Added hashmap to keep track of sent syncs (+1 squashed commit)
Squashed commits:
[6f0a009] fix compile issues (+1 squashed commit)
Squashed commits:
[cae5f7e] caching of announcement messages (+1 squashed commit)
Squashed commits:
[7c1cc1a] refactor using combination of traits for a single referance

Author: SWvheerden

src/ln/msgs.rs

@@ -370,7 +370,7 @@ impl NetAddress {
 		}
 	}
 }
-
+#[derive(Clone)]
 // Only exposed as broadcast of node_announcement should be filtered by node_id
 /// The unsigned part of a node_announcement
 pub struct UnsignedNodeAnnouncement {
@@ -387,6 +387,7 @@ pub struct UnsignedNodeAnnouncement {
 	pub(crate) excess_address_data: Vec<u8>,
 	pub(crate) excess_data: Vec<u8>,
 }
+#[derive(Clone)]
 /// A node_announcement message to be sent or received from a peer
 pub struct NodeAnnouncement {
 	pub(crate) signature: Signature,
@@ -562,16 +563,16 @@ 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);
-}
-
-///A trait to describe the API required to access the network topology
-pub trait NetworkAPI : Send + Sync {
 	///This should return a vec of all possible channel announcements or an error
-	fn get_all_channel_announcements(&self)-> Result<Vec<ChannelAnnouncement>, std::fmt::Error>;
+	fn get_all_channel_announcements(&self)-> Result<Vec<(ChannelAnnouncement,ChannelUpdate)>, std::fmt::Error>;
 	///This should return a vec of all possible node announcements or an error
 	fn get_all_node_announcements(&self)-> Result<Vec<NodeAnnouncement>, std::fmt::Error>;
 }
 
+
+
+
+
 pub(crate) struct OnionRealm0HopData {
 	pub(crate) short_channel_id: u64,
 	pub(crate) amt_to_forward: u64,

src/ln/peer_handler.rs

@@ -9,7 +9,6 @@
 use secp256k1::key::{SecretKey,PublicKey};
 
 use ln::msgs;
-use ln::msgs::NetworkAPI;
 use util::ser::{Writeable, Writer, Readable};
 use ln::peer_channel_encryptor::{PeerChannelEncryptor,NextNoiseStep};
 use util::byte_utils;
@@ -131,8 +130,8 @@ pub struct PeerManager<Descriptor: SocketDescriptor> {
 	pending_events: Mutex<Vec<Event>>,
 	our_node_secret: SecretKey,
 	initial_syncs_sent: AtomicUsize,
-	network_api : NetworkAPI,
 	logger: Arc<Logger>,
+	sent_network_sync_info : HashMap<PublicKey,bool>,
 }
 
 struct VecWriter(Vec<u8>);
@@ -170,6 +169,7 @@ impl<Descriptor: SocketDescriptor> PeerManager<Descriptor> {
 			our_node_secret: our_node_secret,
 			initial_syncs_sent: AtomicUsize::new(0),
 			logger,
+			sent_network_sync_info: HashMap::new(),
 		}
 	}
 
@@ -314,7 +314,7 @@ impl<Descriptor: SocketDescriptor> PeerManager<Descriptor> {
 	/// course of this function!
 	///
 	/// Panics if the descriptor was not previously registered in a new_*_connection event.
-	pub fn read_event(&self, peer_descriptor: &mut Descriptor, data: Vec<u8>) -> Result<bool, PeerHandleError> {
+	pub fn read_event(&mut self, peer_descriptor: &mut Descriptor, data: Vec<u8>) -> Result<bool, PeerHandleError> {
 		match self.do_read_event(peer_descriptor, data) {
 			Ok(res) => Ok(res),
 			Err(e) => {
@@ -324,7 +324,7 @@ impl<Descriptor: SocketDescriptor> PeerManager<Descriptor> {
 		}
 	}
 
-	fn do_read_event(&self, peer_descriptor: &mut Descriptor, data: Vec<u8>) -> Result<bool, PeerHandleError> {
+	fn do_read_event(&mut self, peer_descriptor: &mut Descriptor, data: Vec<u8>) -> Result<bool, PeerHandleError> {
 		let pause_read = {
 			let mut peers_lock = self.peers.lock().unwrap();
 			let peers = peers_lock.borrow_parts();
@@ -517,7 +517,25 @@ impl<Descriptor: SocketDescriptor> PeerManager<Descriptor> {
 													if self.initial_syncs_sent.load(Ordering::Acquire) < INITIAL_SYNCS_TO_SEND {
 														self.initial_syncs_sent.fetch_add(1, Ordering::AcqRel);
 														local_features.set_initial_routing_sync();
-														//TODO get and send announcements.
+														if let Some(i) = peer.their_node_id{
+															let their_id = i;
+															if self.sent_network_sync_info.contains_key(&their_id){
+																let channel_messages_tuple = self.message_handler.route_handler.get_all_channel_announcements().unwrap();
+																let channel_announcements:Vec<msgs::ChannelAnnouncement> = channel_messages_tuple.clone().into_iter().map(|x| { x.0 }).collect();
+																let channel_updates:Vec<msgs::ChannelUpdate> = channel_messages_tuple.into_iter().map(|x| { x.1 }).collect();
+																let node_messages = self.message_handler.route_handler.get_all_node_announcements().unwrap();
+																for message in channel_announcements.iter(){
+																	encode_and_send_msg!(message, 256);
+																}
+																for message in channel_updates.iter(){
+																	encode_and_send_msg!(message, 258);
+																}
+																for message in node_messages.iter(){
+																	encode_and_send_msg!(message, 257);
+																}
+																self.sent_network_sync_info.insert(their_id,true);
+															}
+														}
 													}
 													encode_and_send_msg!(msgs::Init {
 														global_features: msgs::GlobalFeatures::new(),

src/ln/router.rs

@@ -13,7 +13,8 @@ use bitcoin::blockdata::opcodes;
 
 use chain::chaininterface::{ChainError, ChainWatchInterface};
 use ln::channelmanager;
-use ln::msgs::{ErrorAction,HandleError,RoutingMessageHandler,NetAddress,GlobalFeatures, NetworkAPI};
+
+use ln::msgs::{ErrorAction,HandleError,RoutingMessageHandler,NetAddress,GlobalFeatures};
 use ln::msgs;
 use util::ser::Writeable;
 use util::logger::Logger;
@@ -55,7 +56,7 @@ struct DirectionalChannelInfo {
 	htlc_minimum_msat: u64,
 	fee_base_msat: u32,
 	fee_proportional_millionths: u32,
-}
+	}
 
 impl std::fmt::Display for DirectionalChannelInfo {
 	fn fmt(&self, f: &mut std::fmt::Formatter) -> Result<(), std::fmt::Error> {
@@ -68,6 +69,9 @@ struct ChannelInfo {
 	features: GlobalFeatures,
 	one_to_two: DirectionalChannelInfo,
 	two_to_one: DirectionalChannelInfo,
+	//this is cached here so we can send out it later if required by route_init_sync
+	announcement_message : Option<msgs::ChannelAnnouncement>,
+	last_update_message : Option<msgs::ChannelUpdate>,
 }
 
 impl std::fmt::Display for ChannelInfo {
@@ -91,6 +95,8 @@ struct NodeInfo {
 	rgb: [u8; 3],
 	alias: [u8; 32],
 	addresses: Vec<NetAddress>,
+	//this is cached here so we can send out it later if required by route_init_sync
+	announcement_message : Option<msgs::NodeAnnouncement>,
 }
 
 impl std::fmt::Display for NodeInfo {
@@ -184,7 +190,7 @@ pub struct RouteHint {
 /// Tracks a view of the network, receiving updates from peers and generating Routes to
 /// payment destinations.
 pub struct Router {
-	secp_ctx: Secp256k1<secp256k1::VerifyOnly>,
+	secp_ctx: Secp256k1<secp256k1::All>,
 	network_map: RwLock<NetworkMap>,
 	chain_monitor: Arc<ChainWatchInterface>,
 	logger: Arc<Logger>,
@@ -221,6 +227,7 @@ impl RoutingMessageHandler for Router {
 				node.rgb = msg.contents.rgb;
 				node.alias = msg.contents.alias;
 				node.addresses = msg.contents.addresses.clone();
+
 				Ok(msg.contents.excess_data.is_empty() && msg.contents.excess_address_data.is_empty() && !msg.contents.features.supports_unknown_bits())
 			}
 		}
@@ -288,7 +295,9 @@ impl RoutingMessageHandler for Router {
 					htlc_minimum_msat: u64::max_value(),
 					fee_base_msat: u32::max_value(),
 					fee_proportional_millionths: u32::max_value(),
-				}
+				},
+				announcement_message : Some(msg.clone()),
+				last_update_message : None,
 			};
 
 		match network.channels.entry(NetworkMap::get_key(msg.contents.short_channel_id, msg.contents.chain_hash)) {
@@ -332,6 +341,7 @@ impl RoutingMessageHandler for Router {
 							rgb: [0; 3],
 							alias: [0; 32],
 							addresses: Vec::new(),
+							announcement_message: None,
 						});
 					}
 				}
@@ -382,6 +392,7 @@ impl RoutingMessageHandler for Router {
 					}
 				}
 
+				channel.last_update_message = Some(msg.clone());
 				let msg_hash = Message::from_slice(&Sha256dHash::from_data(&msg.contents.encode()[..])[..]).unwrap();
 				if msg.contents.flags & 1 == 1 {
 					dest_node_id = channel.one_to_two.src_node_id.clone();
@@ -426,14 +437,29 @@ impl RoutingMessageHandler for Router {
 
 		Ok(msg.contents.excess_data.is_empty())
 	}
-}
-
-impl NetworkAPI for Router {
-	fn get_all_channel_announcements(&self)-> Result<Vec<msgs::NodeAnnouncement>, std::fmt::Error>{
-		unimplemented!();
+	fn get_all_channel_announcements(&self)-> Result<Vec<(msgs::ChannelAnnouncement, msgs::ChannelUpdate)>, std::fmt::Error>{
+		let mut result = Vec::new();
+		let network = self.network_map.read().unwrap();
+		for (key, value) in network.channels.iter(){
+			if let Some(ref i) = value.announcement_message{
+				if let Some(ref j) = value.last_update_message{
+					let temp_tuple = (i.clone(),j.clone());
+					result.push(temp_tuple);
+				}
+			}
+		}
+		return Ok(result)
 	}
+	///This function generates a vec of all node_annoucment messages for all nodes it known of
 	fn get_all_node_announcements(&self)-> Result<Vec<msgs::NodeAnnouncement>, std::fmt::Error>{
-		unimplemented!();
+		let mut result = Vec::new();
+		let network = self.network_map.read().unwrap();
+		for (key, value) in network.nodes.iter(){
+			if let Some(ref i) = value.announcement_message{
+				result.push(i.clone());
+			}
+		}
+		Ok(result)
 	}
 }
 
@@ -478,9 +504,10 @@ impl Router {
 			rgb: [0; 3],
 			alias: [0; 32],
 			addresses: Vec::new(),
+			announcement_message: None,
 		});
 		Router {
-			secp_ctx: Secp256k1::verification_only(),
+			secp_ctx: Secp256k1::new(),
 			network_map: RwLock::new(NetworkMap {
 				channels: HashMap::new(),
 				our_node_id: our_pubkey,
@@ -841,6 +868,7 @@ mod tests {
 				rgb: [0; 3],
 				alias: [0; 32],
 				addresses: Vec::new(),
+				announcement_message : None,
 			});
 			network.channels.insert(NetworkMap::get_key(1, zero_hash.clone()), ChannelInfo {
 				features: GlobalFeatures::new(),
@@ -861,6 +889,8 @@ mod tests {
 					fee_base_msat: 0,
 					fee_proportional_millionths: 0,
 				},
+				announcement_message : None,
+				last_update_message : None,
 			});
 			network.nodes.insert(node2.clone(), NodeInfo {
 				channels: vec!(NetworkMap::get_key(2, zero_hash.clone()), NetworkMap::get_key(4, zero_hash.clone())),
@@ -871,6 +901,7 @@ mod tests {
 				rgb: [0; 3],
 				alias: [0; 32],
 				addresses: Vec::new(),
+				announcement_message : None,
 			});
 			network.channels.insert(NetworkMap::get_key(2, zero_hash.clone()), ChannelInfo {
 				features: GlobalFeatures::new(),
@@ -891,6 +922,8 @@ mod tests {
 					fee_base_msat: 0,
 					fee_proportional_millionths: 0,
 				},
+				announcement_message : None,
+				last_update_message : None,
 			});
 			network.nodes.insert(node8.clone(), NodeInfo {
 				channels: vec!(NetworkMap::get_key(12, zero_hash.clone()), NetworkMap::get_key(13, zero_hash.clone())),
@@ -901,6 +934,7 @@ mod tests {
 				rgb: [0; 3],
 				alias: [0; 32],
 				addresses: Vec::new(),
+				announcement_message : None,
 			});
 			network.channels.insert(NetworkMap::get_key(12, zero_hash.clone()), ChannelInfo {
 				features: GlobalFeatures::new(),
@@ -921,6 +955,8 @@ mod tests {
 					fee_base_msat: 0,
 					fee_proportional_millionths: 0,
 				},
+				announcement_message : None,
+				last_update_message : None,
 			});
 			network.nodes.insert(node3.clone(), NodeInfo {
 				channels: vec!(
@@ -937,6 +973,7 @@ mod tests {
 				rgb: [0; 3],
 				alias: [0; 32],
 				addresses: Vec::new(),
+				announcement_message : None,
 			});
 			network.channels.insert(NetworkMap::get_key(3, zero_hash.clone()), ChannelInfo {
 				features: GlobalFeatures::new(),
@@ -957,6 +994,8 @@ mod tests {
 					fee_base_msat: 100,
 					fee_proportional_millionths: 0,
 				},
+				announcement_message : None,
+				last_update_message : None,
 			});
 			network.channels.insert(NetworkMap::get_key(4, zero_hash.clone()), ChannelInfo {
 				features: GlobalFeatures::new(),
@@ -977,6 +1016,8 @@ mod tests {
 					fee_base_msat: 0,
 					fee_proportional_millionths: 0,
 				},
+				announcement_message : None,
+				last_update_message : None,
 			});
 			network.channels.insert(NetworkMap::get_key(13, zero_hash.clone()), ChannelInfo {
 				features: GlobalFeatures::new(),
@@ -997,6 +1038,8 @@ mod tests {
 					fee_base_msat: 0,
 					fee_proportional_millionths: 0,
 				},
+				announcement_message : None,
+				last_update_message : None,
 			});
 			network.nodes.insert(node4.clone(), NodeInfo {
 				channels: vec!(NetworkMap::get_key(5, zero_hash.clone()), NetworkMap::get_key(11, zero_hash.clone())),
@@ -1007,6 +1050,7 @@ mod tests {
 				rgb: [0; 3],
 				alias: [0; 32],
 				addresses: Vec::new(),
+				announcement_message : None,
 			});
 			network.channels.insert(NetworkMap::get_key(5, zero_hash.clone()), ChannelInfo {
 				features: GlobalFeatures::new(),
@@ -1027,6 +1071,8 @@ mod tests {
 					fee_base_msat: 0,
 					fee_proportional_millionths: 0,
 				},
+				announcement_message : None,
+				last_update_message : None,
 			});
 			network.nodes.insert(node5.clone(), NodeInfo {
 				channels: vec!(NetworkMap::get_key(6, zero_hash.clone()), NetworkMap::get_key(11, zero_hash.clone())),
@@ -1037,6 +1083,7 @@ mod tests {
 				rgb: [0; 3],
 				alias: [0; 32],
 				addresses: Vec::new(),
+				announcement_message : None,
 			});
 			network.channels.insert(NetworkMap::get_key(6, zero_hash.clone()), ChannelInfo {
 				features: GlobalFeatures::new(),
@@ -1057,6 +1104,8 @@ mod tests {
 					fee_base_msat: 0,
 					fee_proportional_millionths: 0,
 				},
+				announcement_message : None,
+				last_update_message : None,
 			});
 			network.channels.insert(NetworkMap::get_key(11, zero_hash.clone()), ChannelInfo {
 				features: GlobalFeatures::new(),
@@ -1077,6 +1126,8 @@ mod tests {
 					fee_base_msat: 0,
 					fee_proportional_millionths: 0,
 				},
+				announcement_message : None,
+				last_update_message : None,
 			});
 			network.nodes.insert(node6.clone(), NodeInfo {
 				channels: vec!(NetworkMap::get_key(7, zero_hash.clone())),
@@ -1087,6 +1138,7 @@ mod tests {
 				rgb: [0; 3],
 				alias: [0; 32],
 				addresses: Vec::new(),
+				announcement_message : None,
 			});
 			network.channels.insert(NetworkMap::get_key(7, zero_hash.clone()), ChannelInfo {
 				features: GlobalFeatures::new(),
@@ -1107,6 +1159,8 @@ mod tests {
 					fee_base_msat: 0,
 					fee_proportional_millionths: 0,
 				},
+				announcement_message : None,
+				last_update_message : None,
 			});
 		}