Depend on bitcoin v0.32.0-rc1

Test the latest bitcoin release candidate. Includes bumping the version
numbers so we can use this branch to test crates further up the stack.

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "electrsd"
-version = "0.27.3"
+version = "0.28.0"
 authors = ["Riccardo Casatta <[email protected]>"]
 description = "Utility to run a regtest electrs process, useful in integration testing environment"
 repository = "https://github.com/RCasatta/electrsd"
@@ -10,8 +10,8 @@ edition = "2018"
 categories = ["cryptography::cryptocurrencies", "development-tools::testing"]
 
 [dependencies]
-bitcoind = { version = "0.34.0" }
-electrum-client = { version = "0.19.0", default-features = false }
+bitcoind = { version = "0.36.0" }
+electrum-client = { version = "0.20.0", default-features = false }
 log = "0.4"
 which = "4.2.5"
 
@@ -22,7 +22,7 @@ nix = { version = "0.25.0" }
 env_logger = "0.10"
 
 [build-dependencies]
-bitcoin_hashes = { version = "0.13", optional = true }
+bitcoin_hashes = { version = "0.14", optional = true }
 zip = { version = "0.6", default-features = false, optional = true, features = [
   "bzip2",
   "deflate",
@@ -52,3 +52,40 @@ bitcoind_0_20_2 = ["download", "bitcoind/0_20_2"]
 bitcoind_0_19_1 = ["download", "bitcoind/0_19_1"]
 bitcoind_0_18_1 = ["download", "bitcoind/0_18_1"]
 bitcoind_0_17_1 = ["download", "bitcoind/0_17_1"]
+
+
+[patch.crates-io.electrum-client]
+git = "https://github.com/tcharding/rust-electrum-client"
+branch = "test-bitcoin"
+
+[patch.crates-io.bitcoind]
+git = "https://github.com/tcharding/bitcoind"
+branch = "test-bitcoin"
+
+[patch.crates-io.bitcoincore-rpc]
+git = "https://github.com/tcharding/rust-bitcoincore-rpc"
+branch = "test-bitcoin"
+
+[patch.crates-io.base58ck]
+git = "https://github.com/rust-bitcoin/rust-bitcoin"
+branch = "rc1-fixes"
+
+[patch.crates-io.bitcoin]
+git = "https://github.com/rust-bitcoin/rust-bitcoin"
+branch = "rc1-fixes"
+
+[patch.crates-io.bitcoin_hashes]
+git = "https://github.com/rust-bitcoin/rust-bitcoin"
+branch = "rc1-fixes"
+
+[patch.crates-io.bitcoin-internals]
+git = "https://github.com/rust-bitcoin/rust-bitcoin"
+branch = "rc1-fixes"
+
+[patch.crates-io.bitcoin-io]
+git = "https://github.com/rust-bitcoin/rust-bitcoin"
+branch = "rc1-fixes"
+
+[patch.crates-io.bitcoin-units]
+git = "https://github.com/rust-bitcoin/rust-bitcoin"
+branch = "rc1-fixes"

src/ext.rs

@@ -26,7 +26,7 @@ impl ElectrsD {
             match self.client.transaction_get(txid) {
                 Ok(tx) => {
                     // having the raw tx doesn't mean the scripts has been indexed
-                    let txid = tx.txid();
+                    let txid = tx.compute_txid();
                     if let Some(output) = tx.output.first() {
                         let history = self
                             .client