From a604d94a1cd2ea3c5414a5537d19cf8fa7511196 Mon Sep 17 00:00:00 2001 From: Leonardo Lima Date: Mon, 23 Mar 2026 19:21:14 -0300 Subject: [PATCH 1/2] fix(ci): pin `clap` to `4.5.17` --- ci/pin-msrv.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/pin-msrv.sh b/ci/pin-msrv.sh index 6cb0b4f4..4131ef95 100755 --- a/ci/pin-msrv.sh +++ b/ci/pin-msrv.sh @@ -10,6 +10,7 @@ set -euo pipefail # cargo clean # rustup override set 1.63.0 +cargo update -p clap --precise "4.5.17" cargo update -p once_cell --precise "1.20.3" cargo update -p syn --precise "2.0.106" cargo update -p quote --precise "1.0.41" From 77964fb1507e748b3e9c2c8452b66e0f04ce14e1 Mon Sep 17 00:00:00 2001 From: Steve Myers Date: Wed, 25 Mar 2026 10:32:26 -0500 Subject: [PATCH 2/2] Revert "chore: deprecate `wallet::signer` mod" This reverts commit 4c4e0b19e5f8f1754ca8c627e147f6c3166741d0. --- examples/example_wallet_electrum/src/main.rs | 1 - examples/example_wallet_esplora_async/src/main.rs | 1 - examples/example_wallet_esplora_blocking/src/main.rs | 1 - wallet/examples/policy.rs | 1 - wallet/src/lib.rs | 1 - wallet/src/wallet/mod.rs | 4 ---- wallet/tests/add_foreign_utxo.rs | 1 - wallet/tests/persisted_wallet.rs | 1 - wallet/tests/psbt.rs | 1 - wallet/tests/wallet.rs | 1 - wallet/tests/wallet_event.rs | 1 - 11 files changed, 14 deletions(-) diff --git a/examples/example_wallet_electrum/src/main.rs b/examples/example_wallet_electrum/src/main.rs index e6532f04..f431873d 100644 --- a/examples/example_wallet_electrum/src/main.rs +++ b/examples/example_wallet_electrum/src/main.rs @@ -1,4 +1,3 @@ -#![allow(deprecated)] use bdk_electrum::electrum_client; use bdk_electrum::BdkElectrumClient; use bdk_wallet::bitcoin::Amount; diff --git a/examples/example_wallet_esplora_async/src/main.rs b/examples/example_wallet_esplora_async/src/main.rs index 49cbcc96..a852c3e2 100644 --- a/examples/example_wallet_esplora_async/src/main.rs +++ b/examples/example_wallet_esplora_async/src/main.rs @@ -1,4 +1,3 @@ -#![allow(deprecated)] use anyhow::Ok; use bdk_esplora::{esplora_client, EsploraAsyncExt}; use bdk_wallet::{ diff --git a/examples/example_wallet_esplora_blocking/src/main.rs b/examples/example_wallet_esplora_blocking/src/main.rs index 262ce403..45e9201e 100644 --- a/examples/example_wallet_esplora_blocking/src/main.rs +++ b/examples/example_wallet_esplora_blocking/src/main.rs @@ -1,4 +1,3 @@ -#![allow(deprecated)] use bdk_esplora::{esplora_client, EsploraExt}; use bdk_wallet::rusqlite::Connection; use bdk_wallet::{ diff --git a/wallet/examples/policy.rs b/wallet/examples/policy.rs index ae274955..969ff2db 100644 --- a/wallet/examples/policy.rs +++ b/wallet/examples/policy.rs @@ -9,7 +9,6 @@ // You may not use this file except in accordance with one or both of these // licenses. -#![allow(deprecated)] extern crate bdk_wallet; use std::error::Error; diff --git a/wallet/src/lib.rs b/wallet/src/lib.rs index 2f1248ab..d54eac92 100644 --- a/wallet/src/lib.rs +++ b/wallet/src/lib.rs @@ -6,7 +6,6 @@ doc(html_logo_url = "https://github.com/bitcoindevkit/bdk/raw/master/static/bdk.png") )] #![no_std] -#![allow(deprecated)] // Signers are being removed. #![warn(missing_docs)] #![allow(clippy::uninlined_format_args)] diff --git a/wallet/src/wallet/mod.rs b/wallet/src/wallet/mod.rs index 617c4536..031b2252 100644 --- a/wallet/src/wallet/mod.rs +++ b/wallet/src/wallet/mod.rs @@ -57,10 +57,6 @@ pub mod export; pub mod migration; mod params; mod persisted; -#[deprecated( - since = "2.2.0", - note = "PSBT signing was moved to `bitcoin::psbt` module" -)] pub mod signer; pub mod tx_builder; pub(crate) mod utils; diff --git a/wallet/tests/add_foreign_utxo.rs b/wallet/tests/add_foreign_utxo.rs index 1346b1f9..1dd0a8c9 100644 --- a/wallet/tests/add_foreign_utxo.rs +++ b/wallet/tests/add_foreign_utxo.rs @@ -1,4 +1,3 @@ -#![allow(deprecated)] use std::str::FromStr; use bdk_wallet::psbt::PsbtUtils; diff --git a/wallet/tests/persisted_wallet.rs b/wallet/tests/persisted_wallet.rs index 8be3ca43..062beee7 100644 --- a/wallet/tests/persisted_wallet.rs +++ b/wallet/tests/persisted_wallet.rs @@ -1,4 +1,3 @@ -#![allow(deprecated)] use std::collections::{BTreeMap, BTreeSet}; use std::path::Path; diff --git a/wallet/tests/psbt.rs b/wallet/tests/psbt.rs index 69dda6da..08c4acc9 100644 --- a/wallet/tests/psbt.rs +++ b/wallet/tests/psbt.rs @@ -1,4 +1,3 @@ -#![allow(deprecated)] use bdk_wallet::bitcoin::{Amount, FeeRate, Psbt, TxIn}; use bdk_wallet::test_utils::*; use bdk_wallet::{psbt, KeychainKind, SignOptions}; diff --git a/wallet/tests/wallet.rs b/wallet/tests/wallet.rs index 04e42595..c779c0a4 100644 --- a/wallet/tests/wallet.rs +++ b/wallet/tests/wallet.rs @@ -1,4 +1,3 @@ -#![allow(deprecated)] use std::str::FromStr; use std::sync::Arc; diff --git a/wallet/tests/wallet_event.rs b/wallet/tests/wallet_event.rs index 82828880..e6c948ff 100644 --- a/wallet/tests/wallet_event.rs +++ b/wallet/tests/wallet_event.rs @@ -1,4 +1,3 @@ -#![allow(deprecated)] use bdk_chain::{BlockId, CheckPoint, ConfirmationBlockTime}; use bdk_wallet::event::WalletEvent; use bdk_wallet::test_utils::{get_test_wpkh_and_change_desc, new_wallet_and_funding_update};