1
0
Fork 0
mirror of synced 2025-09-23 12:18:44 +00:00
Commit graph

4241 commits

Author SHA1 Message Date
Thibaut Schaeffer
9970ecda8f
Merge pull request #1190 from Zokrates/fix-zokrates-js
Fix exports in zokrates_js/package.json
2022-07-19 10:56:09 +02:00
dark64
ee05b57325 fix exports in package.json 2022-07-13 21:28:43 +02:00
Thibaut Schaeffer
0554d616a8
Merge pull request #1185 from Zokrates/rc/0.8.0
Merge back rc/0.8.0
2022-07-12 16:33:52 +02:00
dark64
782bfc108d Add github release to release.sh script 2022-07-12 13:28:33 +02:00
dark64
3c63e9e727 update circleci config 2022-07-07 16:55:48 +02:00
Darko Macesic
d0015e253b
Merge pull request #1183 from Zokrates/rc/0.8.0
Release 0.8.0
2022-07-07 15:29:16 +02:00
dark64
81a0f191df update changelog and zokrates_js docs 2022-07-07 14:41:58 +02:00
schaeff
e1bf046eb3 bump versions, generate changelog, generate js lock 2022-07-06 16:31:24 +02:00
Thibaut Schaeffer
de7f73e234
Merge pull request #1182 from Zokrates/bump-rust-version
Bump rust nightly
2022-07-06 16:22:05 +02:00
Thibaut Schaeffer
32cae8f1a2
Merge pull request #1181 from Zokrates/remove-pghr13
Remove pghr13
2022-07-06 15:54:35 +02:00
Thibaut Schaeffer
0535bf5b50
Merge pull request #1180 from Zokrates/fix-log-fmt
Fix log fmt
2022-07-06 15:53:48 +02:00
schaeff
8b35413169 bump nightly, fix clippy errors 2022-07-06 15:51:45 +02:00
schaeff
792ce87561 remove pghr13 2022-07-06 15:09:14 +02:00
schaeff
7076a1c003 fix log fmt 2022-07-06 14:56:21 +02:00
Thibaut Schaeffer
9e1cb8a07e
Merge pull request #1179 from Zokrates/staging
Merge staging into develop
2022-07-06 14:54:32 +02:00
schaeff
111e4069a0 remove libsnark references and orphaned modules 2022-07-06 11:50:01 +02:00
schaeff
634c17cb56 fix conflicts 2022-07-05 22:54:37 +02:00
schaeff
4eb7b99cc3 fix conflicts 2022-07-05 20:21:46 +02:00
Darko Macesic
2a77d22151
Merge pull request #1177 from Zokrates/merge-dev-into-staging
Merge dev into staging
2022-07-05 18:24:00 +02:00
Darko Macesic
410e802ad5
Merge pull request #1171 from Zokrates/log-statement
Add log command
2022-07-05 18:22:19 +02:00
schaeff
950ac08b0e apply suggestions 2022-07-05 13:40:43 +02:00
schaeff
33d52dd6ed fix tests 2022-07-05 13:32:04 +02:00
schaeff
22b862eeee removed commented out code 2022-07-04 19:57:08 +02:00
schaeff
8f5e4d9985 fix conflicts 2022-07-04 19:50:12 +02:00
schaeff
5f3d0d1f57 fix test 2022-07-04 17:46:41 +02:00
schaeff
66a9dfb729 fix test 2022-07-04 17:27:28 +02:00
Thibaut Schaeffer
80f4aa4939
Merge pull request #1151 from Zokrates/split-to-crates
Split project into crates
2022-07-04 17:20:23 +02:00
Thibaut Schaeffer
393896daa4
Merge pull request #1176 from Zokrates/deploy
Merge back deploy
2022-07-04 17:20:04 +02:00
schaeff
3b07c156ad use function syntax for log, reserve log, add test 2022-07-04 17:19:07 +02:00
schaeff
81d670e531 merge split 2022-07-04 17:02:48 +02:00
schaeff
0413d845f9 Merge branch 'split-to-crates' of github.com:Zokrates/ZoKrates into split-to-crates 2022-07-01 13:58:10 +02:00
schaeff
0f54b94df9 simplify test 2022-07-01 13:57:33 +02:00
Thibaut Schaeffer
7d96cc1e4c
Merge pull request #1143 from Zokrates/zokrates-circom
Add circom/snarkjs compatible output for r1cs and witness
2022-07-01 10:21:11 +02:00
Darko Macesic
fdd4d7895d
Merge pull request #1175 from Zokrates/fq2-enum-infer
Fq2 enum infer
2022-06-30 16:51:15 +02:00
dark64
49f220b866 remove json files 2022-06-30 16:45:35 +02:00
dark64
2ea607226c replace if with safe unwrap 2022-06-30 16:37:11 +02:00
schaeff
28566794f1 Merge branch 'zokrates-circom' of github.com:Zokrates/ZoKrates into zokrates-circom 2022-06-30 13:38:45 +02:00
schaeff
b7ed153e2e changelog 2022-06-30 13:34:36 +02:00
schaeff
b2336420b9 add g2type to field and parse accordingly 2022-06-30 13:31:55 +02:00
dark64
ed7c3632ea fix cli flags, update type def in zokrates.js 2022-06-29 18:43:51 +02:00
dark64
ed28aada22 revert 2022-06-29 14:10:48 +02:00
dark64
5daa31a7b8 update toolchain 2022-06-29 12:50:31 +02:00
schaeff
e6a750a657 upgrade nodejs 2022-06-29 11:46:59 +02:00
schaeff
61f9b33aa9 merge staging 2022-06-29 11:45:46 +02:00
Thibaut Schaeffer
588943567f
Merge pull request #1174 from Zokrates/fix-docs
Fix inconsistencies in docs
2022-06-29 10:37:01 +02:00
Thibaut Schaeffer
7d2d61fe35
Merge pull request #1168 from Zokrates/add-mut-keyword
Add mut keyword, make variables immutable by default
2022-06-29 10:35:50 +02:00
schaeff
aec95d9fe5 fix tests 2022-06-29 10:21:54 +02:00
dark64
79db6ca3b8 fix indentation 2022-06-28 19:31:59 +02:00
dark64
e75552b0eb merge staging 2022-06-28 19:23:45 +02:00
schaeff
c4971779d8 merge staging 2022-06-28 18:22:36 +02:00