feat: migrate FeeRate to procedural macros

Author: thunderbiscuit

bdk-ffi/src/bdk.udl

@@ -1469,19 +1469,7 @@ interface Amount {
   f64 to_btc();
 };
 
-interface FeeRate {
-  [Name=from_sat_per_vb, Throws=FeeRateError]
-  constructor(u64 sat_per_vb);
-
-  [Name=from_sat_per_kwu]
-  constructor(u64 sat_per_kwu);
-
-  u64 to_sat_per_vb_ceil();
-
-  u64 to_sat_per_vb_floor();
-
-  u64 to_sat_per_kwu();
-};
+typedef interface FeeRate;
 
 dictionary OutPoint {
   string txid;

bdk-ffi/src/bitcoin.rs

@@ -54,20 +54,27 @@ impl From<OutPoint> for BdkOutPoint {
     }
 }
 
-#[derive(Clone, Debug)]
+/// Represents fee rate.
+///
+/// This is an integer type representing fee rate in sat/kwu. It provides protection against mixing
+/// up the types as well as basic formatting features.
+#[derive(Clone, Debug, uniffi::Object)]
 pub struct FeeRate(pub BdkFeeRate);
 
+#[uniffi::export]
 impl FeeRate {
-    pub fn from_sat_per_vb(sat_per_vb: u64) -> Result<Self, FeeRateError> {
-        let fee_rate: Option<BdkFeeRate> = BdkFeeRate::from_sat_per_vb(sat_per_vb);
+    #[uniffi::constructor]
+    pub fn from_sat_per_vb(sat_vb: u64) -> Result<Self, FeeRateError> {
+        let fee_rate: Option<BdkFeeRate> = BdkFeeRate::from_sat_per_vb(sat_vb);
         match fee_rate {
             Some(fee_rate) => Ok(FeeRate(fee_rate)),
             None => Err(FeeRateError::ArithmeticOverflow),
         }
     }
 
-    pub fn from_sat_per_kwu(sat_per_kwu: u64) -> Self {
-        FeeRate(BdkFeeRate::from_sat_per_kwu(sat_per_kwu))
+    #[uniffi::constructor]
+    pub fn from_sat_per_kwu(sat_kwu: u64) -> Self {
+        FeeRate(BdkFeeRate::from_sat_per_kwu(sat_kwu))
     }
 
     pub fn to_sat_per_vb_ceil(&self) -> u64 {

bdk-swift/Tests/BitcoinDevKitTests/LiveTxBuilderTests.swift

@@ -61,7 +61,7 @@ final class LiveTxBuilderTests: XCTestCase {
         let recipient: Address = try Address(address: "tb1qrnfslnrve9uncz9pzpvf83k3ukz22ljgees989", network: .signet)
         let psbt: Psbt = try TxBuilder()
             .addRecipient(script: recipient.scriptPubkey(), amount: Amount.fromSat(fromSat: 4200))
-            .feeRate(feeRate: FeeRate.fromSatPerVb(satPerVb: 2))
+            .feeRate(feeRate: FeeRate.fromSatPerVb(satVb: 2))
             .finish(wallet: wallet)
 
         print(psbt.serialize())
@@ -109,7 +109,7 @@ final class LiveTxBuilderTests: XCTestCase {
 
         let psbt: Psbt = try TxBuilder()
             .setRecipients(recipients: allRecipients)
-            .feeRate(feeRate: FeeRate.fromSatPerVb(satPerVb: 4))
+            .feeRate(feeRate: FeeRate.fromSatPerVb(satVb: 4))
             .finish(wallet: wallet)
 
         let _ = try! wallet.sign(psbt: psbt)

bdk-swift/Tests/BitcoinDevKitTests/LiveWalletTests.swift

@@ -98,7 +98,7 @@ final class LiveWalletTests: XCTestCase {
         let psbt: Psbt = try
             TxBuilder()
             .addRecipient(script: recipient.scriptPubkey(), amount: Amount.fromSat(fromSat: 4200))
-                .feeRate(feeRate: FeeRate.fromSatPerVb(satPerVb: 2))
+                .feeRate(feeRate: FeeRate.fromSatPerVb(satVb: 2))
                 .finish(wallet: wallet)
 
         print(psbt.serialize())