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

176 commits

Author SHA1 Message Date
schaeff
6ecc2c9885 patch unconstrained cast 2019-02-11 16:15:43 +01:00
schaeff
8bf0d72725 bump versions 2019-02-06 11:24:03 +01:00
schaeff
90024508c8 Merge branch 'master' of github.com:JacobEberhardt/ZoKrates into develop 2019-02-04 15:56:04 +01:00
schaeff
541cd44997 bump versions: fs_resolver and cli minor, core and field patch 2019-02-01 18:30:36 +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
sdeml
a25dd44975 move merkle tree gadget to example folder 2019-02-01 10:30:43 +01:00
sdeml
fe6396950b resolve PR comments 2019-01-31 21:06:43 +01:00
sdeml
94f855ede8 fix PR comments 2019-01-31 13:29:16 +01:00
sdeml
a7e5477d2b Merge branch 'develop' into add-sharound
* develop:
  Remove the tools directory
  add doc, example and failing test for out of scope
  Add zokrates_field to kcov
  first build docker, then tag gh
  clean env
  revert dockerfile to original, enable master filter, enable push to dockerhub, git tag and mdbook
  clean, move bot addr to env, silence commands
  pass pw through stdin to silence warning
  remove useless checks, rename env var
  enable docker remote
  add docker login, get mdbook from tar
  allow wasm tests to fail
  add integration_test job
  use workflows

# Conflicts:
#	.circleci/config.yml
2019-01-31 08:59:59 +01:00
schaeff
f9cce777f0 add doc, example and failing test for out of scope 2019-01-29 11:24:16 +01:00
schaeff
a50b546714 merge develop 2019-01-29 10:39:48 +01:00
Thibaut Schaeffer
17682a94af
Merge branch 'develop' into add-sharound 2019-01-28 10:22:21 +01:00
schaeff
b731a7c296 solve conflict 2019-01-28 10:18:27 +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
sdeml
6f163bcdb6 fix tests 2019-01-24 17:59:13 +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
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
schaeff
0fe0cbef2c move book snippets to files in test folder, link to them from md 2019-01-21 19:00:21 +01:00
schaeff
e20f104c40 Merge branch 'develop' of github.com:JacobEberhardt/ZoKrates into if-else-array 2019-01-18 17:48:23 +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
a23b5fcda1 merge develop 2019-01-15 10:41:19 +01:00
Guillaume Ballet
e1d2df3e20 Fix build after rebase 2019-01-14 17:04:23 +01:00
Guillaume Ballet
6e4d8b8c3f Fix warning 2019-01-14 14:49:47 +01:00
Guillaume Ballet
4931710b6c fix unwinding issue in tests 2019-01-14 14:48:33 +01:00
schaeff
8e1821dca8 merge, solve conflicts, make tests pass 2019-01-14 00:03:28 +01:00
sdeml
622b0c628e merge with develop 2019-01-13 17:30:17 +01:00
sdeml
e84e0efd97 fix tests 2019-01-13 17:25:40 +01:00
sdeml
1d3f4268e7 fix tests 2019-01-13 17:24:30 +01:00
sdeml
e53197e3c1 delete debug statements 2019-01-13 17:22:59 +01:00
sdeml
4d463c5a18 fix conflicts 2019-01-13 17:20:47 +01:00
sdeml
f33ad7a673 add sharound 2019-01-13 14:32:27 +01:00
schaeff
29403cfb50 bump patch 2019-01-06 22:41:43 +01:00
schaeff
9de72fe21e add tests, fix order of outputs in test runner 2019-01-04 15:31:16 +01:00
Thibaut Schaeffer
44caf701b0
Merge pull request #210 from Zokrates/add-core-e2e-tests
[Preview] Add core e2e tests
2019-01-04 14:36:14 +01:00
schaeff
38be2a4890 Merge branch 'develop' of github.com:JacobEberhardt/ZoKrates into if-else-array 2019-01-04 14:36:14 +01:00
schaeff
1e03eabacd add ifelse for arrays 2019-01-04 13:55:45 +01:00
schaeff
9f10aae2ba fix tests 2018-12-31 08:18:35 +01:00
schaeff
e196d67b07 put trait in scope 2018-12-31 08:14:17 +01:00
schaeff
1f71554584 hide witness operations away from cli 2018-12-31 08:10:33 +01:00
Guillaume Ballet
5a9f5c8060 Make field its own crate 2018-12-27 11:02:48 +01:00
schaeff
82a18e99f5 Merge branch 'develop' of github.com:JacobEberhardt/ZoKrates into greater_than 2018-12-17 18:19:14 +01:00
schaeff
9dcd6d9206 reuse backend detection 2018-12-11 18:50:58 +01:00
schaeff
fe964c57a8 add missing import 2018-12-07 18:41:25 +01:00
schaeff
9160aa4164 fix conflicts 2018-12-07 18:01:17 +01:00
schaeff
57fc5453dd Merge branch 'master' of github.com:JacobEberhardt/ZoKrates into gm17 2018-12-07 17:54:08 +01:00
schaeff
7a46f15e74 Merge branch 'develop' of github.com:JacobEberhardt/ZoKrates into use-lincomb-ir 2018-12-04 19:41:45 +01:00
schaeff
1e33f8b564 remove example 2018-11-30 17:21:05 +01:00