chore: update for bdk_wallet 3.1.0 API changes

    - bump bdk_wallet to 3.1.0
    - replace Network with NetworkKind
    - replace TxBuilder::include_output_redeem_witness_script with TxBuilder::add_global_xpubs

diff --git a/Cargo.lock b/Cargo.lock
index 420c1bd3b65d9c36443b40629036375ef7bcb781..915b4ba1faaac80f16f121c9fa490fa94026619d 100644 (file)
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -255,7 +255,7 @@ dependencies = [
  "bdk_redb",
  "bdk_sp",
  "bdk_testenv",
- "bdk_wallet 2.4.0",
+ "bdk_wallet",
  "bitcoin-payment-instructions",
  "clap",
  "clap_complete",
@@ -342,7 +342,7 @@ version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "346c1d502ee4613cf2201db9c3b93a2317772d8eaa372114f34bf5f374be94fd"
 dependencies = [
- "bdk_wallet 2.4.0",
+ "bdk_wallet",
  "bip157",
 ]
 
@@ -351,16 +351,6 @@ name = "bdk_message_signer"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b2e0c999b3dcc448ceb6337658c363df3197bbed987b663810497bd9c20ea4ef"
-dependencies = [
- "bdk_wallet 3.1.0",
- "bitcoin",
-]
-
-[[package]]
-name = "bdk_redb"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2e0c999b3dcc448ceb6337658c363df3197bbed987b663810497bd9c20ea4ef"
 dependencies = [
  "bdk_wallet",
  "bitcoin",
@@ -373,7 +363,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "69ac8b88c9594c615fcb5b763e7afa16937e94f7a7f5ca334bf59a7fee69fea1"
 dependencies = [
  "bdk_chain",
- "bdk_wallet 2.4.0",
+ "bdk_wallet",
  "ciborium",
  "redb",
  "thiserror 2.0.18",
@@ -412,20 +402,6 @@ dependencies = [
  "serde_json",
 ]
 
-[[package]]
-name = "bdk_wallet"
-version = "3.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1284fb23acc3e3022673712b55f4d5ce7e38aadc2c49bbef830dc3935f0a3289"
-dependencies = [
- "bdk_chain",
- "bitcoin",
- "miniscript",
- "rand_core 0.6.4",
- "serde",
- "serde_json",
-]
-
 [[package]]
 name = "bech32"
 version = "0.11.1"

diff --git a/src/handlers/offline.rs b/src/handlers/offline.rs
index 8cb5eca2d35255daa5b94d3978f4e7f5613bfa53..fe4097e42f49cfba456cc1c905b0daba48114b7c 100644 (file)
--- a/src/handlers/offline.rs
+++ b/src/handlers/offline.rs
@@ -32,7 +32,7 @@ use {
 use {
     crate::utils::parse_signature_format,
     crate::utils::types::MessageResult,
-    bdk_message_signer::{MessageSigner, MessageProof},
+    bdk_message_signer::{MessageProof, MessageSigner},
 };
 
 impl OfflineWalletSubCommand {

diff --git a/src/utils/common.rs b/src/utils/common.rs
index 0300109791ff9590ae6a76744460ad229efb5b05..136c9873bebd4902bdfd17051a751abe6d1bd091 100644 (file)
--- a/src/utils/common.rs
+++ b/src/utils/common.rs
@@ -1,8 +1,8 @@
 use crate::{commands::WalletOpts, config::WalletConfig, error::BDKCliError as Error};
-#[cfg(feature = "message_signer")]
-use bdk_message_signer::SignatureFormat;
 #[cfg(feature = "cbf")]
 use bdk_kyoto::{Info, Receiver, UnboundedReceiver, Warning};
+#[cfg(feature = "message_signer")]
+use bdk_message_signer::SignatureFormat;
 #[cfg(feature = "silent-payments")]
 use bdk_sp::encoding::SilentPaymentCode;
 use bdk_wallet::bitcoin::{Address, Network, OutPoint, ScriptBuf};

diff --git a/tests/integration/offline.rs b/tests/integration/offline.rs
index f19f623c0baf286112c8cd79dd174d3618289d84..780761a01396eeb79e65e4c01e6f18b9c8f8ced6 100644 (file)
--- a/tests/integration/offline.rs
+++ b/tests/integration/offline.rs
@@ -151,7 +151,7 @@ mod test_offline {
         .stderr(predicate::str::contains("Invalid"));
     }
 
-    #[cfg(feature = "bip322")]
+    #[cfg(feature = "message_signer")]
     #[test]
     fn test_sign_message_and_verify_message() {
         let (cli, mut cmd_init) = setup_wallet_config();
@@ -216,7 +216,7 @@ mod test_offline {
         .stdout(predicate::str::contains("\"valid\": true"));
     }
 
-    #[cfg(feature = "bip322")]
+    #[cfg(feature = "message_signer")]
     #[test]
     fn test_verify_message_rejects_tampered_message() {
         let (cli, mut cmd_init) = setup_wallet_config();

diff --git a/tests/integration/online.rs b/tests/integration/online.rs
index e6d7108fa12147a678a063cb5b3e8001fa237141..2e63e216c4a3bafeea3a8e5af5f88935cc73d658 100644 (file)
--- a/tests/integration/online.rs
+++ b/tests/integration/online.rs
@@ -814,7 +814,7 @@ mod test_online {
         }
     }
 
-    #[cfg(feature = "bip322")]
+    #[cfg(feature = "message_signer")]
     #[test]
     fn test_verify_message_proof_of_funds_uses_persisted_utxos() {
         let env = TestEnv::new().expect("Failed to start bdk_testenv");