f funding time-out event reason

Author: TheBlueMatt

lightning/src/ln/channel.rs

@@ -4168,10 +4168,10 @@ impl<Signer: Sign> Channel<Signer> {
 			// If funding_tx_confirmed_in is unset, the channel must not be active
 			assert!(non_shutdown_state <= ChannelState::ChannelFunded as u32);
 			assert_eq!(non_shutdown_state & ChannelState::OurFundingLocked as u32, 0);
-			return Err(msgs::ErrorMessage {
+			return Err((msgs::ErrorMessage {
 				channel_id: self.channel_id(),
 				data: format!("Funding transaction failed to confirm within {} blocks", FUNDING_CONF_DEADLINE_BLOCKS),
-			});
+			}, ClosureReason::FundingTimedOut));
 		}
 
 		Ok((None, timed_out_htlcs))

lightning/src/ln/functional_tests.rs

@@ -8195,6 +8195,7 @@ fn test_channel_conf_timeout() {
 
 	connect_blocks(&nodes[1], 1);
 	check_added_monitors!(nodes[1], 1);
+	check_closed_event!(nodes[1], 1, ClosureReason::FundingTimedOut);
 	let close_ev = nodes[1].node.get_and_clear_pending_msg_events();
 	assert_eq!(close_ev.len(), 1);
 	match close_ev[0] {

lightning/src/util/events.rs

@@ -97,6 +97,8 @@ pub enum ClosureReason {
 	/// commitment transaction came from our counterparty, but it may also have come from
 	/// a copy of our own `ChannelMonitor`.
 	CommitmentTxConfirmed,
+	/// The commitment transaction failed to confirm in a timely manner on an inbound channel.
+	FundingTimedOut,
 	/// Closure generated from processing an event, likely a HTLC forward/relay/reception.
 	ProcessingError {
 		/// A developer-readable error message which we generated.
@@ -116,6 +118,7 @@ pub enum ClosureReason {
 
 impl_writeable_tlv_based_enum_upgradable!(ClosureReason,
 	(0, CounterpartyForceClosed) => { (1, peer_msg, required) },
+	(1, FundingTimedOut) => {},
 	(2, HolderForceClosed) => {},
 	(6, CommitmentTxConfirmed) => {},
 	(4, CooperativeClosure) => {},