Merge #76: Bump electrsd to 0.26 + bitcoind_25_0 and fix msrv errors

ac2fd86 ci: limit test threads to 1 (Steve Myers)
19bdeb1 replace temporary dependency on bitcoin-internals with hex-conservative (Steve Myers)
c99118e bump electrsd to 0.26 + bitcoind_25_0 and fix msrv errors (Steve Myers)

Pull request description:

  This PR bumps electrsd to 0.26 and replaces temporary dependency on `bitcoin-internals` with `hex-conservative` as done in #75. Fixed CI MSRV issues with dev dependencies blocking #75 and #74.

ACKs for top commit:
  evanlinjin:
    ACK ac2fd86
  tcharding:
    ACK ac2fd86

Tree-SHA512: 37d825aae78d1ca89806870455b97a48e5a69bbdd78adadb16f506fb4df0fe98dc3a262b8fb74b68f5c44031e76c8fa0b5304c8592bf332356a0215843a52c33

.github/workflows/code_coverage.yml

@@ -44,7 +44,7 @@ jobs:
         # For more info, see:
         # - https://github.com/bitcoindevkit/bdk/issues/696
         # - https://github.com/bitcoindevkit/bdk/pull/748#issuecomment-1242721040
-        run: cargo test
+        run: cargo test -- --test-threads=1
       - name: Run grcov
         run: mkdir coverage; grcov . --binary-path ./target/debug/ -s . -t lcov --branch --ignore-not-existing --ignore '/*' -o ./coverage/lcov.info
       - name: Generate HTML coverage report

.github/workflows/cont_integration.yml

@@ -51,11 +51,14 @@ jobs:
     - name: pin dependencies
       if: matrix.rust.version == '1.63.0'
       run: |
+        cargo update -p zstd-sys --precise "2.0.8+zstd.1.5.5"
+        cargo update -p time --precise "0.3.20"
+        cargo update -p jobserver --precise "0.1.26"
         cargo update -p home --precise 0.5.5
     - name: Build
       run: cargo build --features ${{ matrix.features }} --no-default-features
     - name: Clippy
       if: ${{ matrix.rust.clippy }}
       run: cargo clippy --all-targets --features ${{ matrix.features }} --no-default-features -- -D warnings
     - name: Test
-      run: cargo test --features ${{ matrix.features }} --no-default-features
+      run: cargo test --features ${{ matrix.features }} --no-default-features -- --test-threads=1

Cargo.toml

@@ -19,17 +19,15 @@ path = "src/lib.rs"
 [dependencies]
 serde = { version = "1.0", features = ["derive"] }
 bitcoin = { version = "0.30.0", features = ["serde", "std"], default-features = false }
-# Temporary dependency on internals until the rust-bitcoin devs release the hex-conservative crate.
-bitcoin-internals = { version = "0.1.0", features = ["alloc"] }
+hex = { package = "hex-conservative", version = "*" }
 log = "^0.4"
 ureq = { version = "2.5.0", features = ["json"], optional = true }
 reqwest = { version = "0.11", optional = true, default-features = false, features = ["json"] }
 
 [dev-dependencies]
 serde_json = "1.0"
 tokio = { version = "1.20.1", features = ["full"] }
-electrsd = { version = "0.24.0", features = ["legacy", "esplora_a33e97e1", "bitcoind_22_0"] }
-electrum-client = "0.16.0"
+electrsd = { version = "0.26.0", features = ["legacy", "esplora_a33e97e1", "bitcoind_25_0"] }
 lazy_static = "1.4.0"
 
 [features]

README.md

@@ -18,5 +18,5 @@ This library should compile with any combination of features with Rust 1.63.0.
 To build with the MSRV you will need to pin dependencies as follows:
 
 ```shell
-cargo update -p home --precise 0.5.5
+cargo update -p jobserver --precise "0.1.26"
 ```

src/async.rs

@@ -20,7 +20,7 @@ use bitcoin::hashes::{sha256, Hash};
 use bitcoin::{
     block::Header as BlockHeader, Block, BlockHash, MerkleBlock, Script, Transaction, Txid,
 };
-use bitcoin_internals::hex::display::DisplayHex;
+use hex::display::DisplayHex;
 
 #[allow(unused_imports)]
 use log::{debug, error, info, trace};

src/blocking.rs

@@ -29,7 +29,7 @@ use bitcoin::{
     block::Header as BlockHeader, Block, BlockHash, MerkleBlock, Script, Transaction, Txid,
 };
 
-use bitcoin_internals::hex::display::DisplayHex;
+use hex::display::DisplayHex;
 
 use crate::{BlockStatus, BlockSummary, Builder, Error, MerkleProof, OutputStatus, Tx, TxStatus};