Add second value to announcement tuple to allow overriding the Postgres-default seen timestamp.

Author: arik-so

src/downloader.rs

@@ -62,7 +62,7 @@ impl<L: Deref + Clone + Send + Sync> GossipRouter<L> where L::Target: Logger {
 			counter.channel_announcements += 1;
 		}
 
-		let gossip_message = GossipMessage::ChannelAnnouncement(msg);
+		let gossip_message = GossipMessage::ChannelAnnouncement(msg, None);
 		if let Err(err) = self.sender.try_send(gossip_message) {
 			let gossip_message = match err { TrySendError::Full(msg)|TrySendError::Closed(msg) => msg };
 			tokio::task::block_in_place(move || { tokio::runtime::Handle::current().block_on(async move {

src/persistence.rs

@@ -115,21 +115,34 @@ impl<L: Deref> GossipPersister<L> where L::Target: Logger {
 			}
 
 			match &gossip_message {
-				GossipMessage::ChannelAnnouncement(announcement) => {
+				GossipMessage::ChannelAnnouncement(announcement, timestamp) => {
 					let scid = announcement.contents.short_channel_id as i64;
 
 					// start with the type prefix, which is already known a priori
 					let mut announcement_signed = Vec::new();
 					announcement.write(&mut announcement_signed).unwrap();
 
-					tokio::time::timeout(POSTGRES_INSERT_TIMEOUT, client
-						.execute("INSERT INTO channel_announcements (\
+					if let Some(timestamp) = timestamp {
+						tokio::time::timeout(POSTGRES_INSERT_TIMEOUT, client
+							.execute("INSERT INTO channel_announcements (\
+							short_channel_id, \
+							announcement_signed, \
+							seen \
+						) VALUES ($1, $2, TO_TIMESTAMP($3)) ON CONFLICT (short_channel_id) DO NOTHING", &[
+								&scid,
+								&announcement_signed,
+								&(*timestamp as f64)
+							])).await.unwrap().unwrap();
+					} else {
+						tokio::time::timeout(POSTGRES_INSERT_TIMEOUT, client
+							.execute("INSERT INTO channel_announcements (\
 							short_channel_id, \
 							announcement_signed \
 						) VALUES ($1, $2) ON CONFLICT (short_channel_id) DO NOTHING", &[
-							&scid,
-							&announcement_signed
-						])).await.unwrap().unwrap();
+								&scid,
+								&announcement_signed
+							])).await.unwrap().unwrap();
+					}
 				}
 				GossipMessage::ChannelUpdate(update) => {
 					let scid = update.contents.short_channel_id as i64;

src/tests/mod.rs

@@ -125,7 +125,7 @@ async fn test_trivial_setup() {
 		network_graph_arc.update_channel_unsigned(&update_1.contents).unwrap();
 		network_graph_arc.update_channel_unsigned(&update_2.contents).unwrap();
 
-		receiver.send(GossipMessage::ChannelAnnouncement(announcement)).await.unwrap();
+		receiver.send(GossipMessage::ChannelAnnouncement(announcement, Some(timestamp))).await.unwrap();
 		receiver.send(GossipMessage::ChannelUpdate(update_1)).await.unwrap();
 		receiver.send(GossipMessage::ChannelUpdate(update_2)).await.unwrap();
 		drop(receiver);

src/types.rs

@@ -14,7 +14,10 @@ pub(crate) type GossipPeerManager<L> = Arc<PeerManager<lightning_net_tokio::Sock
 
 #[derive(Debug)]
 pub(crate) enum GossipMessage {
-	ChannelAnnouncement(ChannelAnnouncement),
+	ChannelAnnouncement(
+		ChannelAnnouncement,
+		Option<u32> // optionally include a persistence timestamp
+	),
 	ChannelUpdate(ChannelUpdate),
 }