Add FundingScope::minimum_depth_override

When a channel is funded using the coinbase transaction, the minimum
depth must be at least COINBASE_MATURITY. Instead of overriding it in
ChannelContext, add FundingScope::minimum_depth_override for this
purpose. Otherwise, if the overridden minimum_depth were reused in a
splice's minimum dpeth, then sending splice_locked would be
unnecessarily delayed.

Later, this can be used to override the minimum depth needed for a
splice.

Author: jkczyz

lightning/src/ln/channel.rs

@@ -1825,6 +1825,10 @@ pub(super) struct FundingScope {
 	funding_tx_confirmed_in: Option<BlockHash>,
 	funding_tx_confirmation_height: u32,
 	short_channel_id: Option<u64>,
+
+	/// The minimum number of confirmations before the funding is locked. If set, this will override
+	/// [`ChannelContext::minimum_depth`].
+	minimum_depth_override: Option<u32>,
 }
 
 impl Writeable for FundingScope {
@@ -1838,6 +1842,7 @@ impl Writeable for FundingScope {
 			(11, self.funding_tx_confirmed_in, option),
 			(13, self.funding_tx_confirmation_height, required),
 			(15, self.short_channel_id, option),
+			(17, self.minimum_depth_override, option),
 		});
 		Ok(())
 	}
@@ -1853,6 +1858,7 @@ impl Readable for FundingScope {
 		let mut funding_tx_confirmed_in = None;
 		let mut funding_tx_confirmation_height = RequiredWrapper(None);
 		let mut short_channel_id = None;
+		let mut minimum_depth_override = None;
 
 		read_tlv_fields!(reader, {
 			(1, value_to_self_msat, required),
@@ -1863,6 +1869,7 @@ impl Readable for FundingScope {
 			(11, funding_tx_confirmed_in, option),
 			(13, funding_tx_confirmation_height, required),
 			(15, short_channel_id, option),
+			(17, minimum_depth_override, option),
 		});
 
 		Ok(Self {
@@ -1878,6 +1885,7 @@ impl Readable for FundingScope {
 			funding_tx_confirmed_in,
 			funding_tx_confirmation_height: funding_tx_confirmation_height.0.unwrap(),
 			short_channel_id,
+			minimum_depth_override,
 			#[cfg(any(test, fuzzing))]
 			next_local_commitment_tx_fee_info_cached: Mutex::new(None),
 			#[cfg(any(test, fuzzing))]
@@ -2952,6 +2960,7 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
 			funding_tx_confirmed_in: None,
 			funding_tx_confirmation_height: 0,
 			short_channel_id: None,
+			minimum_depth_override: None,
 		};
 		let channel_context = ChannelContext {
 			user_id,
@@ -3192,6 +3201,7 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
 			funding_tx_confirmed_in: None,
 			funding_tx_confirmation_height: 0,
 			short_channel_id: None,
+			minimum_depth_override: None,
 		};
 		let channel_context = Self {
 			user_id,
@@ -5257,7 +5267,9 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
 	}
 
 	fn check_funding_meets_minimum_depth(&self, funding: &mut FundingScope, height: u32) -> bool {
-		if funding.funding_tx_confirmation_height == 0 && self.minimum_depth != Some(0) {
+		let minimum_depth = funding.minimum_depth_override.or(self.minimum_depth);
+
+		if funding.funding_tx_confirmation_height == 0 && minimum_depth != Some(0) {
 			return false;
 		}
 
@@ -5266,7 +5278,7 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
 			funding.funding_tx_confirmation_height = 0;
 		}
 
-		if funding_tx_confirmations < self.minimum_depth.unwrap_or(0) as i64 {
+		if funding_tx_confirmations < minimum_depth.unwrap_or(0) as i64 {
 			return false;
 		}
 
@@ -8604,7 +8616,7 @@ impl<SP: Deref> FundedChannel<SP> where
 						if tx.is_coinbase() &&
 							self.context.minimum_depth.unwrap_or(0) > 0 &&
 							self.context.minimum_depth.unwrap_or(0) < COINBASE_MATURITY {
-							self.context.minimum_depth = Some(COINBASE_MATURITY);
+							self.funding.minimum_depth_override = Some(COINBASE_MATURITY);
 						}
 					}
 					// If we allow 1-conf funding, we may need to check for channel_ready here and
@@ -10008,7 +10020,7 @@ impl<SP: Deref> OutboundV1Channel<SP> where SP::Target: SignerProvider {
 		if funding_transaction.is_coinbase() &&
 			self.context.minimum_depth.unwrap_or(0) > 0 &&
 			self.context.minimum_depth.unwrap_or(0) < COINBASE_MATURITY {
-			self.context.minimum_depth = Some(COINBASE_MATURITY);
+			self.funding.minimum_depth_override = Some(COINBASE_MATURITY);
 		}
 
 		debug_assert!(self.funding.funding_transaction.is_none());
@@ -11246,7 +11258,8 @@ impl<SP: Deref> Writeable for FundedChannel<SP> where SP::Target: SignerProvider
 			(54, self.pending_funding, optional_vec), // Added in 0.2
 			(55, removed_htlc_failure_attribution_data, optional_vec), // Added in 0.2
 			(57, holding_cell_failure_attribution_data, optional_vec), // Added in 0.2
-			(58, self.interactive_tx_signing_session, option) // Added in 0.2
+			(58, self.interactive_tx_signing_session, option), // Added in 0.2
+			(59, self.funding.minimum_depth_override, option), // Added in 0.2
 		});
 
 		Ok(())
@@ -11565,6 +11578,8 @@ impl<'a, 'b, 'c, ES: Deref, SP: Deref> ReadableArgs<(&'a ES, &'b SP, &'c Channel
 
 		let mut interactive_tx_signing_session: Option<InteractiveTxSigningSession> = None;
 
+		let mut minimum_depth_override: Option<u32> = None;
+
 		read_tlv_fields!(reader, {
 			(0, announcement_sigs, option),
 			(1, minimum_depth, option),
@@ -11604,6 +11619,7 @@ impl<'a, 'b, 'c, ES: Deref, SP: Deref> ReadableArgs<(&'a ES, &'b SP, &'c Channel
 			(55, removed_htlc_failure_attribution_data, optional_vec),
 			(57, holding_cell_failure_attribution_data, optional_vec),
 			(58, interactive_tx_signing_session, option), // Added in 0.2
+			(59, minimum_depth_override, option), // Added in 0.2
 		});
 
 		let holder_signer = signer_provider.derive_channel_signer(channel_keys_id);
@@ -11779,6 +11795,7 @@ impl<'a, 'b, 'c, ES: Deref, SP: Deref> ReadableArgs<(&'a ES, &'b SP, &'c Channel
 				funding_tx_confirmed_in,
 				funding_tx_confirmation_height,
 				short_channel_id,
+				minimum_depth_override,
 			},
 			pending_funding: pending_funding.unwrap(),
 			context: ChannelContext {