fixup: Add method to derive Peer Storage encryption key

Author: adi2011

fuzz/src/chanmon_consistency.rs

@@ -37,7 +37,6 @@ use lightning::blinded_path::message::{BlindedMessagePath, MessageContext};
 use lightning::blinded_path::payment::{BlindedPaymentPath, ReceiveTlvs};
 use lightning::chain;
 use lightning::chain::chaininterface::{BroadcasterInterface, ConfirmationTarget, FeeEstimator};
-use lightning::chain::chainmonitor::PeerStorageKey;
 use lightning::chain::channelmonitor::{ChannelMonitor, MonitorEvent};
 use lightning::chain::transaction::OutPoint;
 use lightning::chain::{
@@ -63,7 +62,9 @@ use lightning::onion_message::messenger::{Destination, MessageRouter, OnionMessa
 use lightning::routing::router::{
 	InFlightHtlcs, Path, PaymentParameters, Route, RouteHop, RouteParameters, Router,
 };
-use lightning::sign::{EntropySource, InMemorySigner, NodeSigner, Recipient, SignerProvider};
+use lightning::sign::{
+	EntropySource, InMemorySigner, NodeSigner, PeerStorageKey, Recipient, SignerProvider,
+};
 use lightning::types::payment::{PaymentHash, PaymentPreimage, PaymentSecret};
 use lightning::util::config::UserConfig;
 use lightning::util::hash_tables::*;

lightning/src/chain/chainmonitor.rs

@@ -35,6 +35,7 @@ use crate::ln::types::ChannelId;
 use crate::ln::msgs::{self, BaseMessageHandler, Init, MessageSendEvent};
 use crate::ln::our_peer_storage::OurPeerStorage;
 use crate::sign::ecdsa::EcdsaChannelSigner;
+use crate::sign::PeerStorageKey;
 use crate::events::{self, Event, EventHandler, ReplayEvent};
 use crate::util::logger::{Logger, WithContext};
 use crate::util::errors::APIError;
@@ -217,23 +218,6 @@ impl<ChannelSigner: EcdsaChannelSigner> Deref for LockedChannelMonitor<'_, Chann
 	}
 }
 
-/// Represents Secret Key used for encrypting Peer Storage.
-#[derive(Clone, PartialEq, Eq)]
-pub struct PeerStorageKey ([u8; 32]);
-
-impl PeerStorageKey {
-	/// Creates a new `PeerStorageKey` from a `[u8; 32]` array.
-    pub fn new(key: [u8; 32]) -> Self {
-        PeerStorageKey(key)
-    }
-
-    /// Returns a reference to the inner `[u8; 32]` array.
-    pub fn as_bytes(&self) -> &[u8; 32] {
-        &self.0
-    }
-}
-
-
 /// An implementation of [`chain::Watch`] for monitoring channels.
 ///
 /// Connected and disconnected blocks must be provided to `ChainMonitor` as documented by
@@ -702,7 +686,7 @@ where C::Target: chain::Filter,
 	///
 	/// This function collects the counterparty node IDs from all monitors into a `HashSet`,
 	/// ensuring unique IDs are returned.
-	fn get_peer_node_ids(&self) -> HashSet<PublicKey> {
+	fn all_counterparty_node_ids(&self) -> HashSet<PublicKey> {
 		let mon = self.monitors.read().unwrap();
 		mon
 		.values()

lightning/src/ln/blinded_payment_tests.rs

@@ -18,7 +18,6 @@ use crate::blinded_path::utils::is_padded;
 use crate::events::{Event, HTLCDestination, PaymentFailureReason};
 use crate::ln::types::ChannelId;
 use crate::types::payment::{PaymentHash, PaymentSecret};
-use crate::chain::chainmonitor::PeerStorageKey;
 use crate::ln::channelmanager;
 use crate::ln::channelmanager::{HTLCFailureMsg, PaymentId, RecipientOnionFields};
 use crate::types::features::{BlindedHopFeatures, ChannelFeatures, NodeFeatures};
@@ -34,7 +33,7 @@ use crate::offers::invoice::UnsignedBolt12Invoice;
 use crate::offers::nonce::Nonce;
 use crate::prelude::*;
 use crate::routing::router::{BlindedTail, Path, Payee, PaymentParameters, RouteHop, RouteParameters, TrampolineHop};
-use crate::sign::{NodeSigner, Recipient};
+use crate::sign::{NodeSigner, PeerStorageKey, Recipient};
 use crate::util::config::UserConfig;
 use crate::util::ser::{WithoutLength, Writeable};
 use crate::util::test_utils;

lightning/src/sign/mod.rs

@@ -37,7 +37,6 @@ use bitcoin::{secp256k1, Psbt, Sequence, Txid, WPubkeyHash, Witness};
 
 use lightning_invoice::RawBolt11Invoice;
 
-use crate::chain::chainmonitor::PeerStorageKey;
 use crate::chain::transaction::OutPoint;
 use crate::crypto::utils::{hkdf_extract_expand_twice, sign, sign_with_aux_rand};
 use crate::ln::chan_utils;
@@ -795,6 +794,13 @@ pub trait ChannelSigner {
 	fn channel_keys_id(&self) -> [u8; 32];
 }
 
+/// Represents Secret Key used for encrypting Peer Storage.
+#[derive(Clone, PartialEq, Eq)]
+pub struct PeerStorageKey {
+	/// Represents the key used to encrypt and decrypt Peer Storage.
+	pub inner: [u8; 32],
+}
+
 /// Specifies the recipient of an invoice.
 ///
 /// This indicates to [`NodeSigner::sign_invoice`] what node secret key should be used to sign
@@ -1891,7 +1897,7 @@ impl KeysManager {
 					node_id,
 					inbound_payment_key: ExpandedKey::new(inbound_pmt_key_bytes),
 
-					peer_storage_key: PeerStorageKey::new(peer_storage_key.secret_bytes()),
+					peer_storage_key: PeerStorageKey { inner: peer_storage_key.secret_bytes() },
 
 					destination_script,
 					shutdown_pubkey,

lightning/src/util/dyn_signer.rs

@@ -4,7 +4,6 @@ use crate::prelude::*;
 
 use core::any::Any;
 
-use crate::chain::chainmonitor::PeerStorageKey;
 use crate::ln::chan_utils::{
 	ChannelPublicKeys, ChannelTransactionParameters, ClosingTransaction, CommitmentTransaction,
 	HTLCOutputInCommitment, HolderCommitmentTransaction,
@@ -18,7 +17,9 @@ use crate::sign::taproot::TaprootChannelSigner;
 use crate::sign::ChannelSigner;
 use crate::sign::InMemorySigner;
 use crate::sign::{EntropySource, HTLCDescriptor, OutputSpender, PhantomKeysManager};
-use crate::sign::{NodeSigner, Recipient, SignerProvider, SpendableOutputDescriptor};
+use crate::sign::{
+	NodeSigner, PeerStorageKey, Recipient, SignerProvider, SpendableOutputDescriptor,
+};
 use bitcoin;
 use bitcoin::absolute::LockTime;
 use bitcoin::secp256k1::All;

lightning/src/util/test_utils.rs

@@ -15,7 +15,7 @@ use crate::chain::chaininterface;
 use crate::chain::chaininterface::ConfirmationTarget;
 #[cfg(any(test, feature = "_externalize_tests"))]
 use crate::chain::chaininterface::FEERATE_FLOOR_SATS_PER_KW;
-use crate::chain::chainmonitor::{ChainMonitor, PeerStorageKey, Persist};
+use crate::chain::chainmonitor::{ChainMonitor, Persist};
 use crate::chain::channelmonitor::{
 	ChannelMonitor, ChannelMonitorUpdate, ChannelMonitorUpdateStep, MonitorEvent,
 };
@@ -46,7 +46,7 @@ use crate::routing::router::{
 use crate::routing::scoring::{ChannelUsage, ScoreLookUp, ScoreUpdate};
 use crate::routing::utxo::{UtxoLookup, UtxoLookupError, UtxoResult};
 use crate::sign;
-use crate::sign::ChannelSigner;
+use crate::sign::{ChannelSigner, PeerStorageKey};
 use crate::sync::RwLock;
 use crate::types::features::{ChannelFeatures, InitFeatures, NodeFeatures};
 use crate::util::config::UserConfig;