diff --git a/crates/wallet/src/types.rs b/crates/wallet/src/types.rs index 0370e55d..6ed17b57 100644 --- a/crates/wallet/src/types.rs +++ b/crates/wallet/src/types.rs @@ -13,7 +13,7 @@ use alloc::boxed::Box; use core::convert::AsRef; use bdk_chain::ConfirmationTime; -use bitcoin::blockdata::transaction::{OutPoint, Sequence, TxOut}; +use bitcoin::transaction::{OutPoint, Sequence, TxOut}; use bitcoin::{psbt, Weight}; use serde::{Deserialize, Serialize}; diff --git a/crates/wallet/src/wallet/mod.rs b/crates/wallet/src/wallet/mod.rs index 71fb39f7..9fa9e530 100644 --- a/crates/wallet/src/wallet/mod.rs +++ b/crates/wallet/src/wallet/mod.rs @@ -2530,7 +2530,7 @@ fn create_signers( #[doc(hidden)] macro_rules! floating_rate { ($rate:expr) => {{ - use $crate::bitcoin::blockdata::constants::WITNESS_SCALE_FACTOR; + use $crate::bitcoin::constants::WITNESS_SCALE_FACTOR; // sat_kwu / 250.0 -> sat_vb $rate.to_sat_per_kwu() as f64 / ((1000 / WITNESS_SCALE_FACTOR) as f64) }}; diff --git a/crates/wallet/tests/wallet.rs b/crates/wallet/tests/wallet.rs index 5b8d3abd..1f8aa451 100644 --- a/crates/wallet/tests/wallet.rs +++ b/crates/wallet/tests/wallet.rs @@ -201,8 +201,7 @@ fn new_or_load() -> anyhow::Result<()> { // wrong genesis hash { let exp_blockhash = BlockHash::all_zeros(); - let got_blockhash = - bitcoin::blockdata::constants::genesis_block(Network::Testnet).block_hash(); + let got_blockhash = bitcoin::constants::genesis_block(Network::Testnet).block_hash(); let db = &mut new_or_load(&file_path).expect("must open db"); let changeset = read(db)?; diff --git a/nursery/tmp_plan/src/lib.rs b/nursery/tmp_plan/src/lib.rs index d39a7fe6..08c28d84 100644 --- a/nursery/tmp_plan/src/lib.rs +++ b/nursery/tmp_plan/src/lib.rs @@ -18,11 +18,11 @@ use bdk_chain::{bitcoin, collections::*, miniscript}; use bitcoin::{ absolute, bip32::{DerivationPath, Fingerprint, KeySource}, - blockdata::transaction::Sequence, ecdsa, hashes::{hash160, ripemd160, sha256}, secp256k1::Secp256k1, taproot::{self, LeafVersion, TapLeafHash}, + transaction::Sequence, ScriptBuf, TxIn, Witness, WitnessVersion, }; use miniscript::{