Merge #294: feat(utxo-locking)!: Add commands to lock, unlock and list locked UTXOs

7c2dfac feat(utxo-locking): Limit locking to known utxos (Vihiga Tyonum)
90270f7 fix(bip322): Re-enable bip322 feature (Vihiga Tyonum)
aba6c66 feat(utxo-locking): Add tests for utxo locking (Vihiga Tyonum)
d3dde30 fix(bip322): disable bip322 feature (Vihiga Tyonum)
242d4da feat(utxo-locking): Add wallet locking commands (Vihiga Tyonum)
205d46c feat(cbf): Update bdk_kyoto to v0.17.0 (Vihiga Tyonum)
d89a08d feat(wallet-3.1.0): Update Wallet to v3.1.0 (Vihiga Tyonum)
cbee8a0 fix(proxy_opts): add saving and reading proxy_opts (Vihiga Tyonum)
eec81e2 ref(verbose): Dropped `verbose` flag from tests (Vihiga Tyonum)
dfeb580 test(online): Add test transaction full cycle (Vihiga Tyonum)
ae0c32a test: Add integration tests for offline wallet ops (Vihiga Tyonum)
b8761bc test: Add wallets, descriptor, compile & config (Vihiga Tyonum)
38a709f test: Add helper fns & integration tests for key (Vihiga Tyonum)

Pull request description:

  <!-- You can erase any parts of this template not applicable to your Pull Request. -->

  ### Description
  <!-- Describe the purpose of this PR, what's being adding and/or fixed -->

  This PR updates the Wallet API to v3.1.0 and adds wallet subcommands to lock and unlock UTXOs.  Locked outpoints are excluded from coin selection, and the lock state is stored in the wallet. It also updates the `bdk_redb` to v0.2.0 and `bdk_kyoto` to v0.17.0.

  Fixes #293 and builds upon #289 and #278

  ### Notes to the reviewers

  <!-- In this section you can include notes directed to the reviewers, like explaining why some parts
  of the PR were done in a specific way -->

  ## Changelog notice

  <!-- Notice the release manager should include in the release tag message changelog -->
  <!-- See https://keepachangelog.com/en/1.0.0/ for examples -->
  - Update bdk_wallet to v3.1.0
  - Add wallet `lock_utxo` command
  - Add wallet `unlock_utxo` command
  - Add wallet `locked_uxtos` command
  - Update bdk_redb to v0.2.0
  - Update bdk_kyoto to v0.17.0
  - Replace `Network` enum with `NetworkKind`
  - Replace `include_output_redeem_witness_script` with `add_global_xpubs` in TxBuilder
  - Replace `submit_package` with `broadcast_random` for broadcasting transactions in KyotoClient

  ### Checklists

  #### All Submissions:

  * [x] I've signed all my commits
  * [x] I followed the [contribution guidelines](https://github.com/bitcoindevkit/bdk-cli/blob/master/CONTRIBUTING.md)
  * [x] I ran `cargo fmt` and `cargo clippy` before committing

  #### New Features:

  * [ ] I've added tests for the new feature
  * [ ] I've added docs for the new feature
  * [ ] I've updated `CHANGELOG.md`

Top commit has no ACKs.

Tree-SHA512: df9291a93f2231408981d5a90b6164a75e6ca4b6c73e5638fe1c18323ea2be1c1b485bddc86efbfc64620087238df19dcb5274272a1ea27cd8b5dac0f08e6b6b

Author: tvpeter

Cargo.lock

@@ -12,7 +12,7 @@ readme = "README.md"
 license = "MIT"
 
 [dependencies]
-bdk_wallet = { version = "2.4.0", features = ["rusqlite", "keys-bip39", "compiler", "std"] }
+bdk_wallet = { version = "3.1.0", features = ["rusqlite", "keys-bip39", "compiler", "std"] }
 clap = { version = "4.6", features = ["derive","env"] }
 clap_complete = "4.6"
 dirs = {  version = "6.0.0" }
@@ -32,14 +32,14 @@ tap = "1.0.1"
 bdk_bitcoind_rpc = { version = "0.22.0", features = ["std"], optional = true }
 bdk_electrum = { version = "0.24.0", optional = true }
 bdk_esplora = { version = "0.22.2", features = ["async-https", "tokio"], optional = true }
-bdk_kyoto = { version = "0.15.4", optional = true }
-bdk_redb = { version = "0.1.1", optional = true }
+bdk_kyoto = { version = "0.17.0", optional = true }
+bdk_redb = { version = "0.2.0", optional = true }
 bdk_sp = { version = "0.1.0", optional = true, git = "https://github.com/bitcoindevkit/bdk-sp", tag = "v0.1.0" }
 shlex = {  version = "1.3.0", optional = true }
 payjoin = { version = "0.25.0", features = ["v1", "v2", "io", "_test-utils"], optional = true}
 reqwest = { version = "0.13.2", default-features = false, features = ["rustls"], optional = true }
 url = { version = "2.5.8", optional = true }
-bdk_bip322 = { version = "0.1.0", optional = true }
+bdk_message_signer = { version = "0.2.0", optional = true }
 bitcoin-payment-instructions = { version = "0.7.0", optional = true}
 
 [features]
@@ -61,7 +61,7 @@ dns_payment = ["bitcoin-payment-instructions"]
 
 # Internal features
 _payjoin-dependencies = ["payjoin", "reqwest", "url", "sqlite"]
-bip322 = ["bdk_bip322"]
+bip322 = ["bdk_message_signer"]
 
 # Use this to consensus verify transactions at sync time
 verify = []
@@ -74,7 +74,6 @@ compiler = []
 silent-payments = ["dep:bdk_sp"]
 
 [dev-dependencies]
-claims = "0.8.0"
 predicates = "3.0"
 tempfile = "3.8"
 assert_cmd = "2.2.2"

Cargo.toml

@@ -23,10 +23,7 @@ use {
 };
 
 #[cfg(feature = "cbf")]
-use {
-    crate::utils::trace_logger,
-    bdk_kyoto::{BuilderExt, LightClient},
-};
+use {crate::utils::trace_logger, bdk_kyoto::BuilderExt};
 
 #[cfg(any(
     feature = "electrum",
@@ -101,14 +98,10 @@ impl BlockchainClient {
             #[cfg(feature = "cbf")]
             Self::KyotoClient { client } => {
                 let txid = tx.compute_txid();
-                let wtxid = client
-                    .requester
-                    .broadcast_random(tx.clone())
-                    .await
-                    .map_err(|_| {
-                        tracing::warn!("Broadcast was unsuccessful");
-                        Error::Generic("Transaction broadcast timed out after 30 seconds".into())
-                    })?;
+                let wtxid = client.requester.submit_package(tx).await.map_err(|_| {
+                    tracing::warn!("Broadcast was unsuccessful");
+                    Error::Generic("Transaction broadcast timed out after 30 seconds".into())
+                })?;
                 tracing::info!("Successfully broadcast WTXID: {wtxid}");
                 Ok(txid)
             }
@@ -205,7 +198,8 @@ impl BlockchainClient {
 #[cfg(feature = "cbf")]
 pub struct KyotoClientHandle {
     pub requester: bdk_kyoto::Requester,
-    pub update_subscriber: tokio::sync::Mutex<bdk_kyoto::UpdateSubscriber>,
+    pub update_subscriber:
+        tokio::sync::Mutex<bdk_kyoto::UpdateSubscriber<bdk_kyoto::wallets::Single>>,
 }
 
 #[cfg(any(
@@ -267,21 +261,16 @@ pub(crate) fn new_blockchain_client(
                 .data_dir(&_datadir)
                 .build_with_wallet(_wallet, scan_type)?;
 
-            let LightClient {
-                requester,
-                info_subscriber,
-                warning_subscriber,
-                update_subscriber,
-                node,
-            } = light_client;
+            let (client, logging, update_subscriber) = light_client.subscribe();
+            // `start()` spawns the node's run loop on a tokio task internally.
+            let requester = client.start().requester();
 
             let subscriber = tracing_subscriber::FmtSubscriber::new();
             let _ = tracing::subscriber::set_global_default(subscriber);
 
-            tokio::task::spawn(async move { node.run().await });
-            tokio::task::spawn(
-                async move { trace_logger(info_subscriber, warning_subscriber).await },
-            );
+            tokio::task::spawn(async move {
+                trace_logger(logging.info_subscriber, logging.warning_subscriber).await
+            });
 
             BlockchainClient::KyotoClient {
                 client: Box::new(KyotoClientHandle {