Merge #286: bitcoin 0.29.x -> 0.30.0

201914e bitcoin 0.29.x -> 0.30.0 (Riccardo Casatta)
624ca4f use serde 1.0.152 to avoid syn 2.x (Riccardo Casatta)

Pull request description:

  ~~I temporarily added two crates that must be removed before removing the draft status:~~

  * ~~hex crate: because I couldn't quickly figure out how to convert bytes to hex~~
  * ~~rand: because it didn't seem to be re-exported anymore~~

  about `Address`:
  * when parameters:  `Address<NetworkChecked>`
  * when return values:  `Address<NetworkUnchecked>`

  and updated tests with `assume_checked()` where needed

ACKs for top commit:
  apoelstra:
    ACK 201914e

Tree-SHA512: f77f5407c4180a65bf6c85a3ae39322204be3d7808efac20c2c0a2d057c54a58bd5d4b27c4dab0be397ccabcf9036940a1b5f316634ba4f2e1bf3d571c562f3f

Author: apoelstra

.github/workflows/rust.yml

@@ -27,6 +27,7 @@ jobs:
                   profile: minimal
                   toolchain: ${{ matrix.rust }}
                   override: true
+            - run: cargo update -p serde --precise 1.0.152
             - name: Running test script
               env: ${{ matrix.env }}
               run: ./contrib/test.sh

client/Cargo.toml

@@ -27,3 +27,4 @@ jsonrpc = "0.13.0"
 # Used for deserialization of JSON.
 serde = "1"
 serde_json = "1"
+bitcoin-private = "0.1.0"

client/src/client.rs

@@ -15,14 +15,16 @@ use std::path::PathBuf;
 use std::{fmt, result};
 
 use crate::{bitcoin, deserialize_hex};
+use bitcoin_private::hex::exts::DisplayHex;
 use jsonrpc;
 use serde;
 use serde_json;
 
-use crate::bitcoin::hashes::hex::{FromHex, ToHex};
+use crate::bitcoin::address::{NetworkUnchecked, NetworkChecked};
+use crate::bitcoin::hashes::hex::FromHex;
 use crate::bitcoin::secp256k1::ecdsa::Signature;
 use crate::bitcoin::{
-    Address, Amount, Block, BlockHeader, OutPoint, PrivateKey, PublicKey, Script, Transaction,
+    Address, Amount, Block, OutPoint, PrivateKey, PublicKey, Script, Transaction,
 };
 use log::Level::{Debug, Trace, Warn};
 
@@ -160,19 +162,19 @@ pub trait RawTx: Sized + Clone {
 
 impl<'a> RawTx for &'a Transaction {
     fn raw_hex(self) -> String {
-        bitcoin::consensus::encode::serialize(self).to_hex()
+        bitcoin::consensus::encode::serialize_hex(self)
     }
 }
 
 impl<'a> RawTx for &'a [u8] {
     fn raw_hex(self) -> String {
-        self.to_hex()
+        self.to_lower_hex_string()
     }
 }
 
 impl<'a> RawTx for &'a Vec<u8> {
     fn raw_hex(self) -> String {
-        self.to_hex()
+        self.to_lower_hex_string()
     }
 }
 
@@ -345,7 +347,7 @@ pub trait RpcApi: Sized {
     }
     //TODO(stevenroose) add getblock_txs
 
-    fn get_block_header(&self, hash: &bitcoin::BlockHash) -> Result<BlockHeader> {
+    fn get_block_header(&self, hash: &bitcoin::BlockHash) -> Result<bitcoin::block::Header> {
         let hex: String = self.call("getblockheader", &[into_json(hash)?, false.into()])?;
         deserialize_hex(&hex)
     }
@@ -640,7 +642,7 @@ pub trait RpcApi: Sized {
         p2sh: Option<bool>,
     ) -> Result<()> {
         let mut args = [
-            script.to_hex().into(),
+            script.to_hex_string().into(),
             opt_into_json(label)?,
             opt_into_json(rescan)?,
             opt_into_json(p2sh)?,
@@ -685,7 +687,7 @@ pub trait RpcApi: Sized {
         &self,
         minconf: Option<usize>,
         maxconf: Option<usize>,
-        addresses: Option<&[&Address]>,
+        addresses: Option<&[&Address<NetworkChecked>]>,
         include_unsafe: Option<bool>,
         query_options: Option<json::ListUnspentQueryOptions>,
     ) -> Result<Vec<json::ListUnspentResultEntry>> {
@@ -886,12 +888,12 @@ pub trait RpcApi: Sized {
         &self,
         label: Option<&str>,
         address_type: Option<json::AddressType>,
-    ) -> Result<Address> {
+    ) -> Result<Address<NetworkUnchecked>> {
         self.call("getnewaddress", &[opt_into_json(label)?, opt_into_json(address_type)?])
     }
 
     /// Generate new address for receiving change
-    fn get_raw_change_address(&self, address_type: Option<json::AddressType>) -> Result<Address> {
+    fn get_raw_change_address(&self, address_type: Option<json::AddressType>) -> Result<Address<NetworkUnchecked>> {
         self.call("getrawchangeaddress", &[opt_into_json(address_type)?])
     }
 
@@ -905,7 +907,7 @@ pub trait RpcApi: Sized {
     fn generate_to_address(
         &self,
         block_num: u64,
-        address: &Address,
+        address: &Address<NetworkChecked>,
     ) -> Result<Vec<bitcoin::BlockHash>> {
         self.call("generatetoaddress", &[block_num.into(), address.to_string().into()])
     }
@@ -956,7 +958,7 @@ pub trait RpcApi: Sized {
 
     fn send_to_address(
         &self,
-        address: &Address,
+        address: &Address<NetworkChecked>,
         amount: Amount,
         comment: Option<&str>,
         comment_to: Option<&str>,
@@ -1155,7 +1157,7 @@ pub trait RpcApi: Sized {
         ];
         let defaults = [
             true.into(),
-            into_json(json::SigHashType::from(bitcoin::EcdsaSighashType::All))?,
+            into_json(json::SigHashType::from(bitcoin::sighash::EcdsaSighashType::All))?,
             true.into(),
         ];
         self.call("walletprocesspsbt", handle_defaults(&mut args, &defaults))
@@ -1182,7 +1184,7 @@ pub trait RpcApi: Sized {
         self.call("finalizepsbt", handle_defaults(&mut args, &[true.into()]))
     }
 
-    fn derive_addresses(&self, descriptor: &str, range: Option<[u32; 2]>) -> Result<Vec<Address>> {
+    fn derive_addresses(&self, descriptor: &str, range: Option<[u32; 2]>) -> Result<Vec<Address<NetworkUnchecked>>> {
         let mut args = [into_json(descriptor)?, opt_into_json(range)?];
         self.call("deriveaddresses", handle_defaults(&mut args, &[null()]))
     }
@@ -1242,7 +1244,7 @@ pub trait RpcApi: Sized {
 
     /// Submit a raw block
     fn submit_block_bytes(&self, block_bytes: &[u8]) -> Result<()> {
-        let block_hex: String = block_bytes.to_hex();
+        let block_hex: String = block_bytes.to_lower_hex_string();
         self.submit_block_hex(&block_hex)
     }
 

client/src/error.rs

@@ -25,7 +25,7 @@ pub enum Error {
     BitcoinSerialization(bitcoin::consensus::encode::Error),
     Secp256k1(secp256k1::Error),
     Io(io::Error),
-    InvalidAmount(bitcoin::util::amount::ParseAmountError),
+    InvalidAmount(bitcoin::amount::ParseAmountError),
     InvalidCookieFile,
     /// The JSON result had an unexpected structure.
     UnexpectedStructure,
@@ -69,8 +69,8 @@ impl From<io::Error> for Error {
     }
 }
 
-impl From<bitcoin::util::amount::ParseAmountError> for Error {
-    fn from(e: bitcoin::util::amount::ParseAmountError) -> Error {
+impl From<bitcoin::amount::ParseAmountError> for Error {
+    fn from(e: bitcoin::amount::ParseAmountError) -> Error {
         Error::InvalidAmount(e)
     }
 }

client/src/queryable.rs

@@ -22,7 +22,7 @@ pub trait Queryable<C: RpcApi>: Sized {
     fn query(rpc: &C, id: &Self::Id) -> Result<Self>;
 }
 
-impl<C: RpcApi> Queryable<C> for bitcoin::blockdata::block::Block {
+impl<C: RpcApi> Queryable<C> for bitcoin::block::Block {
     type Id = bitcoin::BlockHash;
 
     fn query(rpc: &C, id: &Self::Id) -> Result<Self> {
@@ -33,7 +33,7 @@ impl<C: RpcApi> Queryable<C> for bitcoin::blockdata::block::Block {
     }
 }
 
-impl<C: RpcApi> Queryable<C> for bitcoin::blockdata::transaction::Transaction {
+impl<C: RpcApi> Queryable<C> for bitcoin::transaction::Transaction {
     type Id = bitcoin::Txid;
 
     fn query(rpc: &C, id: &Self::Id) -> Result<Self> {

integration_test/Cargo.toml

@@ -6,6 +6,6 @@ edition = "2018"
 
 [dependencies]
 bitcoincore-rpc = { path = "../client" }
-bitcoin = { version = "0.29.0", features = ["serde", "rand"]}
+bitcoin = { version = "0.30.0", features = ["serde", "rand"]}
 lazy_static = "1.4.0"
 log = "0.4"