1
0
Fork 0
mirror of synced 2025-09-24 04:40:05 +00:00
Commit graph

942 commits

Author SHA1 Message Date
Tjaden Hess
8efa63a821 Merge branch 'or' into boolean_exprs 2018-10-27 13:52:12 -04:00
Tjaden Hess
ef33cba92a Allow parsing primitive conditions as factors 2018-10-27 13:52:00 -04:00
Tjaden Hess
cc29180201 Remove unnecessary variable definitions 2018-10-27 13:43:52 -04:00
Tjaden Hess
cf52fb074f Make sure to shift past the close parenthesis. 2018-10-27 07:16:26 -10:00
Brian Guo
cc0c83b52a [fix] changes to the parser to make sure it's not ambiguous 2018-10-26 18:36:06 -04:00
schaeff
e57efe2910 enable optimizer by default 2018-10-26 21:45:47 +02:00
Thibaut Schaeffer
5be4cd2b50
Merge pull request #145 from stefandeml/add-book
Add mdbook for documentation
2018-10-26 21:35:08 +02:00
schaeff
f63ffa5e5e Merge branch 'add-book' of github.com:stefandeml/ZoKrates into add-book 2018-10-26 21:15:10 +02:00
schaeff
9ff0030f15 remove grammar, clean structure 2018-10-26 21:13:44 +02:00
sdeml
3351b25fb9 corrected number of public inputs 2018-10-26 16:12:11 +01:00
sdeml
dd6ff30eda fixed link and typo 2018-10-26 15:59:19 +01:00
JacobEberhardt
05cac3fccb
Merge pull request #146 from Schaeff/128-packed-sha
Change sha256packed to take 4 parameters
2018-10-26 16:51:52 +02:00
schaeff
7ad49a45a5 restructure, amend tutorial 2018-10-26 16:31:46 +02:00
schaeff
9b374b5057 remove unwanted script 2018-10-26 14:48:57 +02:00
schaeff
8de54f5979 edit Introduction and getting started, change zokrates to ZoKrates 2018-10-26 14:43:18 +02:00
schaeff
41dccc5d47 fix typo 2018-10-26 10:48:31 +02:00
schaeff
158b98eb86 remove wrongly added dockerfile 2018-10-26 10:30:55 +02:00
schaeff
067df95f71 update maintainers 2018-10-26 10:26:29 +02:00
schaeff
7fe30becc9 add production dockerfile, update CI 2018-10-25 23:25:58 +02:00
schaeff
9b1b85d8c1 revert flatten change 2018-10-25 22:54:11 +02:00
schaeff
b523fd331b change sha packed to use 128bit inputs 2018-10-25 22:51:57 +02:00
sdeml
eb7ce0982b —gadgets flag is not necessary any more 2018-10-25 15:30:58 +01:00
sdeml
01058e5783 add programming concepts and changed example 2018-10-25 15:22:21 +01:00
sdeml
a0e93c6683 changes on the structure and beginning of SHA256 example 2018-10-25 15:22:21 +01:00
Tjaden Hess
a3d99e5477 Start refactoring boolean expressions
Note: In the future I would like to refactor again so that boolean and field expressions are parsed together, type checking should be done at a later stage.
2018-10-24 22:06:17 -04:00
Brian Guo
f1966e918d [add] fixed flattening for OR 2018-10-24 20:52:24 -04:00
Brian Guo
182449812f Merge branch 'boolean_operators' into or 2018-10-24 19:08:54 -04:00
JacobEberhardt
14898f0ab6
Merge pull request #144 from JacobEberhardt/doc/attribution
Added schaeff to authors.
2018-10-24 16:25:26 +02:00
JacobEberhardt
dfb65424f8 Added schaeff to authors. 2018-10-24 15:57:44 +02:00
JacobEberhardt
02919d5069
Merge pull request #138 from Schaeff/array
Add support for field element arrays
2018-10-24 14:42:14 +02:00
schaeff
e23d0b2b63 refine inlining strategy 2018-10-24 12:15:15 +02:00
schaeff
1610ea4486 clean 2018-10-24 11:38:09 +02:00
schaeff
0130f15202 move example 2018-10-24 11:32:41 +02:00
schaeff
27a1714294 Merge branch 'add-ast-folder' into array 2018-10-24 11:31:09 +02:00
schaeff
1b3bd8c692 use folder for all typed analysis 2018-10-24 11:30:29 +02:00
JacobEberhardt
ab2a9c9aa9
Merge pull request #141 from Schaeff/packed-sha-libsnark
Add a packed sha256 function
2018-10-23 20:07:04 +02:00
schaeff
077468944f revert example 2018-10-23 18:48:33 +02:00
schaeff
1ebe026a34 Merge branch 'develop' of github.com:JacobEberhardt/ZoKrates into array 2018-10-23 18:34:31 +02:00
Thibaut Schaeffer
4e69f16eb1
Merge pull request #142 from 3psil0n/develop
Adding Support for Proof Output
2018-10-23 18:33:20 +02:00
schaeff
3b129a1c1d split libsnark and packing helpers 2018-10-23 17:28:17 +02:00
Filip Fatz
20cd8b07d8 minor fix: added missing comma 2018-10-23 14:53:48 +00:00
Filip Fatz
1855d100b4 add helper formatting methods for JSON output 2018-10-23 14:49:02 +00:00
Filip Fatz
c23447497d enabling ZoKrates user to output proof parameters and public input parameters as JSON during generate-proof 2018-10-23 14:36:31 +00:00
schaeff
4deabb3112 solve conflict 2018-10-23 10:32:58 +02:00
schaeff
4d778307f7 Merge branch 'develop' of github.com:JacobEberhardt/ZoKrates into packed-sha-libsnark 2018-10-23 10:30:18 +02:00
schaeff
4478162061 add packed sha256 for 2 254 inputs 2018-10-22 19:48:35 +02:00
JacobEberhardt
86e4e0e28b
Merge pull request #137 from Schaeff/propagation
Add constant propagation
2018-10-22 16:31:58 +02:00
schaeff
881b0b49c2 fix conflicts 2018-10-19 18:49:40 +02:00
schaeff
d45f5f1632 allow array as return, add dead code elimination, fix array flattening 2018-10-19 18:39:59 +02:00
schaeff
56c14d5626 add generic folder and inliner 2018-10-19 13:45:15 +02:00