From: Steve Myers <steve@notmandatory.org>
Date: Mon, 12 Aug 2024 22:26:33 +0000 (-0500)
Subject: fix(example_cli): add bitcoin and rand dependencies
X-Git-Tag: v1.0.0-beta.2~8^2~1
X-Git-Url: http://internal-gitweb-vhost/script/%22https:/struct.EncoderStringWriter.html?a=commitdiff_plain;h=1adf63cd3bce77b2a6bc2edebf5f54c2d8a191d7;p=bdk

fix(example_cli): add bitcoin and rand dependencies

The bitcoin and rand dependencies are required to build examples
independently and not from the top level bdk workspace.
---

diff --git a/example-crates/example_cli/Cargo.toml b/example-crates/example_cli/Cargo.toml
index 9b8c4deb..09f093eb 100644
--- a/example-crates/example_cli/Cargo.toml
+++ b/example-crates/example_cli/Cargo.toml
@@ -9,8 +9,10 @@ edition = "2021"
 bdk_chain = { path = "../../crates/chain", features = ["serde", "miniscript"]}
 bdk_coin_select = "0.3.0"
 bdk_file_store = { path = "../../crates/file_store" }
+bitcoin = { version = "0.32.0", features = ["base64"], default-features = false }
 
 anyhow = "1"
 clap = { version = "3.2.23", features = ["derive", "env"] }
+rand = "0.8"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1.0"
diff --git a/example-crates/example_cli/src/lib.rs b/example-crates/example_cli/src/lib.rs
index ee0c9b37..393f9d3f 100644
--- a/example-crates/example_cli/src/lib.rs
+++ b/example-crates/example_cli/src/lib.rs
@@ -10,14 +10,9 @@ use std::sync::Mutex;
 use anyhow::bail;
 use anyhow::Context;
 use bdk_chain::bitcoin::{
-    absolute,
-    address::NetworkUnchecked,
-    bip32, consensus, constants,
-    hex::DisplayHex,
-    relative,
-    secp256k1::{rand::prelude::*, Secp256k1},
-    transaction, Address, Amount, Network, NetworkKind, PrivateKey, Psbt, PublicKey, Sequence,
-    Transaction, TxIn, TxOut,
+    absolute, address::NetworkUnchecked, bip32, consensus, constants, hex::DisplayHex, relative,
+    secp256k1::Secp256k1, transaction, Address, Amount, Network, NetworkKind, PrivateKey, Psbt,
+    PublicKey, Sequence, Transaction, TxIn, TxOut,
 };
 use bdk_chain::miniscript::{
     descriptor::{DescriptorSecretKey, SinglePubKey},
@@ -37,6 +32,7 @@ use bdk_coin_select::{
 };
 use bdk_file_store::Store;
 use clap::{Parser, Subcommand};
+use rand::prelude::*;
 
 pub use anyhow;
 pub use clap;
@@ -675,7 +671,7 @@ pub fn handle_commands<CS: clap::Subcommand, S: clap::Args>(
                 Ok(())
             }
             PsbtCmd::Sign { psbt, descriptor } => {
-                let mut psbt = Psbt::from_str(&psbt.unwrap_or_default())?;
+                let mut psbt = Psbt::from_str(psbt.unwrap_or_default().as_str())?;
 
                 let desc_str = match descriptor {
                     Some(s) => s,
@@ -717,7 +713,7 @@ pub fn handle_commands<CS: clap::Subcommand, S: clap::Args>(
                 chain_specific,
                 psbt,
             } => {
-                let mut psbt = Psbt::from_str(&psbt)?;
+                let mut psbt = Psbt::from_str(psbt.as_str())?;
                 psbt.finalize_mut(&Secp256k1::new())
                     .map_err(|errors| anyhow::anyhow!("failed to finalize PSBT {errors:?}"))?;