Include spliceable balance in every FundingTemplate

There's no reason not to do so, and it allows us to fail earlier when
the user's net contribution exceeds their spliceable balance.

Author: wpaulino

lightning/src/ln/channel.rs

@@ -56,7 +56,7 @@ use crate::ln::channelmanager::{
 	MAX_LOCAL_BREAKDOWN_TIMEOUT, MIN_CLTV_EXPIRY_DELTA,
 };
 use crate::ln::funding::{
-	FeeRateAdjustmentError, FundingContribution, FundingTemplate, FundingTxInput, PriorContribution,
+	FeeRateAdjustmentError, FundingContribution, FundingTemplate, FundingTxInput,
 };
 use crate::ln::interactivetxs::{
 	AbortReason, HandleTxCompleteValue, InteractiveTxConstructor, InteractiveTxConstructorArgs,
@@ -12333,6 +12333,17 @@ where
 			});
 		}
 
+		let spliceable_balance = self
+			.get_holder_counterparty_balances_floor_incl_fee(&self.funding)
+			.map(|(h, _)| h)
+			.map_err(|e| APIError::ChannelUnavailable {
+				err: format!(
+					"Channel {} cannot be spliced at this time: {}",
+					self.context.channel_id(),
+					e
+				),
+			})?;
+
 		let (min_rbf_feerate, prior_contribution) = if self.is_rbf_compatible().is_err() {
 			// Channel can never RBF (e.g., zero-conf).
 			(None, None)
@@ -12365,17 +12376,7 @@ where
 					.as_ref()
 					.and_then(|pending_splice| pending_splice.contributions.last())
 				{
-					let holder_balance = self
-						.get_holder_counterparty_balances_floor_incl_fee(&self.funding)
-						.map(|(h, _)| h)
-						.map_err(|e| APIError::ChannelUnavailable {
-							err: format!(
-								"Channel {} cannot be spliced at this time: {}",
-								self.context.channel_id(),
-								e
-							),
-						})?;
-					Some(PriorContribution::new(prior.clone(), holder_balance))
+					Some(prior.clone())
 				} else {
 					None
 				}
@@ -12397,7 +12398,12 @@ where
 			satisfaction_weight: EMPTY_SCRIPT_SIG_WEIGHT + FUNDING_TRANSACTION_WITNESS_WEIGHT,
 		};
 
-		Ok(FundingTemplate::new(Some(shared_input), min_rbf_feerate, prior_contribution))
+		Ok(FundingTemplate::new(
+			Some(shared_input),
+			min_rbf_feerate,
+			prior_contribution,
+			spliceable_balance,
+		))
 	}
 
 	/// Returns whether this channel can ever RBF, independent of splice state.