-
Notifications
You must be signed in to change notification settings - Fork 106
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
[20241209] Merge develop into master #2868
base: master
Are you sure you want to change the base?
Conversation
This was originally removed as part of PR #1028, but was mistakenly reintroduced recently during some merge. So now it is again removed.
…tion Remove circuit-construction (again)
[easy] `develop` counterpart of PR#2590
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #2868 +/- ##
==========================================
+ Coverage 76.61% 76.78% +0.17%
==========================================
Files 255 253 -2
Lines 60855 60614 -241
==========================================
- Hits 46622 46543 -79
+ Misses 14233 14071 -162 ☔ View full report in Codecov by Sentry. |
Keccak has been rewritten in o1js instead of being exported from Kimchi. Therefore, the code has never been used. The code related to witness generation has been kept to be used in the o1vm.
To have the same version used by o1js/mina.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
After checking with Danny, I confirm that the Keccak parts that are being removed in this PR are not in use right now. Those constraints and gadgets were a first version of the ones that were then introduced for the o1vm project, and they were only being used inside an old-ish draft PR to check correctness of constraints and witness generation (which required a generic number of witness columns, as well as a full integration of that circuit gate in the proof system, also closed PRs). Other than that, we must not remove the keccak witness generation code inside kimchi, because that's the one being used in o1vm. Perhaps now it makes sense to move that inside the o1vm module.
I also checked that the changes I made to the bound on the zk rows for chunking has been correctly updated in this merge.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This seems about right -- I understand the only last 3 commits are "on top of master for compatibility with mina". They seem to be very benign.
6e6eadb
to
335feeb
Compare
2326314
to
0c64141
Compare
master commit:
cdbc90c275dba3b70aff5fc2ad5a29ebee10c2e5
developer commit:
872c8f2d1cae6bc0e46d1cf79655eb4592792b52
The code related to Keccak constraints in Kimchi has been removed as it is not used in Berkeley/Kimchi.
Commands:
In addition to that, I added some commits to make Mina happy.