Halo2 ecc snark verifier 0220 - Resolve merge conflicts#17
Merged
naure merged 12 commits intohalo2-ecc-snark-verifier-0220from Mar 22, 2023
Merged
Conversation
commit a9ec263 Author: Ho Vei <noelwei@gmail.com> Date: Thu Jan 12 11:13:13 2023 +0800 better organize
commit 0c81d56 Author: Ho Vei <noelwei@gmail.com> Date: Fri Feb 3 10:16:05 2023 +0800 api on row/circuit size and fmt commit 03c0e15 Author: Ho Vei <noelwei@gmail.com> Date: Thu Feb 2 23:46:54 2023 +0800 clippy for formatted string commit 035f6eb Author: Ho Vei <noelwei@gmail.com> Date: Thu Feb 2 23:46:37 2023 +0800 refactoring assignment and optimize constraintions commit 5fbf040 Author: Ho Vei <noelwei@gmail.com> Date: Thu Feb 2 23:45:47 2023 +0800 bump toolchain commit f964a07 Author: Ho Vei <noelwei@gmail.com> Date: Wed Feb 1 22:34:17 2023 +0800 constraint for custom row and tougher test commit 01535c1 Author: Ho Vei <noelwei@gmail.com> Date: Wed Feb 1 21:56:57 2023 +0800 extend hash table and add missed constraints commit 7d0f554 Author: Ho Vei <noelwei@gmail.com> Date: Wed Feb 1 15:02:31 2023 +0800 upgrade bitvec
Co-authored-by: Aurélien Nicolas <info@nau.re>
* compact-constants: fold constants into one per partial round * septidon: working circuit for Poseidon septuple rounds * septidon: design diagrams * septidon-integration: support both septuple implementation and original using a trait * septidon: fix after merge --------- Co-authored-by: Aurélien Nicolas <info@nau.re>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merge main into #13 .