frost/bdk
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update crates/esplora to rust-bitcoin 0.30.0

Browse Source
This commit is contained in:
Daniela Brozzoni 2023-06-24 18:06:23 +02:00
parent 91b0f0ba29
commit 6eb079576f
No known key found for this signature in database
GPG Key ID: 7DE4F1FDCED0AB87
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crates/esplora/Cargo.toml
View File

@ -13,13 +13,13 @@ readme = "README.md"
[dependencies] [dependencies]
bdk_chain = { path = "../chain", version = "0.5.0", default-features = false, features = ["serde", "miniscript"] } bdk_chain = { path = "../chain", version = "0.5.0", default-features = false, features = ["serde", "miniscript"] }
esplora-client = { version = "0.5", default-features = false } esplora-client = { version = "0.6.0", default-features = false }
async-trait = { version = "0.1.66", optional = true } async-trait = { version = "0.1.66", optional = true }
futures = { version = "0.3.26", optional = true } futures = { version = "0.3.26", optional = true }
# use these dependencies if you need to enable their /no-std features # use these dependencies if you need to enable their /no-std features
bitcoin = { version = "0.29", optional = true, default-features = false } bitcoin = { version = "0.30.0", optional = true, default-features = false }
miniscript = { version = "9.0.0", optional = true, default-features = false } miniscript = { version = "10.0.0", optional = true, default-features = false }
[features] [features]
default = ["std", "async-https", "blocking"] default = ["std", "async-https", "blocking"]

8
crates/esplora/src/async_ext.rs
View File

@ -1,7 +1,7 @@
use async_trait::async_trait; use async_trait::async_trait;
use bdk_chain::collections::btree_map; use bdk_chain::collections::btree_map;
use bdk_chain::{ use bdk_chain::{
bitcoin::{BlockHash, OutPoint, Script, Txid}, bitcoin::{BlockHash, OutPoint, ScriptBuf, Txid},
collections::{BTreeMap, BTreeSet}, collections::{BTreeMap, BTreeSet},
local_chain::{self, CheckPoint}, local_chain::{self, CheckPoint},
BlockId, ConfirmationTimeAnchor, TxGraph, BlockId, ConfirmationTimeAnchor, TxGraph,
@ -52,7 +52,7 @@ pub trait EsploraAsyncExt {
&self, &self,
keychain_spks: BTreeMap< keychain_spks: BTreeMap<
K, K,
impl IntoIterator<IntoIter = impl Iterator<Item = (u32, Script)> + Send> + Send, impl IntoIterator<IntoIter = impl Iterator<Item = (u32, ScriptBuf)> + Send> + Send,
>, >,
txids: impl IntoIterator<IntoIter = impl Iterator<Item = Txid> + Send> + Send, txids: impl IntoIterator<IntoIter = impl Iterator<Item = Txid> + Send> + Send,
outpoints: impl IntoIterator<IntoIter = impl Iterator<Item = OutPoint> + Send> + Send, outpoints: impl IntoIterator<IntoIter = impl Iterator<Item = OutPoint> + Send> + Send,
@ -66,7 +66,7 @@ pub trait EsploraAsyncExt {
#[allow(clippy::result_large_err)] #[allow(clippy::result_large_err)]
async fn update_tx_graph_without_keychain( async fn update_tx_graph_without_keychain(
&self, &self,
misc_spks: impl IntoIterator<IntoIter = impl Iterator<Item = Script> + Send> + Send, misc_spks: impl IntoIterator<IntoIter = impl Iterator<Item = ScriptBuf> + Send> + Send,
txids: impl IntoIterator<IntoIter = impl Iterator<Item = Txid> + Send> + Send, txids: impl IntoIterator<IntoIter = impl Iterator<Item = Txid> + Send> + Send,
outpoints: impl IntoIterator<IntoIter = impl Iterator<Item = OutPoint> + Send> + Send, outpoints: impl IntoIterator<IntoIter = impl Iterator<Item = OutPoint> + Send> + Send,
parallel_requests: usize, parallel_requests: usize,
@ -205,7 +205,7 @@ impl EsploraAsyncExt for esplora_client::AsyncClient {
&self, &self,
keychain_spks: BTreeMap< keychain_spks: BTreeMap<
K, K,
impl IntoIterator<IntoIter = impl Iterator<Item = (u32, Script)> + Send> + Send, impl IntoIterator<IntoIter = impl Iterator<Item = (u32, ScriptBuf)> + Send> + Send,
>, >,
txids: impl IntoIterator<IntoIter = impl Iterator<Item = Txid> + Send> + Send, txids: impl IntoIterator<IntoIter = impl Iterator<Item = Txid> + Send> + Send,
outpoints: impl IntoIterator<IntoIter = impl Iterator<Item = OutPoint> + Send> + Send, outpoints: impl IntoIterator<IntoIter = impl Iterator<Item = OutPoint> + Send> + Send,

9
crates/esplora/src/blocking_ext.rs
View File

@ -1,10 +1,9 @@
use std::thread::JoinHandle; use std::thread::JoinHandle;
use bdk_chain::bitcoin::{OutPoint, Txid};
use bdk_chain::collections::btree_map; use bdk_chain::collections::btree_map;
use bdk_chain::collections::{BTreeMap, BTreeSet}; use bdk_chain::collections::{BTreeMap, BTreeSet};
use bdk_chain::{ use bdk_chain::{
bitcoin::{BlockHash, Script}, bitcoin::{BlockHash, OutPoint, ScriptBuf, Txid},
local_chain::{self, CheckPoint}, local_chain::{self, CheckPoint},
BlockId, ConfirmationTimeAnchor, TxGraph, BlockId, ConfirmationTimeAnchor, TxGraph,
}; };
@ -49,7 +48,7 @@ pub trait EsploraExt {
#[allow(clippy::result_large_err)] #[allow(clippy::result_large_err)]
fn update_tx_graph<K: Ord + Clone>( fn update_tx_graph<K: Ord + Clone>(
&self, &self,
keychain_spks: BTreeMap<K, impl IntoIterator<Item = (u32, Script)>>, keychain_spks: BTreeMap<K, impl IntoIterator<Item = (u32, ScriptBuf)>>,
txids: impl IntoIterator<Item = Txid>, txids: impl IntoIterator<Item = Txid>,
outpoints: impl IntoIterator<Item = OutPoint>, outpoints: impl IntoIterator<Item = OutPoint>,
stop_gap: usize, stop_gap: usize,
@ -62,7 +61,7 @@ pub trait EsploraExt {
#[allow(clippy::result_large_err)] #[allow(clippy::result_large_err)]
fn update_tx_graph_without_keychain( fn update_tx_graph_without_keychain(
&self, &self,
misc_spks: impl IntoIterator<Item = Script>, misc_spks: impl IntoIterator<Item = ScriptBuf>,
txids: impl IntoIterator<Item = Txid>, txids: impl IntoIterator<Item = Txid>,
outpoints: impl IntoIterator<Item = OutPoint>, outpoints: impl IntoIterator<Item = OutPoint>,
parallel_requests: usize, parallel_requests: usize,
@ -195,7 +194,7 @@ impl EsploraExt for esplora_client::BlockingClient {
fn update_tx_graph<K: Ord + Clone>( fn update_tx_graph<K: Ord + Clone>(
&self, &self,
keychain_spks: BTreeMap<K, impl IntoIterator<Item = (u32, Script)>>, keychain_spks: BTreeMap<K, impl IntoIterator<Item = (u32, ScriptBuf)>>,
txids: impl IntoIterator<Item = Txid>, txids: impl IntoIterator<Item = Txid>,
outpoints: impl IntoIterator<Item = OutPoint>, outpoints: impl IntoIterator<Item = OutPoint>,
stop_gap: usize, stop_gap: usize,