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

MSM: Bring in quotient polynomial and constraints #1839

Merged
merged 14 commits into from
Mar 5, 2024

Conversation

volhovm
Copy link
Member

@volhovm volhovm commented Feb 22, 2024

Solves #1790:

  1. Moves constraint creating logic into MSM prover/verifier
  2. Hopefully wiring it up with extra simple circuit to prove it works

@volhovm volhovm self-assigned this Feb 22, 2024
msm/src/prover.rs Outdated Show resolved Hide resolved
msm/src/prover.rs Outdated Show resolved Hide resolved
msm/src/prover.rs Show resolved Hide resolved
msm/src/prover.rs Outdated Show resolved Hide resolved
@volhovm volhovm force-pushed the volhovm/1790-connect-expr-framework-with-prover branch 10 times, most recently from e705daa to 479421b Compare February 28, 2024 17:43
@volhovm volhovm marked this pull request as ready for review February 28, 2024 17:43
@volhovm volhovm force-pushed the volhovm/1790-connect-expr-framework-with-prover branch from a52ebbd to d172ca6 Compare February 28, 2024 18:09
@volhovm volhovm force-pushed the volhovm/1790-connect-expr-framework-with-prover branch 5 times, most recently from 72dd90e to 328aaf3 Compare February 29, 2024 17:52
@volhovm volhovm force-pushed the volhovm/1790-connect-expr-framework-with-prover branch from 328aaf3 to 59538b1 Compare February 29, 2024 18:25
@volhovm volhovm force-pushed the volhovm/1790-connect-expr-framework-with-prover branch from 59538b1 to bcd09ef Compare February 29, 2024 19:06
@dannywillems
Copy link
Member

dannywillems commented Mar 4, 2024

Closing. See serialization subdirectory (wrong PR, sorry)

@dannywillems
Copy link
Member

Oopsie. Sorry, wrong PR.

@dannywillems dannywillems reopened this Mar 4, 2024
@volhovm volhovm changed the title MSM: Build actual constraints from expressions MSM: Bring in quotient polynomial and constraints Mar 4, 2024
@dannywillems
Copy link
Member

@volhovm Can you fix the conflicts please?

@volhovm
Copy link
Member Author

volhovm commented Mar 4, 2024

@dannywillems ah, oh well. on it.

@dannywillems
Copy link
Member

dannywillems commented Mar 4, 2024

Can you squash: be3d64e and bcd09ef please? They are unecessary commits.

msm/src/prover.rs Outdated Show resolved Hide resolved
@volhovm
Copy link
Member Author

volhovm commented Mar 4, 2024

@dannywillems I know it's annoying but I can't really squash these without messing everything up sadly because I merged master into it, so now git rebase -i treats my commits and master commits equally. If you know a way to do it please tell me

@volhovm volhovm force-pushed the volhovm/1790-connect-expr-framework-with-prover branch from 61c7d70 to dad2ea3 Compare March 4, 2024 18:52
@dannywillems
Copy link
Member

dannywillems commented Mar 4, 2024

@dannywillems I know it's annoying but I can't really squash these without messing everything up sadly because I merged master into it, so now git rebase -i treats my commits and master commits equally. If you know a way to do it please tell me

The only way I think is restarting the branch before the git merge, squash, redo git merge, git push force.

@dannywillems dannywillems self-assigned this Mar 5, 2024
msm/src/main.rs Outdated Show resolved Hide resolved
msm/src/prover.rs Show resolved Hide resolved
msm/src/constraint.rs Show resolved Hide resolved
msm/src/main.rs Show resolved Hide resolved
msm/src/prover.rs Outdated Show resolved Hide resolved
@volhovm
Copy link
Member Author

volhovm commented Mar 5, 2024

@dannywillems all addressed

Copy link
Member

@dannywillems dannywillems left a comment

Choose a reason for hiding this comment

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

Let's just merge it. We'll fix later. We will iterate over it. I didn't test it, but we will after. It does create tons of conflicts in the next PRs.
Let's have very small PR later.

I would revert the changes in kimchi to decrease as much as possible the changes outside of the MSM code

@dannywillems dannywillems merged commit 018eec0 into master Mar 5, 2024
4 checks passed
@dannywillems dannywillems deleted the volhovm/1790-connect-expr-framework-with-prover branch March 5, 2024 15:26
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.

2 participants