Extend begin_interactive_funding_tx_construction() with splicing-specific extra input (on top of #3443) #3516

Author: optout21

lightning/src/ln/channel.rs

@@ -2243,12 +2243,17 @@ impl<SP: Deref> PendingV2Channel<SP> where SP::Target: SignerProvider {
 	fn begin_interactive_funding_tx_construction<ES: Deref>(
 		&mut self, signer_provider: &SP, entropy_source: &ES, holder_node_id: PublicKey,
 		change_destination_opt: Option<ScriptBuf>,
+		prev_funding_input: Option<(TxIn, TransactionU16LenLimited)>,
 	) -> Result<Option<InteractiveTxMessageSend>, APIError>
 	where ES::Target: EntropySource
 	{
 		let mut funding_inputs = Vec::new();
 		mem::swap(&mut self.dual_funding_context.our_funding_inputs, &mut funding_inputs);
 
+		if let Some(prev_funding_input) = prev_funding_input {
+			funding_inputs.push(prev_funding_input);
+		}
+
 		let funding_inputs_prev_outputs = DualFundingChannelContext::txouts_from_input_prev_txs(&funding_inputs)
 			.map_err(|err| APIError::APIMisuseError { err: err.to_string() })?;