Skip to content

chore: update to ff/group 0.13 and associated dependencies#162

Closed
huitseeker wants to merge 3 commits intomicrosoft:mainfrom
huitseeker:bump_ff_group
Closed

chore: update to ff/group 0.13 and associated dependencies#162
huitseeker wants to merge 3 commits intomicrosoft:mainfrom
huitseeker:bump_ff_group

Conversation

@huitseeker
Copy link
Copy Markdown
Contributor

@huitseeker huitseeker commented Apr 18, 2023

Updates:

  • zkcrypto/ff, zkcrypto/group to 0.13,
  • bellperson to 0.25,
  • neptune to 9.0,
  • pasta_curves to 0.5.1, and removes the fil_pasta_curves fork
  • pasta-msm should no longer need a fork (WIP)

Adapts source in function, mostly for const usage and API updates.

TODOs

@srinathsetty
Copy link
Copy Markdown
Collaborator

Thanks @huitseeker! The PR looks good! We'll wait for pasta-msm update to go through.

huitseeker added a commit to huitseeker/lurk-rs that referenced this pull request Apr 21, 2023
- Update dependencies for various crates,
- Refactor `LurkField` trait in `src/field.rs` to use updated definitions,
- Update to Nova 0.20,
- Remove use of `TrivialCompComputationEngine` and change type aliases in `src/proof/nova.rs`

- [ ] Merge [dependent PR](supranational/pasta-msm#3) in pasta-msm
= [ ] Merge [dependent PR](microsoft/Nova#162) in Nova
huitseeker added a commit to huitseeker/lurk-rs that referenced this pull request Apr 21, 2023
- Update dependencies for various crates,
- Refactor `LurkField` trait in `src/field.rs` to use updated definitions,
- Update to Nova 0.20,
- Remove use of `TrivialCompComputationEngine` and change type aliases in `src/proof/nova.rs`

- [ ] Merge [dependent PR](supranational/pasta-msm#3) in pasta-msm
= [ ] Merge [dependent PR](microsoft/Nova#162) in Nova
huitseeker added a commit to huitseeker/lurk-rs that referenced this pull request Apr 21, 2023
- Update dependencies for various crates,
- Refactor `LurkField` trait in `src/field.rs` to use updated definitions,
- Update to Nova 0.20,
- Remove use of `TrivialCompComputationEngine` and change type aliases in `src/proof/nova.rs`

- [ ] Merge [dependent PR](supranational/pasta-msm#3) in pasta-msm
= [ ] Merge [dependent PR](microsoft/Nova#162) in Nova
huitseeker added a commit to huitseeker/Nova-Scotia that referenced this pull request Apr 22, 2023
- updates pasta_curves to 0.5.1, removes unneeded fork,
- updates bellperson to 0.25,

TODO:
- [ ] Merge [dependent PR](supranational/pasta-msm#3) in pasta-msm
- [ ] Merge [dependent PR](microsoft/Nova#162) in Nova
huitseeker added a commit to huitseeker/Nova-Scotia that referenced this pull request Apr 22, 2023
- updates pasta_curves to 0.5.1, removes unneeded fork,
- updates bellperson to 0.25,

TODO:
- [ ] Merge [dependent PR](supranational/pasta-msm#3) in pasta-msm
- [ ] Merge [dependent PR](microsoft/Nova#162) in Nova
@huitseeker huitseeker marked this pull request as ready for review April 25, 2023 06:22
huitseeker added a commit to huitseeker/Nova-Scotia that referenced this pull request Apr 25, 2023
- updates pasta_curves to 0.5.1, removes unneeded fork,
- updates bellperson to 0.25,

TODO:
- [ ] Merge [dependent PR](supranational/pasta-msm#3) in pasta-msm
- [ ] Merge [dependent PR](microsoft/Nova#162) in Nova
huitseeker added a commit to huitseeker/Nova-Scotia that referenced this pull request Apr 26, 2023
- updates pasta_curves to 0.5.1, removes unneeded fork,
- updates bellperson to 0.25,

TODO:
- [ ] Merge [dependent PR](supranational/pasta-msm#3) in pasta-msm
- [ ] Merge [dependent PR](microsoft/Nova#162) in Nova
huitseeker added a commit to huitseeker/lurk-rs that referenced this pull request Apr 28, 2023
- Update dependencies for various crates,
- Refactor `LurkField` trait in `src/field.rs` to use updated definitions,
- Update to Nova 0.20,
- Remove use of `TrivialCompComputationEngine` and change type aliases in `src/proof/nova.rs`

- [ ] Merge [dependent PR](supranational/pasta-msm#3) in pasta-msm
= [ ] Merge [dependent PR](microsoft/Nova#162) in Nova
@leonardoalt
Copy link
Copy Markdown

@huitseeker not sure what the pasta-msm status is, but looks completed?

@huitseeker
Copy link
Copy Markdown
Contributor Author

@leonardoalt Correct, though it would be ideal to depend on a new version of pasta-msm rather than its master branch: supranational/pasta-msm#4

huitseeker added a commit to huitseeker/Nova-Scotia that referenced this pull request Apr 29, 2023
- updates pasta_curves to 0.5.1, removes unneeded fork,
- updates bellperson to 0.25,

TODO:
- [ ] Merge [dependent PR](supranational/pasta-msm#3) in pasta-msm
- [ ] Merge [dependent PR](microsoft/Nova#162) in Nova
@leonardoalt
Copy link
Copy Markdown

Makes sense, thanks! For context, my interest here is that I'm writing an experimental fork with the BN+Grumpkin cycle, and ff 0.13 makes it easier.

@huitseeker huitseeker changed the title chore: update to ff/group 0.13 and associated dependencies (WIP) chore: update to ff/group 0.13 and associated dependencies Apr 29, 2023
@huitseeker
Copy link
Copy Markdown
Contributor Author

@srinathsetty This is now using the latest release of pasta-msm and is therefore ready to go I think.

@srinathsetty
Copy link
Copy Markdown
Collaborator

Thanks @huitseeker!

huitseeker added 3 commits May 5, 2023 18:56
Updates:
- zkcrypto/ff, zkcrypto/group to 0.13,
- bellperson to 0.25,
- pasta_curves to 0.5.1, and removes the fil_pasta_curves fork
- pasta-msm should no longer need a fork (WIP)

Adapts source in function, mostly for const usage and API updates.
@huitseeker
Copy link
Copy Markdown
Contributor Author

@srinathsetty formatting is fixed.

huitseeker added a commit to huitseeker/lurk-rs that referenced this pull request May 5, 2023
- Update dependencies for various crates,
- Refactor `LurkField` trait in `src/field.rs` to use updated definitions,
- Update to Nova 0.20,
- Remove use of `TrivialCompComputationEngine` and change type aliases in `src/proof/nova.rs`

- [x] Merge [dependent PR](supranational/pasta-msm#3) in pasta-msm
= [ ] Merge [dependent PR](microsoft/Nova#162) in Nova
huitseeker added a commit to huitseeker/lurk-rs that referenced this pull request May 5, 2023
- Update dependencies for various crates,
- Refactor `LurkField` trait in `src/field.rs` to use updated definitions,
- Update to Nova 0.20,
- Remove use of `TrivialCompComputationEngine` and change type aliases in `src/proof/nova.rs`

- [x] Merge [dependent PR](supranational/pasta-msm#3) in pasta-msm
= [ ] Merge [dependent PR](microsoft/Nova#162) in Nova
@srinathsetty
Copy link
Copy Markdown
Collaborator

It looks like we can close this PR given PR #166

samuelburnham pushed a commit to lurk-lab/lurk-beta that referenced this pull request May 18, 2023
- Update dependencies for various crates,
- Refactor `LurkField` trait in `src/field.rs` to use updated definitions,
- Update to Nova 0.20,
- Remove use of `TrivialCompComputationEngine` and change type aliases in `src/proof/nova.rs`

- [x] Merge [dependent PR](supranational/pasta-msm#3) in pasta-msm
= [ ] Merge [dependent PR](microsoft/Nova#162) in Nova
samuelburnham pushed a commit to huitseeker/lurk-rs that referenced this pull request May 18, 2023
- Update dependencies for various crates,
- Refactor `LurkField` trait in `src/field.rs` to use updated definitions,
- Update to Nova 0.20,
- Remove use of `TrivialCompComputationEngine` and change type aliases in `src/proof/nova.rs`

- [x] Merge [dependent PR](supranational/pasta-msm#3) in pasta-msm
= [ ] Merge [dependent PR](microsoft/Nova#162) in Nova
huitseeker added a commit to huitseeker/lurk-rs that referenced this pull request May 22, 2023
- Update dependencies for various crates,
- Refactor `LurkField` trait in `src/field.rs` to use updated definitions,
- Update to Nova 0.20,
- Remove use of `TrivialCompComputationEngine` and change type aliases in `src/proof/nova.rs`

- [x] Merge [dependent PR](supranational/pasta-msm#3) in pasta-msm
= [ ] Merge [dependent PR](microsoft/Nova#162) in Nova
github-merge-queue bot pushed a commit to lurk-lab/lurk-beta that referenced this pull request May 23, 2023
* refactor: Update dependencies to ff/group version 0.13

- Update dependencies for various crates,
- Refactor `LurkField` trait in `src/field.rs` to use updated definitions,
- Update to Nova 0.20,
- Remove use of `TrivialCompComputationEngine` and change type aliases in `src/proof/nova.rs`

- [x] Merge [dependent PR](supranational/pasta-msm#3) in pasta-msm
= [ ] Merge [dependent PR](microsoft/Nova#162) in Nova

* chore: update dependencies

- Update `nova-snark` package to version `0.21`
- Remove temporary git dependencies for `nova` and `pasta-msm`
- Update `pasta-msm` package to version `0.1.4`

* chore: `cargo update -p rust-gpu-tools`

---------

Co-authored-by: Samuel Burnham <samuel.burnham@gmail.com>
github-merge-queue bot pushed a commit to lurk-lab/lurk-beta that referenced this pull request May 23, 2023
* refactor: Update dependencies to ff/group version 0.13

- Update dependencies for various crates,
- Refactor `LurkField` trait in `src/field.rs` to use updated definitions,
- Update to Nova 0.20,
- Remove use of `TrivialCompComputationEngine` and change type aliases in `src/proof/nova.rs`

- [x] Merge [dependent PR](supranational/pasta-msm#3) in pasta-msm
= [ ] Merge [dependent PR](microsoft/Nova#162) in Nova

* chore: update dependencies

- Update `nova-snark` package to version `0.21`
- Remove temporary git dependencies for `nova` and `pasta-msm`
- Update `pasta-msm` package to version `0.1.4`

* chore: `cargo update -p rust-gpu-tools`

---------

Co-authored-by: Samuel Burnham <samuel.burnham@gmail.com>
nalinbhardwaj pushed a commit to nalinbhardwaj/Nova-Scotia that referenced this pull request May 30, 2023
* chore: bump ff, group to 0.13 and update dependent crates

- updates pasta_curves to 0.5.1, removes unneeded fork,
- updates bellperson to 0.25,

TODO:
- [ ] Merge [dependent PR](supranational/pasta-msm#3) in pasta-msm
- [ ] Merge [dependent PR](microsoft/Nova#162) in Nova

* chore: bump version of nova
huitseeker added a commit to huitseeker/Nova that referenced this pull request Dec 9, 2023
* Introduce proper `MaskedEq` poly

* refactor: Refactor MaskedEq poly for improved testing and performance

- Introduce lifetime parameters to `MaskedEqPolynomial` struct to improve memory management.
- Modify the `MaskedEqPolynomial` creation process so it now requires a reference to an existing `EqPolynomial`.
- Adapt corresponding tests to reflect the above changes.

* Fix fmt & derive debug

---------

Co-authored-by: François Garillot <francois@garillot.net>
huitseeker added a commit to huitseeker/Nova that referenced this pull request Dec 18, 2023
* skeleton of what is to be done

* wip inner and outer sumchecks done

* fix borrow checker issues

* batched spartan prove done

* Small improvements
- Irregular shape yields error
- Remove (W,E) clones
- Use Math module for log2
- Generate tau using only 1 challenge
- Remove some `clone()`
- Comments

* Fix evaluation points

* Implement verifier

* `CompressedSNARK` implementation

* Tests fixed, failing

* fix sumcheck, test passes

* bound -> bind

* remove todo

* add test

* Document BatchedRelaxedR1CSSNARKTrait and SuperNova CompressedSNARK.

* working

* - Remove debug code
- Add Sumcheck::verify_batch
- Uniformize batching of evals
- Comments

* Adress review comments
- add itertools for multiunzip
- avoid clones
- avoid recomputing sizes for asserts

* Fix asserts

* batched ppsnark

* Fix scaling

* - Fix padding of poly_W
- Optimized evaluation
- use batch_diff_size
- use multiunzip

* rebase fixes

* Only create taus once.

* Avoid clone by not allocating PowPolynomial.

* Riff on review.

* refactor: Implement `.zip_eq()` for equal length iterator safety

- Replaced `.zip()` with `.zip_eq()` across various files including `sumcheck.rs`, `mod.rs`, `batched_ppsnark.rs`, `batched.rs` and `snark.rs`, ensuring equal length enforcement in iterations and reducing out-of-bound errors.
- Updated a multiunzip resulting in a double iteration in batched_ppsnark::prove.

* add benchmark

* fix witnes

* fix: clean up iterators

* feat: Introduce new utility macros in spartan module

- Introduced a macro `zip_with` in `src/spartan/mod.rs` to simplify the process of zipping multiple iterators and applying a single parallel function.
- Developed additional macros `nested_tuple` and `nested_idents` for detailed nested tuple patterns and identifiers respectively.
- Implemented `zip_all` macro that acts as a fold-right zipping operator for all given expressions.

* refactor: Refactor batched.rs to enhance code readability

- Refactored `src/spartan/batched.rs` to use `zip_with()` macro improving the readability, simplification, and consistent usage in the code.
- Inserted comments highlighting sections marked for review or possible future code simplification.

* refactor: use zip_with! in batch_ppsnark

- Updated `batched_ppsnark.rs` in the `src/spartan` directory with uses of zip_with macro

* ignore local macro doctest

* Use zip_with.

* Implement and use zip_with_for_each.

* Dubious double zip_with.

* More zip_with.

* Small fixes
- `zip_with` for `batched_ppsnark`
- Complete comment of `BatchedRelaxedR1CSSNARK`
- Restore Abomonation bounds
- Fix nits in `multilinear.rs`

* refactor: more zip_with instances (microsoft#153)

* refactor: more instances of zip_with

* Supernova: Some rewrites (microsoft#154)

* refactor: more zip_with

* feat: Implement `FromIterator` for polynomial types

- Enhanced `EqPolynomial`, `MultilinearPolynomial`, and `SparsePolynomial` with `FromIterator` implementation.

* refactor: use instaces of Polynomial Fromiterator where possible

* refactor: remove unused impls of FromIterator

* refactor: address review comments

* refactor: enhance scope visibility scope in Spartan and Supernova modules (microsoft#156)

Absolute visibility modifiers tend to not inadvertently make things public when you move code, contrarily to (super).

- Changed the visibility scope of several fields and methods within multiple substrates in the `ppsnark.rs` file to be within the `crate::spartan`.
- Altered the module import path in the `circuit.rs` file from `super` to `crate::supernova`.
- Modified the visibility of the `WitnessBoundSumcheck` in `batched_ppsnark.rs`, the visibility scope is now set to `crate::spartan`.
- Scoped `batch_eval_prove` and `batch_eval_verify` functions within `crate::spartan` in `snark.rs`.

* Avoid EqPolynomial when only for evals.

* refactor: a few more instances of EqPolynomial::evals_from_points

- in `multilinear.rs` and `ipa_pc.rs`, replaces the previous method `EqPolynomial::new(r.to_vec()).evals()` with a more efficient `EqPolynomial::evals_from_points(r)`.

* doc: fix a few nits (microsoft#160)

* refactor: rename powers -> squares

- Renamed the `powers` method to `squares` in `PowPolynomial` struct within `src/spartan/polys/power.rs` and changed its visibility level.

* fix: comment

* fix: comment of batch

* derive fixes

* fix: compressed snark benchmark

- Introduced `compressed-snark-supernova` within the `Cargo.toml` file.
- fixed Rust

* ci: Add trigger for PRs to batched_spartan (microsoft#165)

* More zip with (microsoft#158)

* Expand zip_with macros to accommodate more use.

* Clippy.

* Move Spartan macros to own module.

* Only use zip_with_fn to implement convenience macros.

* Use convenience zip_with macros more.

* Remove for_each variants of zip_with macros.

* Remove flat_map variants of zip_with.

---------

Co-authored-by: porcuquine <porcuquine@users.noreply.github.com>

* Introduce proper `MaskedEq` poly (microsoft#162)

* Introduce proper `MaskedEq` poly

* refactor: Refactor MaskedEq poly for improved testing and performance

- Introduce lifetime parameters to `MaskedEqPolynomial` struct to improve memory management.
- Modify the `MaskedEqPolynomial` creation process so it now requires a reference to an existing `EqPolynomial`.
- Adapt corresponding tests to reflect the above changes.

* Fix fmt & derive debug

---------

Co-authored-by: François Garillot <francois@garillot.net>

* Restore zip_with_for_each. (microsoft#166)

Co-authored-by: porcuquine <porcuquine@users.noreply.github.com>

* fix benchmark (microsoft#168)

* Sumcheck update (microsoft#163)

* Include number of instances in transcript

* Clarify Sumcheck and verifier

* Fix clippy

* Streamline macro syntax (microsoft#169)

* refactor: Refactor Spartan code for streamlined use of `zip_with_fn`

Details:
- Simplified the implementation of `BatchedRelaxedR1CSSNARKTrait` by replacing usage of `zip_with_iter` and related macros with `zip_with_fn`.
- Eliminated `zip_with_iter`, `zip_with_par_iter`, `zip_with_into_iter`, and `zip_with_into_par_iter` macros from the codebase, reducing repetition and enhancing code organization.

* refactor: Refactor zip functions

- Replaced the `zip_with_fn!` function with the `zip_with!` function in various files,
- Refactored `zip_with` and `zip_with_for_each` macros in `src/spartan/macros.rs` for improved handling of iterator projection specification.
- Consolidated `zip_all_with_fn` macro's functionality into `zip_all` and eliminated unused macros.

* fix: remove brackets

* Small fixes (microsoft#170)

* refactor: removed needless copies of `R1CSShape`

- Modified the `primary_r1cs_shapes` function in `supernova/mod.rs` to return a vector of references, improving memory efficiency.
- Use those `primary_r1cs_shapes` in the `setup` and `prove` methods of `CompressedSNARK`.
- Altered the `BatchedRelaxedR1CSSNARKTrait` trait functions in `traits/snark.rs` to accept vector of references instead of reference,

* refactor: Refactor polynomial size assertion checks in sumcheck.rs

- Refactors the length assertion checks in the `prove_quad_batch` and `prove_cubic_with_additive_term_batch` methods in `src/spartan/sumcheck.rs`.
- Simplified the code by replacing multiple `assert_eq` calls with a loop.

* refactor: Remove "nested_tuple" macro from spartan macros

- Removed the "nested_tuple" macro from the "src/spartan/macros.rs" file.

* refactor: pedantic calls in tests

---------

Co-authored-by: Matej Penciak <matej.penciak@gmail.com>
Co-authored-by: Adrian Hamelink <adrian@hamelink.com>
Co-authored-by: porcuquine <porcuquine@users.noreply.github.com>
Co-authored-by: Hanting Zhang <hantingz@usc.edu>
Co-authored-by: Samuel Burnham <45365069+samuelburnham@users.noreply.github.com>
Co-authored-by: porcuquine <1746729+porcuquine@users.noreply.github.com>
Co-authored-by: Adrian Hamelink <adrian.hamelink@gmail.com>
Co-authored-by: Matej Penciak <96667244+mpenciak@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants