fix Proper error instead of panic in tx_add_input

Author: optout21

lightning/src/ln/channel.rs

@@ -1459,48 +1459,48 @@ impl<SP: Deref> Channel<SP> where
 		}
 	}
 
-	pub fn tx_add_input(&mut self, msg: &msgs::TxAddInput) -> InteractiveTxMessageSendResult {
+	pub fn tx_add_input(&mut self, msg: &msgs::TxAddInput) -> Result<InteractiveTxMessageSendResult, &'static str> {
 		match &mut self.phase {
-			ChannelPhase::UnfundedV2(chan) => chan.tx_add_input(msg),
+			ChannelPhase::UnfundedV2(chan) => Ok(chan.tx_add_input(msg)),
 			#[cfg(splicing)]
-			ChannelPhase::Funded(chan) => chan.tx_add_input(msg),
-			_ => panic!("Got tx_add_input in an invalid phase"),
+			ChannelPhase::Funded(chan) => Ok(chan.tx_add_input(msg)),
+			_ => Err("Got tx_add_input in an invalid phase"),
 		}
 	}
 
-	pub fn tx_add_output(&mut self, msg: &msgs::TxAddOutput) -> InteractiveTxMessageSendResult {
+	pub fn tx_add_output(&mut self, msg: &msgs::TxAddOutput) -> Result<InteractiveTxMessageSendResult, &'static str> {
 		match &mut self.phase {
-			ChannelPhase::UnfundedV2(chan) => chan.tx_add_output(msg),
+			ChannelPhase::UnfundedV2(chan) => Ok(chan.tx_add_output(msg)),
 			#[cfg(splicing)]
-			ChannelPhase::Funded(chan) => chan.tx_add_output(msg),
-			_ => panic!("Got tx_add_output in an invalid phase"),
+			ChannelPhase::Funded(chan) => Ok(chan.tx_add_output(msg)),
+			_ => Err("Got tx_add_output in an invalid phase"),
 		}
 	}
 
-	pub fn tx_remove_input(&mut self, msg: &msgs::TxRemoveInput) -> InteractiveTxMessageSendResult {
+	pub fn tx_remove_input(&mut self, msg: &msgs::TxRemoveInput) -> Result<InteractiveTxMessageSendResult, &'static str> {
 		match &mut self.phase {
-			ChannelPhase::UnfundedV2(chan) => chan.tx_remove_input(msg),
+			ChannelPhase::UnfundedV2(chan) => Ok(chan.tx_remove_input(msg)),
 			#[cfg(splicing)]
-			ChannelPhase::Funded(chan) => chan.tx_remove_input(msg),
-			_ => panic!("Got tx_remove_input in an invalid phase"),
+			ChannelPhase::Funded(chan) => Ok(chan.tx_remove_input(msg)),
+			_ => Err("Got tx_remove_input in an invalid phase"),
 		}
 	}
 
-	pub fn tx_remove_output(&mut self, msg: &msgs::TxRemoveOutput) -> InteractiveTxMessageSendResult {
+	pub fn tx_remove_output(&mut self, msg: &msgs::TxRemoveOutput) -> Result<InteractiveTxMessageSendResult, &'static str> {
 		match &mut self.phase {
-			ChannelPhase::UnfundedV2(chan) => chan.tx_remove_output(msg),
+			ChannelPhase::UnfundedV2(chan) => Ok(chan.tx_remove_output(msg)),
 			#[cfg(splicing)]
-			ChannelPhase::Funded(chan) => chan.tx_remove_output(msg),
-			_ => panic!("Got tx_remove_output in an invalid phase"),
+			ChannelPhase::Funded(chan) => Ok(chan.tx_remove_output(msg)),
+			_ => Err("Got tx_remove_output in an invalid phase"),
 		}
 	}
 
-	pub fn tx_complete(&mut self, msg: &msgs::TxComplete) -> HandleTxCompleteResult {
+	pub fn tx_complete(&mut self, msg: &msgs::TxComplete) -> Result<HandleTxCompleteResult, &'static str> {
 		match &mut self.phase {
-			ChannelPhase::UnfundedV2(chan) => chan.tx_complete(msg),
+			ChannelPhase::UnfundedV2(chan) => Ok(chan.tx_complete(msg)),
 			#[cfg(splicing)]
-			ChannelPhase::Funded(chan) => chan.tx_complete(msg),
-			_ => panic!("Got tx_complete in an invalid phase"),
+			ChannelPhase::Funded(chan) => Ok(chan.tx_complete(msg)),
+			_ => Err("Got tx_complete in an invalid phase"),
 		}
 	}
 

lightning/src/ln/channelmanager.rs

@@ -8452,25 +8452,25 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 
 	fn internal_tx_add_input(&self, counterparty_node_id: PublicKey, msg: &msgs::TxAddInput) -> Result<(), MsgHandleErrInternal> {
 		self.internal_tx_msg(&counterparty_node_id, msg.channel_id, |channel: &mut Channel<SP>| {
-			Ok(channel.tx_add_input(msg).into_msg_send_event(counterparty_node_id))
+			Ok(channel.tx_add_input(msg)?.into_msg_send_event(counterparty_node_id))
 		})
 	}
 
 	fn internal_tx_add_output(&self, counterparty_node_id: PublicKey, msg: &msgs::TxAddOutput) -> Result<(), MsgHandleErrInternal> {
 		self.internal_tx_msg(&counterparty_node_id, msg.channel_id, |channel: &mut Channel<SP>| {
-			Ok(channel.tx_add_output(msg).into_msg_send_event(counterparty_node_id))
+			Ok(channel.tx_add_output(msg)?.into_msg_send_event(counterparty_node_id))
 		})
 	}
 
 	fn internal_tx_remove_input(&self, counterparty_node_id: PublicKey, msg: &msgs::TxRemoveInput) -> Result<(), MsgHandleErrInternal> {
 		self.internal_tx_msg(&counterparty_node_id, msg.channel_id, |channel: &mut Channel<SP>| {
-			Ok(channel.tx_remove_input(msg).into_msg_send_event(counterparty_node_id))
+			Ok(channel.tx_remove_input(msg)?.into_msg_send_event(counterparty_node_id))
 		})
 	}
 
 	fn internal_tx_remove_output(&self, counterparty_node_id: PublicKey, msg: &msgs::TxRemoveOutput) -> Result<(), MsgHandleErrInternal> {
 		self.internal_tx_msg(&counterparty_node_id, msg.channel_id, |channel: &mut Channel<SP>| {
-			Ok(channel.tx_remove_output(msg).into_msg_send_event(counterparty_node_id))
+			Ok(channel.tx_remove_output(msg)?.into_msg_send_event(counterparty_node_id))
 		})
 	}
 
@@ -8487,8 +8487,15 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 		let peer_state = &mut *peer_state_lock;
 		match peer_state.channel_by_id.entry(msg.channel_id) {
 			hash_map::Entry::Occupied(mut chan_entry) => {
-				let (msg_send_event_opt, signing_session_opt) = chan_entry.get_mut().tx_complete(msg)
-					.into_msg_send_event_or_signing_session(counterparty_node_id);
+				let (msg_send_event_opt, signing_session_opt) = match chan_entry.get_mut().tx_complete(msg) {
+					Ok(res) => res.into_msg_send_event_or_signing_session(counterparty_node_id),
+					Err(err) => {
+						try_channel_entry!(self, peer_state, Err(ChannelError::Close((
+							err.into(),
+							ClosureReason::HolderForceClosed { broadcasted_latest_txn: Some(false) },
+						))), chan_entry)
+					}
+				};
 				if let Some(msg_send_event) = msg_send_event_opt {
 					peer_state.pending_msg_events.push(msg_send_event);
 				};