feat: bump bdk_wallet to 3.1.0

bdk-ffi/Cargo.toml

@@ -15,7 +15,7 @@ name = "uniffi-bindgen"
 path = "uniffi-bindgen.rs"
 
 [dependencies]
-bdk_wallet = { version = "=3.0.0", features = ["all-keys", "keys-bip39", "rusqlite"] }
+bdk_wallet = { version = "=3.1.0", features = ["all-keys", "keys-bip39", "rusqlite"] }
 bdk_esplora = { version = "0.22.2", default-features = false, features = ["std", "blocking", "blocking-https-rustls"] }
 bdk_electrum = { version = "0.24.0", default-features = false, features = ["use-rustls-ring"] }
 bdk_kyoto = { version = "0.17.0" }

bdk-ffi/src/tests/tx_builder.rs

@@ -1,13 +1,17 @@
-use crate::bitcoin::{Amount, Input, Network, NetworkKind, OutPoint, Script, TxOut};
+use crate::bitcoin::{Amount, Input, Network, NetworkKind, OutPoint, Script, Transaction, TxOut};
 use crate::descriptor::Descriptor;
-use crate::error::SighashParseError;
+use crate::error::{AddForeignUtxoError, SighashParseError};
 use crate::esplora::EsploraClient;
 use crate::store::Persister;
 use crate::tx_builder::TxBuilder;
 use crate::types::FullScanScriptInspector;
 use crate::wallet::Wallet;
 
 use bdk_wallet::bitcoin::hashes::hex::FromHex;
+use bdk_wallet::bitcoin::{
+    absolute, consensus::serialize, transaction, Amount as BdkAmount, ScriptBuf as BdkScriptBuf,
+    Transaction as BdkTransaction, TxIn as BdkTxIn, TxOut as BdkTxOut,
+};
 
 use std::collections::HashMap;
 use std::sync::Arc;
@@ -301,6 +305,94 @@ fn test_add_foreign_utxo_missing_witness_data() {
     );
 }
 
+#[test]
+fn test_add_foreign_utxo_validates_non_witness_utxo_when_witness_utxo_is_present() {
+    let outpoint = OutPoint {
+        txid: Arc::new(
+            crate::bitcoin::Txid::from_string(
+                "5df6e0e2761359d30a8275058e299fcc0381534545f55cf43e41983f5d4c9456".to_string(),
+            )
+            .unwrap(),
+        ),
+        vout: 0,
+    };
+
+    let witness_utxo = TxOut {
+        value: Arc::new(Amount::from_sat(50_000)),
+        script_pubkey: Arc::new(Script::new(
+            Vec::from_hex("0014d85c2b71d0060b09c9886aeb815e50991dda124d").unwrap(),
+        )),
+    };
+
+    let non_witness_tx = BdkTransaction {
+        version: transaction::Version::TWO,
+        lock_time: absolute::LockTime::ZERO,
+        input: vec![BdkTxIn::default()],
+        output: vec![BdkTxOut {
+            value: BdkAmount::from_sat(50_000),
+            script_pubkey: BdkScriptBuf::new(),
+        }],
+    };
+    let non_witness_utxo = Arc::new(Transaction::new(serialize(&non_witness_tx)).unwrap());
+
+    let psbt_input = Input {
+        non_witness_utxo: Some(non_witness_utxo.clone()),
+        witness_utxo: Some(witness_utxo.clone()),
+        partial_sigs: HashMap::new(),
+        sighash_type: None,
+        redeem_script: None,
+        witness_script: None,
+        bip32_derivation: HashMap::new(),
+        final_script_sig: None,
+        final_script_witness: None,
+        ripemd160_preimages: HashMap::new(),
+        sha256_preimages: HashMap::new(),
+        hash160_preimages: HashMap::new(),
+        hash256_preimages: HashMap::new(),
+        tap_key_sig: None,
+        tap_script_sigs: HashMap::new(),
+        tap_scripts: HashMap::new(),
+        tap_key_origins: HashMap::new(),
+        tap_internal_key: None,
+        tap_merkle_root: None,
+        proprietary: HashMap::new(),
+        unknown: HashMap::new(),
+    };
+
+    let result = TxBuilder::new().add_foreign_utxo(outpoint.clone(), psbt_input, 68);
+
+    assert!(matches!(result, Err(AddForeignUtxoError::InvalidTxid)));
+
+    let psbt_input_with_sequence = Input {
+        non_witness_utxo: Some(non_witness_utxo),
+        witness_utxo: Some(witness_utxo),
+        partial_sigs: HashMap::new(),
+        sighash_type: None,
+        redeem_script: None,
+        witness_script: None,
+        bip32_derivation: HashMap::new(),
+        final_script_sig: None,
+        final_script_witness: None,
+        ripemd160_preimages: HashMap::new(),
+        sha256_preimages: HashMap::new(),
+        hash160_preimages: HashMap::new(),
+        hash256_preimages: HashMap::new(),
+        tap_key_sig: None,
+        tap_script_sigs: HashMap::new(),
+        tap_scripts: HashMap::new(),
+        tap_key_origins: HashMap::new(),
+        tap_internal_key: None,
+        tap_merkle_root: None,
+        proprietary: HashMap::new(),
+        unknown: HashMap::new(),
+    };
+
+    let result =
+        TxBuilder::new().add_foreign_utxo_with_sequence(outpoint, psbt_input_with_sequence, 68, 0);
+
+    assert!(matches!(result, Err(AddForeignUtxoError::InvalidTxid)));
+}
+
 #[test]
 #[ignore = "requires live MutinyNet Esplora access"]
 fn test_add_foreign_utxo_with_witness_utxo_succeeds() {

bdk-ffi/src/tx_builder.rs

@@ -496,20 +496,17 @@ impl TxBuilder {
         let bdk_outpoint: BdkOutPoint = outpoint.into();
         let bdk_input: BdkInput = psbt_input.try_into()?;
 
-        if bdk_input.witness_utxo.is_none() {
-            match bdk_input.non_witness_utxo.as_ref() {
-                Some(tx) => {
-                    if tx.compute_txid() != bdk_outpoint.txid {
-                        return Err(AddForeignUtxoError::InvalidTxid);
-                    }
-                    if tx.output.len() <= bdk_outpoint.vout as usize {
-                        return Err(AddForeignUtxoError::InvalidOutpoint {
-                            outpoint: bdk_outpoint.to_string(),
-                        });
-                    }
-                }
-                None => return Err(AddForeignUtxoError::MissingUtxo),
+        if let Some(tx) = bdk_input.non_witness_utxo.as_ref() {
+            if tx.compute_txid() != bdk_outpoint.txid {
+                return Err(AddForeignUtxoError::InvalidTxid);
             }
+            if tx.output.len() <= bdk_outpoint.vout as usize {
+                return Err(AddForeignUtxoError::InvalidOutpoint {
+                    outpoint: bdk_outpoint.to_string(),
+                });
+            }
+        } else if bdk_input.witness_utxo.is_none() {
+            return Err(AddForeignUtxoError::MissingUtxo);
         }
 
         let bdk_weight = BdkWeight::from_wu(satisfaction_weight);
@@ -535,20 +532,17 @@ impl TxBuilder {
         let bdk_outpoint: BdkOutPoint = outpoint.into();
         let bdk_input: BdkInput = psbt_input.try_into()?;
 
-        if bdk_input.witness_utxo.is_none() {
-            match bdk_input.non_witness_utxo.as_ref() {
-                Some(tx) => {
-                    if tx.compute_txid() != bdk_outpoint.txid {
-                        return Err(AddForeignUtxoError::InvalidTxid);
-                    }
-                    if tx.output.len() <= bdk_outpoint.vout as usize {
-                        return Err(AddForeignUtxoError::InvalidOutpoint {
-                            outpoint: bdk_outpoint.to_string(),
-                        });
-                    }
-                }
-                None => return Err(AddForeignUtxoError::MissingUtxo),
+        if let Some(tx) = bdk_input.non_witness_utxo.as_ref() {
+            if tx.compute_txid() != bdk_outpoint.txid {
+                return Err(AddForeignUtxoError::InvalidTxid);
+            }
+            if tx.output.len() <= bdk_outpoint.vout as usize {
+                return Err(AddForeignUtxoError::InvalidOutpoint {
+                    outpoint: bdk_outpoint.to_string(),
+                });
             }
+        } else if bdk_input.witness_utxo.is_none() {
+            return Err(AddForeignUtxoError::MissingUtxo);
         }
 
         let bdk_weight = BdkWeight::from_wu(satisfaction_weight);