Comments (review)

Author: optout21

lightning/src/ln/channel.rs

@@ -4097,7 +4097,7 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
 	/// The channel value is an input as opposed to using from self, so that this can be used in case of splicing
 	/// to checks with new channel value (before being comitted to it).
 	#[cfg(splicing)]
-	pub fn check_balance_meets_reserve_requirements(&self, balance: u64, channel_value: u64) -> Result<(), ChannelError> {
+	pub fn check_balance_meets_v2_reserve_requirements(&self, balance: u64, channel_value: u64) -> Result<(), ChannelError> {
 		if balance == 0 {
 			return Ok(());
 		}
@@ -4596,8 +4596,7 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
 	pub fn get_splice_init(&self, our_funding_contribution_satoshis: i64,
 		funding_feerate_per_kw: u32, locktime: u32,
 	) -> msgs::SpliceInit {
-		// Reuse the existing funding pubkey, in spite of the channel value changing
-		// (though at this point we don't know the new value yet, due to the optional counterparty contribution)
+		// TODO(splicing): The exisiting pubkey is reused, but a new one should be generated. See #3542.
 		// Note that channel_keys_id is supposed NOT to change
 		let funding_pubkey = self.get_holder_pubkeys().funding_pubkey.clone();
 		msgs::SpliceInit {
@@ -4613,7 +4612,8 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
 	/// Get the splice_ack message that can be sent in response to splice initiation.
 	#[cfg(splicing)]
 	pub fn get_splice_ack(&self, our_funding_contribution_satoshis: i64) -> msgs::SpliceAck {
-		// Reuse the existing funding pubkey, in spite of the channel value changing
+		// TODO(splicing): The exisiting pubkey is reused, but a new one should be generated. See #3542.
+		// Note that channel_keys_id is supposed NOT to change
 		let funding_pubkey = self.get_holder_pubkeys().funding_pubkey;
 		msgs::SpliceAck {
 			channel_id: self.channel_id,
@@ -8463,7 +8463,7 @@ impl<SP: Deref> FundedChannel<SP> where
 		let post_balance = PendingSplice::add_checked(self.funding.value_to_self_msat, our_funding_contribution_satoshis);
 		// Early check for reserve requirement, assuming maximum balance of full channel value
 		// This will also be checked later at tx_complete
-		let _res = self.context.check_balance_meets_reserve_requirements(post_balance, post_channel_value)?;
+		let _res = self.context.check_balance_meets_v2_reserve_requirements(post_balance, post_channel_value)?;
 
 		// TODO(splicing): Store msg.funding_pubkey
 		// TODO(splicing): Apply start of splice (splice_start)
@@ -8492,7 +8492,7 @@ impl<SP: Deref> FundedChannel<SP> where
 		let post_balance = PendingSplice::add_checked(self.funding.value_to_self_msat, our_funding_contribution);
 		// Early check for reserve requirement, assuming maximum balance of full channel value
 		// This will also be checked later at tx_complete
-		let _res = self.context.check_balance_meets_reserve_requirements(post_balance, post_channel_value)?;
+		let _res = self.context.check_balance_meets_v2_reserve_requirements(post_balance, post_channel_value)?;
 		Ok(())
 	}