f - populate SpliceFailed inputs and outputs

Author: jkczyz

lightning/src/ln/channel.rs

@@ -1719,7 +1719,7 @@ where
 		L::Target: Logger,
 	{
 		let logger = WithChannelContext::from(logger, &self.context(), None);
-		let NegotiationError { reason, .. } = error;
+		let NegotiationError { reason, contributed_inputs, contributed_outputs } = error;
 		log_info!(logger, "Failed interactive transaction negotiation: {reason}");
 
 		let splice_funding_failed = match &mut self.phase {
@@ -1736,15 +1736,23 @@ where
 					.and_then(|pending_splice| pending_splice.funding_negotiation.take())
 					.filter(|funding_negotiation| funding_negotiation.is_initiator())
 					.map(|funding_negotiation| {
-						let funding = funding_negotiation.as_funding();
+						let funding_txo = funding_negotiation
+							.as_funding()
+							.and_then(|funding| funding.get_funding_txo())
+							.map(|txo| txo.into_bitcoin_outpoint());
+
+						let channel_type = funding_negotiation
+							.as_funding()
+							.map(|funding| funding.get_channel_type().clone());
+
 						SpliceFundingFailed {
 							channel_id: funded_channel.context.channel_id,
 							counterparty_node_id: funded_channel.context.counterparty_node_id,
 							user_channel_id: funded_channel.context.user_id,
-							funding_txo: funding.as_ref().and_then(|funding| funding.get_funding_txo()).map(|txo| txo.into_bitcoin_outpoint()),
-							channel_type: funding.as_ref().map(|funding| funding.get_channel_type().clone()),
-							contributed_inputs: Vec::new(),
-							contributed_outputs: Vec::new(),
+							funding_txo,
+							channel_type,
+							contributed_inputs,
+							contributed_outputs,
 						}
 					})
 			},