1
0
Fork 0
mirror of synced 2025-09-23 12:18:44 +00:00
Commit graph

868 commits

Author SHA1 Message Date
Tjaden Hess
78ecb9e3ca Fix tokenizing not 2018-11-14 17:57:15 -05:00
schaeff
e02d4fffeb implement gm17, verification contract not working for now 2018-11-13 15:31:37 +01:00
schaeff
4dbf85c79a fmt 2018-11-12 12:51:17 +01:00
schaeff
658d8b4862 use instances, update cli to instanciate backend and move compile flags 2018-11-12 12:35:17 +01:00
schaeff
00dc8988c8 fmt 2018-11-11 12:50:09 +01:00
schaeff
38bb305fa0 make proof system generic 2018-11-11 12:48:02 +01:00
schaeff
5bf7f9cb49 merge develop, format 2018-11-10 12:10:12 +01:00
schaeff
0c491f47d7 merge develop 2018-11-10 11:28:18 +01:00
schaeff
019a4ea388 format with rustfmt 0.99.6, add to circleci 2018-11-10 11:22:27 +01:00
schaeff
c87709c1fe Merge branch 'add-fmt' into add-fmt-bis 2018-11-10 10:24:30 +01:00
Thibaut Schaeffer
04143f4311
Merge pull request #158 from Zokrates/master
Master
2018-11-10 10:17:41 +01:00
Thibaut Schaeffer
b01cadd5ba
Add CircleCi config (#160)
* add circleci config

* replace gcc with cc

* format cpp, use release in test

* remove sha256 example, revert circleci
2018-11-10 00:16:27 +01:00
schaeff
f28fb4593b fmt and add fmt to CI 2018-11-08 11:44:17 +01:00
Tjaden Hess
451cfc00cb Merge branch 'develop' into greater_than 2018-11-07 09:46:27 -05:00
Thibaut Schaeffer
ad6f33a222
Merge pull request #133 from CornellBlockchain/boolean_operators
Implement Boolean Operators
2018-11-06 23:21:41 +01:00
schaeff
4ad8ed2537 bump patch 2018-11-06 15:08:09 +01:00
schaeff
d032618a7c fix integration test 2018-11-06 14:44:35 +01:00
schaeff
9ea556fad8 fix wrong number of inputs in setup and proof generation 2018-11-06 13:44:13 +01:00
Tjaden Hess
a1d0a0aee8 Implement Le, Gt, Ge 2018-11-05 10:46:02 -05:00
Tjaden Hess
4bd136285d Fix boolean or bugs 2018-10-31 18:39:15 -04:00
Tjaden Hess
36a49d8a23 Fix bool_or.code test 2018-10-31 18:15:57 -04:00
Brian Guo
25c823de34 Merge branch 'boolean_operators' of github.com:CornellBlockchain/ZoKrates into boolean_operators 2018-10-31 17:48:16 -04:00
Brian Guo
df70bffc7a Merge branch 'develop' into boolean_operators 2018-10-31 17:46:24 -04:00
Sasha Frolov
3dfa7d73a5 Boolean or example 2018-10-31 17:11:11 -04:00
schaeff
6c685a8963 upgrade local dependencies 2018-10-31 20:55:52 +01:00
schaeff
f25fead004 bump minor 2018-10-31 20:51:49 +01:00
Thibaut Schaeffer
59bd101fc5
Merge pull request #150 from Schaeff/variable-exponents
Variable exponents
2018-10-31 19:58:23 +01:00
schaeff
f0740bcad5 restrict exponentiation base to numbers and identifiers 2018-10-31 19:24:04 +01:00
schaeff
c46b9d6265 catch exponent 0 to equal 1 at propagation and flattening 2018-10-31 17:40:27 +01:00
schaeff
0964d20852 remove remaining flag in test 2018-10-28 22:02:18 +01:00
schaeff
e57efe2910 enable optimizer by default 2018-10-26 21:45:47 +02: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
b523fd331b change sha packed to use 128bit inputs 2018-10-25 22:51:57 +02:00
JacobEberhardt
dfb65424f8 Added schaeff to authors. 2018-10-24 15:57:44 +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
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
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
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
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
schaeff
edf054f278 merge substitution removal 2018-10-18 13:14:38 +02:00
schaeff
35adb3f59a enable gadgets for ethereum sha test 2018-10-18 12:16:26 +02:00
schaeff
0f53e5d553 port sha256 to arrays wip 2018-10-16 19:41:20 +02:00
schaeff
c8a6275e72 solve conflict 2018-10-16 15:08:45 +02:00
schaeff
eb0fd4ca95 fix conflict 2018-10-15 13:19:33 +02:00
schaeff
3a35c134b0 add rough constant propagation 2018-10-12 20:21:46 +02:00
schaeff
7b7e6a11c6 Merge branch 'propagation' into array 2018-10-12 16:59:00 +02:00
schaeff
8b2319b0cb add loop unrolling, post flattening constant propagation 2018-10-12 16:40:11 +02:00
sdeml
da6922ac72 added integration test for sha_ethereum 2018-10-10 14:21:49 +02:00
Valentin Ganev
acd5693fab remove unused parameter 2018-10-10 11:19:24 +03:00
schaeff
a21cbe7c30 add propagation through variables 2018-10-10 00:12:26 +02:00
sdeml
e1e16efe0b added gadgets flat required comment 2018-10-09 21:42:58 +03:00
sdeml
e419a3a320 added example description 2018-10-09 21:42:58 +03:00
schaeff
c8d02fc425 add basic propagation without identifiers 2018-10-09 20:35:27 +02:00
sdeml
66ca995df3 working prototype 2018-10-09 21:33:02 +03:00
schaeff
328fa7b2bf simplify dex further, adjust display function 2018-10-09 17:23:32 +02:00
schaeff
16f03e34b1 add and fix tests, make size array arbitrary, optimize example 2018-10-08 20:54:17 +02:00
schaeff
9d98afef9d add array update wip 2018-10-08 17:20:17 +02:00
schaeff
0795da359b implement dynamic lookup with simple range check 2018-10-05 17:57:14 +02:00
Tjaden Hess
8c382bd5e4 Merge branch 'develop' into boolean_operators 2018-10-05 05:24:47 -10:00
schaeff
004df5ebb6 merge develop, use c for children debug 2018-10-05 14:21:30 +02:00
JacobEberhardt
5f68001973
Merge pull request #131 from Schaeff/string-free-flat-absy
Remove Strings from the flat absy
2018-10-05 10:55:00 +02:00
schaeff
584960248d fix version number 2018-10-05 10:19:13 +02:00
Tjaden Hess
e142662be5 Merge branch 'develop' into boolean_operators 2018-10-04 15:27:57 -04:00
Tjaden Hess
af27840341 Fix parsing conditions 2018-10-03 17:44:42 -04:00
schaeff
04d1ba0545 fix pow example 2018-10-02 14:38:50 +02:00
Tjaden Hess
536465e003 Add boolean && test 2018-09-26 12:12:08 -10:00
schaeff
9abcecabeb merge type system changes 2018-09-26 19:54:05 +02:00
schaeff
ba04fd0481 merge develop, remove is_linear from typed 2018-09-26 17:37:56 +02:00
Thibaut Schaeffer
41b42e06eb
Merge pull request #61 from lubieplacki/fix-pow-number-base
Fixed power expression with a number base in flattener
2018-09-26 13:27:42 +01:00
schaeff
c756296655 fix issue with overlapping indices in flatvariables, clean 2018-09-25 16:37:42 +02:00
schaeff
6ab5003603 add tests, remove loops in substitution, fix lt 2018-09-24 16:47:06 +02:00
schaeff
e2a6d4e999 fix lt 2018-09-21 23:14:42 +02:00
schaeff
3674c7b2b7 remove binary variables, stop using prefix when resolving function calls 2018-09-21 21:32:36 +02:00
schaeff
b6ae2cbbb0 remove unrelated example 2018-09-19 14:41:11 +02:00
schaeff
5fd67befcb merge develop, make base arbitrary 2018-09-19 12:48:21 +02:00
schaeff
ee8d7bf700 add inline arrays, function call flattening, parser 2018-09-18 19:37:47 +02:00
schaeff
2dcbc48b45 remove references in r1cs 2018-09-17 18:19:04 +02:00
schaeff
848b44dc14 disallow declaration without assignment 2018-09-13 12:52:33 +02:00
schaeff
b3db7c5189 compress signatures, fix integration tests 2018-09-13 12:01:17 +02:00
schaeff
fec876a32a fix examples 2018-09-12 14:13:54 +02:00
schaeff
60c63c1aef merge develop 2018-09-12 12:08:56 +02:00
Dimitris Apostolou
f6c30a7377
Fix typos 2018-09-09 13:35:33 +03:00
JacobEberhardt
de57738377
Merge pull request #119 from Schaeff/fix-lt-example
Fix lt issue
2018-09-03 10:52:20 +01:00
JacobEberhardt
4733d75b6f
Merge pull request #110 from Schaeff/remove-path-from-core
Remove path from zokrates_core
2018-09-01 14:17:35 +01:00
schaeff
36f66194cc use conditions for sum checks, fix example expected witness 2018-08-31 13:41:13 +02:00
schaeff
a553dae84a add breaking test, fix integration tests 2018-08-31 10:55:28 +02:00
schaeff
6883632144 add light flag 2018-08-23 16:43:15 +02:00
schaeff
040b5f6f0e fewer clones 2018-08-23 16:12:15 +02:00
schaeff
b7ae64f6e0 update integration tests 2018-08-21 17:47:57 +02:00
schaeff
ec30a23d5b better error messages, wrap scope operations 2018-08-21 16:52:29 +02:00
schaeff
b32ccc5e4f implement type inference for multidef 2018-08-21 13:05:17 +02:00
schaeff
b4ad991bde port most examples to new syntax 2018-08-20 16:43:53 +02:00
schaeff
762999c0c3 add type annotation to definitions, unify reserved keyword handling 2018-08-16 18:06:00 +02:00
schaeff
8380ec6c0c split function parsing, add return types, parse signature, check return statement 2018-08-16 17:28:16 +02:00
schaeff
7d536ec66d move examples, adjust example code 2018-08-15 18:38:08 +02:00
schaeff
e048001ce8 adapt test to new compile API 2018-08-15 18:30:33 +02:00
schaeff
ea5d73cc0d merge develop 2018-08-15 18:10:23 +02:00
JacobEberhardt
c52a21f6ce
Merge pull request #104 from Schaeff/upgrade-develop
Upgrade develop to include master patches
2018-08-15 17:59:24 +02:00
schaeff
5b5a6e87a6 remove path from zokrates_core, delegate alias and location responsibility to resolvers 2018-08-15 17:17:02 +02:00
schaeff
4b6d25b698 move examples to cli, fix lt output 2018-08-13 13:33:05 +02:00
schaeff
7deae155d5 merge master changes 2018-08-09 18:40:02 +02:00
schaeff
90d016136a rename binary to zokrates 2018-08-08 18:18:33 +02:00
schaeff
101bbb17f4 merge develop, resolve conflicts 2018-08-08 12:46:25 +02:00
schaeff
a93bb54589 include all packages in tests and build 2018-08-01 11:50:35 +02:00
schaeff
41cec981f7 ignore integration tests outside development and master 2018-07-31 23:50:51 +02:00
schaeff
9f5f9d03f5 remove expected output from integration tests 2018-07-31 19:19:26 +02:00
schaeff
ec1b84a6b5 fix integration tests 2018-07-31 19:15:19 +02:00
schaeff
b3c0009615 extract fs resolver into new crate, rename crates, refactor importer 2018-07-31 16:57:21 +02:00