X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Frouting%2Fgossip.rs;h=64dbb45888b338177f54f662efc0647e620a7c49;hb=e9be7e272f98023e3eb74e7a1fc67a7a8377d5fa;hp=5ef107e299cfc1d3d1de02dfa043fc0a58b5df3d;hpb=4c342bd6b6c8a989e6647de090c616d75b7d1f8c;p=rust-lightning

diff --git a/lightning/src/routing/gossip.rs b/lightning/src/routing/gossip.rs
index 5ef107e2..64dbb458 100644
--- a/lightning/src/routing/gossip.rs
+++ b/lightning/src/routing/gossip.rs
@@ -1143,26 +1143,26 @@ impl Writeable for NodeAnnouncementInfo {
 			(4, self.rgb, required),
 			(6, self.alias, required),
 			(8, self.announcement_message, option),
-			(10, empty_addresses, vec_type), // Versions prior to 0.0.115 require this field
+			(10, empty_addresses, required_vec), // Versions prior to 0.0.115 require this field
 		});
 		Ok(())
 	}
 }
 
 impl Readable for NodeAnnouncementInfo {
-    fn read<R: io::Read>(reader: &mut R) -> Result<Self, DecodeError> {
+	fn read<R: io::Read>(reader: &mut R) -> Result<Self, DecodeError> {
 		_init_and_read_tlv_fields!(reader, {
 			(0, features, required),
 			(2, last_update, required),
 			(4, rgb, required),
 			(6, alias, required),
 			(8, announcement_message, option),
-			(10, _addresses, vec_type), // deprecated, not used anymore
+			(10, _addresses, optional_vec), // deprecated, not used anymore
 		});
 		let _: Option<Vec<NetAddress>> = _addresses;
 		Ok(Self { features: features.0.unwrap(), last_update: last_update.0.unwrap(), rgb: rgb.0.unwrap(),
 			alias: alias.0.unwrap(), announcement_message })
-    }
+	}
 }
 
 /// A user-defined name for a node, which may be used when displaying the node in a graph.
@@ -1228,7 +1228,7 @@ impl Writeable for NodeInfo {
 		write_tlv_fields!(writer, {
 			// Note that older versions of LDK wrote the lowest inbound fees here at type 0
 			(2, self.announcement_info, option),
-			(4, self.channels, vec_type),
+			(4, self.channels, required_vec),
 		});
 		Ok(())
 	}
@@ -1259,19 +1259,17 @@ impl Readable for NodeInfo {
 		// with zero inbound fees, causing that heuristic to provide little gain. Worse, because it
 		// requires additional complexity and lookups during routing, it ends up being a
 		// performance loss. Thus, we simply ignore the old field here and no longer track it.
-		let mut _lowest_inbound_channel_fees: Option<RoutingFees> = None;
-		let mut announcement_info_wrap: Option<NodeAnnouncementInfoDeserWrapper> = None;
-		_init_tlv_field_var!(channels, vec_type);
-
-		read_tlv_fields!(reader, {
+		_init_and_read_tlv_fields!(reader, {
 			(0, _lowest_inbound_channel_fees, option),
 			(2, announcement_info_wrap, upgradable_option),
-			(4, channels, vec_type),
+			(4, channels, required_vec),
 		});
+		let _: Option<RoutingFees> = _lowest_inbound_channel_fees;
+		let announcement_info_wrap: Option<NodeAnnouncementInfoDeserWrapper> = announcement_info_wrap;
 
 		Ok(NodeInfo {
 			announcement_info: announcement_info_wrap.map(|w| w.0),
-			channels: _init_tlv_based_struct_field!(channels, vec_type),
+			channels,
 		})
 	}
 }
@@ -1555,6 +1553,8 @@ impl<L: Deref> NetworkGraph<L> where L::Target: Logger {
 		let node_id_a = channel_info.node_one.clone();
 		let node_id_b = channel_info.node_two.clone();
 
+		log_gossip!(self.logger, "Adding channel {} between nodes {} and {}", short_channel_id, node_id_a, node_id_b);
+
 		match channels.entry(short_channel_id) {
 			IndexedMapEntry::Occupied(mut entry) => {
 				//TODO: because asking the blockchain if short_channel_id is valid is only optional
@@ -1790,16 +1790,23 @@ impl<L: Deref> NetworkGraph<L> where L::Target: Logger {
 		let mut scids_to_remove = Vec::new();
 		for (scid, info) in channels.unordered_iter_mut() {
 			if info.one_to_two.is_some() && info.one_to_two.as_ref().unwrap().last_update < min_time_unix {
+				log_gossip!(self.logger, "Removing directional update one_to_two (0) for channel {} due to its timestamp {} being below {}",
+					scid, info.one_to_two.as_ref().unwrap().last_update, min_time_unix);
 				info.one_to_two = None;
 			}
 			if info.two_to_one.is_some() && info.two_to_one.as_ref().unwrap().last_update < min_time_unix {
+				log_gossip!(self.logger, "Removing directional update two_to_one (1) for channel {} due to its timestamp {} being below {}",
+					scid, info.two_to_one.as_ref().unwrap().last_update, min_time_unix);
 				info.two_to_one = None;
 			}
 			if info.one_to_two.is_none() || info.two_to_one.is_none() {
 				// We check the announcement_received_time here to ensure we don't drop
 				// announcements that we just received and are just waiting for our peer to send a
 				// channel_update for.
-				if info.announcement_received_time < min_time_unix as u64 {
+				let announcement_received_timestamp = info.announcement_received_time;
+				if announcement_received_timestamp < min_time_unix as u64 {
+					log_gossip!(self.logger, "Removing channel {} because both directional updates are missing and its announcement timestamp {} being below {}",
+						scid, announcement_received_timestamp, min_time_unix);
 					scids_to_remove.push(*scid);
 				}
 			}
@@ -1880,6 +1887,8 @@ impl<L: Deref> NetworkGraph<L> where L::Target: Logger {
 			}
 		}
 
+		log_gossip!(self.logger, "Updating channel {} in direction {} with timestamp {}", msg.short_channel_id, msg.flags & 1, msg.timestamp);
+
 		let mut channels = self.channels.write().unwrap();
 		match channels.get_mut(&msg.short_channel_id) {
 			None => {