Replaces #1578 (#1584)

* chore: update deps

Hopefully this will let us use fewer duplicate deps.

Except:

- bellperson
- neptune

* chore: remove outdated byte-unit version comment

Co-authored-by: Steven Allen <[email protected]>

fil-proofs-param/Cargo.toml

@@ -15,50 +15,50 @@ storage-proofs-post = { path = "../storage-proofs-post", version = "^11.0.0", de
 storage-proofs-update = { path = "../storage-proofs-update", version = "^11.0.0", default-features = false }
 filecoin-hashers = { version = "^6.0.0", path = "../filecoin-hashers", default-features = false, features = ["poseidon", "sha256"] }
 filecoin-proofs = { version = "^11.0.0", path = "../filecoin-proofs", default-features = false }
-bitvec = "0.17"
+bitvec = "1.0.0"
 rand = "0.8"
 lazy_static = "1.2"
 memmap = "0.7"
 pbr = "1.0"
 byteorder = "1"
-itertools = "0.9"
+itertools = "0.10.3"
 serde = { version = "1.0", features = ["rc", "derive"] }
 serde_json = "1.0"
 ff = "0.11.0"
-blake2b_simd = "0.5"
+blake2b_simd = "1.0.0"
 bellperson = "0.18.0"
 log = "0.4.7"
 fil_logger = "0.1"
 env_proxy = "0.4"
 flate2 = { version = "1.0.9", features = ["rust_backend"]}
 tar = "0.4.26"
 rayon = "1.1.0"
-blake2s_simd = "0.5.8"
+blake2s_simd = "1.0.0"
 hex = "0.4.0"
 merkletree = "0.21.0"
 bincode = "1.1.2"
 anyhow = "1.0.23"
 rand_xorshift = "0.3.0"
-sha2 = "0.9.1"
+sha2 = "0.10.2"
 typenum = "1.11.2"
 gperftools = { version = "0.2", optional = true }
 generic-array = "0.14.4"
 structopt = "0.3.12"
 humansize = "1.1.0"
-indicatif = "0.15.0"
+indicatif = "0.16.2"
 group = "0.11.0"
-dialoguer = "0.8.0"
-clap = "2.33.3"
+dialoguer = "0.10.0"
+clap = "3.1.6"
 
 [dependencies.reqwest]
-version = "0.10"
+version = "0.11.10"
 default-features = false
 features = ["blocking", "native-tls-vendored"]
 
 [dev-dependencies]
 criterion = "0.3"
 rexpect = "0.4.0"
-pretty_assertions = "0.6.1"
+pretty_assertions = "1.2.0"
 failure = "0.1.7"
 tempfile = "3"
 

fil-proofs-param/src/bin/paramcache.rs

@@ -309,7 +309,7 @@ pub fn main() {
         info!("{}", &message);
 
         let spinner = ProgressBar::new_spinner();
-        spinner.set_message(&message);
+        spinner.set_message(message);
         spinner.enable_steady_tick(100);
 
         if opts.only_sector_update {
@@ -323,6 +323,6 @@ pub fn main() {
             }
         }
 
-        spinner.finish_with_message(&format!("✔ {}", &message));
+        spinner.finish_with_message(format!("✔ Generated sector size: {}", human_size));
     }
 }

fil-proofs-tooling/Cargo.toml

@@ -16,7 +16,7 @@ storage-proofs-post = { path = "../storage-proofs-post", version = "^11.0.0", de
 storage-proofs-update = { path = "../storage-proofs-update", version = "^11.0.0", default-features = false }
 filecoin-proofs = { path = "../filecoin-proofs", default-features = false }
 filecoin-hashers = { path = "../filecoin-hashers", default-features = false, features = ["poseidon", "blake2s", "sha256"] }
-clap = "2"
+clap = { version = "3.1.6", features = ["derive"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 toml = "0.5"
@@ -30,30 +30,30 @@ bellperson = "0.18.0"
 rand = "0.8"
 tempfile = "3.0.8"
 cpu-time = "1.0.0"
-git2 = "0.13.6"
+git2 = "0.14.2"
 heim = { git = "https://github.com/heim-rs/heim", rev = "b292f15", features = ["host", "memory", "cpu"] }
 async-std = "1.6"
-blake2s_simd = "0.5.6"
+blake2s_simd = "1.0.0"
 fil_logger = "0.1"
 log = "0.4.8"
-uom = "0.30"
+uom = "0.32.0"
 merkletree = "0.21.0"
 bincode = "1.1.2"
 anyhow = "1.0.23"
 ff = "0.11.0"
 rand_xorshift = "0.3.0"
 bytefmt = "0.1.7"
 rayon = "1.3.0"
-flexi_logger = "0.16.1"
+flexi_logger = "0.22.3"
 typenum = "1.11.2"
 generic-array = "0.14.4"
-# `byte-unit = 4.0.13` is the final version that uses Rust 2018 edition.
-byte-unit = "=4.0.13"
+byte-unit = "4.0.14"
 fdlimit = "0.2.0"
-dialoguer = "0.8.0"
+dialoguer = "0.10.0"
 structopt = "0.3.12"
 humansize = "1.1.0"
 blstrs = "0.4.0"
+time = "0.3.9"
 
 [features]
 default = ["opencl", "measurements"]
@@ -79,4 +79,4 @@ measurements = ["storage-proofs-core/measurements"]
 profile = ["storage-proofs-core/profile", "measurements"]
 
 [target.'cfg(target_arch = "x86_64")'.dependencies]
-raw-cpuid = "8.1.2"
+raw-cpuid = "10.3.0"