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

464 commits

Author SHA1 Message Date
schaeff
b3c0009615 extract fs resolver into new crate, rename crates, refactor importer 2018-07-31 16:57:21 +02:00
schaeff
03bf84bb61 Merge branch 'develop' of github.com:JacobEberhardt/ZoKrates into split-project 2018-07-30 19:15:44 +02:00
JacobEberhardt
3c36637521
Merge pull request #83 from Schaeff/remove-compiler-statements
Refactor Compiler statements to rust Directives
2018-07-14 09:31:50 +02:00
schaeff
f087e8bfeb update jenkins file with correct toml file 2018-07-09 16:55:04 +02:00
schaeff
9c2940ca0b merge develop in 2018-07-09 16:53:05 +02:00
schaeff
209b3a08c1 --amend 2018-07-09 15:41:56 +02:00
schaeff
ea62ece22a refactor compiler statements to rust directives 2018-07-09 15:41:36 +02:00
Thibaut Schaeffer
90859abd1e Merge 0.2.0 into develop (#82)
* Add version tag to dockerhub

* Add major, minor, patch version to dockerhub

* Bump version 0.2.0

* remove grammar as it is outdated

* complete merge
2018-07-09 11:01:14 +02:00
Thibaut Schaeffer
af4410172d
Merge pull request #81 from JacobEberhardt/feature/ci-dockerfile
Use Dockerfile for CI tests
2018-07-08 17:28:01 +02:00
Dennis Kuhnert
aa7e11aa88 Use zokrates dockerhub org 2018-07-07 18:03:46 +02:00
Dennis Kuhnert
f3b7debffa Use Dockerfile for CI tests 2018-07-06 23:26:27 +02:00
schaeff
d4b3873fa9 Merge branch 'develop' of github.com:JacobEberhardt/ZoKrates into split-project 2018-07-01 11:34:31 -04:00
schaeff
a8bc7184db make compile interface generic, remove imports for now 2018-06-30 01:36:39 -04:00
schaeff
ef471811f7 revert dockerfile, fix build options 2018-06-30 00:54:28 -04:00
schaeff
1d3204c90f split into cli and lib 2018-06-30 00:32:15 -04:00
Thibaut Schaeffer
8f0542ef29
Merge pull request #78 from cipherpeon/patch-1
Named Verified event parameter
2018-06-29 14:50:59 -04:00
Jack Leslie
0ed8ef2931
Named Verified event parameter
In accordance with issue #77
2018-06-28 09:56:10 +01:00
JacobEberhardt
ca0759fecc
Merge pull request #74 from lubieplacki/fixed-less-than-function-call
Fixed less-than function call bug
2018-06-25 16:35:28 +02:00
JacobEberhardt
435572ee24
Merge pull request #75 from Schaeff/generic-helpers
Make helpers generic
2018-06-22 23:32:25 +02:00
schaeff
15f1818176 revert dockerfile changes 2018-06-22 17:12:41 -04:00
schaeff
3b35710a89 fix build for nolibsnark 2018-06-22 16:59:26 -04:00
JacobEberhardt
d74cb1dd27
Merge pull request #76 from Schaeff/fix-nolibsnark-config
Fix nolibsnark build
2018-06-22 22:44:00 +02:00
schaeff
0cfa2e77e9 fix full build following changes to nolibsnark build 2018-06-22 16:24:17 -04:00
schaeff
9be24966b5 add feature flags 2018-06-22 12:07:39 -04:00
schaeff
68353ba720 make helpers generic, support libsnark and rust 2018-06-22 09:16:46 -04:00
Mateusz Kopec
4f4f474370 Fixed less-than function call bug 2018-06-20 18:02:36 +02:00
JacobEberhardt
0bc3369d28
Merge pull request #72 from Schaeff/bind-libsnark-sha256
Complete libsnark sha integration
2018-06-18 11:19:18 +02:00
schaeff
8f07cc0fa1 tweaks following review 2018-06-17 13:44:22 +02:00
JacobEberhardt
e8d35567f4
Merge branch 'develop' into bind-libsnark-sha256 2018-06-15 18:21:35 +02:00
JacobEberhardt
6964e1fe22
Merge pull request #73 from Schaeff/test-setup-proof-generation
Add setup, proof generation, verifier export to integration tests
2018-06-15 17:25:57 +02:00
schaeff
6069e61c20 Merge branch 'bind-libsnark-sha256' of github.com:Schaeff/ZoKrates into bind-libsnark-sha256 2018-06-15 11:35:17 +02:00
schaeff
abc3b24c4f update expected flattened code to swapped constraints 2018-06-15 11:33:03 +02:00
Thibaut Schaeffer
02cdf149d4
Merge pull request #8 from lubieplacki/fix-memory-issues-with-libsnark-wrapper
Optimized memory usage
2018-06-15 11:05:48 +02:00
schaeff
f18fb4c482 add solidity verifier export to integration test 2018-06-15 11:01:40 +02:00
schaeff
bb87e21cbe add setup and proof generation to integration tests 2018-06-15 10:57:27 +02:00
Mateusz Kopec
749e122f1c Revert asserts to ifs 2018-06-15 10:53:34 +02:00
Mateusz Kopec
5eb562b040 Constants to uppercase 2018-06-15 10:53:24 +02:00
Mateusz Kopec
96cc47fe8e Formatting 2018-06-15 10:32:18 +02:00
Mateusz Kopec
14497abe7c Constants as variables 2018-06-15 10:32:06 +02:00
Mateusz Kopec
cb6ee1cb19 Asserts checking if value != 0 - instead of ifs 2018-06-15 10:22:16 +02:00
Mateusz Kopec
3f652e691d init libff only once 2018-06-15 10:19:48 +02:00
Mateusz Kopec
a8e10ad9f5 Optimized memory usage 2018-06-15 01:19:50 +02:00
schaeff
930c565940 add reduce to main 2018-06-13 17:27:39 +02:00
schaeff
4889989de2 invert lhs and rhs in r1cs import to please the R1CS exporter. Replace fold with reduce for more concise output 2018-06-13 17:22:20 +02:00
schaeff
04b624688a revert removal of examples 2018-06-12 13:59:31 +02:00
schaeff
caf5df00a3 resolve conflict 2018-06-12 13:58:05 +02:00
schaeff
47213cdb80 revert removal of sha directives, add gadgets to build 2018-06-12 13:47:23 +02:00
schaeff
c9bc01db49 Revert "only keep changes to libsnark version"
This reverts commit 8b60a2fea3.
2018-06-12 12:55:15 +02:00
schaeff
ed6105f022 rename cpp helper 2018-06-12 11:47:00 +02:00
schaeff
bdf9b64f3a merge develop 2018-06-12 00:17:59 +02:00