fixup: Distribute PeerStorage from ChainMonitor

Author: adi2011

lightning/src/chain/chainmonitor.rs

@@ -46,7 +46,7 @@ use crate::sync::{RwLock, RwLockReadGuard, Mutex, MutexGuard};
 use crate::types::features::{InitFeatures, NodeFeatures};
 use core::ops::Deref;
 use core::sync::atomic::{AtomicUsize, Ordering};
-use bitcoin::secp256k1::{PublicKey, SecretKey};
+use bitcoin::secp256k1::PublicKey;
 
 /// `Persist` defines behavior for persisting channel monitors: this could mean
 /// writing once to disk, and/or uploading to one or more backup services.
@@ -257,7 +257,7 @@ pub struct ChainMonitor<ChannelSigner: EcdsaChannelSigner, C: Deref, T: Deref, F
 	event_notifier: Notifier,
 	pending_send_only_events: Mutex<Vec<MessageSendEvent>>,
 
-	our_peerstorage_encryption_key: SecretKey,
+	our_peerstorage_encryption_key: [u8; 32],
 }
 
 impl<ChannelSigner: EcdsaChannelSigner, C: Deref, T: Deref, F: Deref, L: Deref, P: Deref> ChainMonitor<ChannelSigner, C, T, F, L, P>
@@ -399,7 +399,7 @@ where C::Target: chain::Filter,
 	/// **Important**: This key should not be set arbitrarily or changed after initialization. The same key
 	/// is obtained by the `ChannelManager` through `KeyMananger` to decrypt peer backups.
 	/// Using an inconsistent or incorrect key will result in the inability to decrypt previously encrypted backups.
-	pub fn new(chain_source: Option<C>, broadcaster: T, logger: L, feeest: F, persister: P, our_peerstorage_encryption_key: SecretKey) -> Self {
+	pub fn new(chain_source: Option<C>, broadcaster: T, logger: L, feeest: F, persister: P, our_peerstorage_encryption_key: [u8; 32]) -> Self {
 		Self {
 			monitors: RwLock::new(new_hash_map()),
 			chain_source,
@@ -696,10 +696,10 @@ where C::Target: chain::Filter,
 	fn send_peer_storage(&self, their_node_id: PublicKey) {
 		// TODO: Serialize `ChannelMonitor`s inside `our_peer_storage`.
 
-		let encrypted_data = OurPeerStorage::create_from_data(self.our_peerstorage_encryption_key, Vec::new());
+		let our_peer_storage = OurPeerStorage::create_from_data(self.our_peerstorage_encryption_key, Vec::new());
 		log_debug!(self.logger, "Sending Peer Storage from chainmonitor");
 		self.pending_send_only_events.lock().unwrap().push(MessageSendEvent::SendPeerStorage { node_id: their_node_id,
-			msg: msgs::PeerStorage { data: encrypted_data } })
+			msg: msgs::PeerStorage { data: our_peer_storage.encrypted_data() } })
 	}
 }