From f5b6f909c970f34cdee821e28c4a92d831db20b9 Mon Sep 17 00:00:00 2001
From: Steven Allen <steven@stebalien.com>
Date: Thu, 24 Mar 2022 12:25:48 -0400
Subject: [PATCH] chore: update deps

Hopefully this will let us use fewer duplicate deps.
---
 fil-proofs-param/Cargo.toml      | 22 +++++++++++-----------
 fil-proofs-tooling/Cargo.toml    | 18 +++++++++---------
 filecoin-hashers/Cargo.toml      |  8 ++++----
 filecoin-proofs/Cargo.toml       | 14 +++++++-------
 fr32/Cargo.toml                  |  8 ++++----
 sha2raw/Cargo.toml               | 14 +++++++-------
 storage-proofs-core/Cargo.toml   | 26 +++++++++++++-------------
 storage-proofs-porep/Cargo.toml  | 16 ++++++++--------
 storage-proofs-post/Cargo.toml   | 12 ++++++------
 storage-proofs-update/Cargo.toml | 16 ++++++++--------
 10 files changed, 77 insertions(+), 77 deletions(-)

diff --git a/fil-proofs-param/Cargo.toml b/fil-proofs-param/Cargo.toml
index 4866cddd57..6f691dba6b 100644
--- a/fil-proofs-param/Cargo.toml
+++ b/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"
-bellperson = "0.18.0"
+blake2b_simd = "1.0.0"
+bellperson = "0.19.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"
 
diff --git a/fil-proofs-tooling/Cargo.toml b/fil-proofs-tooling/Cargo.toml
index 92d5b2b47e..5ad1432e98 100644
--- a/fil-proofs-tooling/Cargo.toml
+++ b/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 = "3.1.6"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 toml = "0.5"
@@ -26,17 +26,17 @@ regex = "1.3.7"
 commandspec = "0.12.2"
 chrono = { version = "0.4.7", features = ["serde"] }
 memmap = "0.7.0"
-bellperson = "0.18.0"
+bellperson = "0.19.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"
@@ -44,13 +44,13 @@ 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"
@@ -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"
diff --git a/filecoin-hashers/Cargo.toml b/filecoin-hashers/Cargo.toml
index ad27ab6bd7..93969e3f5b 100644
--- a/filecoin-hashers/Cargo.toml
+++ b/filecoin-hashers/Cargo.toml
@@ -9,7 +9,7 @@ repository = "https://github.com/filecoin-project/rust-fil-proofs"
 readme = "README.md"
 
 [dependencies]
-bellperson = "0.18.0"
+bellperson = "0.19.0"
 blstrs = "0.4.0"
 generic-array = "0.14.4"
 merkletree = "0.21.0"
@@ -18,10 +18,10 @@ anyhow = "1.0.34"
 serde = "1.0.117"
 rand = "0.8.0"
 
-neptune = { version = "5.1.0", optional = true, features = ["arity2", "arity4", "arity8", "arity11", "arity16", "arity24", "arity36"] }
+neptune = { version = "6.0.0", optional = true, features = ["arity2", "arity4", "arity8", "arity11", "arity16", "arity24", "arity36"] }
 lazy_static = { version = "1.4.0", optional = true }
-blake2s_simd = { version = "0.5.11", optional = true }
-sha2 = { version = "0.9.2", optional = true }
+blake2s_simd = { version = "1.0.0", optional = true }
+sha2 = { version = "0.10.2", optional = true }
 hex = "0.4.2"
 
 [features]
diff --git a/filecoin-proofs/Cargo.toml b/filecoin-proofs/Cargo.toml
index 4fa7950d91..0bcb0f6e8e 100644
--- a/filecoin-proofs/Cargo.toml
+++ b/filecoin-proofs/Cargo.toml
@@ -14,27 +14,27 @@ storage-proofs-porep = { path = "../storage-proofs-porep", version = "^11.0.0",
 storage-proofs-post = { path = "../storage-proofs-post", version = "^11.0.0", default-features = false }
 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"] }
-bitvec = "0.17"
+bitvec = "1.0.0"
 rand = "0.8"
 lazy_static = "1.2"
 memmap = "0.7"
 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"
-bellperson = "0.18.0"
+blake2b_simd = "1.0.0"
+bellperson = "0.19.0"
 log = "0.4.7"
 fil_logger = "0.1"
 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"
@@ -47,7 +47,7 @@ blstrs = "0.4.0"
 [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"
 
diff --git a/fr32/Cargo.toml b/fr32/Cargo.toml
index d6a2e9a2e9..386cd366dc 100644
--- a/fr32/Cargo.toml
+++ b/fr32/Cargo.toml
@@ -9,7 +9,7 @@ repository = "https://github.com/filecoin-project/rust-fil-proofs"
 
 [dependencies]
 anyhow = "1.0.23"
-bellperson = "0.18.0"
+bellperson = "0.19.0"
 byte-slice-cast = "1.0.0"
 byteorder = "1"
 ff = "0.11.0"
@@ -17,10 +17,10 @@ thiserror = "1.0.6"
 blstrs = "0.4.0"
 
 [dev-dependencies]
-bitvec = "0.17"
+bitvec = "1.0.0"
 criterion = "0.3"
-itertools = "0.9"
-pretty_assertions = "0.6.1"
+itertools = "0.10.3"
+pretty_assertions = "1.2.0"
 rand = "0.8"
 rand_xorshift = "0.3"
 
diff --git a/sha2raw/Cargo.toml b/sha2raw/Cargo.toml
index 8bcdbe4405..9e33004cc1 100644
--- a/sha2raw/Cargo.toml
+++ b/sha2raw/Cargo.toml
@@ -11,8 +11,8 @@ categories = ["cryptography", "no-std"]
 edition = "2018"
 
 [dependencies]
-digest = "0.9"
-block-buffer = "0.9"
+digest = "0.10.3"
+block-buffer = "0.10.2"
 fake-simd = "0.1"
 opaque-debug = "0.3"
 sha2-asm = { version = "0.6", optional = true }
@@ -22,13 +22,13 @@ byteorder = "1.3.4"
 version = "1.4.0"
 
 [target.'cfg(target_arch = "x86_64")'.dependencies]
-cpuid-bool = "0.1.0"
+cpuid-bool = "0.99.99"
 
 [dev-dependencies]
-digest = { version = "0.9", features = ["dev", "std"] }
-sha2 = "0.9.1"
-rand = "0.7.3"
-rand_xorshift = "0.2.0"
+digest = { version = "0.10.3", features = ["dev", "std"] }
+sha2 = "0.10.2"
+rand = "0.8.5"
+rand_xorshift = "0.3.0"
 
 [features]
 default = ["asm"]
diff --git a/storage-proofs-core/Cargo.toml b/storage-proofs-core/Cargo.toml
index 3aa168e38d..1e5f3eda53 100644
--- a/storage-proofs-core/Cargo.toml
+++ b/storage-proofs-core/Cargo.toml
@@ -16,22 +16,22 @@ filecoin-hashers = { path = "../filecoin-hashers", version = "^6.0.0", default-f
 rand = "0.8"
 merkletree = "0.21.0"
 byteorder = "1"
-config = { version = "0.10.1", default-features = false, features = ["toml"] }
-itertools = "0.9"
+config = { version = "0.12.0", default-features = false, features = ["toml"] }
+itertools = "0.10.3"
 lazy_static = "1.2"
 memmap = "0.7"
-aes = "0.6"
-block-modes = "0.7"
-sha2 = "0.9.1"
+aes = "0.8.1"
+block-modes = "0.9.1"
+sha2 = "0.10.2"
 tempfile = "3"
 fs2 = "0.4"
 rayon = "1.0.0"
 serde = { version = "1.0", features = ["derive"]}
-blake2b_simd = "0.5"
-blake2s_simd = "0.5"
+blake2b_simd = "1.0.0"
+blake2s_simd = "1.0.0"
 toml = "0.5"
 ff = "0.11.0"
-bellperson = "0.18.0"
+bellperson = "0.19.0"
 serde_json = "1.0"
 log = "0.4.7"
 rand_chacha = "0.3"
@@ -39,21 +39,21 @@ hex = "0.4.0"
 generic-array = "0.14.4"
 anyhow = "1.0.23"
 thiserror = "1.0.6"
-neptune = { version = "5.1.0", features = ["arity2", "arity4", "arity8", "arity11", "arity16", "arity24", "arity36"] }
+neptune = { version = "6.0.0", features = ["arity2", "arity4", "arity8", "arity11", "arity16", "arity24", "arity36"] }
 cpu-time = { version = "1.0", optional = true }
 gperftools = { version = "0.2", optional = true }
 num_cpus = "1.10.1"
-semver = "0.11.0"
+semver = "1.0.6"
 fr32 = { path = "../fr32", version = "^4.0.0"}
 pairing = "0.21"
 blstrs = "0.4.0"
 
 [dev-dependencies]
-proptest = "0.10"
+proptest = "1.0.0"
 criterion = "0.3"
-bitvec = "0.17"
+bitvec = "1.0.0"
 rand_xorshift = "0.3.0"
-pretty_assertions = "0.6.1"
+pretty_assertions = "1.2.0"
 sha2raw = { path = "../sha2raw", version = "^6.0.0"}
 filecoin-hashers = { path = "../filecoin-hashers", version = "^6.0.0", default-features = false, features = ["blake2s", "sha256", "poseidon"] }
 
diff --git a/storage-proofs-porep/Cargo.toml b/storage-proofs-porep/Cargo.toml
index 01ac3783f1..baab0747ba 100644
--- a/storage-proofs-porep/Cargo.toml
+++ b/storage-proofs-porep/Cargo.toml
@@ -10,32 +10,32 @@ readme = "README.md"
 
 [dependencies]
 crossbeam = "0.8"
-digest = "0.9"
+digest = "0.10.3"
 storage-proofs-core = { path = "../storage-proofs-core", version = "^11.0.0", default-features = false}
 sha2raw = { path = "../sha2raw", version = "^6.0.0"}
 filecoin-hashers = { path = "../filecoin-hashers", version = "^6.0.0", default-features = false, features = ["poseidon", "sha256"]}
 rand = "0.8"
 merkletree = "0.21.0"
 mapr = "0.8.0"
-num-bigint = "0.2"
+num-bigint = "0.4.3"
 num-traits = "0.2"
 rayon = "1.0.0"
 serde = { version = "1.0", features = ["derive"]}
 serde_json = "1.0"
 ff = "0.11.0"
-bellperson = "0.18.0"
+bellperson = "0.19.0"
 log = "0.4.7"
-pretty_assertions = "0.6.1"
+pretty_assertions = "1.2.0"
 generic-array = "0.14.4"
 anyhow = "1.0.23"
-neptune = { version = "5.1.0", features = ["arity2", "arity4", "arity8", "arity11", "arity16", "arity24", "arity36"] }
+neptune = { version = "6.0.0", features = ["arity2", "arity4", "arity8", "arity11", "arity16", "arity24", "arity36"] }
 num_cpus = "1.10.1"
 hex = "0.4.2"
 bincode = "1.1.2"
 byteorder = "1.3.4"
 lazy_static = "1.2"
 byte-slice-cast = "1.0.0"
-hwloc = { version = "0.3.0", optional = true }
+hwloc = { version = "0.5.0", optional = true }
 libc = "0.2"
 fdlimit = "0.2.0"
 fr32 = { path = "../fr32", version = "^4.0.0", default-features = false }
@@ -45,9 +45,9 @@ pairing = "0.21"
 blstrs = "0.4.0"
 
 [target."cfg(target_arch = \"aarch64\")".dependencies]
-sha2 = { version = "0.9.3", features = ["compress", "asm"] }
+sha2 = { version = "0.10.2", features = ["compress", "asm"] }
 [target."cfg(not(target_arch = \"aarch64\"))".dependencies]
-sha2 = { version = "0.9.3", features = ["compress"] }
+sha2 = { version = "0.10.2", features = ["compress"] }
 
 [dev-dependencies]
 tempfile = "3"
diff --git a/storage-proofs-post/Cargo.toml b/storage-proofs-post/Cargo.toml
index de02118bf5..1267e4edcd 100644
--- a/storage-proofs-post/Cargo.toml
+++ b/storage-proofs-post/Cargo.toml
@@ -15,25 +15,25 @@ rand = "0.8"
 merkletree = "0.21.0"
 byteorder = "1"
 crossbeam = "0.8"
-sha2 = "0.9.1"
+sha2 = "0.10.2"
 rayon = "1.0.0"
 serde = { version = "1.0", features = ["derive"]}
-blake2b_simd = "0.5"
-blake2s_simd = "0.5"
+blake2b_simd = "1.0.0"
+blake2s_simd = "1.0.0"
 ff = "0.11.0"
-bellperson = "0.18.0"
+bellperson = "0.19.0"
 log = "0.4.7"
 hex = "0.4.0"
 generic-array = "0.14.4"
 anyhow = "1.0.23"
-neptune = { version = "5.1.0", features = ["arity2", "arity4", "arity8", "arity11", "arity16", "arity24", "arity36"] }
+neptune = { version = "6.0.0", features = ["arity2", "arity4", "arity8", "arity11", "arity16", "arity24", "arity36"] }
 num_cpus = "1.10.1"
 fr32 = { path = "../fr32", version = "^4.0.0", default-features = false }
 blstrs = "0.4.0"
 
 [dev-dependencies]
 tempfile = "3"
-pretty_assertions = "0.6.1"
+pretty_assertions = "1.2.0"
 filecoin-hashers = { path = "../filecoin-hashers", version = "^6.0.0", default-features = false, features = ["poseidon", "sha256", "blake2s"]}
 rand_xorshift = "0.3.0"
 
diff --git a/storage-proofs-update/Cargo.toml b/storage-proofs-update/Cargo.toml
index dd07209273..05c17dd95e 100644
--- a/storage-proofs-update/Cargo.toml
+++ b/storage-proofs-update/Cargo.toml
@@ -10,7 +10,7 @@ readme = "README.md"
 
 [dependencies]
 crossbeam = "0.8"
-digest = "0.9"
+digest = "0.10.3"
 storage-proofs-core = { path = "../storage-proofs-core", version = "^11.0.0", default-features = false}
 storage-proofs-porep = { path = "../storage-proofs-porep", version = "^11.0.0", default-features = false}
 sha2raw = { path = "../sha2raw", version = "^6.0.0"}
@@ -18,26 +18,26 @@ filecoin-hashers = { path = "../filecoin-hashers", version = "^6.0.0", default-f
 rand = "0.8"
 merkletree = "0.21.0"
 mapr = "0.8.0"
-num-bigint = "0.2"
+num-bigint = "0.4.3"
 num-traits = "0.2"
 rayon = "1.0.0"
 serde = { version = "1.0", features = ["derive"]}
 serde_json = "1.0"
 ff = "0.11.0"
-bellperson = "0.18.0"
+bellperson = "0.19.0"
 blstrs = "0.4.0"
 log = "0.4.7"
-pretty_assertions = "0.6.1"
+pretty_assertions = "1.2.0"
 generic-array = "0.14.4"
 anyhow = "1.0.23"
-neptune = { version = "5.1.0", features = ["arity2", "arity4", "arity8", "arity11", "arity16", "arity24", "arity36"] }
+neptune = { version = "6.0.0", features = ["arity2", "arity4", "arity8", "arity11", "arity16", "arity24", "arity36"] }
 num_cpus = "1.10.1"
 hex = "0.4.2"
 bincode = "1.1.2"
 byteorder = "1.3.4"
 lazy_static = "1.2"
 byte-slice-cast = "1.0.0"
-hwloc = { version = "0.3.0", optional = true }
+hwloc = { version = "0.5.0", optional = true }
 libc = "0.2"
 fdlimit = "0.2.0"
 fr32 = { path = "../fr32", version = "^4.0.0", default-features = false }
@@ -46,9 +46,9 @@ fil_logger = "0.1"
 memmap = "0.7"
 
 [target."cfg(target_arch = \"aarch64\")".dependencies]
-sha2 = { version = "0.9.3", features = ["compress", "asm"] }
+sha2 = { version = "0.10.2", features = ["compress", "asm"] }
 [target."cfg(not(target_arch = \"aarch64\"))".dependencies]
-sha2 = { version = "0.9.3", features = ["compress"] }
+sha2 = { version = "0.10.2", features = ["compress"] }
 
 [dev-dependencies]
 tempfile = "3"