schaeff
|
ef5e8fff6c
|
merge dev
|
2019-01-21 14:21:03 +01:00 |
|
schaeff
|
dc554fc036
|
resolve lock conflict...
|
2019-01-21 13:59:47 +01:00 |
|
schaeff
|
44b3b7dbc6
|
merge and resolve lock conflict
|
2019-01-21 13:57:16 +01:00 |
|
schaeff
|
d6521b295f
|
update cargo.lock
|
2019-01-21 13:55:43 +01:00 |
|
schaeff
|
edd07957a5
|
resolve cargo.lock conflict
|
2019-01-21 13:48:17 +01:00 |
|
schaeff
|
5c0b5e84ad
|
add /Users/obit/sides/zokrates/zokrates_stdlib/stdlib to Dockerfiles, add stdlib with dummy file
|
2019-01-16 17:58:46 +01:00 |
|
schaeff
|
e1abb3e54b
|
merge develop, resolve conflicts
|
2019-01-16 14:07:05 +01:00 |
|
schaeff
|
f8b029ea28
|
fallback to /Users/obit/.zokrates when importing source files
|
2019-01-14 19:45:17 +01:00 |
|
Guillaume Ballet
|
a5a94bea89
|
Upgrade to wasmi 0.4.2
|
2019-01-14 14:46:21 +01:00 |
|
Guillaume Ballet
|
163f2b42f4
|
Implement support for WASM helpers
|
2019-01-14 14:39:36 +01:00 |
|
schaeff
|
8e1821dca8
|
merge, solve conflicts, make tests pass
|
2019-01-14 00:03:28 +01:00 |
|
schaeff
|
0770db761d
|
fix import paths
|
2019-01-10 10:21:13 +01:00 |
|
schaeff
|
a5290fab39
|
upgrade num, derive serialize
|
2019-01-10 10:13:50 +01:00 |
|
schaeff
|
29403cfb50
|
bump patch
|
2019-01-06 22:41:43 +01:00 |
|
Guillaume Ballet
|
5a9f5c8060
|
Make field its own crate
|
2018-12-27 11:02:48 +01:00 |
|
schaeff
|
648a78601a
|
bump patch
|
2018-11-30 17:10:30 +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
|
53b5b7ca40
|
add cargo lock from master
|
2018-11-10 09:55:07 +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 |
|
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 |
|
schaeff
|
6c0eea26d7
|
wip
|
2018-09-19 18:38:40 +02:00 |
|
schaeff
|
a2239ddb29
|
merge master changes
|
2018-09-17 11:24:49 +02:00 |
|
schaeff
|
ea5d73cc0d
|
merge develop
|
2018-08-15 18:10:23 +02:00 |
|
schaeff
|
c226c3eb2a
|
remove local num dependency
|
2018-08-15 17:26:08 +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
|
7deae155d5
|
merge master changes
|
2018-08-09 18:40:02 +02:00 |
|
schaeff
|
b3c0009615
|
extract fs resolver into new crate, rename crates, refactor importer
|
2018-07-31 16:57:21 +02:00 |
|
schaeff
|
9c2940ca0b
|
merge develop in
|
2018-07-09 16:53:05 +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 |
|
schaeff
|
1d3204c90f
|
split into cli and lib
|
2018-06-30 00:32:15 -04: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
|
b4b5ae708a
|
remove grammar as it is outdated
|
2018-06-12 14:11:50 +02:00 |
|
schaeff
|
63f49278da
|
fix conflicts
|
2018-06-08 14:54:09 +02:00 |
|
schaeff
|
401624c0dd
|
upgrade libsnark to latest master
|
2018-06-07 16:57:47 +02:00 |
|
schaeff
|
b8e29e50cf
|
merge r1cs import
|
2018-05-28 16:51:52 +02:00 |
|
David Terry
|
c58a484be9
|
build with latest version of libsnark
|
2018-05-12 16:54:31 +02:00 |
|
Steffen Haertlein
|
5235a24503
|
Merge remote-tracking branch 'origin/develop' into feature/r1cs_import
|
2018-03-07 09:11:21 +01:00 |
|
Steffen Haertlein
|
8e84f13eba
|
added missing dependency, implemented r1cs import from json file
|
2018-03-05 16:23:07 +01:00 |
|
schaeff
|
c0600779f2
|
read arguments from json, walk folder to run tests
|
2018-02-26 19:52:28 +01:00 |
|
schaeff
|
14da7f6004
|
fix rust and cpp warnings
|
2018-02-15 21:37:37 +01:00 |
|
schaeff
|
df1cfd968f
|
upgrade rust to 2018-02-10, adjust C build
|
2018-02-13 00:14:42 +01:00 |
|
schaeff
|
f2bbb05c28
|
add assert_cli and simple test
|
2018-02-05 18:01:14 +01:00 |
|
Steffen Haertlein
|
9525d5df4c
|
added export verifier functionality and required template
|
2017-10-25 10:02:52 +02:00 |
|
Jacob Eberhardt
|
8fc4d5609f
|
Witness serialization and deserialization completed.
|
2017-10-24 00:30:31 +02:00 |
|
Jacob Eberhardt
|
d10a4bef56
|
Renamed. Serialization and Deserialization implemented for FieldPrime
|
2017-10-09 19:03:06 +02:00 |
|
Jacob Eberhardt
|
5d60e174ee
|
Intermediary commit. Serialization added, Deserialization still ToDo. Formatted.
|
2017-10-09 13:24:31 +02:00 |
|
Jacob Eberhardt
|
9528f6576c
|
Skeleton for CLI added. Compile subcommand implemented.
|
2017-10-08 17:50:15 +02:00 |
|