Merge pull request #247 from str4d/update-deps

Update dependencies

bellman/Cargo.toml

@@ -10,7 +10,7 @@ version = "0.6.0"
 edition = "2018"
 
 [dependencies]
-bit-vec = "0.4.4"
+bit-vec = "0.6"
 blake2s_simd = "0.5"
 ff = { version = "0.6", path = "../ff" }
 futures = "0.1"
@@ -27,7 +27,7 @@ subtle = "2.2.1"
 hex-literal = "0.2"
 rand = "0.7"
 rand_xorshift = "0.2"
-sha2 = "0.8"
+sha2 = "0.9"
 
 [features]
 groth16 = ["pairing"]

bellman/src/gadgets/sha256.rs

@@ -343,8 +343,8 @@ mod test {
         for input_len in (0..32).chain((32..256).filter(|a| a % 8 == 0)) {
             let mut h = Sha256::new();
             let data: Vec<u8> = (0..input_len).map(|_| rng.next_u32() as u8).collect();
-            h.input(&data);
-            let hash_result = h.result();
+            h.update(&data);
+            let hash_result = h.finalize();
 
             let mut cs = TestConstraintSystem::<Fr>::new();
             let mut input_bits = vec![];
@@ -366,7 +366,6 @@ mod test {
             assert!(cs.is_satisfied());
 
             let mut s = hash_result
-                .as_ref()
                 .iter()
                 .flat_map(|&byte| (0..8).rev().map(move |i| (byte >> i) & 1u8 == 1u8));
 

ff/ff_derive/Cargo.toml

@@ -16,8 +16,8 @@ edition = "2018"
 proc-macro = true
 
 [dependencies]
-addchain = "0.1"
-num-bigint = "0.2"
+addchain = "0.2"
+num-bigint = "0.3"
 num-traits = "0.2"
 num-integer = "0.1"
 proc-macro2 = "1"

ff/ff_derive/src/lib.rs

@@ -419,7 +419,8 @@ fn biguint_to_real_u64_vec(mut v: BigUint, limbs: usize) -> Vec<u64> {
     let mut ret = vec![];
 
     while v > BigUint::zero() {
-        ret.push((&v % &m).to_u64().unwrap());
+        let limb: BigUint = &v % &m;
+        ret.push(limb.to_u64().unwrap());
         v >>= 64;
     }
 

pairing/benches/bls12_381/mod.rs

@@ -10,7 +10,7 @@ use rand_xorshift::XorShiftRng;
 
 use group::Group;
 use pairing::bls12_381::*;
-use pairing::{Engine, MillerLoopResult, MultiMillerLoop, PairingCurveAffine};
+use pairing::{Engine, MillerLoopResult, MultiMillerLoop};
 
 fn bench_pairing_g2_preparation(c: &mut Criterion) {
     const SAMPLES: usize = 1000;

zcash_client_backend/Cargo.toml

@@ -15,7 +15,7 @@ edition = "2018"
 bech32 = "0.7"
 bs58 = { version = "0.3", features = ["check"] }
 ff = { version = "0.6", path = "../ff" }
-hex = "0.3"
+hex = "0.4"
 pairing = { version = "0.16", path = "../pairing" }
 protobuf = "=2.14.0" # 2.15 has MSRV of 1.44.1
 subtle = "2"

zcash_history/Cargo.toml

@@ -9,7 +9,7 @@ description = "Library for Zcash blockchain history tools"
 
 [dev-dependencies]
 assert_matches = "1.3.0"
-quickcheck = "0.8"
+quickcheck = "0.9"
 
 [dependencies]
 bigint = "4"

zcash_primitives/Cargo.toml

@@ -12,23 +12,23 @@ license = "MIT OR Apache-2.0"
 edition = "2018"
 
 [dependencies]
-aes = "0.3"
+aes = "0.5"
 blake2b_simd = "0.5"
 blake2s_simd = "0.5"
 byteorder = "1"
-crypto_api_chachapoly = "0.2.1"
+crypto_api_chachapoly = "0.4"
 equihash = { version = "0.1", path = "../components/equihash" }
 ff = { version = "0.6", path = "../ff" }
-fpe = "0.2"
-hex = "0.3"
+fpe = "0.3"
+hex = "0.4"
 lazy_static = "1"
 log = "0.4"
 pairing = { version = "0.16", path = "../pairing" }
 rand = "0.7"
 rand_core = "0.5.1"
-ripemd160 = { version = "0.8", optional = true }
-secp256k1 = { version = "=0.15.0", optional = true }
-sha2 = "0.8"
+ripemd160 = { version = "0.9", optional = true }
+secp256k1 = { version = "0.17", optional = true }
+sha2 = "0.9"
 subtle = "2.2.1"
 
 [dev-dependencies]

zcash_proofs/Cargo.toml

@@ -15,7 +15,7 @@ edition = "2018"
 bellman = { version = "0.6", path = "../bellman", default-features = false, features = ["groth16"] }
 blake2b_simd = "0.5"
 byteorder = "1"
-directories = { version = "1", optional = true }
+directories = { version = "3", optional = true }
 ff = { version = "0.6", path = "../ff" }
 minreq = { version = "2", features = ["https"], optional = true }
 pairing = { version = "0.16", path = "../pairing" }