Migrate NetworkGraph, NodeEntropy, and LSPS1Liquidity interfaces to UniFFI proc-macro export

Move these three simple Object types from UDL interface definitions to
`#[derive(uniffi::Object)]` + `#[uniffi::export]` proc-macro annotations,
replacing their UDL interface blocks with `typedef interface` references.

Generated with the assistance of AI (Claude).

Co-Authored-By: HAL 9000

Author: tnull

bindings/ldk_node.udl

@@ -17,14 +17,7 @@ typedef dictionary ElectrumSyncConfig;
 
 typedef dictionary LSPS2ServiceConfig;
 
-interface NodeEntropy {
-	[Name=from_bip39_mnemonic]
-	constructor(Mnemonic mnemonic, string? passphrase);
-	[Throws=EntropyError, Name=from_seed_bytes]
-	constructor(bytes seed_bytes);
-	[Throws=EntropyError, Name=from_seed_path]
-	constructor(string seed_path);
-};
+typedef interface NodeEntropy;
 
 typedef enum EntropyError;
 
@@ -239,12 +232,7 @@ interface UnifiedPayment {
 	UnifiedPaymentResult send([ByRef]string uri_str, u64? amount_msat, RouteParametersConfig? route_parameters);
 };
 
-interface LSPS1Liquidity {
-	[Throws=NodeError]
-	LSPS1OrderStatus request_channel(u64 lsp_balance_sat, u64 client_balance_sat, u32 channel_expiry_blocks, boolean announce_channel);
-	[Throws=NodeError]
-	LSPS1OrderStatus check_order_status(LSPS1OrderId order_id);
-};
+typedef interface LSPS1Liquidity;
 
 [Error]
 enum NodeError {
@@ -438,12 +426,7 @@ typedef dictionary ChannelConfig;
 
 typedef enum MaxDustHTLCExposure;
 
-interface NetworkGraph {
-	sequence<u64> list_channels();
-	ChannelInfo? channel(u64 short_channel_id);
-	sequence<NodeId> list_nodes();
-	NodeInfo? node([ByRef]NodeId node_id);
-};
+typedef interface NetworkGraph;
 
 typedef dictionary ChannelInfo;
 

src/entropy.rs

@@ -40,29 +40,38 @@ impl std::error::Error for EntropyError {}
 ///
 /// [`Node`]: crate::Node
 #[derive(Copy, Clone)]
+#[cfg_attr(feature = "uniffi", derive(uniffi::Object))]
 pub struct NodeEntropy([u8; WALLET_KEYS_SEED_LEN]);
 
+impl NodeEntropy {
+	/// Configures the [`Node`] instance to source its wallet entropy from the given
+	/// [`WALLET_KEYS_SEED_LEN`] seed bytes.
+	///
+	/// [`Node`]: crate::Node
+	#[cfg(not(feature = "uniffi"))]
+	pub fn from_seed_bytes(seed_bytes: [u8; WALLET_KEYS_SEED_LEN]) -> Self {
+		Self(seed_bytes)
+	}
+
+	pub(crate) fn to_seed_bytes(&self) -> [u8; WALLET_KEYS_SEED_LEN] {
+		self.0
+	}
+}
+
+#[cfg_attr(feature = "uniffi", uniffi::export)]
 impl NodeEntropy {
 	/// Configures the [`Node`] instance to source its wallet entropy from a [BIP 39] mnemonic.
 	///
 	/// [BIP 39]: https://github.com/bitcoin/bips/blob/master/bip-0039.mediawiki
 	/// [`Node`]: crate::Node
+	#[cfg_attr(feature = "uniffi", uniffi::constructor)]
 	pub fn from_bip39_mnemonic(mnemonic: Mnemonic, passphrase: Option<String>) -> Self {
 		match passphrase {
 			Some(passphrase) => Self(mnemonic.to_seed(passphrase)),
 			None => Self(mnemonic.to_seed("")),
 		}
 	}
 
-	/// Configures the [`Node`] instance to source its wallet entropy from the given
-	/// [`WALLET_KEYS_SEED_LEN`] seed bytes.
-	///
-	/// [`Node`]: crate::Node
-	#[cfg(not(feature = "uniffi"))]
-	pub fn from_seed_bytes(seed_bytes: [u8; WALLET_KEYS_SEED_LEN]) -> Self {
-		Self(seed_bytes)
-	}
-
 	/// Configures the [`Node`] instance to source its wallet entropy from the given
 	/// [`WALLET_KEYS_SEED_LEN`] seed bytes.
 	///
@@ -71,6 +80,7 @@ impl NodeEntropy {
 	///
 	/// [`Node`]: crate::Node
 	#[cfg(feature = "uniffi")]
+	#[uniffi::constructor]
 	pub fn from_seed_bytes(seed_bytes: Vec<u8>) -> Result<NodeEntropy, EntropyError> {
 		if seed_bytes.len() != WALLET_KEYS_SEED_LEN {
 			return Err(EntropyError::InvalidSeedBytes);
@@ -86,16 +96,13 @@ impl NodeEntropy {
 	/// stored at the given location.
 	///
 	/// [`Node`]: crate::Node
+	#[cfg_attr(feature = "uniffi", uniffi::constructor)]
 	pub fn from_seed_path(seed_path: String) -> Result<Self, EntropyError> {
 		Ok(Self(
 			io::utils::read_or_generate_seed_file(&seed_path)
 				.map_err(|_| EntropyError::InvalidSeedFile)?,
 		))
 	}
-
-	pub(crate) fn to_seed_bytes(&self) -> [u8; WALLET_KEYS_SEED_LEN] {
-		self.0
-	}
 }
 
 impl fmt::Display for NodeEntropy {

src/ffi/types.rs

@@ -139,9 +139,8 @@ impl VssClientHeaderProvider for VssHeaderProviderAdapter {
 
 use crate::builder::sanitize_alias;
 pub use crate::config::{default_config, ElectrumSyncConfig, EsploraSyncConfig};
-pub use crate::entropy::{generate_entropy_mnemonic, EntropyError, NodeEntropy, WordCount};
+pub use crate::entropy::{generate_entropy_mnemonic, NodeEntropy, WordCount};
 use crate::error::Error;
-pub use crate::graph::{ChannelInfo, NodeInfo};
 pub use crate::liquidity::LSPS1OrderStatus;
 pub use crate::logger::{LogLevel, LogRecord, LogWriter};
 pub use crate::payment::UnifiedPaymentResult;

src/graph.rs

@@ -20,6 +20,7 @@ use lightning::routing::gossip::{ChannelInfo, NodeInfo};
 use crate::types::Graph;
 
 /// Represents the network as nodes and channels between them.
+#[cfg_attr(feature = "uniffi", derive(uniffi::Object))]
 pub struct NetworkGraph {
 	inner: Arc<Graph>,
 }
@@ -28,7 +29,10 @@ impl NetworkGraph {
 	pub(crate) fn new(inner: Arc<Graph>) -> Self {
 		Self { inner }
 	}
+}
 
+#[cfg_attr(feature = "uniffi", uniffi::export)]
+impl NetworkGraph {
 	/// Returns the list of channels in the graph
 	pub fn list_channels(&self) -> Vec<u64> {
 		self.inner.read_only().channels().unordered_keys().map(|c| *c).collect()

src/liquidity.rs

@@ -1451,6 +1451,7 @@ pub(crate) struct LSPS2BuyResponse {
 /// [`Node::lsps1_liquidity`]: crate::Node::lsps1_liquidity
 /// [`Bolt11Payment::receive_via_jit_channel`]: crate::payment::Bolt11Payment::receive_via_jit_channel
 #[derive(Clone)]
+#[cfg_attr(feature = "uniffi", derive(uniffi::Object))]
 pub struct LSPS1Liquidity {
 	runtime: Arc<Runtime>,
 	wallet: Arc<Wallet>,
@@ -1467,7 +1468,10 @@ impl LSPS1Liquidity {
 	) -> Self {
 		Self { runtime, wallet, connection_manager, liquidity_source, logger }
 	}
+}
 
+#[cfg_attr(feature = "uniffi", uniffi::export)]
+impl LSPS1Liquidity {
 	/// Connects to the configured LSP and places an order for an inbound channel.
 	///
 	/// The channel will be opened after one of the returned payment options has successfully been