Add counterparty_node_id to ChannelClosed and ChannelReady events

Author: tnull

bindings/ldk_node.udl

@@ -142,8 +142,8 @@ interface Event {
 	PaymentFailed( PaymentHash payment_hash );
 	PaymentReceived( PaymentHash payment_hash, u64 amount_msat);
 	ChannelPending ( ChannelId channel_id, UserChannelId user_channel_id, ChannelId former_temporary_channel_id, PublicKey counterparty_node_id, OutPoint funding_txo );
-	ChannelReady ( ChannelId channel_id, UserChannelId user_channel_id );
-	ChannelClosed ( ChannelId channel_id, UserChannelId user_channel_id );
+	ChannelReady ( ChannelId channel_id, UserChannelId user_channel_id, PublicKey? counterparty_node_id );
+	ChannelClosed ( ChannelId channel_id, UserChannelId user_channel_id, PublicKey? counterparty_node_id );
 };
 
 enum PaymentDirection {

src/event.rs

@@ -68,13 +68,21 @@ pub enum Event {
 		channel_id: ChannelId,
 		/// The `user_channel_id` of the channel.
 		user_channel_id: UserChannelId,
+		/// The `node_id` of the channel counterparty.
+		///
+		/// This will be `None` for events serialized by LDK Node XXX TODO and prior.
+		counterparty_node_id: Option<PublicKey>,
 	},
 	/// A channel has been closed.
 	ChannelClosed {
 		/// The `channel_id` of the channel.
 		channel_id: ChannelId,
 		/// The `user_channel_id` of the channel.
 		user_channel_id: UserChannelId,
+		/// The `node_id` of the channel counterparty.
+		///
+		/// This will be `None` for events serialized by LDK Node XXX TODO and prior.
+		counterparty_node_id: Option<PublicKey>,
 	},
 }
 
@@ -91,6 +99,7 @@ impl_writeable_tlv_based_enum!(Event,
 	},
 	(3, ChannelReady) => {
 		(0, channel_id, required),
+		(1, counterparty_node_id, option),
 		(2, user_channel_id, required),
 	},
 	(4, ChannelPending) => {
@@ -102,6 +111,7 @@ impl_writeable_tlv_based_enum!(Event,
 	},
 	(5, ChannelClosed) => {
 		(0, channel_id, required),
+		(1, counterparty_node_id, option),
 		(2, user_channel_id, required),
 	};
 );
@@ -735,13 +745,20 @@ where
 					.add_event(Event::ChannelReady {
 						channel_id: ChannelId(channel_id),
 						user_channel_id: UserChannelId(user_channel_id),
+						counterparty_node_id: Some(counterparty_node_id),
 					})
 					.unwrap_or_else(|e| {
 						log_error!(self.logger, "Failed to push to event queue: {}", e);
 						panic!("Failed to push to event queue");
 					});
 			}
-			LdkEvent::ChannelClosed { channel_id, reason, user_channel_id } => {
+			LdkEvent::ChannelClosed {
+				channel_id,
+				reason,
+				user_channel_id,
+				counterparty_node_id,
+				..
+			} => {
 				log_info!(
 					self.logger,
 					"Channel {} closed due to: {:?}",
@@ -752,6 +769,7 @@ where
 					.add_event(Event::ChannelClosed {
 						channel_id: ChannelId(channel_id),
 						user_channel_id: UserChannelId(user_channel_id),
+						counterparty_node_id,
 					})
 					.unwrap_or_else(|e| {
 						log_error!(self.logger, "Failed to push to event queue: {}", e);
@@ -780,6 +798,7 @@ mod tests {
 		let expected_event = Event::ChannelReady {
 			channel_id: ChannelId([23u8; 32]),
 			user_channel_id: UserChannelId(2323),
+			counterparty_node_id: None,
 		};
 		event_queue.add_event(expected_event.clone()).unwrap();
 		assert!(store.get_and_clear_did_persist());