feat(fil-proofs-tooling): use Halo2 compatible dependencies

Cargo.toml

@@ -5,8 +5,8 @@ members = [
   "storage-proofs-core",
   "storage-proofs-porep",
   "storage-proofs-post",
-#  "fil-proofs-tooling",
-#  "fil-proofs-param",
+  "fil-proofs-tooling",
+  "fil-proofs-param",
   "fr32",
   "sha2raw",
   "filecoin-hashers",

fil-proofs-param/Cargo.toml

@@ -15,17 +15,17 @@ storage-proofs-post = { path = "../storage-proofs-post", version = "^8.0.0", def
 filecoin-hashers = { version = "^3.0.0", path = "../filecoin-hashers", default-features = false, features = ["poseidon", "sha256"] }
 filecoin-proofs = { version = "^8.0.0", path = "../filecoin-proofs", default-features = false }
 bitvec = "0.17"
-rand = "0.7"
+rand = "0.8"
 lazy_static = "1.2"
 memmap = "0.7"
 pbr = "1.0"
 byteorder = "1"
 itertools = "0.9"
 serde = { version = "1.0", features = ["rc", "derive"] }
 serde_json = "1.0"
-ff = { version = "0.3.1", package = "fff" }
+ff = "0.10.0"
 blake2b_simd = "0.5"
-bellperson = { version = "0.14", default-features = false }
+bellperson = { git = "https://github.com/filecoin-project/bellperson", branch = "halo" }
 log = "0.4.7"
 fil_logger = "0.1"
 env_proxy = "0.4"
@@ -37,15 +37,15 @@ hex = "0.4.0"
 merkletree = "0.21.0"
 bincode = "1.1.2"
 anyhow = "1.0.23"
-rand_xorshift = "0.2.0"
+rand_xorshift = "0.3.0"
 sha2 = "0.9.1"
 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"
-groupy = "0.4.1"
+group = "0.10.0"
 dialoguer = "0.8.0"
 clap = "2.33.3"
 
@@ -62,11 +62,9 @@ failure = "0.1.7"
 tempfile = "3"
 
 [features]
-default = ["gpu", "pairing"]
+default = ["gpu"]
 cpu-profile = ["gperftools"]
 heap-profile = ["gperftools/heap"]
 simd = ["storage-proofs-core/simd"]
 asm = ["storage-proofs-core/asm"]
 gpu = ["storage-proofs-core/gpu", "storage-proofs-porep/gpu", "storage-proofs-post/gpu", "bellperson/gpu"]
-pairing = ["storage-proofs-core/pairing", "storage-proofs-porep/pairing", "storage-proofs-post/pairing", "bellperson/pairing"]
-blst = ["storage-proofs-core/blst", "storage-proofs-porep/blst", "storage-proofs-post/blst", "bellperson/blst"]

fil-proofs-tooling/Cargo.toml

@@ -25,8 +25,8 @@ regex = "1.3.7"
 commandspec = "0.12.2"
 chrono = { version = "0.4.7", features = ["serde"] }
 memmap = "0.7.0"
-bellperson = { version = "0.14", default-features = false }
-rand = "0.7"
+bellperson = { git = "https://github.com/filecoin-project/bellperson", branch = "halo" }
+rand = "0.8"
 tempfile = "3.0.8"
 cpu-time = "1.0.0"
 git2 = "0.13.6"
@@ -39,8 +39,8 @@ uom = "0.30"
 merkletree = "0.21.0"
 bincode = "1.1.2"
 anyhow = "1.0.23"
-ff = { version = "0.3.1", package = "fff" }
-rand_xorshift = "0.2.0"
+ff = "0.10.0"
+rand_xorshift = "0.3.0"
 bytefmt = "0.1.7"
 rayon = "1.3.0"
 flexi_logger = "0.16.1"
@@ -53,7 +53,7 @@ structopt = "0.3.12"
 humansize = "1.1.0"
 
 [features]
-default = ["gpu", "measurements", "pairing"]
+default = ["gpu", "measurements"]
 gpu = [
     "storage-proofs-core/gpu",
     "storage-proofs-porep/gpu",
@@ -64,22 +64,6 @@ gpu = [
 ]
 measurements = ["storage-proofs-core/measurements"]
 profile = ["storage-proofs-core/profile", "measurements"]
-pairing = [
-    "storage-proofs-core/pairing",
-    "storage-proofs-porep/pairing",
-    "storage-proofs-post/pairing",
-    "filecoin-proofs/pairing",
-    "bellperson/pairing",
-    "filecoin-hashers/pairing",
-]
-blst = [
-    "storage-proofs-core/blst",
-    "storage-proofs-porep/blst",
-    "storage-proofs-post/blst",
-    "filecoin-proofs/blst",
-    "bellperson/blst",
-    "filecoin-hashers/blst",
-]
 
 [target.'cfg(target_arch = "x86_64")'.dependencies]
 raw-cpuid = "8.1.2"

fil-proofs-tooling/src/bin/benchy/merkleproofs.rs

@@ -50,7 +50,7 @@ fn generate_proofs<R: Rng, Tree: MerkleTreeTrait>(
         let challenge = if proofs_count == nodes {
             i
         } else {
-            rng.gen_range(0, nodes)
+            rng.gen_range(0..nodes)
         };
         debug!("challenge[{}] = {}", i, challenge);
         let proof = tree