Migrate policy-related types to procedural macros

bdk-ffi/src/bdk.udl

@@ -312,33 +312,9 @@ interface ChangeSet {};
 // bdk_wallet crate - wallet module
 // ------------------------------------------------------------------------
 
-interface Policy {
-  string id();
-
-  string as_string();
-
-  boolean requires_path();
-
-  SatisfiableItem item();
-
-  Satisfaction satisfaction();
-
-  Satisfaction contribution();
-};
+typedef interface Policy;
 
-[Enum]
-interface SatisfiableItem {
-  EcdsaSignature(PkOrF key);
-  SchnorrSignature(PkOrF key);
-  Sha256Preimage(string hash);
-  Hash256Preimage(string hash);
-  Ripemd160Preimage(string hash);
-  Hash160Preimage(string hash);
-  AbsoluteTimelock(LockTime value);
-  RelativeTimelock(u32 value);
-  Multisig(sequence<PkOrF> keys, u64 threshold);
-  Thresh(sequence<Policy> items, u64 threshold);
-};
+typedef enum SatisfiableItem;
 
 [Enum]
 interface PkOrF {
@@ -353,13 +329,7 @@ interface LockTime {
   Seconds(u32 consensus_time);
 };
 
-[Enum]
-interface Satisfaction {
-    Partial(u64 n, u64 m, sequence<u64> items, boolean? sorted, record<u32, sequence<Condition>> conditions);
-    PartialComplete(u64 n, u64 m, sequence<u64> items, boolean? sorted, record<sequence<u32>, sequence<Condition>> conditions);
-    Complete(Condition condition);
-    None(string msg);
-};
+typedef enum Satisfaction;
 
 typedef record Condition;
 

bdk-ffi/src/lib.rs

@@ -32,15 +32,11 @@ use crate::error::PsbtFinalizeError;
 use crate::error::PsbtParseError;
 use crate::error::RequestBuilderError;
 use crate::error::TransactionError;
-use crate::types::Condition;
 use crate::types::FullScanRequest;
 use crate::types::FullScanRequestBuilder;
 use crate::types::FullScanScriptInspector;
 use crate::types::LockTime;
 use crate::types::PkOrF;
-use crate::types::Policy;
-use crate::types::Satisfaction;
-use crate::types::SatisfiableItem;
 use crate::types::SyncRequest;
 use crate::types::SyncRequestBuilder;
 use crate::types::SyncScriptInspector;

bdk-ffi/src/types.rs

@@ -335,12 +335,13 @@ pub struct KeychainAndIndex {
 }
 
 /// Descriptor spending policy
-#[derive(Debug, PartialEq, Eq, Clone)]
+#[derive(Debug, PartialEq, Eq, Clone, uniffi::Object)]
 pub struct Policy(BdkPolicy);
 
 impl_from_core_type!(BdkPolicy, Policy);
 impl_into_core_type!(Policy, BdkPolicy);
 
+#[uniffi::export]
 impl Policy {
     pub fn id(&self) -> String {
         self.0.id.clone()
@@ -367,7 +368,7 @@ impl Policy {
     }
 }
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, uniffi::Enum)]
 pub enum SatisfiableItem {
     EcdsaSignature {
         key: PkOrF,
@@ -500,7 +501,7 @@ impl TryFrom<&LockTime> for BdkLockTime {
     }
 }
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, uniffi::Enum)]
 pub enum Satisfaction {
     Partial {
         n: u64,