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

1276 commits

Author SHA1 Message Date
schaeff
37e2efe01c Merge branch 'develop' of github.com:JacobEberhardt/ZoKrates into ir-optimiser 2019-02-15 12:01:15 +01:00
schaeff
a856e138af serialize proof to JSON. hacky. 2019-02-15 11:59:07 +01:00
schaeff
b0e8b9d042 integrate with backend api, activate with --backend g16 2019-02-15 11:41:35 +01:00
schaeff
9ad9e52de1 fix integration tests 2019-02-14 21:56:24 +01:00
schaeff
4cf22faef3 move metadata to struct, move r1cs_program inside backend, simplify API 2019-02-13 18:21:01 +01:00
JacobEberhardt
1d766ad52b
Merge pull request #255 from Zokrates/return-variables-in-ir
Return variables in ZIR functions
2019-02-12 13:46:26 +01:00
Thibaut Schaeffer
f2a7101500
Merge pull request #270 from Zokrates/master
Merge back master after patch
2019-02-11 18:23:58 +01:00
JacobEberhardt
2b3f50105f
Merge pull request #269 from Zokrates/patch/0.4.2
Release 0.4.2 patch
2019-02-11 18:05:40 +01:00
schaeff
f998a087ce merge develop 2019-02-11 17:22:29 +01:00
schaeff
a04440495d remove print 2019-02-11 16:33:14 +01:00
schaeff
8e64cc68b1 remove call to unimplemented cast 2019-02-11 16:20:47 +01:00
schaeff
6ecc2c9885 patch unconstrained cast 2019-02-11 16:15:43 +01:00
schaeff
678c046ad0 Merge branch 'develop' of github.com:JacobEberhardt/ZoKrates into ir-optimiser 2019-02-11 10:53:56 +01:00
Thibaut Schaeffer
8478a47c3f
Merge pull request #265 from Zokrates/fix-dockerfile-typo
Fix dockerfile typo
2019-02-11 10:41:16 +01:00
schaeff
fb0a5e06b5 fix typo 2019-02-11 10:23:38 +01:00
JacobEberhardt
1c87d1229c
Merge pull request #259 from Zokrates/move-libsnark-fetch-to-build
Move libsnark fetch to build
2019-02-09 20:37:18 +01:00
schaeff
f995d20cc2 install libsnark for wasm test 2019-02-08 18:20:39 +01:00
schaeff
b00fc6365a Merge branch 'develop' of github.com:JacobEberhardt/ZoKrates into return-variables-in-ir 2019-02-08 18:16:59 +01:00
schaeff
781b7c3a0d Merge branch 'develop' of github.com:JacobEberhardt/ZoKrates into move-libsnark-fetch-to-build 2019-02-08 18:15:38 +01:00
schaeff
293477ed6c clean dockerfiles, execute prerequisites as root 2019-02-08 16:58:45 +01:00
Thibaut Schaeffer
a8743d4c08
Merge pull request #263 from gballet/fix-identity-state-clearing-issue
fix loop counter persistence bug in identity WASM
2019-02-08 16:34:40 +01:00
Guillaume Ballet
6cb407837d fix loop counter persistence bug in identity WASM 2019-02-08 16:04:56 +01:00
Thibaut Schaeffer
d5974738c7
Merge pull request #260 from Zokrates/master
Merge master back
2019-02-08 12:07:22 +01:00
schaeff
31149cdff0 remove tempdir 2019-02-07 18:25:20 +01:00
schaeff
50ae73aeb2 remove tempdir 2019-02-07 17:46:30 +01:00
schaeff
5e3209442a remove libsnark source from ci 2019-02-07 17:34:18 +01:00
schaeff
bea858dc9b remove libsnark buid from ci 2019-02-07 17:25:38 +01:00
schaeff
826168240b move libsnark fetch to build 2019-02-07 17:22:28 +01:00
schaeff
2134873031 fix from_flat to accept functions which return quadratic combs 2019-02-06 17:32:28 +01:00
schaeff
6597ec511f fix wrong try_linear, fix comment 2019-02-06 17:16:04 +01:00
schaeff
87ddcdcc55 use variable as function output, avoid substituting outputs 2019-02-06 14:51:13 +01:00
schaeff
57192ea98a change to always return variables 2019-02-06 12:25:41 +01:00
Stefan
57ed8adb1d
Merge pull request #254 from Zokrates/rc/0.4.1
Release 0.4.1
2019-02-06 11:34:34 +01:00
schaeff
8bf0d72725 bump versions 2019-02-06 11:24:03 +01:00
schaeff
803c4c8906 remove counter, fix test 2019-02-05 16:32:03 +01:00
schaeff
bd1f97af58 adjust test 2019-02-05 11:59:07 +01:00
schaeff
f68995a87a avoid optimizing already substituted variables 2019-02-05 11:41:05 +01:00
Thibaut Schaeffer
4eb7843ced
Merge pull request #252 from Zokrates/0.4.0-into-dev
0.4.0 into dev
2019-02-04 16:04:59 +01:00
schaeff
90024508c8 Merge branch 'master' of github.com:JacobEberhardt/ZoKrates into develop 2019-02-04 15:56:04 +01:00
schaeff
7f8d3f1d1c remove warning 2019-02-04 12:53:11 +01:00
schaeff
2ff39e9733 add test 2019-02-04 12:44:07 +01:00
schaeff
82951efcf4 don't substitute output variables 2019-02-04 12:12:29 +01:00
Stefan
b1fbe401d2
Merge pull request #250 from Zokrates/rc/0.4.0
Release 0.4.0
2019-02-01 21:51:41 +01:00
schaeff
541cd44997 bump versions: fs_resolver and cli minor, core and field patch 2019-02-01 18:30:36 +01:00
schaeff
d065ca657d Merge branch 'develop' of github.com:JacobEberhardt/ZoKrates into ir-optimiser 2019-02-01 17:57:01 +01:00
Thibaut Schaeffer
e7a943dbf9
Merge pull request #220 from Zokrates/update-G2-lib
Update G2 library
2019-02-01 17:43:19 +01:00
Thibaut Schaeffer
718158717f
Merge pull request #221 from Zokrates/add-sharound
Simplify SHA gadgets and add a stdlib
2019-02-01 17:42:40 +01:00
JacobEberhardt
033217b520
Merge pull request #224 from Zokrates/useful-semantic-errors
Output more, better errors in the CLI
2019-02-01 13:46:42 +01:00
JacobEberhardt
efc28ca813
Merge pull request #243 from Zokrates/display-empty-lincomb
Display empty linear combination as 0
2019-02-01 13:26:15 +01:00
Thibaut Schaeffer
02157bf312
Merge branch 'develop' into display-empty-lincomb 2019-02-01 13:13:52 +01:00