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

feat: merge plonk into dev #39

Merged
merged 6 commits into from
Jun 24, 2024
Merged

feat: merge plonk into dev #39

merged 6 commits into from
Jun 24, 2024

Conversation

huitseeker
Copy link
Contributor

@huitseeker huitseeker commented Jun 24, 2024

Companion PR of argumentcomputer/sphinx#72

Rebased variant of #32. Fixes #35

Note

The CI failure is 100% expected. We should re-launch CI once argumentcomputer/sphinx#72 is merged.

tchataigner
tchataigner previously approved these changes Jun 24, 2024
Copy link
Contributor

@tchataigner tchataigner left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe we can merge this once https://github.com/lurk-lab/sphinx/pull/72/files is merged

wwared and others added 5 commits June 24, 2024 12:23
* feat: Add scaffolding for Plonk verification in Solidity

* feat: Add Plonk contract

* tests: Add more negative Solidity testing

* feat: Add Rust program for Solidity contract generating

* chore: Update Cargo.lock

* chore: Update Plonk contract according to 'e48c01ec' tag of Sphinx

* chore: Formatting

* feat: Introduce downloading from our AWS private bucket

* feat: Update Foundry project to use sphinx-contracts dependency

* chore: Rename SP1 -> Sphinx
Signed-off-by: Thomas Chataigner <tom.chataigner@yahoo.fr>
* feat: Update Sphinx and replace Groth16 with Plonk (#23)

* feat: Solidity verification of light client proofs with Plonk (#28)

* feat: Add scaffolding for Plonk verification in Solidity

* feat: Add Plonk contract

* tests: Add more negative Solidity testing

* feat: Add Rust program for Solidity contract generating

* chore: Update Cargo.lock

* chore: Update Plonk contract according to 'e48c01ec' tag of Sphinx

* chore: Formatting

* feat: Introduce downloading from our AWS private bucket

* feat: Update Foundry project to use sphinx-contracts dependency

* chore: Rename SP1 -> Sphinx

* chore: Add README for Solidity verification

* feat: Add CI configuration for Solidity

* ci: solidity tests on all PR

Signed-off-by: Thomas Chataigner <tom.chataigner@yahoo.fr>

* chore: update programs

Signed-off-by: Thomas Chataigner <tom.chataigner@yahoo.fr>

* docs: move documentation to mdBook

Signed-off-by: Thomas Chataigner <tom.chataigner@yahoo.fr>

---------

Signed-off-by: Thomas Chataigner <tom.chataigner@yahoo.fr>
Co-authored-by: wwared <wwared@users.noreply.github.com>
Co-authored-by: Thomas Chataigner <tom.chataigner@yahoo.fr>
- Added a new "aptos" feature to the `aptos-lc` dependency.
- Updated the `fixture-generator`'s Cargo.toml file.
Signed-off-by: Thomas Chataigner <tom.chataigner@yahoo.fr>
@tchataigner tchataigner enabled auto-merge (squash) June 24, 2024 10:40
@wwared wwared disabled auto-merge June 24, 2024 10:41
@wwared wwared enabled auto-merge (rebase) June 24, 2024 10:41
@wwared wwared merged commit 96ae8ef into dev Jun 24, 2024
4 checks passed
@tchataigner tchataigner deleted the plonk-rebased2 branch July 26, 2024 09:51
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.

Possible unsatisfied constraint in running benches
4 participants