Added finalize

clippy map to OtherPsbtErr otherwise uniffi is giving a warning clippy
bitcoindevkit · Sep 14, 2024 · 9fb72e0 · 9fb72e0
1 parent 014504e
commit 9fb72e0
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/bdk-ffi/src/bdk.udl b/bdk-ffi/src/bdk.udl
@@ -685,6 +685,9 @@ interface Psbt {
   [Throws=PsbtError]
   Psbt combine(Psbt other);
 
+  [Throws=PsbtError]
+  Psbt finalize();
+
   string json_serialize();
 };
 

diff --git a/bdk-ffi/src/bitcoin.rs b/bdk-ffi/src/bitcoin.rs
@@ -11,12 +11,14 @@ use bdk_wallet::bitcoin::consensus::encode::serialize;
 use bdk_wallet::bitcoin::consensus::Decodable;
 use bdk_wallet::bitcoin::io::Cursor;
 use bdk_wallet::bitcoin::psbt::ExtractTxError;
+use bdk_wallet::bitcoin::secp256k1::Secp256k1;
 use bdk_wallet::bitcoin::Address as BdkAddress;
 use bdk_wallet::bitcoin::Network;
 use bdk_wallet::bitcoin::Psbt as BdkPsbt;
 use bdk_wallet::bitcoin::Transaction as BdkTransaction;
 use bdk_wallet::bitcoin::TxIn as BdkTxIn;
 use bdk_wallet::bitcoin::TxOut as BdkTxOut;
+use bdk_wallet::miniscript::psbt::PsbtExt as MiniscriptPsbtExt;
 
 use std::fmt::Display;
 use std::ops::Deref;
@@ -166,6 +168,15 @@ impl Psbt {
         psbt.to_string()
     }
 
+    pub(crate) fn finalize(&self) -> Result<Arc<Psbt>, PsbtError> {
+        let secp = Secp256k1::new();
+        let result = self.0.lock().unwrap().clone().finalize(&secp);
+        match result {
+            Ok(psbt) => Ok(Arc::new(Psbt::from(psbt))),
+            Err((_psbt, _errors)) => Err(PsbtError::OtherPsbtErr),
+        }
+    }
+
     pub(crate) fn extract_tx(&self) -> Result<Arc<Transaction>, ExtractTxError> {
         let tx: BdkTransaction = self.0.lock().unwrap().clone().extract_tx()?;
         let transaction: Transaction = tx.into();