Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,12 @@ lightning-macros = { git = "https://github.com/lightningdevkit/rust-lightning",
bdk_chain = { version = "0.23.0", default-features = false, features = ["std"] }
bdk_esplora = { version = "0.22.0", default-features = false, features = ["async-https-rustls", "tokio"]}
bdk_electrum = { version = "0.23.0", default-features = false, features = ["use-rustls-ring"]}
bdk_wallet = { version = "2.0.0", default-features = false, features = ["std", "keys-bip39"]}
bdk_wallet = { version = "2.2.0", default-features = false, features = ["std", "keys-bip39"]}

reqwest = { version = "0.12", default-features = false, features = ["json", "rustls-tls"] }
rustls = { version = "0.23", default-features = false }
rusqlite = { version = "0.31.0", features = ["bundled"] }
bitcoin = "0.32.4"
bitcoin = "0.32.7"
bip39 = "2.0.0"
bip21 = { version = "0.5", features = ["std"], default-features = false }

Expand Down
2 changes: 2 additions & 0 deletions src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ use bdk_chain::bitcoin::psbt::ExtractTxError as BdkExtractTxError;
use bdk_chain::local_chain::CannotConnectError as BdkChainConnectionError;
use bdk_chain::tx_graph::CalculateFeeError as BdkChainCalculateFeeError;
use bdk_wallet::error::CreateTxError as BdkCreateTxError;
#[allow(deprecated)]
use bdk_wallet::signer::SignerError as BdkSignerError;

#[derive(Copy, Clone, Debug, PartialEq, Eq)]
Expand Down Expand Up @@ -207,6 +208,7 @@ impl fmt::Display for Error {

impl std::error::Error for Error {}

#[allow(deprecated)]
impl From<BdkSignerError> for Error {
fn from(_: BdkSignerError) -> Self {
Self::OnchainTxSigningFailed
Expand Down
8 changes: 7 additions & 1 deletion src/wallet/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ use std::str::FromStr;
use std::sync::{Arc, Mutex};

use bdk_chain::spk_client::{FullScanRequest, SyncRequest};
use bdk_wallet::{Balance, KeychainKind, PersistedWallet, SignOptions, Update};
#[allow(deprecated)]
use bdk_wallet::SignOptions;
use bdk_wallet::{Balance, KeychainKind, PersistedWallet, Update};
use bitcoin::address::NetworkUnchecked;
use bitcoin::blockdata::constants::WITNESS_SCALE_FACTOR;
use bitcoin::blockdata::locktime::absolute::LockTime;
Expand Down Expand Up @@ -222,6 +224,7 @@ impl Wallet {
Ok(())
}

#[allow(deprecated)]
pub(crate) fn create_funding_transaction(
&self, output_script: ScriptBuf, amount: Amount, confirmation_target: ConfirmationTarget,
locktime: LockTime,
Expand Down Expand Up @@ -338,6 +341,7 @@ impl Wallet {
.map_err(|_| Error::InvalidAddress)
}

#[allow(deprecated)]
pub(crate) fn send_to_address(
&self, address: &bitcoin::Address, send_amount: OnchainSendAmount,
fee_rate: Option<FeeRate>,
Expand Down Expand Up @@ -647,6 +651,7 @@ impl Wallet {
Ok(utxos)
}

#[allow(deprecated)]
fn get_change_script_inner(&self) -> Result<ScriptBuf, ()> {
let mut locked_wallet = self.inner.lock().unwrap();
let mut locked_persister = self.persister.lock().unwrap();
Expand All @@ -659,6 +664,7 @@ impl Wallet {
Ok(address_info.address.script_pubkey())
}

#[allow(deprecated)]
fn sign_psbt_inner(&self, mut psbt: Psbt) -> Result<Transaction, ()> {
let locked_wallet = self.inner.lock().unwrap();

Expand Down
Loading