Add funding_txo to ChannelReady event

A ChannelReady event is used for both channel establishment and splicing
to indicate that the funding transaction is confirmed to an acceptable
depth and thus the channel can be used with the funding. An upcoming
SplicePending event will be emitted for each pending splice (i.e., both
the initial splice attempt and any RBF attempts). Thus, when a
ChannelReady event is emitted, the funding_txo must be included to
differentiate between which ChannelPending -- which also contains the
funding_txo -- that the event corresponds to.

Author: jkczyz

lightning/src/events/mod.rs

@@ -1318,6 +1318,11 @@ pub enum Event {
 		user_channel_id: u128,
 		/// The `node_id` of the channel counterparty.
 		counterparty_node_id: PublicKey,
+		/// The outpoint of the channel's funding transaction.
+		///
+		/// Will be `None` if the channel's funding transaction reached an acceptable depth prior to
+		/// version 0.2.
+		funding_txo: Option<OutPoint>,
 		/// The features that this channel will operate with.
 		channel_type: ChannelTypeFeatures,
 	},
@@ -1786,10 +1791,14 @@ impl Writeable for Event {
 				}
 				write_tlv_fields!(writer, {}); // Write a length field for forwards compat
 			}
-			&Event::ChannelReady { ref channel_id, ref user_channel_id, ref counterparty_node_id, ref channel_type } => {
+			&Event::ChannelReady {
+				ref channel_id, ref user_channel_id, ref counterparty_node_id, ref funding_txo,
+				ref channel_type,
+			} => {
 				29u8.write(writer)?;
 				write_tlv_fields!(writer, {
 					(0, channel_id, required),
+					(1, funding_txo, required),
 					(2, user_channel_id, required),
 					(4, counterparty_node_id, required),
 					(6, channel_type, required),
@@ -2239,9 +2248,11 @@ impl MaybeReadable for Event {
 					let mut channel_id = ChannelId::new_zero();
 					let mut user_channel_id: u128 = 0;
 					let mut counterparty_node_id = RequiredWrapper(None);
+					let mut funding_txo = None;
 					let mut channel_type = RequiredWrapper(None);
 					read_tlv_fields!(reader, {
 						(0, channel_id, required),
+						(1, funding_txo, option),
 						(2, user_channel_id, required),
 						(4, counterparty_node_id, required),
 						(6, channel_type, required),
@@ -2251,6 +2262,7 @@ impl MaybeReadable for Event {
 						channel_id,
 						user_channel_id,
 						counterparty_node_id: counterparty_node_id.0.unwrap(),
+						funding_txo,
 						channel_type: channel_type.0.unwrap()
 					}))
 				};

lightning/src/ln/channelmanager.rs

@@ -3201,6 +3201,7 @@ macro_rules! emit_initial_channel_ready_event {
 				channel_id: $channel.context.channel_id(),
 				user_channel_id: $channel.context.get_user_id(),
 				counterparty_node_id: $channel.context.get_counterparty_node_id(),
+				funding_txo: $channel.funding.get_funding_txo().map(|outpoint| outpoint.into_bitcoin_outpoint()),
 				channel_type: $channel.funding.get_channel_type().clone(),
 			}, None));
 			$channel.context.set_initial_channel_ready_event_emitted();
@@ -9645,6 +9646,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 							channel_id: chan.context.channel_id(),
 							user_channel_id: chan.context.get_user_id(),
 							counterparty_node_id: chan.context.get_counterparty_node_id(),
+							funding_txo: chan.funding.get_funding_txo().map(|outpoint| outpoint.into_bitcoin_outpoint()),
 							channel_type: chan.funding.get_channel_type().clone(),
 						}, None));
 
@@ -11798,6 +11800,7 @@ where
 												channel_id: funded_channel.context.channel_id(),
 												user_channel_id: funded_channel.context.get_user_id(),
 												counterparty_node_id: funded_channel.context.get_counterparty_node_id(),
+												funding_txo: funded_channel.funding.get_funding_txo().map(|outpoint| outpoint.into_bitcoin_outpoint()),
 												channel_type: funded_channel.funding.get_channel_type().clone(),
 											}, None));
 										}