caching of announcement messages

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,

src/ln/peer_handler.rs

@@ -516,7 +516,14 @@ 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.
+														let channel_messages = self.message_handler.route_handler.get_all_channel_announcements();
+														let node_messages = self.message_handler.route_handler.get_all_node_announcements();
+														for message in channel_messages.iter(){
+															encode_and_send_msg!(message, 256);
+														}
+														for message in node_messages.iter(){
+															encode_and_send_msg!(message, 257);
+														}
 													}
 													encode_and_send_msg!(msgs::Init {
 														global_features: msgs::GlobalFeatures::new(),

src/ln/router.rs

@@ -55,6 +55,7 @@ struct DirectionalChannelInfo {
 	htlc_minimum_msat: u64,
 	fee_base_msat: u32,
 	fee_proportional_millionths: u32,
+	bitcoin_key: PublicKey,
 }
 
 impl std::fmt::Display for DirectionalChannelInfo {
@@ -68,6 +69,8 @@ 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>,
 }
 
 impl std::fmt::Display for ChannelInfo {
@@ -91,6 +94,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 +189,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 +226,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())
 			}
 		}
@@ -279,6 +285,7 @@ impl RoutingMessageHandler for Router {
 					htlc_minimum_msat: u64::max_value(),
 					fee_base_msat: u32::max_value(),
 					fee_proportional_millionths: u32::max_value(),
+					bitcoin_key : msg.contents.bitcoin_key_1.clone(),
 				},
 				two_to_one: DirectionalChannelInfo {
 					src_node_id: msg.contents.node_id_2.clone(),
@@ -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(),
-				}
+					bitcoin_key : msg.contents.bitcoin_key_2.clone(),
+				},
+				announcement_message : Some(msg.clone()),
 			};
 
 		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,
 						});
 					}
 				}
@@ -430,13 +440,66 @@ impl RoutingMessageHandler for Router {
 
 impl NetworkTopology for Router {
 	fn get_all_channel_announcements(&self)-> Result<Vec<msgs::ChannelAnnouncement>, std::fmt::Error>{
-		unimplemented!();
+		let result = Vec::new();
+		let network = self.network_map.read().unwrap();
+		for (key, value) in network.channels.iter(){
+			if let Some(i) = value.announcement_message{
+			result.push(i.clone());
+			}
+		}
+		return Ok(result)
+	/*	#[cfg(not(feature = "non_bitcoin_chain_hash_routing"))]
+		return Ok(Vec::new());
+		#[cfg(feature = "non_bitcoin_chain_hash_routing")]{
+		let result = Vec::new();
+		let network = self.network_map.read().unwrap();
+		for (key, value) in network.channels.iter(){
+			let (id, chainhash) = key;
+			let msg_contents = msgs::UnsignedChannelAnnouncement {
+				features: value.features.clone(),
+				chain_hash: chainhash,
+				short_channel_id: id.clone(),
+				node_id_1: value.one_to_two.src_node_id.clone(),
+				node_id_2: value.two_to_one.src_node_id.clone(),
+				bitcoin_key_1: value.one_to_two.bitcoin_key.clone(),
+				bitcoin_key_2: value.two_to_one.bitcoin_key.clone(),
+				excess_data: Vec::new()};
+			let msg_hash = Message::from_slice(&Sha256dHash::from_data(&msg_contents.encode()[..])[..]).unwrap();
+			let msg_signature = self.secp_ctx.sign(&msg_hash, key);
+			result.push(msgs::ChannelAnnouncement {
+				signature: msg_signature,
+				contents: msg_contents,
+			})
+		}
+		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 result = Vec::new();
+		let network = self.network_map.read().unwrap();
+		for (key, value) in network.nodes.iter(){
+			if let Some(i) = value.announcement_message{
+				result.push(i.clone());
+			}
+			/*let msg_contents = msgs::UnsignedNodeAnnouncement{
+							features: value.features.clone(),
+							timestamp: value.last_update,
+							node_id: key.clone(),
+							rgb: value.rgb.clone(),
+							alias: value.alias.clone(),
+							addresses: value.addresses.clone(),
+							excess_address_data: Vec::new(),
+							excess_data: Vec::new(),};
+			let msg_hash = Message::from_slice(&Sha256dHash::from_data(&msg_contents.encode()[..])[..]).unwrap();
+			let msg_signature = self.secp_ctx.sign(&msg_hash, key);
+			result.push(msgs::NodeAnnouncement {
+				signature: msg_signature,
+				contents: msg_contents,
+			})*/
+		}
+		Ok(result)
 	}
 }
-
 #[derive(Eq, PartialEq)]
 struct RouteGraphNode {
 	pubkey: PublicKey,
@@ -478,9 +541,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,