f relay handling

Author: arik-so

lightning/src/routing/gossip.rs

@@ -1592,13 +1592,23 @@ impl<L: Deref> NetworkGraph<L> where L::Target: Logger {
 					}
 				}
 
-				let should_relay =
-					msg.excess_data.len() <= MAX_EXCESS_BYTES_FOR_RELAY &&
-					msg.excess_address_data.len() <= MAX_EXCESS_BYTES_FOR_RELAY &&
-					msg.excess_data.len() + msg.excess_address_data.len() <= MAX_EXCESS_BYTES_FOR_RELAY;
-
-				node.announcement_info = if should_relay {
-					Some(NodeAnnouncementInfo::Relayed(full_msg.unwrap().clone()))
+				node.announcement_info = if let Some(signed_announcement) = full_msg {
+					let should_relay =
+						msg.excess_data.len() <= MAX_EXCESS_BYTES_FOR_RELAY &&
+							msg.excess_address_data.len() <= MAX_EXCESS_BYTES_FOR_RELAY &&
+							msg.excess_data.len() + msg.excess_address_data.len() <= MAX_EXCESS_BYTES_FOR_RELAY;
+
+					if should_relay {
+						Some(NodeAnnouncementInfo::Relayed(signed_announcement.clone()))
+					} else {
+						Some(NodeAnnouncementInfo::Local(NodeAnnouncementDetails {
+							features: msg.features.clone(),
+							last_update: msg.timestamp,
+							rgb: msg.rgb,
+							alias: msg.alias,
+							addresses: msg.addresses.clone(),
+						}))
+					}
 				} else {
 					Some(NodeAnnouncementInfo::Local(NodeAnnouncementDetails {
 						features: msg.features.clone(),