WIP

Author: tnull

bindings/ldk_node.udl

@@ -414,21 +414,6 @@ enum VssHeaderProviderError {
 	"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);
-};
-
 [Remote]
 enum PaymentFailureReason {
 	"RecipientRejected",
@@ -443,25 +428,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);
@@ -939,3 +905,6 @@ typedef string LSPSDateTime;
 
 [Custom]
 typedef string ScriptBuf;
+
+typedef interface ClosureReason;
+typedef enum Event;

src/event.rs

@@ -58,6 +58,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 {

src/ffi/types.rs

@@ -1215,6 +1215,43 @@ uniffi::custom_type!(LSPSDateTime, String, {
 	},
 });
 
+/// The reason the channel was closed. See individual variants for more details.
+#[uniffi::remote(Enum)]
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub enum ClosureReason {
+	CounterpartyForceClosed {
+		peer_msg: UntrustedString,
+	},
+	HolderForceClosed {
+		broadcasted_latest_txn: Option<bool>,
+		message: String,
+	},
+	LegacyCooperativeClosure,
+	CounterpartyInitiatedCooperativeClosure,
+	LocallyInitiatedCooperativeClosure,
+	CommitmentTxConfirmed,
+	FundingTimedOut,
+	ProcessingError {
+		err: String,
+	},
+	DisconnectedPeer,
+	OutdatedChannelManager,
+	CounterpartyCoopClosedUnfundedChannel,
+	LocallyCoopClosedUnfundedChannel,
+	FundingBatchClosure,
+	HTLCsTimedOut {
+		payment_hash: Option<PaymentHash>,
+	},
+	PeerFeerateTooLow {
+		/// The feerate on our channel set by our peer.
+		peer_feerate_sat_per_kw: u32,
+		/// The required feerate we enforce, from our [`FeeEstimator`].
+		///
+		/// [`FeeEstimator`]: crate::chain::chaininterface::FeeEstimator
+		required_feerate_sat_per_kw: u32,
+	},
+}
+
 #[cfg(test)]
 mod tests {
 	use std::num::NonZeroU64;