feat: expose TxBuilder::current_height

bitcoindevkit · Nov 15, 2024 · 0ac8dce · 0ac8dce
1 parent e06f2a9
commit 0ac8dce
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/bdk-ffi/src/bdk.udl b/bdk-ffi/src/bdk.udl
@@ -486,6 +486,8 @@ interface BumpFeeTxBuilder {
 
   BumpFeeTxBuilder set_exact_sequence(u32 nsequence);
 
+  TxBuilder current_height(u32 height);
+
   [Throws=CreateTxError]
   Psbt finish([ByRef] Wallet wallet);
 };

diff --git a/bdk-ffi/src/tx_builder.rs b/bdk-ffi/src/tx_builder.rs
@@ -31,6 +31,7 @@ pub struct TxBuilder {
     pub(crate) drain_to: Option<BdkScriptBuf>,
     pub(crate) sequence: Option<u32>,
     pub(crate) data: Vec<u8>,
+    pub(crate) current_height: Option<u32>,
 }
 
 impl TxBuilder {
@@ -48,6 +49,7 @@ impl TxBuilder {
             drain_to: None,
             sequence: None,
             data: Vec::new(),
+            current_height: None,
         }
     }
 
@@ -178,6 +180,13 @@ impl TxBuilder {
         })
     }
 
+    pub(crate) fn current_height(&self, height: u32) -> Arc<Self> {
+        Arc::new(TxBuilder {
+            current_height: Some(height),
+            ..self.clone()
+        })
+    }
+
     pub(crate) fn finish(&self, wallet: &Arc<Wallet>) -> Result<Arc<Psbt>, CreateTxError> {
         // TODO: I had to change the wallet here to be mutable. Why is that now required with the 1.0 API?
         let mut wallet = wallet.get_wallet();
@@ -220,6 +229,9 @@ impl TxBuilder {
             let push_bytes = PushBytesBuf::try_from(self.data.clone())?;
             tx_builder.add_data(&push_bytes);
         }
+        if let Some(height) = self.current_height {
+            tx_builder.current_height(height);
+        }
 
         let psbt = tx_builder.finish().map_err(CreateTxError::from)?;
 
@@ -232,6 +244,7 @@ pub(crate) struct BumpFeeTxBuilder {
     pub(crate) txid: String,
     pub(crate) fee_rate: Arc<FeeRate>,
     pub(crate) sequence: Option<u32>,
+    pub(crate) current_height: Option<u32>,
 }
 
 impl BumpFeeTxBuilder {
@@ -240,6 +253,7 @@ impl BumpFeeTxBuilder {
             txid,
             fee_rate,
             sequence: None,
+            current_height: None,
         }
     }
 
@@ -250,6 +264,13 @@ impl BumpFeeTxBuilder {
         })
     }
 
+    pub(crate) fn current_height(&self, height: u32) -> Arc<Self> {
+        Arc::new(BumpFeeTxBuilder {
+            current_height: Some(height),
+            ..self.clone()
+        })
+    }
+
     pub(crate) fn finish(&self, wallet: &Arc<Wallet>) -> Result<Arc<Psbt>, CreateTxError> {
         let txid = Txid::from_str(self.txid.as_str()).map_err(|_| CreateTxError::UnknownUtxo {
             outpoint: self.txid.clone(),
@@ -260,6 +281,9 @@ impl BumpFeeTxBuilder {
         if let Some(sequence) = self.sequence {
             tx_builder.set_exact_sequence(Sequence(sequence));
         }
+        if let Some(height) = self.current_height {
+            tx_builder.current_height(height);
+        }
 
         let psbt: BdkPsbt = tx_builder.finish()?;