[wip] chore(esplora): bump esplora-client to v0.13.0-prerelease

Author: luisschwab

ci/pin-msrv.sh

@@ -9,8 +9,3 @@ set -euo pipefail
 
 # cargo clean
 # rustup override set 1.85.0
-
-cargo update -p idna_adapter --precise "1.2.1"
-cargo update -p icu_normalizer --precise "2.1.1"
-cargo update -p icu_provider --precise "2.1.1"
-cargo update -p icu_locale_core --precise "2.1.1"

crates/esplora/Cargo.toml

@@ -17,13 +17,12 @@ workspace = true
 
 [dependencies]
 bdk_core = { path = "../core", version = "0.6.1", default-features = false }
-esplora-client = { version = "0.12.3", default-features = false }
+esplora-client = { git = "https://github.com/luisschwab/rust-esplora-client", branch = "more-api-fixes", default-features = false }
 async-trait = { version = "0.1.66", optional = true }
 futures = { version = "0.3.26", optional = true }
 serde_json = { version = "1.0", features = ["alloc"] }
 
 [dev-dependencies]
-esplora-client = { version = "0.12.0" }
 bdk_chain = { path = "../chain" }
 bdk_testenv = { path = "../testenv" }
 tokio = { version = "1", features = ["rt", "rt-multi-thread", "macros"] }

crates/esplora/src/async_ext.rs

@@ -7,7 +7,7 @@ use bdk_core::{
     bitcoin::{BlockHash, OutPoint, Txid},
     BlockId, CheckPoint, ConfirmationBlockTime, Indexed, TxUpdate,
 };
-use esplora_client::Sleeper;
+use esplora_client::{EsploraTx, Sleeper};
 use futures::{stream::FuturesOrdered, TryStreamExt};
 
 use crate::{insert_anchor_or_seen_at_from_status, insert_prevouts};
@@ -314,7 +314,7 @@ where
     I: Iterator<Item = Indexed<SpkWithExpectedTxids>> + Send,
     S: Sleeper + Clone + Send + Sync,
 {
-    type TxsOfSpkIndex = (u32, Vec<esplora_client::Tx>, HashSet<Txid>);
+    type TxsOfSpkIndex = (u32, Vec<EsploraTx>, HashSet<Txid>);
 
     let mut update = TxUpdate::<ConfirmationBlockTime>::default();
     let mut last_active_index = Option::<u32>::None;
@@ -335,7 +335,7 @@ where
                     let mut last_seen = None;
                     let mut spk_txs = Vec::new();
                     loop {
-                        let txs = client.scripthash_txs(&spk, last_seen).await?;
+                        let txs = client.get_scripthash_txs(&spk, last_seen).await?;
                         let tx_count = txs.len();
                         last_seen = txs.last().map(|tx| tx.txid);
                         spk_txs.extend(txs);

crates/esplora/src/blocking_ext.rs

@@ -6,7 +6,7 @@ use bdk_core::{
     bitcoin::{BlockHash, OutPoint, Txid},
     BlockId, CheckPoint, ConfirmationBlockTime, Indexed, TxUpdate,
 };
-use esplora_client::{OutputStatus, Tx};
+use esplora_client::{EsploraTx, OutputStatus};
 use std::thread::JoinHandle;
 
 use crate::{insert_anchor_or_seen_at_from_status, insert_prevouts};
@@ -282,7 +282,7 @@ fn fetch_txs_with_keychain_spks<I: Iterator<Item = Indexed<SpkWithExpectedTxids>
     last_revealed: Option<u32>,
     parallel_requests: usize,
 ) -> Result<(TxUpdate<ConfirmationBlockTime>, Option<u32>), Error> {
-    type TxsOfSpkIndex = (u32, Vec<esplora_client::Tx>, HashSet<Txid>);
+    type TxsOfSpkIndex = (u32, Vec<EsploraTx>, HashSet<Txid>);
 
     let mut update = TxUpdate::<ConfirmationBlockTime>::default();
     let mut last_active_index = Option::<u32>::None;
@@ -303,7 +303,7 @@ fn fetch_txs_with_keychain_spks<I: Iterator<Item = Indexed<SpkWithExpectedTxids>
                     let mut last_txid = None;
                     let mut spk_txs = Vec::new();
                     loop {
-                        let txs = client.scripthash_txs(&spk, last_txid)?;
+                        let txs = client.get_scripthash_txs(&spk, last_txid)?;
                         let tx_count = txs.len();
                         last_txid = txs.last().map(|tx| tx.txid);
                         spk_txs.extend(txs);
@@ -414,7 +414,7 @@ fn fetch_txs_with_txids<I: IntoIterator<Item = Txid>>(
                         .map(|t| (txid, t))
                 })
             })
-            .collect::<Vec<JoinHandle<Result<(Txid, Option<Tx>), Error>>>>();
+            .collect::<Vec<JoinHandle<Result<(Txid, Option<EsploraTx>), Error>>>>();
 
         if handles.is_empty() {
             break;

crates/esplora/src/lib.rs

@@ -21,7 +21,7 @@
 //! [`esplora_client::AsyncClient`].
 #![cfg_attr(coverage_nightly, feature(coverage_attribute))]
 
-use bdk_core::bitcoin::{Amount, OutPoint, TxOut, Txid};
+use bdk_core::bitcoin::{OutPoint, TxOut, Txid};
 use bdk_core::{BlockId, ConfirmationBlockTime, TxUpdate};
 use esplora_client::TxStatus;
 
@@ -76,7 +76,7 @@ fn insert_prevouts(
             OutPoint::new(prev_txid, prev_vout),
             TxOut {
                 script_pubkey: prev_txout.scriptpubkey,
-                value: Amount::from_sat(prev_txout.value),
+                value: prev_txout.value,
             },
         );
     }