refactor: use TxIn type from bitcoin-ffi

bitcoindevkit · Oct 18, 2024 · 3207943 · 3207943
1 parent ed2aadf
commit 3207943
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 33 deletions.
diff --git a/bdk-ffi/Cargo.lock b/bdk-ffi/Cargo.lock
diff --git a/bdk-ffi/Cargo.toml b/bdk-ffi/Cargo.toml
@@ -22,7 +22,9 @@ bdk_wallet = { version = "=1.0.0-beta.5", features = ["all-keys", "keys-bip39",
 bdk_core = { version = "0.3.0" }
 bdk_esplora = { version = "0.19.0", default-features = false, features = ["std", "blocking", "blocking-https-rustls"] }
 bdk_electrum = { version = "0.19.0", default-features = false, features = ["use-rustls-ring"] }
-bitcoin-ffi = { git = "https://github.com/bitcoindevkit/bitcoin-ffi", tag = "v0.1.2" }
+bitcoin-ffi = { git = "https://github.com/bitcoindevkit/bitcoin-ffi", ref = "165f910f560a51545f93b3eab496cc92ad210aa8" }
+#bitcoin-ffi = { path = "../../bitcoin-ffi" }
+#bitcoin-ffi = { git = "https://github.com/bitcoindevkit/bitcoin-ffi", tag = "v0.1.2" }
 
 uniffi = { version = "=0.28.0" }
 thiserror = "1.0.58"

diff --git a/bdk-ffi/src/bdk.udl b/bdk-ffi/src/bdk.udl
@@ -714,12 +714,7 @@ interface Psbt {
   string json_serialize();
 };
 
-dictionary TxIn {
-  OutPoint previous_output;
-  Script script_sig;
-  u32 sequence;
-  sequence<sequence<u8>> witness;
-};
+
 
 // ------------------------------------------------------------------------
 // types defined in external crate bitcoin-ffi
@@ -743,6 +738,9 @@ typedef extern Txid;
 [External="bitcoin_ffi"]
 typedef extern OutPoint;
 
+[External="bitcoin_ffi"]
+typedef extern TxIn;
+
 [ExternalInterface="bitcoin_ffi"]
 typedef extern FeeRateError;
 

diff --git a/bdk-ffi/src/bitcoin.rs b/bdk-ffi/src/bitcoin.rs
@@ -2,8 +2,8 @@ use crate::error::{
     AddressParseError, FromScriptError, PsbtError, PsbtParseError, TransactionError,
 };
 
-use bitcoin_ffi::OutPoint;
 use bitcoin_ffi::Script;
+use bitcoin_ffi::TxIn;
 
 use bdk_wallet::bitcoin::address::{NetworkChecked, NetworkUnchecked};
 use bdk_wallet::bitcoin::consensus::encode::serialize;
@@ -14,7 +14,6 @@ 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::serde_json;
 
@@ -200,28 +199,6 @@ impl From<BdkPsbt> for Psbt {
     }
 }
 
-#[derive(Debug, Clone)]
-pub struct TxIn {
-    pub previous_output: OutPoint,
-    pub script_sig: Arc<Script>,
-    pub sequence: u32,
-    pub witness: Vec<Vec<u8>>,
-}
-
-impl From<&BdkTxIn> for TxIn {
-    fn from(tx_in: &BdkTxIn) -> Self {
-        TxIn {
-            previous_output: OutPoint {
-                txid: tx_in.previous_output.txid,
-                vout: tx_in.previous_output.vout,
-            },
-            script_sig: Arc::new(Script(tx_in.script_sig.clone())),
-            sequence: tx_in.sequence.0,
-            witness: tx_in.witness.to_vec(),
-        }
-    }
-}
-
 #[derive(Debug, Clone)]
 pub struct TxOut {
     pub value: u64,

diff --git a/bdk-ffi/src/lib.rs b/bdk-ffi/src/lib.rs
@@ -12,7 +12,6 @@ mod wallet;
 use crate::bitcoin::Address;
 use crate::bitcoin::Psbt;
 use crate::bitcoin::Transaction;
-use crate::bitcoin::TxIn;
 use crate::bitcoin::TxOut;
 use crate::descriptor::Descriptor;
 use crate::electrum::ElectrumClient;
@@ -70,6 +69,7 @@ use bitcoin_ffi::FeeRate;
 use bitcoin_ffi::Network;
 use bitcoin_ffi::OutPoint;
 use bitcoin_ffi::Script;
+use bitcoin_ffi::TxIn;
 
 use bdk_wallet::keys::bip39::WordCount;
 use bdk_wallet::tx_builder::ChangeSpendPolicy;