Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Unsafe Serde :) #170

Closed

Conversation

winston-h-zhang
Copy link
Contributor

The 1k diff is because I had to manually rewrite a bunch of the serializing 😭.

@winston-h-zhang winston-h-zhang deleted the hz/unsafe_serde branch May 19, 2023 01:37
@winston-h-zhang winston-h-zhang restored the hz/unsafe_serde branch May 19, 2023 01:39
@microsoft-github-policy-service

@winston-h-zhang please read the following Contributor License Agreement(CLA). If you agree with the CLA, please reply with the following information.

@microsoft-github-policy-service agree [company="{your company}"]

Options:

  • (default - no company specified) I have sole ownership of intellectual property rights to my Submissions and I am not making Submissions in the course of work for my employer.
@microsoft-github-policy-service agree
  • (when company given) I am making Submissions in the course of work for my employer (or my employer has intellectual property rights in my Submissions by contract or applicable law). I have permission from my employer to make Submissions and enter into this Agreement on behalf of my employer. By signing below, the defined term “You” includes me and my employer.
@microsoft-github-policy-service agree company="Microsoft"
Contributor License Agreement

Contribution License Agreement

This Contribution License Agreement (“Agreement”) is agreed to by the party signing below (“You”),
and conveys certain license rights to Microsoft Corporation and its affiliates (“Microsoft”) for Your
contributions to Microsoft open source projects. This Agreement is effective as of the latest signature
date below.

  1. Definitions.
    “Code” means the computer software code, whether in human-readable or machine-executable form,
    that is delivered by You to Microsoft under this Agreement.
    “Project” means any of the projects owned or managed by Microsoft and offered under a license
    approved by the Open Source Initiative (www.opensource.org).
    “Submit” is the act of uploading, submitting, transmitting, or distributing code or other content to any
    Project, including but not limited to communication on electronic mailing lists, source code control
    systems, and issue tracking systems that are managed by, or on behalf of, the Project for the purpose of
    discussing and improving that Project, but excluding communication that is conspicuously marked or
    otherwise designated in writing by You as “Not a Submission.”
    “Submission” means the Code and any other copyrightable material Submitted by You, including any
    associated comments and documentation.
  2. Your Submission. You must agree to the terms of this Agreement before making a Submission to any
    Project. This Agreement covers any and all Submissions that You, now or in the future (except as
    described in Section 4 below), Submit to any Project.
  3. Originality of Work. You represent that each of Your Submissions is entirely Your original work.
    Should You wish to Submit materials that are not Your original work, You may Submit them separately
    to the Project if You (a) retain all copyright and license information that was in the materials as You
    received them, (b) in the description accompanying Your Submission, include the phrase “Submission
    containing materials of a third party:” followed by the names of the third party and any licenses or other
    restrictions of which You are aware, and (c) follow any other instructions in the Project’s written
    guidelines concerning Submissions.
  4. Your Employer. References to “employer” in this Agreement include Your employer or anyone else
    for whom You are acting in making Your Submission, e.g. as a contractor, vendor, or agent. If Your
    Submission is made in the course of Your work for an employer or Your employer has intellectual
    property rights in Your Submission by contract or applicable law, You must secure permission from Your
    employer to make the Submission before signing this Agreement. In that case, the term “You” in this
    Agreement will refer to You and the employer collectively. If You change employers in the future and
    desire to Submit additional Submissions for the new employer, then You agree to sign a new Agreement
    and secure permission from the new employer before Submitting those Submissions.
  5. Licenses.
  • Copyright License. You grant Microsoft, and those who receive the Submission directly or
    indirectly from Microsoft, a perpetual, worldwide, non-exclusive, royalty-free, irrevocable license in the
    Submission to reproduce, prepare derivative works of, publicly display, publicly perform, and distribute
    the Submission and such derivative works, and to sublicense any or all of the foregoing rights to third
    parties.
  • Patent License. You grant Microsoft, and those who receive the Submission directly or
    indirectly from Microsoft, a perpetual, worldwide, non-exclusive, royalty-free, irrevocable license under
    Your patent claims that are necessarily infringed by the Submission or the combination of the
    Submission with the Project to which it was Submitted to make, have made, use, offer to sell, sell and
    import or otherwise dispose of the Submission alone or with the Project.
  • Other Rights Reserved. Each party reserves all rights not expressly granted in this Agreement.
    No additional licenses or rights whatsoever (including, without limitation, any implied licenses) are
    granted by implication, exhaustion, estoppel or otherwise.
  1. Representations and Warranties. You represent that You are legally entitled to grant the above
    licenses. You represent that each of Your Submissions is entirely Your original work (except as You may
    have disclosed under Section 3). You represent that You have secured permission from Your employer to
    make the Submission in cases where Your Submission is made in the course of Your work for Your
    employer or Your employer has intellectual property rights in Your Submission by contract or applicable
    law. If You are signing this Agreement on behalf of Your employer, You represent and warrant that You
    have the necessary authority to bind the listed employer to the obligations contained in this Agreement.
    You are not expected to provide support for Your Submission, unless You choose to do so. UNLESS
    REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING, AND EXCEPT FOR THE WARRANTIES
    EXPRESSLY STATED IN SECTIONS 3, 4, AND 6, THE SUBMISSION PROVIDED UNDER THIS AGREEMENT IS
    PROVIDED WITHOUT WARRANTY OF ANY KIND, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY OF
    NONINFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE.
  2. Notice to Microsoft. You agree to notify Microsoft in writing of any facts or circumstances of which
    You later become aware that would make Your representations in this Agreement inaccurate in any
    respect.
  3. Information about Submissions. You agree that contributions to Projects and information about
    contributions may be maintained indefinitely and disclosed publicly, including Your name and other
    information that You submit with Your Submission.
  4. Governing Law/Jurisdiction. This Agreement is governed by the laws of the State of Washington, and
    the parties consent to exclusive jurisdiction and venue in the federal courts sitting in King County,
    Washington, unless no federal subject matter jurisdiction exists, in which case the parties consent to
    exclusive jurisdiction and venue in the Superior Court of King County, Washington. The parties waive all
    defenses of lack of personal jurisdiction and forum non-conveniens.
  5. Entire Agreement/Assignment. This Agreement is the entire agreement between the parties, and
    supersedes any and all prior agreements, understandings or communications, written or oral, between
    the parties relating to the subject matter hereof. This Agreement may be assigned by Microsoft.

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.

1 participant