Update example_electrum to rust-bitcoin 0.30.0

This commit is contained in:
Daniela Brozzoni 2023-06-28 15:12:56 +02:00
parent 2949bdc7b8
commit 3dac3f9bba
No known key found for this signature in database
GPG Key ID: 7DE4F1FDCED0AB87

View File

@ -5,7 +5,7 @@ use std::{
}; };
use bdk_chain::{ use bdk_chain::{
bitcoin::{Address, Network, OutPoint, Txid}, bitcoin::{Address, Network, OutPoint, ScriptBuf, Txid},
indexed_tx_graph::{IndexedAdditions, IndexedTxGraph}, indexed_tx_graph::{IndexedAdditions, IndexedTxGraph},
keychain::LocalChangeSet, keychain::LocalChangeSet,
local_chain::LocalChain, local_chain::LocalChain,
@ -79,6 +79,7 @@ fn main() -> anyhow::Result<()> {
Network::Testnet => "ssl://electrum.blockstream.info:60002", Network::Testnet => "ssl://electrum.blockstream.info:60002",
Network::Regtest => "tcp://localhost:60401", Network::Regtest => "tcp://localhost:60401",
Network::Signet => "tcp://signet-electrumx.wakiyamap.dev:50001", Network::Signet => "tcp://signet-electrumx.wakiyamap.dev:50001",
_ => panic!("Unknown network"),
}; };
let config = electrum_client::Config::builder() let config = electrum_client::Config::builder()
.validate_domain(matches!(args.network, Network::Bitcoin)) .validate_domain(matches!(args.network, Network::Bitcoin))
@ -172,7 +173,7 @@ fn main() -> anyhow::Result<()> {
unused_spks = false; unused_spks = false;
} }
let mut spks: Box<dyn Iterator<Item = bdk_chain::bitcoin::Script>> = let mut spks: Box<dyn Iterator<Item = bdk_chain::bitcoin::ScriptBuf>> =
Box::new(core::iter::empty()); Box::new(core::iter::empty());
if all_spks { if all_spks {
let all_spks = graph let all_spks = graph
@ -190,7 +191,7 @@ fn main() -> anyhow::Result<()> {
let unused_spks = graph let unused_spks = graph
.index .index
.unused_spks(..) .unused_spks(..)
.map(|(k, v)| (*k, v.clone())) .map(|(k, v)| (*k, ScriptBuf::from(v)))
.collect::<Vec<_>>(); .collect::<Vec<_>>();
spks = Box::new(spks.chain(unused_spks.into_iter().map(|(index, script)| { spks = Box::new(spks.chain(unused_spks.into_iter().map(|(index, script)| {
eprintln!( eprintln!(