Switch to Arecibo

Cargo.toml

@@ -16,6 +16,8 @@ anymap = "1.0.0-beta.2"
 base32ct = { version = "0.2.0", features = ["std"] }
 base64 = { workspace = true }
 base-x = "0.2.11"
+bellpepper = { workspace = true }
+bellpepper-core = { workspace = true }
 bellperson = { workspace = true }
 bincode = { workspace = true }
 blstrs = { workspace = true }
@@ -34,8 +36,9 @@ metrics = { workspace = true }
 neptune = { workspace = true, features = ["arity2","arity4","arity8","arity16","pasta","bls"] }
 nom = "7.1.3"
 nom_locate = "4.1.0"
-nova = { workspace = true, default-features = false }
+nova = { workspace = true }
 num-bigint = "0.4.3"
+num_cpus = "1.10.1"
 num-integer = "0.1.45"
 num-traits = "0.2.15"
 once_cell = { workspace = true }
@@ -56,10 +59,13 @@ tap = "1.0.1"
 stable_deref_trait = "1.2.0"
 thiserror = { workspace = true }
 camino = { workspace = true }
+abomonation = { workspace = true}
+abomonation_derive = { git = "https://github.com/lurk-lab/abomonation_derive.git" }
+crossbeam = "0.8.2"
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 memmap = { version = "0.5.10", package = "memmap2" }
-pasta-msm = "0.1.4"
+pasta-msm = { workspace = true }
 proptest = { workspace = true }
 proptest-derive = { workspace = true }
 rand = "0.8.5"
@@ -93,6 +99,7 @@ flamegraph = ["pprof/flamegraph", "pprof/criterion"]
 [dev-dependencies]
 assert_cmd = "2.0.12"
 cfg-if = "1.0.0"
+ascii_table = "4.0.2"
 criterion = "0.4"
 hex = "0.4.3"
 pprof = { version = "0.11" }
@@ -101,41 +108,47 @@ structopt = { version = "0.3", default-features = false }
 tap = "1.0.1"
 tempfile = { workspace = true }
 
+[build-dependencies]
+vergen = { version = "8", features = ["build", "git", "gitcl"] }
+
 [workspace]
 resolver = "2"
 members = [
     "clutch",
-    "fcomm", 
+    "fcomm",
     "lurk-macros",
     "lurk-metrics"
 ]
 
 # Dependencies that should be kept in sync through the whole workspace
 [workspace.dependencies]
+abomonation = "0.7.3"
 anyhow = "1.0.72"
 base64 = "0.13.1"
-bellperson = "0.25"
+bellpepper = { git = "https://github.com/lurk-lab/bellpepper", branch = "dev" }
+bellpepper-core = { git = "https://github.com/lurk-lab/bellpepper", branch = "dev" }
+bellperson = { git = "https://github.com/lurk-lab/bellperson", branch = "dev" }
 bincode = "1.3.3"
-blstrs = "0.7.0"
+blstrs = { git = "https://github.com/lurk-lab/blstrs", branch = "dev" }
 clap = "4.3.17"
 ff = "0.13"
 log = "0.4.19"
 metrics = "0.21.1"
-neptune = { version = "10.0.0" }
-nova = { version = "0.23", default-features = false, package = "nova-snark" }
+neptune = { git = "https://github.com/lurk-lab/neptune", branch = "dev" }
+nova = { git = "https://github.com/lurk-lab/arecibo", branch = "dev", package = "nova-snark" }
 once_cell = "1.18.0"
 pairing = { version = "0.23" }
-pasta_curves = { version = "0.5.1" }
-pasta-msm = "0.1.4"
+pasta_curves = { git = "https://github.com/lurk-lab/pasta_curves", branch = "dev" }
+pasta-msm = { git = "https://github.com/lurk-lab/pasta-msm", branch = "dev" }
 pretty_env_logger = "0.4"
 proptest = "1.2.0"
 proptest-derive = "0.3.0"
 rand = "0.8"
 serde = "1.0"
 serde_json = { version = "1.0" }
-thiserror = "1.0.43"
 tempfile = "3.6.0"
 camino = "1.1.6"
+thiserror = "1.0.44"
 
 [[bin]]
 name = "lurk"
@@ -173,3 +186,5 @@ harness = false
 
 [patch.crates-io]
 sppark = { git = "https://github.com/supranational/sppark", rev="5fea26f43cc5d12a77776c70815e7c722fd1f8a7" }
+# This is needed to ensure halo2curves, which imports pasta-curves, uses the *same* traits in bn256_grumpkin
+pasta_curves = { git="https://github.com/lurk-lab/pasta_curves", branch="dev" }

benches/end2end.rs

@@ -72,6 +72,7 @@ fn end2end_benchmark(c: &mut Criterion) {
     // use cached public params
     let pp = public_parameters::public_params(
         reduction_count,
+        true,
         lang_pallas_rc.clone(),
         Utf8Path::new(PUBLIC_PARAMS_PATH),
     )
@@ -291,6 +292,7 @@ fn prove_benchmark(c: &mut Criterion) {
         let prover = NovaProver::new(reduction_count, lang_pallas.clone());
         let pp = public_parameters::public_params(
             reduction_count,
+            true,
             lang_pallas_rc.clone(),
             Utf8Path::new(PUBLIC_PARAMS_PATH),
         )
@@ -337,6 +339,7 @@ fn prove_compressed_benchmark(c: &mut Criterion) {
         let prover = NovaProver::new(reduction_count, lang_pallas.clone());
         let pp = public_parameters::public_params(
             reduction_count,
+            true,
             lang_pallas_rc.clone(),
             Utf8Path::new(PUBLIC_PARAMS_PATH),
         )
@@ -382,6 +385,7 @@ fn verify_benchmark(c: &mut Criterion) {
             let prover = NovaProver::new(reduction_count, lang_pallas.clone());
             let pp = public_parameters::public_params(
                 reduction_count,
+                true,
                 lang_pallas_rc.clone(),
                 Utf8Path::new(PUBLIC_PARAMS_PATH),
             )
@@ -433,6 +437,7 @@ fn verify_compressed_benchmark(c: &mut Criterion) {
             let prover = NovaProver::new(reduction_count, lang_pallas.clone());
             let pp = public_parameters::public_params(
                 reduction_count,
+                true,
                 lang_pallas_rc.clone(),
                 Utf8Path::new(PUBLIC_PARAMS_PATH),
             )