Merge remote-tracking branch 'upstream/master'

Author: lateminer

.github/workflows/rust.yml

@@ -15,7 +15,7 @@ jobs:
                     - rust: nightly
                       env:
                           RUSTFMTCHK: false
-                    - rust: 1.41.1
+                    - rust: 1.48.0
                       env:
                           RUSTFMTCHK: false
         steps:
@@ -27,7 +27,6 @@ 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

CHANGELOG.md

@@ -1,3 +1,10 @@
+# 0.18.0
+
+- MSRV changed from 1.41.1 to 1.48.0
+- Use `bitcoin::Network` in `GetBlockchainInfoResult `.
+- Make checksum optional in `GetDescriptorInfoResult`.
+- Make `getmempoolinfo` compatible with supported RPC versions.
+
 # 0.17.0
 
 - add `list_wallet_dir` rpc

README.md

@@ -39,4 +39,4 @@ The following versions are officially supported and automatically tested:
 * 25.1.0
 
 # Minimum Supported Rust Version (MSRV)
-This library should always compile with any combination of features on **Rust 1.41.1**.
+This library should always compile with any combination of features on **Rust 1.48.0**.

client/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "blackcoinmore-rpc"
-version = "0.17.0"
+version = "0.18.0"
 authors = [
     "Steven Roose <steven@stevenroose.org>",
     "Jean Pierre Dudey <jeandudey@hotmail.com>",
@@ -20,11 +20,15 @@ name = "blackcoinmore_rpc"
 path = "src/lib.rs"
 
 [dependencies]
-blackcoinmore-rpc-json = { version = "0.17.0", path = "../json" }
+blackcoinmore-rpc-json = { version = "0.18.0", path = "../json" }
 
 log = "0.4.5"
 jsonrpc = "0.14.0"
 
 # Used for deserialization of JSON.
 serde = "1"
 serde_json = "1"
+
+[dev-dependencies]
+tempfile = "3.3.0"
+

client/src/client.rs

@@ -10,6 +10,7 @@
 
 use std::collections::HashMap;
 use std::fs::File;
+use std::io::{BufRead, BufReader};
 use std::iter::FromIterator;
 use std::path::PathBuf;
 use std::{fmt, result};
@@ -201,19 +202,16 @@ pub enum Auth {
 impl Auth {
     /// Convert into the arguments that jsonrpc::Client needs.
     pub fn get_user_pass(self) -> Result<(Option<String>, Option<String>)> {
-        use std::io::Read;
         match self {
             Auth::None => Ok((None, None)),
             Auth::UserPass(u, p) => Ok((Some(u), Some(p))),
             Auth::CookieFile(path) => {
-                let mut file = File::open(path)?;
-                let mut contents = String::new();
-                file.read_to_string(&mut contents)?;
-                let mut split = contents.splitn(2, ":");
-                Ok((
-                    Some(split.next().ok_or(Error::InvalidCookieFile)?.into()),
-                    Some(split.next().ok_or(Error::InvalidCookieFile)?.into()),
-                ))
+                let line = BufReader::new(File::open(path)?)
+                    .lines()
+                    .next()
+                    .ok_or(Error::InvalidCookieFile)??;
+                let colon = line.find(':').ok_or(Error::InvalidCookieFile)?;
+                Ok((Some(line[..colon].into()), Some(line[colon + 1..].into())))
             }
         }
     }
@@ -1440,4 +1438,34 @@ mod tests {
     fn test_handle_defaults() {
         test_handle_defaults_inner().unwrap();
     }
+
+    #[test]
+    fn auth_cookie_file_ignores_newline() {
+        let tempdir = tempfile::tempdir().unwrap();
+        let path = tempdir.path().join("cookie");
+        std::fs::write(&path, "foo:bar\n").unwrap();
+        assert_eq!(
+            Auth::CookieFile(path).get_user_pass().unwrap(),
+            (Some("foo".into()), Some("bar".into())),
+        );
+    }
+
+    #[test]
+    fn auth_cookie_file_ignores_additional_lines() {
+        let tempdir = tempfile::tempdir().unwrap();
+        let path = tempdir.path().join("cookie");
+        std::fs::write(&path, "foo:bar\nbaz").unwrap();
+        assert_eq!(
+            Auth::CookieFile(path).get_user_pass().unwrap(),
+            (Some("foo".into()), Some("bar".into())),
+        );
+    }
+
+    #[test]
+    fn auth_cookie_file_fails_if_colon_isnt_present() {
+        let tempdir = tempfile::tempdir().unwrap();
+        let path = tempdir.path().join("cookie");
+        std::fs::write(&path, "foobar").unwrap();
+        assert!(matches!(Auth::CookieFile(path).get_user_pass(), Err(Error::InvalidCookieFile)));
+    }
 }

contrib/test.sh

@@ -1,6 +1,8 @@
 
 set -xe
 
+MSRV="1\.48"
+
 # Just echo all the relevant env vars to help debug Travis.
 echo "RUSTFMTCHECK: \"$RUSTFMTCHECK\""
 echo "BITCOINVERSION: \"$BITCOINVERSION\""
@@ -11,6 +13,16 @@ if [ -n "$RUSTFMTCHECK" ]; then
   cargo fmt --all -- --check
 fi
 
+# Test pinned versions (these are from rust-bitcoin pinning for 1.48).
+if cargo --version | grep ${MSRV}; then
+    cargo update -p tempfile --precise 3.3.0
+    cargo update -p log --precise 0.4.18
+    cargo update -p serde_json --precise 1.0.99
+    cargo update -p serde --precise 1.0.156
+    cargo update -p quote --precise 1.0.30
+    cargo update -p proc-macro2 --precise 1.0.63
+fi
+
 # Integration test.
 if [ -n "$BITCOINVERSION" ]; then
     wget https://bitcoincore.org/bin/bitcoin-core-$BITCOINVERSION/bitcoin-$BITCOINVERSION-x86_64-linux-gnu.tar.gz
@@ -25,4 +37,3 @@ else
   cargo test --verbose
   cargo build --verbose --examples
 fi
-

integration_test/Cargo.toml

@@ -6,6 +6,6 @@ edition = "2018"
 
 [dependencies]
 blackcoinmore-rpc = { path = "../client" }
-bitcoin = { version = "0.31.0-rc2", features = ["serde", "rand", "rand-std"], git = "http://github.com/CoinBlack/rust-blackcoin", branch = "develop" }
+bitcoin = { version = "0.31.0", features = ["serde", "rand", "rand-std"], git = "http://github.com/CoinBlack/rust-blackcoin" }
 lazy_static = "1.4.0"
 log = "0.4"

integration_test/src/main.rs

@@ -1406,7 +1406,10 @@ fn test_add_multisig_address(cl: &Client) {
 #[rustfmt::skip]
 fn test_derive_addresses(cl: &Client) {
     let descriptor = r"pkh(02e96fe52ef0e22d2f131dd425ce1893073a3c6ad20e8cac36726393dfb4856a4c)#62k9sn4x";
-    assert_eq!(cl.derive_addresses(descriptor, None).unwrap(), vec!["mrkwtj5xpYQjHeJe5wsweNjVeTKkvR5fCr".parse::<Address<NetworkUnchecked>>().unwrap()]);
+    assert_eq!(
+        cl.derive_addresses(descriptor, None).unwrap(),
+        vec!["mrkwtj5xpYQjHeJe5wsweNjVeTKkvR5fCr".parse::<Address<NetworkUnchecked>>().unwrap()]
+    );
     assert!(cl.derive_addresses(descriptor, Some([0, 1])).is_err()); // Range should not be specified for an unranged descriptor
 
     let descriptor = std::concat!(

json/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "blackcoinmore-rpc-json"
-version = "0.17.0"
+version = "0.18.0"
 authors = [
     "Steven Roose <steven@stevenroose.org>",
     "Jean Pierre Dudey <jeandudey@hotmail.com>",
@@ -23,4 +23,4 @@ path = "src/lib.rs"
 serde = { version = "1", features = [ "derive" ] }
 serde_json = "1"
 
-bitcoin = { version = "0.31.0-rc2", features = ["serde", "rand", "rand-std"], git = "http://github.com/CoinBlack/rust-blackcoin", branch = "develop" }
+bitcoin = { version = "0.31.0", features = ["serde", "rand", "rand-std"], git = "http://github.com/CoinBlack/rust-blackcoin" }