Upgrade uniffi dependency to v0.29.5

We here upgrade to `uniffi` v0.29.5. This upgrade requires a few
changes and workarounds, in particular `UniffiCustomTypeConverter` are
gone and replaced with corresponding macros. We also had to find
workarounds for remote enum interface definitions, and discovered that
`uniffi` lost the ability to use remote trait interfaces.

The latter therefore requires us to add some duplicative code as we
added a local copy of `VssHeaderProvider`/`VssHeaderProviderError` and
used an adaptor to make it work for the bindings side of the builder.

Author: tnull

Cargo.toml

@@ -70,11 +70,12 @@ tokio = { version = "1.37", default-features = false, features = [ "rt-multi-thr
 esplora-client = { version = "0.12", default-features = false, features = ["tokio", "async-https-rustls"] }
 electrum-client = { version = "0.24.0", default-features = false, features = ["proxy", "use-rustls-ring"] }
 libc = "0.2"
-uniffi = { version = "0.28.3", features = ["build"], optional = true }
+uniffi = { version = "0.29.5", features = ["build"], optional = true }
 serde = { version = "1.0.210", default-features = false, features = ["std", "derive"] }
 serde_json = { version = "1.0.128", default-features = false, features = ["std"] }
 log = { version = "0.4.22", default-features = false, features = ["std"]}
 
+async-trait = { version = "0.1", default-features = false }
 vss-client = { package = "vss-client-ng", version = "0.5" }
 prost = { version = "0.11.6", default-features = false}
 #bitcoin-payment-instructions = { version = "0.6" }
@@ -106,7 +107,7 @@ lnd_grpc_rust = { version = "2.10.0", default-features = false }
 tokio = { version = "1.37", features = ["fs"] }
 
 [build-dependencies]
-uniffi = { version = "0.28.3", features = ["build"], optional = true }
+uniffi = { version = "0.29.5", features = ["build"], optional = true }
 
 [profile.release]
 panic = "abort"

bindings/ldk_node.udl

@@ -79,6 +79,7 @@ enum WordCount {
 	"Words24",
 };
 
+[Remote]
 enum LogLevel {
 	"Gossip",
 	"Trace",
@@ -281,6 +282,7 @@ interface OnchainPayment {
 	Txid bump_fee_rbf(PaymentId payment_id, FeeRate? fee_rate);
 };
 
+[Remote]
 interface FeeRate {
 	[Name=from_sat_per_kwu]
 	constructor(u64 sat_kwu);
@@ -377,6 +379,7 @@ dictionary NodeStatus {
 	u64? latest_node_announcement_broadcast_timestamp;
 };
 
+[Remote]
 dictionary BestBlock {
 	BlockHash block_hash;
 	u32 height;
@@ -400,35 +403,21 @@ enum BuildError {
 	"AsyncPaymentsConfigMismatch",
 };
 
-[Trait]
+[Trait, WithForeign]
 interface VssHeaderProvider {
 	[Async, Throws=VssHeaderProviderError]
-	record<string, string> get_headers([ByRef]sequence<u8> request);
+	record<string, string> get_headers(sequence<u8> request);
 };
 
 [Error]
-enum VssHeaderProviderError {
-	"InvalidData",
-	"RequestError",
-	"AuthorizationError",
-	"InternalError",
-};
-
-[Enum]
-interface Event {
-	PaymentSuccessful(PaymentId? payment_id, PaymentHash payment_hash, PaymentPreimage? payment_preimage, u64? fee_paid_msat);
-	PaymentFailed(PaymentId? payment_id, PaymentHash? payment_hash, PaymentFailureReason? reason);
-	PaymentReceived(PaymentId? payment_id, PaymentHash payment_hash, u64 amount_msat, sequence<CustomTlvRecord> custom_records);
-	PaymentClaimable(PaymentId payment_id, PaymentHash payment_hash, u64 claimable_amount_msat, u32? claim_deadline, sequence<CustomTlvRecord> custom_records);
-	PaymentForwarded(ChannelId prev_channel_id, ChannelId next_channel_id, UserChannelId?
-	prev_user_channel_id, UserChannelId? next_user_channel_id, PublicKey? prev_node_id, PublicKey? next_node_id, u64? total_fee_earned_msat, u64? skimmed_fee_msat, boolean claim_from_onchain_tx, u64? outbound_amount_forwarded_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, PublicKey? counterparty_node_id, OutPoint? funding_txo);
-	ChannelClosed(ChannelId channel_id, UserChannelId user_channel_id, PublicKey? counterparty_node_id, ClosureReason? reason);
-	SplicePending(ChannelId channel_id, UserChannelId user_channel_id, PublicKey counterparty_node_id, OutPoint new_funding_txo);
-	SpliceFailed(ChannelId channel_id, UserChannelId user_channel_id, PublicKey counterparty_node_id, OutPoint? abandoned_funding_txo);
+interface VssHeaderProviderError {
+	InvalidData(string error);
+	RequestError(string error);
+	AuthorizationError(string error);
+	InternalError(string error);
 };
 
+[Remote]
 enum PaymentFailureReason {
 	"RecipientRejected",
 	"UserAbandoned",
@@ -442,25 +431,6 @@ enum PaymentFailureReason {
 	"BlindedPathCreationFailed",
 };
 
-[Enum]
-interface ClosureReason {
-	CounterpartyForceClosed(UntrustedString peer_msg);
-	HolderForceClosed(boolean? broadcasted_latest_txn, string message);
-	LegacyCooperativeClosure();
-	CounterpartyInitiatedCooperativeClosure();
-	LocallyInitiatedCooperativeClosure();
-	CommitmentTxConfirmed();
-	FundingTimedOut();
-	ProcessingError(string err);
-	DisconnectedPeer();
-	OutdatedChannelManager();
-	CounterpartyCoopClosedUnfundedChannel();
-	LocallyCoopClosedUnfundedChannel();
-	FundingBatchClosure();
-	HTLCsTimedOut( PaymentHash? payment_hash );
-	PeerFeerateTooLow(u32 peer_feerate_sat_per_kw, u32 required_feerate_sat_per_kw);
-};
-
 [Enum]
 interface PaymentKind {
 	Onchain(Txid txid, ConfirmationStatus status);
@@ -510,6 +480,7 @@ dictionary PaymentDetails {
 	u64 latest_update_timestamp;
 };
 
+[Remote]
 dictionary RouteParametersConfig {
 	u64? max_total_routing_fee_msat;
 	u32 max_total_cltv_expiry_delta;
@@ -522,13 +493,15 @@ dictionary CustomTlvRecord {
 	sequence<u8> value;
 };
 
+[Remote]
 dictionary LSPS1OrderStatus {
 	LSPS1OrderId order_id;
 	LSPS1OrderParams order_params;
 	LSPS1PaymentInfo payment_options;
 	LSPS1ChannelInfo? channel_state;
 };
 
+[Remote]
 dictionary LSPS1OrderParams {
 	u64 lsp_balance_sat;
 	u64 client_balance_sat;
@@ -563,26 +536,29 @@ dictionary LSPS1OnchainPaymentInfo {
 	Address? refund_onchain_address;
 };
 
+[Remote]
 dictionary LSPS1ChannelInfo {
 	LSPSDateTime funded_at;
 	OutPoint funding_outpoint;
 	LSPSDateTime expires_at;
 };
 
+[Remote]
 enum LSPS1PaymentState {
 	"ExpectPayment",
 	"Paid",
 	"Refunded",
 };
 
-[NonExhaustive]
+[Remote, NonExhaustive]
 enum Network {
 	"Bitcoin",
 	"Testnet",
 	"Signet",
 	"Regtest",
 };
 
+[Remote]
 dictionary OutPoint {
 	Txid txid;
 	u32 vout;
@@ -679,6 +655,7 @@ interface LightningBalance {
 	);
 };
 
+[Remote]
 enum BalanceSource {
 	"HolderForceClosed",
 	"CounterpartyForceClosed",
@@ -741,6 +718,7 @@ dictionary ChannelUpdateInfo {
 	RoutingFees fees;
 };
 
+[Remote]
 dictionary RoutingFees {
 	u32 base_msat;
 	u32 proportional_millionths;
@@ -757,6 +735,7 @@ dictionary NodeAnnouncementInfo {
 	sequence<SocketAddress> addresses;
 };
 
+[Remote]
 enum Currency {
 	"Bitcoin",
 	"BitcoinTestnet",
@@ -929,3 +908,6 @@ typedef string LSPSDateTime;
 
 [Custom]
 typedef string ScriptBuf;
+
+typedef interface ClosureReason;
+typedef enum Event;

bindings/uniffi-bindgen/Cargo.toml

@@ -6,4 +6,4 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-uniffi = { version = "0.28.3", features = ["cli"] }
+uniffi = { version = "0.29.5", features = ["cli"] }

src/builder.rs

@@ -1026,17 +1026,13 @@ impl ArcedNodeBuilder {
 	/// [VSS]: https://github.com/lightningdevkit/vss-server/blob/main/README.md
 	pub fn build_with_vss_store_and_header_provider(
 		&self, node_entropy: Arc<NodeEntropy>, vss_url: String, store_id: String,
-		header_provider: Arc<dyn VssHeaderProvider>,
+		header_provider: Arc<dyn crate::ffi::VssHeaderProvider>,
 	) -> Result<Arc<Node>, BuildError> {
+		let adapter = Arc::new(crate::ffi::VssHeaderProviderAdapter::new(header_provider));
 		self.inner
 			.read()
 			.unwrap()
-			.build_with_vss_store_and_header_provider(
-				*node_entropy,
-				vss_url,
-				store_id,
-				header_provider,
-			)
+			.build_with_vss_store_and_header_provider(*node_entropy, vss_url, store_id, adapter)
 			.map(Arc::new)
 	}
 

src/event.rs

@@ -60,6 +60,7 @@ use crate::{
 ///
 /// [`Node`]: [`crate::Node`]
 #[derive(Debug, Clone, PartialEq, Eq)]
+#[cfg_attr(feature = "uniffi", derive(uniffi::Enum))]
 pub enum Event {
 	/// A sent payment was successful.
 	PaymentSuccessful {