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

1276 commits

Author SHA1 Message Date
JacobEberhardt
732c1b70f9
Merge pull request #242 from Zokrates/short-field-display
Display field elements in a more compact way
2019-02-01 13:11:21 +01:00
Thibaut Schaeffer
e0316c39e2
Update ir.md 2019-02-01 11:44:44 +01:00
Thibaut Schaeffer
00659fc60a
Update ir.md 2019-02-01 11:38:43 +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
Thibaut Schaeffer
041cfa2052
Update SUMMARY.md 2019-01-31 11:06:11 +01:00
schaeff
a708e5ba07 Merge branch 'develop' of github.com:JacobEberhardt/ZoKrates into short-field-display 2019-01-31 10:21:42 +01:00
schaeff
ef16ee6090 expose zir in book reference 2019-01-31 10:21:25 +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
a853934adb fix test 2019-01-30 18:40:44 +01:00
Thibaut Schaeffer
4d3dd47841
Merge pull request #245 from gballet/remove-tools
Remove the tools directory
2019-01-30 18:36:46 +01:00
schaeff
c55fdf98b8 update docs, implement agreed change ie only print compact for in zir 2019-01-30 18:33:55 +01:00
Guillaume Ballet
761d4b5904 Remove the tools directory 2019-01-30 08:59:05 -08:00
schaeff
72a8f719a8 move optimiser to act on IR 2019-01-30 17:43:32 +01:00
Thibaut Schaeffer
4aa5cd0147
Merge pull request #239 from Zokrates/modularize-circleci
Modularize CircleCI, add github tag, push to dockerhub
2019-01-30 15:02:30 +01:00
schaeff
98fedeb807 Merge branch 'develop' of github.com:JacobEberhardt/ZoKrates into use-folder-pattern-for-optimizer 2019-01-29 17:19:54 +01:00
schaeff
60719998da display empty lincomb 2019-01-29 14:03:14 +01:00
schaeff
0001ea6670 represent big field elements as negative 2019-01-29 12:18:02 +01:00
schaeff
bff63a78f6 represent big field elements as negative 2019-01-29 12:17:51 +01:00
JacobEberhardt
d71f133e16
Merge pull request #241 from Zokrates/variable-scope-doc
Document variable scope
2019-01-29 11:37:25 +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
08c5baf53e
Merge pull request #240 from Zokrates/add-zokrates-field-to-kcov
Add zokrates_field to kcov
2019-01-29 10:27:07 +01:00
schaeff
f114b952ca Add zokrates_field to kcov 2019-01-29 10:07:25 +01:00
schaeff
250c849a76 first build docker, then tag gh 2019-01-28 20:45:36 +01:00
schaeff
feca495f71 clean env 2019-01-28 20:44:12 +01:00
schaeff
14ea912ea2 revert dockerfile to original, enable master filter, enable push to dockerhub, git tag and mdbook 2019-01-28 20:35:19 +01:00
schaeff
231d7611cb clean, move bot addr to env, silence commands 2019-01-28 20:22:40 +01:00
schaeff
4a58229dc6 pass pw through stdin to silence warning 2019-01-28 20:14:30 +01:00
schaeff
08cda8ed33 remove useless checks, rename env var 2019-01-28 20:05:43 +01:00
schaeff
7a14e0025f enable docker remote 2019-01-28 19:55:09 +01:00
schaeff
3bc6ecae6a add docker login, get mdbook from tar 2019-01-28 19:52:00 +01:00
schaeff
c594886596 allow wasm tests to fail 2019-01-28 15:02:30 +01:00
schaeff
ddaa961b89 add integration_test job 2019-01-28 14:55:13 +01:00
schaeff
d72169dba9 use workflows 2019-01-28 14:52:40 +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
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