schaeff
b731a7c296
solve conflict
2019-01-28 10:18:27 +01:00
JacobEberhardt
6e7d368a74
Merge pull request #235 from Zokrates/clean-cli-hints
...
Clean CLI hints and error handling
2019-01-25 19:23:15 +01:00
Thibaut Schaeffer
25208ea1d4
Merge pull request #229 from Zokrates/fix-circleci-tag
...
Fix circleci tag
2019-01-25 16:42:52 +01:00
schaeff
04960faf46
Merge branch 'develop' of github.com:JacobEberhardt/ZoKrates into fix-circleci-tag
2019-01-25 15:50:34 +01:00
schaeff
b7f1747df6
Merge branch 'develop' of github.com:JacobEberhardt/ZoKrates into clean-cli-hints
2019-01-25 15:49:51 +01:00
Thibaut Schaeffer
74ba983731
Merge pull request #236 from Zokrates/deactivate-wasm-tests
...
Remove wasm tests from CI until fixed
2019-01-25 15:43:38 +01:00
schaeff
7df02b5e0e
remove wasm tests from CI
2019-01-25 15:37:45 +01:00
schaeff
10fbe003c3
improve error handling in CLI
2019-01-25 15:35:50 +01:00
schaeff
35896ec8a2
clean hints
2019-01-25 12:10:27 +01:00
schaeff
04e2d3e718
Merge branch 'add-sharound' of github.com:JacobEberhardt/ZoKrates into add-sharound
2019-01-24 22:30:07 +01:00
schaeff
d604faea37
rename NOT.code to not.code (yeah macos, I'm looking at you)
2019-01-24 22:28:48 +01:00
sdeml
277be7e6b9
clear cache
2019-01-24 21:58:33 +01:00
sdeml
3de75f9a3a
fix ZOKRATES_HOME path
2019-01-24 19:52:59 +01:00
sdeml
2b80b6ccd0
fix circleci
2019-01-24 18:09:29 +01:00
sdeml
6f163bcdb6
fix tests
2019-01-24 17:59:13 +01:00
sdeml
178572bbfe
set ENV ZOKRATES_HOME for circleci
2019-01-24 17:20:31 +01:00
sdeml
33bb047bf7
small refactor & update docs
2019-01-24 17:05:19 +01:00
sdeml
00147b3917
Merge branch 'develop' into add-sharound
...
* develop: (53 commits)
move book snippets to files in test folder, link to them from md
handle case where path is a directory
update cargo.lock
update tests to use relative paths
resolve cargo.lock conflict
WASM crate import depends on the presence of the `wasm` feature
Insert missing fi at the end of if statement
change test to check flattening of 1-sized array is identical to flattening of single value
implement variable access to ifelse array
add support for ifelse array access, clean up semantic treatment
recommend setting /Users/obit/sides/zokrates/zokrates_stdlib/stdlib if it is not already
add /Users/obit/sides/zokrates/zokrates_stdlib/stdlib to Dockerfiles, add stdlib with dummy file
remove commented out old serialization
branch based on first path component
base decision on first character of path
fallback to /Users/obit/.zokrates when importing source files
Run the tests with WASM enabled
Fix build after rebase
Fix warning
Move wasm plugin generation to a different repo
...
# Conflicts:
# zokrates_book/src/sha256example.md
2019-01-23 17:43:14 +01:00
schaeff
66d4244717
fix typo: change target to develop
2019-01-23 10:32:00 +01:00
Stefan
6b916e779f
Merge pull request #225 from Zokrates/if-else-array
...
Add support for IfElse for arrays
2019-01-22 14:54:43 +01:00
Stefan
df9dc36b03
Merge pull request #196 from Schaeff/optimize-subtraction
...
Optimize subtraction flattening
2019-01-22 14:54:30 +01:00
Stefan
0b99d60c08
Merge pull request #227 from Zokrates/test-book-snippets
...
Test book snippets
2019-01-21 20:28:46 +01:00
Stefan
16c5c845c2
Merge pull request #223 from Zokrates/add-zokrates-home
...
Change fs_resolver for stdlib
2019-01-21 19:09:43 +01:00
schaeff
0fe0cbef2c
move book snippets to files in test folder, link to them from md
2019-01-21 19:00:21 +01:00
Thibaut Schaeffer
3018c1ccbe
Merge branch 'develop' into optimize-subtraction
2019-01-21 14:25:59 +01:00
schaeff
ef5e8fff6c
merge dev
2019-01-21 14:21:03 +01:00
Thibaut Schaeffer
869a5bc87e
Merge pull request #216 from Zokrates/remove-manual-serialization
...
Derive serialization for FieldPrime
2019-01-21 14:16:35 +01:00
schaeff
138a792a69
handle case where path is a directory
2019-01-21 14:14:40 +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
aebb557dc7
update tests to use relative paths
2019-01-21 13:53:50 +01:00
schaeff
edd07957a5
resolve cargo.lock conflict
2019-01-21 13:48:17 +01:00
Thibaut Schaeffer
bb97e7942c
Merge pull request #203 from gballet/wasmi
...
Implement support for WASM helpers
2019-01-21 13:08:33 +01:00
Thibaut Schaeffer
a8379b1875
Merge pull request #226 from asifmallik/patch-1
...
Insert missing fi at the end of if statement
2019-01-21 13:04:15 +01:00
Guillaume Ballet
a025c59d84
WASM crate import depends on the presence of the wasm feature
2019-01-21 10:23:49 +01:00
Asif Mallik
86495b9436
Insert missing fi at the end of if statement
2019-01-19 01:27:33 -05:00
sdeml
a2a977b75c
free unused memory / fix memory leak
2019-01-18 21:05:40 +01:00
schaeff
283d18db85
fix libsnark magic path error
2019-01-18 20:32:05 +01:00
schaeff
ae7b5c0daa
change test to check flattening of 1-sized array is identical to flattening of single value
2019-01-18 19:59:17 +01:00
schaeff
87fccb3457
implement variable access to ifelse array
2019-01-18 19:35:10 +01:00
schaeff
b74e0b6dc6
add support for ifelse array access, clean up semantic treatment
2019-01-18 18:56:56 +01:00
schaeff
e20f104c40
Merge branch 'develop' of github.com:JacobEberhardt/ZoKrates into if-else-array
2019-01-18 17:48:23 +01:00
sdeml
91bf2c0ea8
fix further memory leaks
2019-01-18 17:37:36 +01:00
sdeml
710eab6eac
fix memory overflow
2019-01-18 14:52:54 +01:00
sdeml
7850ac7dbe
fix tests
2019-01-18 14:52:28 +01:00
schaeff
e084165adc
add multiple errors, add node for all AST, fix tests ignoring positions
2019-01-18 11:49:16 +01:00
sdeml
dba5bc3e4e
add merke-tree inclusion proof
2019-01-17 17:35:58 +01:00
sdeml
02dfa019ff
new test fails
2019-01-17 17:29:46 +01:00
schaeff
d1295adc49
pass positions to absy, allow one error per function
2019-01-16 22:59:37 +01:00
