WIP: Track rust-bitcoin master branch

As we develop `primitives` it is useful to have crates using the changes
to catch mistakes as we go. The crates in this repo are prime candidates
for depending on `primitives` and not using `rust-bitcoin`.

Author: tcharding

Cargo.toml

@@ -11,3 +11,31 @@ path = "json"
 
 [patch.crates-io.jsonrpc]
 path = "jsonrpc"
+
+[patch.crates-io.base58ck]
+git = "https://github.com/tcharding/rust-bitcoin"
+branch = "10-16-set-version-to-alpha"
+
+[patch.crates-io.bitcoin]
+git = "https://github.com/tcharding/rust-bitcoin"
+branch = "10-16-set-version-to-alpha"
+
+[patch.crates-io.bitcoin_hashes]
+git = "https://github.com/tcharding/rust-bitcoin"
+branch = "10-16-set-version-to-alpha"
+
+[patch.crates-io.bitcoin-internals]
+git = "https://github.com/tcharding/rust-bitcoin"
+branch = "10-16-set-version-to-alpha"
+
+[patch.crates-io.bitcoin-io]
+git = "https://github.com/tcharding/rust-bitcoin"
+branch = "10-16-set-version-to-alpha"
+
+[patch.crates-io.bitcoin-primitives]
+git = "https://github.com/tcharding/rust-bitcoin"
+branch = "10-16-set-version-to-alpha"
+
+[patch.crates-io.bitcoin-units]
+git = "https://github.com/tcharding/rust-bitcoin"
+branch = "10-16-set-version-to-alpha"

client/Cargo.toml

@@ -26,7 +26,7 @@ rustdoc-args = ["--cfg", "docsrs"]
 client-sync = ["jsonrpc"]
 
 [dependencies]
-bitcoin = { version = "0.32.0", default-features = false, features = ["std", "serde"] }
+bitcoin = { version = "0.33.0-alpha", default-features = false, features = ["std", "serde"] }
 json = { package = "bitcoind-json-rpc-types", version = "0.3.0", default-features = false, features = [] }
 log = "0.4"
 serde = { version = "1.0.103", default-features = false, features = [ "derive", "alloc" ] }

json/Cargo.toml

@@ -21,8 +21,8 @@ exclude = ["tests", "contrib"]
 default = []
 
 [dependencies]
-bitcoin = { version = "0.32.0", default-features = false, features = ["std", "serde"] }
-internals = { package = "bitcoin-internals", version = "0.3.0", default-features = false,  features = ["std"] }
+bitcoin = { version = "0.33.0-alpha", default-features = false, features = ["std", "serde"] }
+internals = { package = "bitcoin-internals", version = "0.4.0", default-features = false,  features = ["std"] }
 serde = { version = "1.0.103", default-features = false, features = [ "derive", "alloc" ] }
 serde_json = { version = "1.0.117" }
 

json/src/lib.rs

@@ -82,4 +82,3 @@ fn btc_per_kb(btc_per_kb: f64) -> Result<Option<FeeRate>, ParseAmountError> {
 
     Ok(rate)
 }
-

json/src/v17/blockchain.rs

@@ -9,8 +9,10 @@ use std::fmt;
 use std::str::FromStr;
 
 use bitcoin::consensus::encode;
-use bitcoin::error::UnprefixedHexError;
 use bitcoin::hex::FromHex;
+use bitcoin::parse::UnprefixedHexError;
+use bitcoin::pow::CompactTargetExt as _;
+use bitcoin::script::ScriptBufExt as _;
 use bitcoin::{
     address, amount, block, hex, network, Address, Amount, Block, BlockHash, CompactTarget,
     FeeRate, Network, ScriptBuf, TxMerkleNode, TxOut, Txid, Weight, Work,

json/src/v19/blockchain.rs

@@ -7,7 +7,7 @@
 use core::fmt;
 use std::collections::BTreeMap;
 
-use bitcoin::error::UnprefixedHexError;
+use bitcoin::parse::UnprefixedHexError;
 use bitcoin::{hex, network, BlockHash, Network, Work};
 use internals::write_err;
 use serde::{Deserialize, Serialize};

regtest/Cargo.toml

@@ -24,7 +24,7 @@ serde_json = { version = "1.0.117" }
 env_logger = "0.9.0"
 
 [build-dependencies]
-bitcoin_hashes = { version = ">= 0.13, <= 0.14", optional = true }
+bitcoin_hashes = { version = "0.15", optional = true }
 flate2 = { version = "1.0", optional = true }
 tar = { version = "0.4", optional = true }
 minreq = { version = "2.9.1", default-features = false, features = [