Depend on consensus-encode branch

Cargo.toml

@@ -70,10 +70,6 @@ required-features = ["std", "base64", "compiler"]
 members = ["fuzz"]
 exclude = ["embedded", "bitcoind-tests"]
 
-[patch.crates-io.bitcoin-addresses]
-git = "https://github.com/tcharding/rust-bitcoin"
-branch = "10-16-set-version-to-alpha"
-
 [patch.crates-io.base58ck]
 git = "https://github.com/tcharding/rust-bitcoin"
 branch = "10-16-set-version-to-alpha"

bitcoind-tests/Cargo.toml

@@ -32,3 +32,40 @@ secp256k1 = {version = "0.29.0", features = ["rand-std"]}
 "0_19_1" = ["bitcoind/0_19_1"]
 "0_18_1" = ["bitcoind/0_18_1"]
 "0_17_1" = ["bitcoind/0_17_1"]
+
+# Patch crates from bitcoind-json-rpc repo.
+
+[patch.crates-io.bitcoind-json-rpc-client]
+git = "https://github.com/tcharding/rust-bitcoind-json-rpc"
+branch = "track-bitcoin-master"
+
+[patch.crates-io.bitcoind-json-rpc-regtest]
+git = "https://github.com/tcharding/rust-bitcoind-json-rpc"
+branch = "track-bitcoin-master"
+
+[patch.crates-io.bitcoind-json-rpc-types]
+git = "https://github.com/tcharding/rust-bitcoind-json-rpc"
+branch = "track-bitcoin-master"
+
+# Patch crates from rust-bitcoin repo.
+
+[patch.crates-io.base58ck]
+path = "../../../rust-bitcoin/10-17-consensus-encode/base58"
+
+[patch.crates-io.bitcoin]
+path = "../../../rust-bitcoin/10-17-consensus-encode/bitcoin"
+
+[patch.crates-io.bitcoin_hashes]
+path = "../../../rust-bitcoin/10-17-consensus-encode/hashes"
+
+[patch.crates-io.bitcoin-internals]
+path = "../../../rust-bitcoin/10-17-consensus-encode/internals"
+
+[patch.crates-io.bitcoin-io]
+path = "../../../rust-bitcoin/10-17-consensus-encode/io"
+
+[patch.crates-io.bitcoin-primitives]
+path = "../../../rust-bitcoin/10-17-consensus-encode/primitives"
+
+[patch.crates-io.bitcoin-units]
+path = "../../../rust-bitcoin/10-17-consensus-encode/units"