f Expose ChannelPending

Author: tnull

bindings/ldk_node.udl

@@ -86,6 +86,7 @@ interface Event {
 	PaymentSuccessful( PaymentHash payment_hash );
 	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 );
 };
@@ -110,6 +111,14 @@ dictionary PaymentDetails {
 	PaymentStatus status;
 };
 
+dictionary OutPoint {
+    Txid txid;
+    u32 vout;
+};
+
+[Custom]
+typedef string Txid;
+
 [Custom]
 typedef string SocketAddr;
 

src/event.rs

@@ -55,11 +55,11 @@ pub enum Event {
 	/// A channel has been created and is pending confirmation on-chain.
 	ChannelPending {
 		/// The `channel_id` of the channel.
-		channel_id: [u8; 32],
+		channel_id: ChannelId,
 		/// The `user_channel_id` of the channel.
-		user_channel_id: u128,
+		user_channel_id: UserChannelId,
 		/// The `temporary_channel_id` this channel used to be known by during channel establishment.
-		former_temporary_channel_id: [u8; 32],
+		former_temporary_channel_id: ChannelId,
 		/// The `node_id` of the channel counterparty.
 		counterparty_node_id: PublicKey,
 		/// The outpoint of the channel's funding transaction.
@@ -645,9 +645,11 @@ where
 				);
 				self.event_queue
 					.add_event(Event::ChannelPending {
-						channel_id,
-						user_channel_id,
-						former_temporary_channel_id: former_temporary_channel_id.unwrap(),
+						channel_id: ChannelId(channel_id),
+						user_channel_id: UserChannelId(user_channel_id),
+						former_temporary_channel_id: ChannelId(
+							former_temporary_channel_id.unwrap(),
+						),
 						counterparty_node_id,
 						funding_txo,
 					})

src/lib.rs

@@ -140,7 +140,7 @@ use bdk::template::Bip84;
 use bitcoin::hashes::sha256::Hash as Sha256;
 use bitcoin::hashes::Hash;
 use bitcoin::secp256k1::PublicKey;
-use bitcoin::{Address, BlockHash};
+use bitcoin::{Address, BlockHash, OutPoint, Txid};
 
 use rand::Rng;
 

src/types.rs

@@ -22,7 +22,7 @@ use lightning_transaction_sync::EsploraSyncClient;
 use bitcoin::hashes::sha256::Hash as Sha256;
 use bitcoin::hashes::Hash;
 use bitcoin::secp256k1::PublicKey;
-use bitcoin::Address;
+use bitcoin::{Address, Txid};
 
 use std::convert::TryInto;
 use std::default::Default;
@@ -339,3 +339,14 @@ impl UniffiCustomTypeConverter for Network {
 		obj.0.to_string()
 	}
 }
+
+impl UniffiCustomTypeConverter for Txid {
+	type Builtin = String;
+	fn into_custom(val: Self::Builtin) -> uniffi::Result<Self> {
+		Ok(Txid::from_str(&val).unwrap())
+	}
+
+	fn from_custom(obj: Self) -> Self::Builtin {
+		obj.to_string()
+	}
+}