wip(fix(examples)): update to use Psbt::sign

- updates `example_wallet_{electrum|esplora}` examples to use the
  `SignerWrapper` implementation from test utilities through
`test-utils` feature.
- update examples to parse the used descriptors into a `KeyMap`, and
  using `SignerWrapper` to sign the transaction with `Psbt::sign`
method, it still uses the `Wallet::finalize_psbt` though.

Author: oleonardolima

examples/example_wallet_electrum/Cargo.toml

@@ -4,6 +4,6 @@ version = "0.2.0"
 edition = "2021"
 
 [dependencies]
-bdk_wallet = { path = "../../wallet", features = ["file_store"] }
+bdk_wallet = { path = "../../wallet", features = ["file_store", "test-utils"] }
 bdk_electrum = { version = "0.22.0" }
 anyhow = "1"

examples/example_wallet_electrum/src/main.rs

@@ -1,4 +1,6 @@
+use bdk_wallet::bitcoin::key::Secp256k1;
 use bdk_wallet::file_store::Store;
+use bdk_wallet::miniscript::Descriptor;
 use bdk_wallet::Wallet;
 use std::io::Write;
 
@@ -85,7 +87,18 @@ fn main() -> Result<(), anyhow::Error> {
     tx_builder.add_recipient(address.script_pubkey(), SEND_AMOUNT);
 
     let mut psbt = tx_builder.finish()?;
-    let finalized = wallet.sign(&mut psbt, SignOptions::default())?;
+
+    let secp = Secp256k1::new();
+
+    let (_, external_keymap) = Descriptor::parse_descriptor(&secp, EXTERNAL_DESC)?;
+    let (_, internal_keymap) = Descriptor::parse_descriptor(&secp, INTERNAL_DESC)?;
+    let key_map = external_keymap.into_iter().chain(internal_keymap).collect();
+
+    // It's using the signer implementation from `test_utils`, you should implement your own signing implementation for `KeyMap`.
+    let signer = bdk_wallet::test_utils::SignerWrapper::new(key_map);
+    let _ = psbt.sign(&signer, &secp);
+
+    let finalized = wallet.finalize_psbt(&mut psbt, SignOptions::default())?;
     assert!(finalized);
 
     let tx = psbt.extract_tx()?;

examples/example_wallet_esplora_async/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-bdk_wallet = { path = "../../wallet", features = ["rusqlite"] }
+bdk_wallet = { path = "../../wallet", features = ["rusqlite", "test-utils"] }
 bdk_esplora = { version = "0.21.0", features = ["async-https", "tokio"] }
 tokio = { version = "1.38.1", features = ["rt", "rt-multi-thread", "macros"] }
 anyhow = "1"

examples/example_wallet_esplora_async/src/main.rs

@@ -3,9 +3,7 @@ use std::{collections::BTreeSet, io::Write};
 use anyhow::Ok;
 use bdk_esplora::{esplora_client, EsploraAsyncExt};
 use bdk_wallet::{
-    bitcoin::{Amount, Network},
-    rusqlite::Connection,
-    KeychainKind, SignOptions, Wallet,
+    bitcoin::{Amount, Network}, miniscript::Descriptor, rusqlite::Connection, KeychainKind, SignOptions, Wallet
 };
 
 const SEND_AMOUNT: Amount = Amount::from_sat(5000);
@@ -80,7 +78,18 @@ async fn main() -> Result<(), anyhow::Error> {
     tx_builder.add_recipient(address.script_pubkey(), SEND_AMOUNT);
 
     let mut psbt = tx_builder.finish()?;
-    let finalized = wallet.sign(&mut psbt, SignOptions::default())?;
+
+    let secp = bdk_wallet::bitcoin::key::Secp256k1::new();
+
+    let (_, external_keymap) = Descriptor::parse_descriptor(&secp, EXTERNAL_DESC)?;
+    let (_, internal_keymap) = Descriptor::parse_descriptor(&secp, INTERNAL_DESC)?;
+    let key_map = external_keymap.into_iter().chain(internal_keymap).collect();
+
+    // It's using the signer implementation from `test_utils`, you should implement your own signing implementation for `KeyMap`.
+    let signer = bdk_wallet::test_utils::SignerWrapper::new(key_map);
+    let _ = psbt.sign(&signer, &secp);
+
+    let finalized = wallet.finalize_psbt(&mut psbt, SignOptions::default())?;
     assert!(finalized);
 
     let tx = psbt.extract_tx()?;

examples/example_wallet_esplora_blocking/Cargo.toml

@@ -7,6 +7,6 @@ publish = false
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-bdk_wallet = { path = "../../wallet", features = ["file_store"] }
+bdk_wallet = { path = "../../wallet", features = ["file_store", "test-utils"] }
 bdk_esplora = { version = "0.21.0", features = ["blocking"] }
 anyhow = "1"

examples/example_wallet_esplora_blocking/src/main.rs

@@ -2,9 +2,7 @@ use std::{collections::BTreeSet, io::Write};
 
 use bdk_esplora::{esplora_client, EsploraExt};
 use bdk_wallet::{
-    bitcoin::{Amount, Network},
-    file_store::Store,
-    KeychainKind, SignOptions, Wallet,
+    bitcoin::{Amount, Network}, file_store::Store, miniscript::Descriptor, KeychainKind, SignOptions, Wallet
 };
 
 const DB_MAGIC: &str = "bdk_wallet_esplora_example";
@@ -80,7 +78,18 @@ fn main() -> Result<(), anyhow::Error> {
     tx_builder.add_recipient(address.script_pubkey(), SEND_AMOUNT);
 
     let mut psbt = tx_builder.finish()?;
-    let finalized = wallet.sign(&mut psbt, SignOptions::default())?;
+
+    let secp = bdk_wallet::bitcoin::key::Secp256k1::new();
+
+    let (_, external_keymap) = Descriptor::parse_descriptor(&secp, EXTERNAL_DESC)?;
+    let (_, internal_keymap) = Descriptor::parse_descriptor(&secp, INTERNAL_DESC)?;
+    let key_map = external_keymap.into_iter().chain(internal_keymap).collect();
+
+    // It's using the signer implementation from `test_utils`, you should implement your own signing implementation for `KeyMap`.
+    let signer = bdk_wallet::test_utils::SignerWrapper::new(key_map);
+    let _ = psbt.sign(&signer, &secp);
+
+    let finalized = wallet.finalize_psbt(&mut psbt, SignOptions::default())?;
     assert!(finalized);
 
     let tx = psbt.extract_tx()?;