update dependencies

fil-proofs-tooling/Cargo.toml

@@ -22,7 +22,7 @@ regex = "1.3.7"
 commandspec = "0.12.2"
 chrono = { version = "0.4.7", features = ["serde"] }
 memmap = "0.7.0"
-bellperson = { git = "https://github.com/filecoin-project/bellman", branch = "blstrs", default-features = false }
+bellperson = { git = "https://github.com/filecoin-project/bellperson", branch = "blstrs", default-features = false }
 rand = "0.7"
 tempfile = "3.0.8"
 cpu-time = "1.0.0"
@@ -40,9 +40,9 @@ ff = { version = "0.2.3", package = "fff" }
 rand_xorshift = "0.2.0"
 bytefmt = "0.1.7"
 rayon = "1.3.0"
-flexi_logger = "0.14.7"
+flexi_logger = "0.16.1"
 typenum = "1.11.2"
-generic-array = "0.13.2"
+generic-array = "0.14.4"
 byte-unit = "4.0.9"
 
 [features]
@@ -54,4 +54,4 @@ pairing = ["storage-proofs/pairing", "filecoin-proofs/pairing", "bellperson/pair
 blst = ["storage-proofs/blst", "filecoin-proofs/blst", "bellperson/blst"]
 
 [target.'cfg(target_arch = "x86_64")'.dependencies]
-raw-cpuid = "7.0.3"
+raw-cpuid = "8.1.2"

filecoin-proofs/Cargo.toml

@@ -23,7 +23,7 @@ serde_json = "1.0"
 regex = "1.3.7"
 ff = { version = "0.2.3", package = "fff" }
 blake2b_simd = "0.5"
-bellperson = { git = "https://github.com/filecoin-project/bellman", branch = "blstrs", default-features = false }
+bellperson = { git = "https://github.com/filecoin-project/bellperson", branch = "blstrs", default-features = false }
 clap = "2"
 log = "0.4.7"
 fil_logger = "0.1"
@@ -44,11 +44,11 @@ gperftools = { version = "0.2", optional = true }
 phase2 = { git = "https://github.com/filecoin-project/phase2", branch = "blst", package = "phase21", default-features = false }
 simplelog = "0.8.0"
 rand_chacha = "0.2.1"
-dialoguer = "0.6.2"
-generic-array = "0.13.2"
+dialoguer = "0.7.1"
+generic-array = "0.14.4"
 structopt = "0.3.12"
 humansize = "1.1.0"
-indicatif = "0.14.0"
+indicatif = "0.15.0"
 groupy = "0.3.0"
 
 [dependencies.reqwest]

filecoin-proofs/src/bin/circuitinfo.rs

@@ -4,15 +4,14 @@ use log::{info, warn};
 use structopt::StructOpt;
 
 use bellperson::util_cs::bench_cs::BenchCS;
-use bellperson::Circuit;
+use bellperson::{bls::Bls12, Circuit};
 use filecoin_proofs::constants::*;
 use filecoin_proofs::parameters::{
     public_params, window_post_public_params, winning_post_public_params,
 };
 use filecoin_proofs::types::*;
 use filecoin_proofs::with_shape;
 use filecoin_proofs::PoStType;
-use paired::bls12_381::Bls12;
 use storage_proofs::compound_proof::CompoundProof;
 use storage_proofs::porep::stacked::{StackedCompound, StackedDrg};
 use storage_proofs::post::fallback::{FallbackPoSt, FallbackPoStCircuit, FallbackPoStCompound};

sha2raw/Cargo.toml

@@ -12,10 +12,11 @@ edition = "2018"
 
 [dependencies]
 digest = "0.9"
-block-buffer = "0.7"
+block-buffer = "0.9"
 fake-simd = "0.1"
-opaque-debug = "0.2"
+opaque-debug = "0.3"
 sha2-asm = { version = "0.5", optional = true }
+byteorder = "1.3.4"
 
 [dependencies.lazy_static]
 version = "1.4.0"

sha2raw/src/sha256.rs

@@ -1,4 +1,4 @@
-use block_buffer::byteorder::{ByteOrder, BE};
+use byteorder::{ByteOrder, BE};
 
 use crate::consts::H256;
 use crate::platform::Implementation;
@@ -79,7 +79,7 @@ impl Sha256 {
     }
 }
 
-opaque_debug::impl_opaque_debug!(Sha256);
+opaque_debug::implement!(Sha256);
 
 #[cfg(test)]
 mod tests {

sha2raw/src/sha256_utils.rs

@@ -283,7 +283,7 @@ fn sha256_digest_block_u32(state: &mut [u32; 8], block: &[u32; 16]) {
 #[inline]
 pub fn compress256(state: &mut [u32; 8], blocks: &[&[u8]]) {
     use crate::consts::BLOCK_LEN;
-    use block_buffer::byteorder::{ByteOrder, BE};
+    use byteorder::{ByteOrder, BE};
 
     let mut block_u32 = [0u32; BLOCK_LEN];
 

storage-proofs/core/Cargo.toml

@@ -19,8 +19,8 @@ config = { version = "0.10.1", default-features = false, features = ["toml"] }
 itertools = "0.9"
 lazy_static = "1.2"
 memmap = "0.7"
-aes = "0.3"
-block-modes = "0.3"
+aes = "0.6"
+block-modes = "0.7"
 sha2 = "0.9.1"
 tempfile = "3"
 fs2 = "0.4"
@@ -30,12 +30,12 @@ blake2b_simd = "0.5"
 blake2s_simd = "0.5"
 toml = "0.5"
 ff = { version = "0.2.3", package = "fff" }
-bellperson = { git = "https://github.com/filecoin-project/bellman", branch = "blstrs", default-features = false }
+bellperson = { git = "https://github.com/filecoin-project/bellperson", branch = "blstrs", default-features = false }
 serde_json = "1.0"
 log = "0.4.7"
 rand_chacha = "0.2.1"
 hex = "0.4.0"
-generic-array = "0.13.2"
+generic-array = "0.14.4"
 anyhow = "1.0.23"
 thiserror = "1.0.6"
 neptune = { git = "https://github.com/filecoin-project/neptune", branch = "blst", default-features = false, features = ["gpu"] }

storage-proofs/core/src/gadgets/xor.rs

@@ -1,6 +1,5 @@
 use bellperson::gadgets::boolean::Boolean;
-use bellperson::{ConstraintSystem, SynthesisError};
-use paired::Engine;
+use bellperson::{bls::Engine, ConstraintSystem, SynthesisError};
 
 pub fn xor<E, CS>(
     cs: &mut CS,

storage-proofs/porep/Cargo.toml

@@ -9,7 +9,7 @@ repository = "https://github.com/filecoin-project/rust-fil-proofs"
 readme = "README.md"
 
 [dependencies]
-crossbeam = "0.7.3"
+crossbeam = "0.8"
 digest = "0.9"
 storage-proofs-core = { path = "../core", version = "^5.0.0", default-features = false}
 sha2raw = { path = "../../sha2raw", version = "^2.0.0"}
@@ -23,18 +23,18 @@ rayon = "1.0.0"
 serde = { version = "1.0", features = ["derive"]}
 serde_json = "1.0"
 ff = { version = "0.2.3", package = "fff" }
-bellperson = { git = "https://github.com/filecoin-project/bellman", branch = "blstrs", default-features = false }
+bellperson = { git = "https://github.com/filecoin-project/bellperson", branch = "blstrs", default-features = false }
 log = "0.4.7"
 pretty_assertions = "0.6.1"
-generic-array = "0.13.2"
+generic-array = "0.14.4"
 anyhow = "1.0.23"
 neptune = { git = "https://github.com/filecoin-project/neptune", branch = "blst", default-features = false, features = ["gpu"] }
 num_cpus = "1.10.1"
 hex = "0.4.2"
 bincode = "1.1.2"
 byteorder = "1.3.4"
 lazy_static = "1.2"
-byte-slice-cast = "0.3.5"
+byte-slice-cast = "1.0.0"
 hwloc = "0.3.0"
 libc = "0.2"
 

storage-proofs/porep/src/stacked/circuit/create_label.rs

@@ -1,7 +1,6 @@
 use bellperson::gadgets::{boolean::Boolean, num, sha256::sha256 as sha256_circuit, uint32};
-use bellperson::{ConstraintSystem, SynthesisError};
+use bellperson::{bls::Engine, ConstraintSystem, SynthesisError};
 use ff::PrimeField;
-use paired::Engine;
 use storage_proofs_core::{gadgets::multipack, gadgets::uint64, util::reverse_bit_numbering};
 
 use crate::stacked::vanilla::TOTAL_PARENTS;

storage-proofs/post/Cargo.toml

@@ -13,17 +13,17 @@ storage-proofs-core = { path = "../core", version = "^5.0.0", default-features =
 rand = "0.7"
 merkletree = "0.21.0"
 byteorder = "1"
-crossbeam = "0.7.3"
+crossbeam = "0.8"
 sha2 = "0.9.1"
 rayon = "1.0.0"
 serde = { version = "1.0", features = ["derive"]}
 blake2b_simd = "0.5"
 blake2s_simd = "0.5"
 ff = { version = "0.2.3", package = "fff" }
-bellperson = { git = "https://github.com/filecoin-project/bellman", branch = "blstrs", default-features = false }
+bellperson = { git = "https://github.com/filecoin-project/bellperson", branch = "blstrs", default-features = false }
 log = "0.4.7"
 hex = "0.4.0"
-generic-array = "0.13.2"
+generic-array = "0.14.4"
 anyhow = "1.0.23"
 neptune = { git = "https://github.com/filecoin-project/neptune", branch = "blst", default-features = false, features = ["gpu"] }
 num_cpus = "1.10.1"