f - echo tx_abort even if no SpliceFailed event is generated

Author: jkczyz

lightning/src/ln/channel.rs

@@ -1815,7 +1815,7 @@ where
 
 	pub fn tx_abort<L: Deref>(
 		&mut self, msg: &msgs::TxAbort, logger: &L,
-	) -> Result<Option<(msgs::TxAbort, SpliceFundingFailed)>, ChannelError>
+	) -> Result<(Option<msgs::TxAbort>, Option<SpliceFundingFailed>), ChannelError>
 	where
 		L::Target: Logger,
 	{
@@ -1862,20 +1862,18 @@ where
 			},
 		};
 
-		let result = if should_ack {
+		let tx_abort = should_ack.then(|| {
 			let logger = WithChannelContext::from(logger, &self.context(), None);
 			let reason =
 				types::string::UntrustedString(String::from_utf8_lossy(&msg.data).to_string());
 			log_info!(logger, "Counterparty failed interactive transaction negotiation: {reason}");
-			let tx_abort_response = msgs::TxAbort {
+			msgs::TxAbort {
 				channel_id: msg.channel_id,
 				data: "Acknowledged tx_abort".to_string().into_bytes(),
-			};
-			splice_funding_failed.map(|failed| (tx_abort_response, failed))
-		} else {
-			None
-		};
-		Ok(result)
+			}
+		});
+
+		Ok((tx_abort, splice_funding_failed))
 	}
 
 	#[rustfmt::skip]

lightning/src/ln/channelmanager.rs

@@ -10505,10 +10505,22 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 		match peer_state.channel_by_id.entry(msg.channel_id) {
 			hash_map::Entry::Occupied(mut chan_entry) => {
 				let res = chan_entry.get_mut().tx_abort(msg, &self.logger);
-				let tx_abort_and_splice_failed = try_channel_entry!(self, peer_state, res, chan_entry);
+				let (tx_abort, splice_failed) = try_channel_entry!(self, peer_state, res, chan_entry);
 
-				// Emit SpliceFailed event and send TxAbort response if we had an active splice negotiation
-				if let Some((tx_abort_msg, splice_funding_failed)) = tx_abort_and_splice_failed {
+				let persist = if tx_abort.is_some() || splice_failed.is_some() {
+					NotifyOption::DoPersist
+				} else {
+					NotifyOption::SkipPersistNoEvents
+				};
+
+				if let Some(tx_abort_msg) = tx_abort {
+					peer_state.pending_msg_events.push(MessageSendEvent::SendTxAbort {
+						node_id: *counterparty_node_id,
+						msg: tx_abort_msg,
+					});
+				}
+
+				if let Some(splice_funding_failed) = splice_failed {
 					let pending_events = &mut self.pending_events.lock().unwrap();
 					pending_events.push_back((events::Event::SpliceFailed {
 						channel_id: msg.channel_id,
@@ -10519,15 +10531,9 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 						contributed_inputs: splice_funding_failed.contributed_inputs,
 						contributed_outputs: splice_funding_failed.contributed_outputs,
 					}, None));
-
-					peer_state.pending_msg_events.push(MessageSendEvent::SendTxAbort {
-						node_id: *counterparty_node_id,
-						msg: tx_abort_msg,
-					});
-					Ok(NotifyOption::DoPersist)
-				} else {
-					Ok(NotifyOption::SkipPersistNoEvents)
 				}
+
+				Ok(persist)
 			},
 			hash_map::Entry::Vacant(_) => {
 				Err(MsgHandleErrInternal::send_err_msg_no_close(format!("Got a message for a channel from the wrong node! No such channel for the passed counterparty_node_id {}", counterparty_node_id), msg.channel_id))