refactor(rpc): Update bitcoind_client to v0.1.0

- also rebased changes

Author: tvpeter

crates/bitcoind_rpc/Cargo.toml

@@ -17,7 +17,7 @@ workspace = true
 
 [dependencies]
 bitcoin = { version = "0.32.0", default-features = false }
-bdk-bitcoind-client ={ git = "https://github.com/bitcoindevkit/bdk-bitcoind-client", rev = "06526db5c25047b61d29f81b25cfee7bd0f3abc8"}
+bdk_bitcoind_client ={ version = "0.1.0", default-features = false }
 bdk_core = { path = "../core", version = "0.6.1", default-features = false }
 
 [dev-dependencies]
@@ -29,7 +29,9 @@ bdk_chain = { path = "../chain" }
 default = ["std", "bitcoind_28_0"]
 std = ["bitcoin/std", "bdk_core/std"]
 serde = ["bitcoin/serde", "bdk_core/serde"]
-bitcoind_28_0 =["bdk-bitcoind-client/28_0"]
+bitcoind_28_0 =["bdk_bitcoind_client/28_0"] 
+bitcoind_29_0 = ["bdk_bitcoind_client/29_0"]
+bitcoind_30_0 = ["bdk_bitcoind_client/30_0"]
 
 [[example]]
 name = "filter_iter"

crates/bitcoind_rpc/src/lib.rs

@@ -354,9 +354,7 @@ fn poll(
             PollResponse::AgreementFound(res, cp) => {
                 // When a reorg happens, the agreement point drops below `last_cp`. We
                 // override `start_height` so the emitter revisits the invalidated heights.
-                if (res.height as u32) < emitter.start_height
-                    && (res.height as u32) < emitter.last_cp.height()
-                {
+                if res.height < emitter.start_height && res.height < emitter.last_cp.height() {
                     emitter.start_height = res.height as _;
                 }
                 // get rid of evicted blocks
@@ -373,28 +371,6 @@ fn poll(
     }
 }
 
-/// Extends [`bdk_bitcoind_client::Error`].
-pub trait BitcoindRpcErrorExt {
-    /// Returns whether the error is a "not found" error.
-    ///
-    /// This is useful since [`Emitter`] emits [`Result<_, bdk_bitcoind_client::Error>`]s as
-    /// [`Iterator::Item`].
-    fn is_not_found_error(&self) -> bool;
-}
-
-impl BitcoindRpcErrorExt for bdk_bitcoind_client::Error {
-    fn is_not_found_error(&self) -> bool {
-        if let bdk_bitcoind_client::Error::JsonRpc(bdk_bitcoind_client::jsonrpc::Error::Rpc(
-            rpc_err,
-        )) = self
-        {
-            rpc_err.code == -5
-        } else {
-            false
-        }
-    }
-}
-
 #[cfg(test)]
 #[cfg_attr(coverage_nightly, coverage(off))]
 mod test {

crates/bitcoind_rpc/tests/test_emitter.rs

@@ -660,11 +660,11 @@ fn test_expect_tx_evicted() -> anyhow::Result<()> {
 fn test_sync_with_new_emitter_after_reorg() -> anyhow::Result<()> {
     let env = TestEnv::new()?;
     let (mut local_chain, _) = LocalChain::from_genesis(env.genesis_hash()?);
-    let client = ClientExt::get_rpc_client(&env)?;
+    let client_1 = ClientExt::get_rpc_client(&env)?;
 
     env.mine_blocks(110, None)?;
 
-    let mut emitter = Emitter::new(&client, local_chain.tip(), 0, NO_EXPECTED_MEMPOOL_TXS);
+    let mut emitter = Emitter::new(client_1, local_chain.tip(), 0, NO_EXPECTED_MEMPOOL_TXS);
     while let Some(emission) = emitter.next_block()? {
         let _ = local_chain.apply_update(emission.checkpoint)?;
     }
@@ -674,9 +674,11 @@ fn test_sync_with_new_emitter_after_reorg() -> anyhow::Result<()> {
 
     env.reorg(6)?;
 
+    let client_2 = ClientExt::get_rpc_client(&env)?;
+
     // New emitter with start_height = tip height (common caller pattern).
     let mut emitter = Emitter::new(
-        &client,
+        client_2,
         local_chain.tip(),
         tip_height,
         NO_EXPECTED_MEMPOOL_TXS,