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.

Sign up for GitHub

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

Jump to bottom

Circuit work tracker [WIP] #109

Merged
merged 308 commits into from
Nov 15, 2018
Merged

Circuit work tracker [WIP] #109

merged 308 commits into from
Nov 15, 2018

Conversation

cathieyun
Copy link
Member

@cathieyun cathieyun commented Jul 11, 2018 •
edited
Loading

This PR tracks work on the circuit branch, which is the central branch for circuit/R1CS-related work.

@cathieyun cathieyun added the T-r1cs Related to constraint system label Jul 18, 2018
cathieyun and others added 22 commits July 18, 2018 12:03
@cathieyun
cargo fmt
fb2adfe
@cathieyun
cargo fmt more
1f19b64
@cathieyun
fix shuffle test
f89d7c5
@cathieyun
breaking up r1cs proof input creation func
37d434c
@cathieyun
break up long equation lines
6b744d4
@cathieyun
break up RHS of line
5e0ec82
@cathieyun
Merge pull request #101 from dalek-cryptography/circuit-notes
0150efd 
Arithmetic circuit notes
@cathieyun
address naming feedback
123ea5d
@hdevalence
Merge pull request #119 from dalek-cryptography/main
3f9d44f 
Merge `main` into `circuit`
@cathieyun
move eval func from LinearCombination to ConstraintSystem
d519402
@cathieyun
cargo fmt
5690edb
@cathieyun
assert that ipp and circuit inputs are powers of two
b9a0316
@cathieyun
Undo changes to ipp
7af4190
@hdevalence
Merge pull request #120 from dalek-cryptography/power-2
eff6a4b 
Enforce lengths of inputs to circuit proofs
@cathieyun
pad circuit if n is not a power of 2
6a5c5a2
@cathieyun
Merge pull request #106 from dalek-cryptography/r1cs
8477da1 
R1CS circuit frontend
@hdevalence
Merge pull request #122 from dalek-cryptography/main
3cc56bc 
Update circuit work from `main`
@cathieyun
add test for non-power-of-2 padding
55eefd2
@cathieyun
add zero() func for linear combination
a54fb03
@hdevalence
Merge pull request #123 from dalek-cryptography/r1cs-pad
ba76a47 
Pad circuits when creating them from `r1cs` format
@hdevalence
Merge branch 'main' into circuit-errors
11ce004
@hdevalence
Merge pull request #125 from dalek-cryptography/circuit-errors
f9de941 
Merge RP error-handling into the circuit branch.
cathieyun and others added 22 commits November 13, 2018 16:04
@cathieyun
Merge pull request #211 from dalek-cryptography/restructure-cs
e444347 
Eliminate R1CS facade
@hdevalence @cathieyun
Split notes into multiple files
aac11d1 
Co-authored-by: Cathie Yun <cathieyun@gmail.com>
@hdevalence
"rank-1 constraint system" over "rank-1 quadratic"
c6ff743
@hdevalence @cathieyun
Change the ConstraintSystem trait to take LinearConstraints.
a7f39c3 
Co-authored-by: Cathie Yun <cathieyun@gmail.com>
@hdevalence
Implement add, sub for variables
708c80a
@cathieyun @hdevalence
add "add_intermediate_constraint" function,
e5aee43 
update shuffle tests to use new api.

Co-authored-by: Henry de Valence <hdevalence@hdevalence.ca>
@cathieyun
cleanup, update doctest & benchmarks
0606f13
@cathieyun
add documentation for constraintsystem trait
7d1bd0c
@cathieyun
add prove and verify func to kshuffle gadget in test
9abe0ee
@cathieyun
update doctest and benchmark with new api
44d6272
@cathieyun
have prove() take in scalar insteaad of u64
cea96d9
@cathieyun
kshuffle fill_cs does not take ownership of variables
89217d1
@hdevalence
Merge pull request #212 from dalek-cryptography/circuit-notes-update
7e5e539 
Split notes into multiple files
@cathieyun
Merge pull request #213 from dalek-cryptography/circuit-trait-rework
5389dca 
Circuit trait rework
@hdevalence
fixup module name
3646d27
@hdevalence @cathieyun
Rename add_intermediate_constraint to add_partial_constraint
39d316f 
This name change better reflects what's actually happening: we want to explicitly constrain the output of the multiplier, but we might not be able to do that up-front

Co-authored-by: Cathie Yun <cathieyun@gmail.com>
@hdevalence
fix link
4d6a9fc
@hdevalence @cathieyun
This error is unneeded because it's now impossible for it to occur
729f291 
Co-authored-by: Cathie Yun <cathieyun@gmail.com>
@hdevalence
update verifier doc
6bbde4a
@hdevalence
missing links
0615fe9
@cathieyun
Merge pull request #215 from dalek-cryptography/circuit-notes-edit
b01ef96 
some more circuit tweaks
@hdevalence
Feature-gate R1CS code behind 'yoloproofs' feature
29d6f4b
@hdevalence
Copy link
Contributor

Changing the base to develop since we're not working in two places now

@hdevalence hdevalence changed the base branch from main to develop November 15, 2018 23:34
hdevalence
hdevalence approved these changes Nov 15, 2018
View reviewed changes
Copy link
Contributor

@hdevalence hdevalence 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 merge this into develop and base everything off of there?

@cathieyun
Copy link
Member Author

👍

@hdevalence hdevalence merged commit 776565e into develop Nov 15, 2018
@oleganza oleganza deleted the circuit branch March 15, 2019 19:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hdevalence hdevalence hdevalence approved these changes

Assignees
No one assigned
Labels
T-r1cs Related to constraint system
Projects
None yet
Milestone
2.0
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@cathieyun @hdevalence @oleganza