minor Add optional change destination parameter

Author: optout21

lightning/src/ln/channel.rs

@@ -2213,9 +2213,12 @@ impl<SP: Deref> InitialRemoteCommitmentReceiver<SP> for FundedChannel<SP> where
 }
 
 impl<SP: Deref> PendingV2Channel<SP> where SP::Target: SignerProvider {
+	/// Prepare and start interactive transaction negotiation.
+	/// `change_destination_opt` - Optional destination for optional change; if None, default destination address is used.
 	#[allow(dead_code)] // TODO(dual_funding): Remove once contribution to V2 channels is enabled
 	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>,
 	) -> Result<Option<InteractiveTxMessageSend>, APIError>
 	where ES::Target: EntropySource
 	{
@@ -2267,10 +2270,15 @@ impl<SP: Deref> PendingV2Channel<SP> where SP::Target: SignerProvider {
 			),
 		})?;
 		if let Some(change_value) = change_value_opt {
-			let change_script = signer_provider.get_destination_script(self.context.channel_keys_id).map_err(
-				|err| APIError::APIMisuseError {
-					err: format!("Failed to get change script as new destination script, {:?}", err),
-				})?;
+			let change_script = match change_destination_opt {
+				Some(script) => script,
+				None => {
+					signer_provider.get_destination_script(self.context.channel_keys_id).map_err(
+						|err| APIError::APIMisuseError {
+							err: format!("Failed to get change script as new destination script, {:?}", err),
+						})?
+				}
+			};
 			let mut change_output = TxOut {
 				value: Amount::from_sat(change_value),
 				script_pubkey: change_script,

lightning/src/ln/interactivetxs.rs

@@ -1704,7 +1704,8 @@ pub(super) fn calculate_change_output_value(
 	// Note: in case of additional outputs, they will have to be subtracted here
 
 	let min_contribution_and_fees = our_contribution.saturating_add(fees_sats);
-	let min_contribution_and_fees_and_dust = min_contribution_and_fees.saturating_add(holder_dust_limit_satoshis);
+	let min_contribution_and_fees_and_dust =
+		min_contribution_and_fees.saturating_add(holder_dust_limit_satoshis);
 	if total_input_satoshis < min_contribution_and_fees {
 		// Not enough to cover contribution plus fees
 		Err(AbortReason::InsufficientFees)