fixup: our_peer_storage: Replace timestamp with block height

Author: adi2011

lightning/src/chain/chainmonitor.rs

@@ -712,6 +712,7 @@ where C::Target: chain::Filter,
 {
 	fn send_peer_storage(&self, their_node_id: PublicKey) {
 		log_debug!(self.logger, "Sending Peer Storage from chainmonitor");
+		// TODO: Serialize `ChannelMonitor`s inside `our_peer_storage` and update [`OurPeerStorage::block_height`] accordingly.
 
 		self.pending_send_only_events.lock().unwrap().push(events::MessageSendEvent::SendPeerStorage { node_id: their_node_id
 			, msg: msgs::PeerStorage { data: self.our_peer_storage.lock().unwrap().encrypt_our_peer_storage(self.our_peerstorage_encryption_key) } })

lightning/src/ln/channelmanager.rs

@@ -8309,7 +8309,6 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 		match OurPeerStorage::decrypt_our_peer_storage(&mut res, cyphertext_with_key.as_slice()) {
 			Ok(()) => {
 				// Decryption successful, the plaintext is now stored in `res`.
-				log_debug!(logger, "Received a peer storage from peer {}", log_pubkey!(counterparty_node_id));
 			}
 			Err(_) => {
 				log_debug!(logger, "Invalid YourPeerStorage received from {}", log_pubkey!(counterparty_node_id));
@@ -8319,6 +8318,12 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 				), ChannelId([0; 32])));
 			}
 		}
+		let our_peer_storage = <OurPeerStorage as Readable>::read(&mut ::bitcoin::io::Cursor::new(res)).unwrap();
+
+		if our_peer_storage.get_block_height() == 0 {
+			log_debug!(logger, "Received a peer storage from peer {} with 0 channels.", log_pubkey!(counterparty_node_id));
+		}
+
 		Ok(())
 	}
 

lightning/src/ln/our_peer_storage.rs

@@ -56,22 +56,15 @@ use crate::ln::msgs::DecodeError;
 #[derive(PartialEq)]
 pub struct OurPeerStorage {
 	version: u8,
-	timestamp: u32,
+	// If the block height is 0, OurPeerStorage doesn't have any channels backed up.
+	block_height: u32,
 	ser_channels: Vec<u8>,
 }
 
 impl OurPeerStorage {
 	/// Returns a [`OurPeerStorage`] with version 1 and current timestamp.
 	pub fn new() -> Self {
-		let duration_since_epoch = std::time::SystemTime::now()
-			.duration_since(std::time::SystemTime::UNIX_EPOCH)
-			.expect("Time must be > 1970");
-
-		Self {
-			version: 1,
-			timestamp: duration_since_epoch.as_secs() as u32,
-			ser_channels: Vec::new(),
-		}
+		Self { version: 1, block_height: 0u32, ser_channels: Vec::new() }
 	}
 
 	/// Stubs a channel inside [`OurPeerStorage`]
@@ -84,6 +77,10 @@ impl OurPeerStorage {
 		self.ser_channels.clone()
 	}
 
+	pub fn get_block_height(&self) -> u32 {
+		self.block_height
+	}
+
 	/// Encrypt [`OurPeerStorage`] using the `key` and return a `Vec<u8>` containing the result.
 	pub fn encrypt_our_peer_storage(&self, key: [u8; 32]) -> Vec<u8> {
 		let n = 0u64;
@@ -135,7 +132,7 @@ impl OurPeerStorage {
 impl Writeable for OurPeerStorage {
 	fn write<W: Writer>(&self, writer: &mut W) -> Result<(), Error> {
 		write_ver_prefix!(writer, self.version, 1);
-		self.timestamp.write(writer)?;
+		self.block_height.write(writer)?;
 		self.ser_channels.write(writer)?;
 		Ok(())
 	}
@@ -144,10 +141,10 @@ impl Writeable for OurPeerStorage {
 impl Readable for OurPeerStorage {
 	fn read<R: io::Read>(reader: &mut R) -> Result<Self, DecodeError> {
 		let ver = read_ver_prefix!(reader, 1u8);
-		let timestamp: u32 = Readable::read(reader)?;
+		let block_height: u32 = Readable::read(reader)?;
 		let ser_channels = <Vec<u8> as Readable>::read(reader)?;
 
-		let ps = OurPeerStorage { version: ver, timestamp, ser_channels };
+		let ps = OurPeerStorage { version: ver, block_height, ser_channels };
 		Ok(ps)
 	}
 }