Updated deps (#1615)

* 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 * feat: update dependencies * feat: lock versions so only patch releases are allowed Based on #1613 * feat: update merkletree to latest release * docs: update changelog for release * docs: update changelog for release * feat: update neptune to the latest release
filecoin-project · Jul 22, 2022 · 76de0be · 76de0be
1 parent ccfea67
commit 76de0be
Show file tree

Hide file tree

Showing 17 changed files with 275 additions and 382 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -3,7 +3,7 @@ version: 2.1
 parameters:
   nightly-toolchain:
     type: string
-    default: "nightly-2022-03-10"
+    default: "nightly-2022-05-09"
 
 executors:
   default:
@@ -131,6 +131,7 @@ jobs:
           at: "."
       - restore_rustup_cache
       - restore_parameter_cache
+      - run: rustup install << pipeline.parameters.nightly-toolchain >>
       - run:
           name: Test with use_multicore_sdr
           command: |

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://book.async.rs/overview
 
 ## Unreleased
 
+## [11.1.1] - 2022-06-15
+
+- Lock versions to the correct minor number [#1614](https://github.com/filecoin-project/rust-fil-proofs/pull/1614)
+
+## [11.1.0] - 2022-06-13
+
+- Updates for aggregate proof versioning support [#1612](https://github.com/filecoin-project/rust-fil-proofs/pull/1612)
+
 ## [11.0.2] - 2022-02-09
 
 - Fix cache clearing by resetting the cache path first [#1563](https://github.com/filecoin-project/rust-fil-proofs/pull/1563)
@@ -316,7 +324,9 @@ mainnet ready and will be replaced in a future version.  This release is intende
 
 - Initial stable release
 
-[Unreleased]: https://github.com/filecoin-project/rust-fil-proofs/compare/v11.0.2...HEAD
+[Unreleased]: https://github.com/filecoin-project/rust-fil-proofs/compare/v11.1.1...HEAD
+[11.1.1]: https://github.com/filecoin-project/rust-fil-proofs/tree/releases/v11.1.1
+[11.1.0]: https://github.com/filecoin-project/rust-fil-proofs/tree/releases/v11.1.0
 [11.0.2]: https://github.com/filecoin-project/rust-fil-proofs/tree/releases/v11.0.2
 [11.0.1]: https://github.com/filecoin-project/rust-fil-proofs/tree/releases/v11.0.1
 [11.0.0]: https://github.com/filecoin-project/rust-fil-proofs/tree/releases/v11.0.0

diff --git a/fil-proofs-param/Cargo.toml b/fil-proofs-param/Cargo.toml
@@ -9,11 +9,11 @@ repository = "https://github.com/filecoin-project/rust-fil-proofs"
 readme = "README.md"
 
 [dependencies]
-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 }
-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-proofs = { version = "^11.0.0", path = "../filecoin-proofs", default-features = false }
+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 }
+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-proofs = { version = "~11.0.0", path = "../filecoin-proofs", default-features = false }
 rand = "0.8"
 lazy_static = "1.2"
 pbr = "1.0"

diff --git a/fil-proofs-param/src/bin/paramfetch.rs b/fil-proofs-param/src/bin/paramfetch.rs
@@ -23,16 +23,15 @@ 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 '{}'.",
         parameter_cache_dir_name(),
     );
 }
 
 const DEFAULT_JSON: &str = include_str!("../../parameters.json");
-const DEFAULT_IPGET_VERSION: &str = "v0.6.0";
+const DEFAULT_IPGET_VERSION: &str = "v0.8.1";
 
 #[inline]
 fn get_ipget_dir(version: &str) -> String {

diff --git a/fil-proofs-tooling/Cargo.toml b/fil-proofs-tooling/Cargo.toml
@@ -10,19 +10,19 @@ repository = "https://github.com/filecoin-project/rust-fil-proofs"
 readme = "README.md"
 
 [dependencies]
-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 }
-storage-proofs-post = { path = "../storage-proofs-post", 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"] }
+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 }
+storage-proofs-post = { path = "../storage-proofs-post", version = "~11.0.0", default-features = false }
+filecoin-proofs = { path = "../filecoin-proofs", version = "~11.0.0", default-features = false }
+filecoin-hashers = { path = "../filecoin-hashers", version = "~6.0.0", default-features = false, features = ["poseidon", "blake2s", "sha256"] }
 clap = { version = "3.1.6", features = ["derive"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 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.22.0"
 rand = "0.8"
 tempfile = "3.0.8"
 cpu-time = "1.0.0"
@@ -32,7 +32,7 @@ async-std = "1.6"
 blake2s_simd = "1.0.0"
 fil_logger = "0.1.6"
 log = "0.4.8"
-merkletree = "0.21.0"
+merkletree = "0.22.0"
 bincode = "1.1.2"
 anyhow = "1.0.23"
 rand_xorshift = "0.3.0"
@@ -46,7 +46,7 @@ fdlimit = "0.2.0"
 dialoguer = "0.10.0"
 structopt = "0.3.12"
 humansize = "1.1.0"
-blstrs = "0.4.0"
+blstrs = "0.5.0"
 time = "0.3.9"
 
 [features]

diff --git a/filecoin-hashers/Cargo.toml b/filecoin-hashers/Cargo.toml
@@ -9,16 +9,16 @@ repository = "https://github.com/filecoin-project/rust-fil-proofs"
 readme = "README.md"
 
 [dependencies]
-bellperson = "0.18.0"
-blstrs = "0.4.0"
+bellperson = "0.22.0"
+blstrs = "0.5.0"
 generic-array = "0.14.4"
-merkletree = "0.21.0"
-ff = "0.11.0"
+merkletree = "0.22.0"
+ff = "0.12.0"
 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 = "~7.0.0", optional = true, features = ["bls", "arity2", "arity4", "arity8", "arity11", "arity16", "arity24", "arity36"] }
 lazy_static = { version = "1.4.0", optional = true }
 blake2s_simd = { version = "1.0.0", optional = true }
 sha2 = { version = "0.10.2", optional = true }

diff --git a/filecoin-proofs/Cargo.toml b/filecoin-proofs/Cargo.toml
@@ -9,36 +9,36 @@ repository = "https://github.com/filecoin-project/rust-fil-proofs"
 readme = "README.md"
 
 [dependencies]
-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 }
-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"] }
+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 }
+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"] }
 rand = "0.8"
 lazy_static = "1.2"
 memmap = "0.7"
 serde = { version = "1.0", features = ["rc", "derive"] }
 serde_json = "1.0"
 blake2b_simd = "1.0.0"
-bellperson = "0.18.0"
+bellperson = "0.22.0"
 log = "0.4.7"
 rayon = "1.1.0"
 hex = "0.4.0"
-merkletree = "0.21.0"
+merkletree = "0.22.0"
 bincode = "1.1.2"
 anyhow = "1.0.23"
 sha2 = "0.10.2"
 typenum = "1.11.2"
 gperftools = { version = "0.2", optional = true }
 generic-array = "0.14.4"
-fr32 = { path = "../fr32", version = "^4.0.0", default-features = false }
+fr32 = { path = "../fr32", version = "~4.0.0", default-features = false }
 once_cell = "1.8.0"
-blstrs = "0.4.0"
+blstrs = "0.5.0"
 
 [dev-dependencies]
 criterion = "0.3"
 tempfile = "3"
-ff = "0.11.0"
+ff = "0.12.0"
 fil_logger = "0.1.6"
 rand_xorshift = "0.3.0"
 

diff --git a/filecoin-proofs/src/api/seal.rs b/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");