Releases/v11 update (#1612)

* feat: extend proofs API such that aggregation can use snarkpack versions
* feat: extend aggregation tests to ensure version incompatibility
* feat: update bellperson and neptune to latest
* feat: update CI nightly

.circleci/config.yml

@@ -3,7 +3,7 @@ version: 2.1
 parameters:
   nightly-toolchain:
     type: string
-    default: "nightly-2021-04-24"
+    default: "nightly-2022-05-09"
 
 executors:
   default:
@@ -136,6 +136,7 @@ jobs:
           at: "."
       - restore_rustup_cache
       - restore_parameter_cache
+      - run: rustup install << pipeline.parameters.nightly-toolchain >>
       - run:
           name: Test with use_multicore_sdr
           command: |

Cargo.toml

@@ -12,3 +12,6 @@ members = [
   "filecoin-hashers",
   "storage-proofs-update",
 ]
+
+[patch.crates-io]
+async-global-executor = { git = "https://github.com/async-rs/async-global-executor", rev = "v2.0.4" }

fil-proofs-param/Cargo.toml

@@ -26,7 +26,7 @@ serde = { version = "1.0", features = ["rc", "derive"] }
 serde_json = "1.0"
 ff = "0.11.0"
 blake2b_simd = "0.5"
-bellperson = "0.18.0"
+bellperson = "0.21.0"
 log = "0.4.7"
 fil_logger = "0.1"
 env_proxy = "0.4"

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

@@ -23,7 +23,7 @@ use tar::Archive;
 
 lazy_static! {
     static ref CLI_ABOUT: String = format!(
-        "Downloads missing or outdated Groth parameter files from ipfs using ipget.\n\n\
+        "Downloads missing or outdated Groth parameter files from ipfs using ipget.\n\n
 
         Set the $FIL_PROOFS_PARAMETER_CACHE env-var to specify the path to the parameter cache
         directory (location where params are written), otherwise params will be written to '{}'.",

fil-proofs-tooling/Cargo.toml

@@ -26,7 +26,7 @@ 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.21.0"
 rand = "0.8"
 tempfile = "3.0.8"
 cpu-time = "1.0.0"

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.21.0"
 blstrs = "0.4.0"
 generic-array = "0.14.4"
 merkletree = "0.21.0"
@@ -18,7 +18,7 @@ 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 = "5.2.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 }

filecoin-proofs/Cargo.toml

@@ -24,7 +24,7 @@ serde = { version = "1.0", features = ["rc", "derive"] }
 serde_json = "1.0"
 ff = "0.11.0"
 blake2b_simd = "0.5"
-bellperson = "0.18.0"
+bellperson = "0.21.0"
 log = "0.4.7"
 fil_logger = "0.1"
 rayon = "1.1.0"

filecoin-proofs/src/api/seal.rs

@@ -724,6 +724,7 @@ pub fn aggregate_seal_commit_proofs<Tree: 'static + MerkleTreeTrait>(
     comm_rs: &[[u8; 32]],
     seeds: &[[u8; 32]],
     commit_outputs: &[SealCommitOutput],
+    aggregate_version: groth16::aggregate::AggregateVersion,
 ) -> Result<AggregateSnarkProof> {
     info!("aggregate_seal_commit_proofs:start");
 
@@ -784,6 +785,7 @@ pub fn aggregate_seal_commit_proofs<Tree: 'static + MerkleTreeTrait>(
         &srs_prover_key,
         &hashed_seeds_and_comm_rs,
         proofs.as_slice(),
+        aggregate_version,
     )?;
     let mut aggregate_proof_bytes = Vec::new();
     aggregate_proof.write(&mut aggregate_proof_bytes)?;
@@ -809,6 +811,7 @@ pub fn verify_aggregate_seal_commit_proofs<Tree: 'static + MerkleTreeTrait>(
     comm_rs: &[[u8; 32]],
     seeds: &[[u8; 32]],
     commit_inputs: Vec<Vec<Fr>>,
+    aggregate_version: groth16::aggregate::AggregateVersion,
 ) -> Result<bool> {
     info!("verify_aggregate_seal_commit_proofs:start");
 
@@ -878,6 +881,7 @@ pub fn verify_aggregate_seal_commit_proofs<Tree: 'static + MerkleTreeTrait>(
         &hashed_seeds_and_comm_rs,
         commit_inputs.as_slice(),
         &aggregate_proof,
+        aggregate_version,
     )?;
     trace!("end verifying aggregate proof");