Migrate FFI-only types and remaining types to UniFFI proc-macro export

Migrate `Bolt11InvoiceDescription`, `OfferAmount`, `UnifiedPaymentResult`,
`RouteHintHop`, `LogRecord`, `LSPS1PaymentInfo`, `LSPS1Bolt11PaymentInfo`,
`LSPS1OnchainPaymentInfo`, `ChannelInfo`, `ChannelUpdateInfo`, `NodeInfo`,
`NodeAnnouncementInfo`, and `VssHeaderProviderError` from UDL definitions
to proc-macro derives.

Co-Authored-By: HAL 9000

Author: tnull

bindings/ldk_node.udl

@@ -40,15 +40,7 @@ enum LogLevel {
 	"Error",
 };
 
-dictionary LogRecord {
-	LogLevel level;
-	string args;
-	string module_path;
-	u32 line;
-	PublicKey? peer_id;
-	ChannelId? channel_id;
-	PaymentHash? payment_hash;
-};
+typedef dictionary LogRecord;
 
 [Trait, WithForeign]
 interface LogWriter {
@@ -151,11 +143,7 @@ interface Node {
 	bytes export_pathfinding_scores();
 };
 
-[Enum]
-interface Bolt11InvoiceDescription {
-	Hash(string hash);
-	Direct(string description);
-};
+typedef enum Bolt11InvoiceDescription;
 
 interface Bolt11Payment {
 	[Throws=NodeError]
@@ -335,13 +323,7 @@ interface VssHeaderProvider {
 	record<string, string> get_headers(sequence<u8> request);
 };
 
-[Error]
-interface VssHeaderProviderError {
-	InvalidData(string error);
-	RequestError(string error);
-	AuthorizationError(string error);
-	InternalError(string error);
-};
+typedef enum VssHeaderProviderError;
 
 [Remote]
 enum PaymentFailureReason {
@@ -359,12 +341,7 @@ enum PaymentFailureReason {
 
 typedef enum PaymentKind;
 
-[Enum]
-interface UnifiedPaymentResult {
-	Onchain(Txid txid);
-	Bolt11(PaymentId payment_id);
-	Bolt12(PaymentId payment_id);
-};
+typedef enum UnifiedPaymentResult;
 
 typedef enum PaymentDirection;
 
@@ -405,29 +382,11 @@ dictionary LSPS1OrderParams {
 	boolean announce_channel;
 };
 
-dictionary LSPS1PaymentInfo {
-	LSPS1Bolt11PaymentInfo? bolt11;
-	LSPS1OnchainPaymentInfo? onchain;
-};
+typedef dictionary LSPS1PaymentInfo;
 
-dictionary LSPS1Bolt11PaymentInfo {
-	LSPS1PaymentState state;
-	LSPSDateTime expires_at;
-	u64 fee_total_sat;
-	u64 order_total_sat;
-	Bolt11Invoice invoice;
-};
+typedef dictionary LSPS1Bolt11PaymentInfo;
 
-dictionary LSPS1OnchainPaymentInfo {
-	LSPS1PaymentState state;
-	LSPSDateTime expires_at;
-	u64 fee_total_sat;
-	u64 order_total_sat;
-	Address address;
-	u16? min_onchain_payment_confirmations;
-	FeeRate min_fee_for_0conf;
-	Address? refund_onchain_address;
-};
+typedef dictionary LSPS1OnchainPaymentInfo;
 
 [Remote]
 dictionary LSPS1ChannelInfo {
@@ -486,39 +445,19 @@ interface NetworkGraph {
 	NodeInfo? node([ByRef]NodeId node_id);
 };
 
-dictionary ChannelInfo {
-	NodeId node_one;
-	ChannelUpdateInfo? one_to_two;
-	NodeId node_two;
-	ChannelUpdateInfo? two_to_one;
-	u64? capacity_sats;
-};
+typedef dictionary ChannelInfo;
 
-dictionary ChannelUpdateInfo {
-	u32 last_update;
-	boolean enabled;
-	u16 cltv_expiry_delta;
-	u64 htlc_minimum_msat;
-	u64 htlc_maximum_msat;
-	RoutingFees fees;
-};
+typedef dictionary ChannelUpdateInfo;
 
 [Remote]
 dictionary RoutingFees {
 	u32 base_msat;
 	u32 proportional_millionths;
 };
 
-dictionary NodeInfo {
-	sequence<u64> channels;
-	NodeAnnouncementInfo? announcement_info;
-};
+typedef dictionary NodeInfo;
 
-dictionary NodeAnnouncementInfo {
-	u32 last_update;
-	string alias;
-	sequence<SocketAddress> addresses;
-};
+typedef dictionary NodeAnnouncementInfo;
 
 [Remote]
 enum Currency {
@@ -531,14 +470,7 @@ enum Currency {
 
 typedef enum AsyncPaymentsRole;
 
-dictionary RouteHintHop {
-	PublicKey src_node_id;
-	u64 short_channel_id;
-	u16 cltv_expiry_delta;
-	u64? htlc_minimum_msat;
-	u64? htlc_maximum_msat;
-	RoutingFees fees;
-};
+typedef dictionary RouteHintHop;
 
 [Traits=(Debug, Display, Eq)]
 interface Bolt11Invoice {
@@ -562,11 +494,7 @@ interface Bolt11Invoice {
 	PublicKey recover_payee_pub_key();
 };
 
-[Enum]
-interface OfferAmount {
-	Bitcoin(u64 amount_msats);
-	Currency(string iso4217_code, u64 amount);
-};
+typedef enum OfferAmount;
 
 [Traits=(Debug, Display, Eq)]
 interface Offer {

src/ffi/types.rs

@@ -47,7 +47,7 @@ use vss_client::headers::VssHeaderProvider as VssClientHeaderProvider;
 use vss_client::headers::VssHeaderProviderError as VssClientHeaderProviderError;
 
 /// Errors around providing headers for each VSS request.
-#[derive(Debug)]
+#[derive(Debug, uniffi::Error)]
 pub enum VssHeaderProviderError {
 	/// Invalid data was encountered.
 	InvalidData {
@@ -141,7 +141,7 @@ use crate::builder::sanitize_alias;
 pub use crate::config::{default_config, ElectrumSyncConfig, EsploraSyncConfig};
 pub use crate::entropy::{generate_entropy_mnemonic, EntropyError, NodeEntropy, WordCount};
 use crate::error::Error;
-pub use crate::graph::{ChannelInfo, ChannelUpdateInfo, NodeAnnouncementInfo, NodeInfo};
+pub use crate::graph::{ChannelInfo, NodeInfo};
 pub use crate::liquidity::LSPS1OrderStatus;
 pub use crate::logger::{LogLevel, LogRecord, LogWriter};
 pub use crate::payment::UnifiedPaymentResult;
@@ -203,7 +203,7 @@ uniffi::custom_type!(ScriptBuf, String, {
 	},
 });
 
-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Debug, Clone, PartialEq, Eq, uniffi::Enum)]
 pub enum OfferAmount {
 	Bitcoin { amount_msats: u64 },
 	Currency { iso4217_code: String, amount: u64 },
@@ -933,7 +933,7 @@ uniffi::custom_type!(NodeAlias, String, {
 
 /// Represents the description of an invoice which has to be either a directly included string or
 /// a hash of a description provided out of band.
-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Debug, Clone, PartialEq, Eq, uniffi::Enum)]
 pub enum Bolt11InvoiceDescription {
 	/// Contains a full description.
 	Direct {
@@ -1026,7 +1026,7 @@ impl From<lightning_invoice::Currency> for Currency {
 ///
 /// While this generally comes from BOLT 11's `r` field, this struct includes more fields than are
 /// available in BOLT 11.
-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Debug, Clone, PartialEq, Eq, uniffi::Record)]
 pub struct RouteHintHop {
 	/// The node_id of the non-target end of the route
 	pub src_node_id: PublicKey,
@@ -1198,7 +1198,7 @@ impl std::fmt::Display for Bolt11Invoice {
 	}
 }
 
-#[derive(Clone, Debug, PartialEq, Eq)]
+#[derive(Clone, Debug, PartialEq, Eq, uniffi::Record)]
 pub struct LSPS1PaymentInfo {
 	/// A Lightning payment using BOLT 11.
 	pub bolt11: Option<crate::ffi::LSPS1Bolt11PaymentInfo>,
@@ -1218,7 +1218,7 @@ impl From<lightning_liquidity::lsps1::msgs::LSPS1PaymentInfo> for LSPS1PaymentIn
 
 /// An onchain payment.
 #[cfg(feature = "uniffi")]
-#[derive(Clone, Debug, PartialEq, Eq)]
+#[derive(Clone, Debug, PartialEq, Eq, uniffi::Record)]
 pub struct LSPS1OnchainPaymentInfo {
 	/// Indicates the current state of the payment.
 	pub state: lightning_liquidity::lsps1::msgs::LSPS1PaymentState,
@@ -1257,7 +1257,7 @@ impl From<lightning_liquidity::lsps1::msgs::LSPS1OnchainPaymentInfo> for LSPS1On
 	}
 }
 /// A Lightning payment using BOLT 11.
-#[derive(Clone, Debug, PartialEq, Eq)]
+#[derive(Clone, Debug, PartialEq, Eq, uniffi::Record)]
 pub struct LSPS1Bolt11PaymentInfo {
 	/// Indicates the current state of the payment.
 	pub state: LSPS1PaymentState,

src/graph.rs

@@ -56,7 +56,7 @@ impl NetworkGraph {
 ///
 /// This is a simplified version of LDK's `ChannelInfo` for bindings.
 #[cfg(feature = "uniffi")]
-#[derive(Clone, Debug, PartialEq, Eq)]
+#[derive(Clone, Debug, PartialEq, Eq, uniffi::Record)]
 pub struct ChannelInfo {
 	/// Source node of the first direction of a channel
 	pub node_one: NodeId,
@@ -87,7 +87,7 @@ impl From<lightning::routing::gossip::ChannelInfo> for ChannelInfo {
 ///
 /// This is a simplified version of LDK's `ChannelUpdateInfo` for bindings.
 #[cfg(feature = "uniffi")]
-#[derive(Clone, Debug, PartialEq, Eq)]
+#[derive(Clone, Debug, PartialEq, Eq, uniffi::Record)]
 pub struct ChannelUpdateInfo {
 	/// When the last update to the channel direction was issued.
 	/// Value is opaque, as set in the announcement.
@@ -122,7 +122,7 @@ impl From<lightning::routing::gossip::ChannelUpdateInfo> for ChannelUpdateInfo {
 ///
 /// This is a simplified version of LDK's `NodeInfo` for bindings.
 #[cfg(feature = "uniffi")]
-#[derive(Clone, Debug, PartialEq, Eq)]
+#[derive(Clone, Debug, PartialEq, Eq, uniffi::Record)]
 pub struct NodeInfo {
 	/// All valid channels a node has announced
 	pub channels: Vec<u64>,
@@ -146,7 +146,7 @@ impl From<lightning::routing::gossip::NodeInfo> for NodeInfo {
 ///
 /// This is a simplified version of LDK's `NodeAnnouncementInfo` for bindings.
 #[cfg(feature = "uniffi")]
-#[derive(Clone, Debug, PartialEq, Eq)]
+#[derive(Clone, Debug, PartialEq, Eq, uniffi::Record)]
 pub struct NodeAnnouncementInfo {
 	/// When the last known update to the node state was issued.
 	/// Value is opaque, as set in the announcement.

src/logger.rs

@@ -101,6 +101,7 @@ impl fmt::Display for LogContext<'_> {
 /// It is similar to the non-`uniffi` version, but it omits the lifetime parameter
 /// for the `LogRecord`, as the Uniffi-exposed interface cannot handle lifetimes.
 #[cfg(feature = "uniffi")]
+#[derive(uniffi::Record)]
 pub struct LogRecord {
 	/// The verbosity level of the message.
 	pub level: LogLevel,

src/payment/unified.rs

@@ -296,6 +296,7 @@ impl UnifiedPayment {
 /// [`PaymentId`]: lightning::ln::channelmanager::PaymentId
 /// [`Txid`]: bitcoin::hash_types::Txid
 #[derive(Debug)]
+#[cfg_attr(feature = "uniffi", derive(uniffi::Enum))]
 pub enum UnifiedPaymentResult {
 	/// An on-chain payment.
 	Onchain {