sdeml
765c0e1349
Merge branch 'develop' into update_readme
...
* develop: (53 commits)
add contributor guidelines
format with rustfmt 0.99.6, add to circleci
add cargo lock from master
remove cargo lock
Add CircleCi config (#160 )
fmt and add fmt to CI
minor fixes
Implement boolean not
Add compeent about flatten_boolean_expression postconditions
Remove magic string constant in statement.rs
Fix boolean or bugs
Fix bool_or.code test
Rename stdlib to corelib
Add test of parsing boolean operator associativity.
[add] new cases to folding
Boolean or example
[fix] parsing primitive conditions if we see a bad symbol
[del] test.code file in root directory
[add] changed associativity of boolean and on test
Swap associativity in test
...
# Conflicts:
# README.md
2018-11-20 19:33:22 +01:00
schaeff
66b54f509a
add dummy file
2018-11-20 19:25:47 +01:00
sdeml
d3d7f685a3
add logo
2018-11-20 10:00:12 +01:00
sdeml
d5506a7ed0
link readme to docs
2018-11-20 09:42:14 +01:00
Tjaden Hess
db5fa90965
Merge branch 'greater_than' of https://github.com/CornellBlockchain/ZoKrates into greater_than
2018-11-14 18:05:17 -05:00
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
2cdba9893f
add prepare_generate_proof
2018-11-12 11:34:08 +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
Thibaut Schaeffer
7edd04d9eb
Merge pull request #163 from Schaeff/add-fmt-bis
...
Add fmt
2018-11-10 12:05:01 +01:00
schaeff
623f54f5b0
add contributor guidelines
2018-11-10 11:58:10 +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
7d8399f6e3
Merge pull request #162 from Schaeff/solve-cargo-lock-conflict
...
Add cargo lock from master
2018-11-10 10:11:09 +01:00
schaeff
53b5b7ca40
add cargo lock from master
2018-11-10 09:55:07 +01:00
Thibaut Schaeffer
f9d90612e7
Merge pull request #161 from Schaeff/remove-cargo-lock
...
Remove cargo lock
2018-11-10 00:24:19 +01:00
schaeff
f89a43654b
remove cargo lock
2018-11-10 00:19:50 +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
711f60fe7f
fix bool_and test
2018-11-07 17:20:05 -05:00
Tjaden Hess
451cfc00cb
Merge branch 'develop' into greater_than
2018-11-07 09:46:27 -05:00
Thibaut Schaeffer
e41efb4930
Merge pull request #156 from CornellBlockchain/remove_magic_constants
...
Remove magic string constant in statement.rs
2018-11-07 10:24:07 +01:00
Thibaut Schaeffer
ad6f33a222
Merge pull request #133 from CornellBlockchain/boolean_operators
...
Implement Boolean Operators
2018-11-06 23:21:41 +01:00
schaeff
24e4593853
minor fixes
2018-11-06 16:35:53 +01:00
JacobEberhardt
00be915bac
Merge pull request #157 from Schaeff/rc/0.3.1
...
Release 0.3.1
2018-11-06 15:31:14 +01:00
schaeff
4ad8ed2537
bump patch
2018-11-06 15:08:09 +01:00
Thibaut Schaeffer
8d3b493c34
Merge branch 'master' into rc/0.3.1
2018-11-06 15:02:21 +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
schaeff
7b9570a4cd
fix dead code for array expressions
2018-11-05 15:25:20 +01:00
Tjaden Hess
f30398b3e2
Implement boolean not
2018-11-02 17:30:58 -04:00
Tjaden Hess
e89a303906
Add compeent about flatten_boolean_expression postconditions
2018-11-02 16:25:44 -04:00
Tjaden Hess
0ce616677b
Remove magic string constant in statement.rs
2018-11-01 13:30:04 -04:00
JacobEberhardt
c2570225ac
excluded dockerhub push from jenkins build
2018-11-01 16:05:33 +01:00
JacobEberhardt
c2341101aa
Jenkins Plugin fixed. Comments removed.
2018-11-01 15:11:50 +01:00
JacobEberhardt
8e348e435d
Merge pull request #154 from Zokrates/master
...
Master
2018-11-01 14:35:31 +01:00
JacobEberhardt
af3e051f0c
fixed comment scope
2018-11-01 12:06:15 +01:00
JacobEberhardt
ab004bc88c
removed push to dockerhub from Jenkinsfile
2018-11-01 11:59:43 +01:00
JacobEberhardt
ef717ed322
Merge pull request #153 from Zokrates/bugfix/dockerhub-deployment
...
Renamed DevImage Tag
2018-11-01 09:26:54 +01:00
Tjaden Hess
87eabe5f60
Merge pull request #4 from CornellBlockchain/boolean_exprs
...
Implement boolean expressions
2018-10-31 18:42:14 -04:00
Tjaden Hess
4bd136285d
Fix boolean or bugs
2018-10-31 18:39:15 -04:00
JacobEberhardt
ec7240edcc
Renamed DevImage Tag
2018-10-31 23:23:52 +01:00
Tjaden Hess
36a49d8a23
Fix bool_or.code test
2018-10-31 18:15:57 -04:00
