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

356 commits

Author SHA1 Message Date
Thibaut Schaeffer
5ef0b8e5ee
Merge pull request #1061 from Zokrates/use-ark-ff
Use ark ff
2021-12-10 15:12:19 +01:00
dark64
db9615bdac merge develop, fix conflicts 2021-12-10 12:38:44 +01:00
schaeff
9d95e08e30 merge dev 2021-12-07 19:17:55 +01:00
dark64
36362101f4 merge dev, fix conflicts 2021-12-07 14:44:23 +01:00
dark64
23812e310f update cargo.lock 2021-12-07 14:24:46 +01:00
dark64
71a8121854 wrap phase2 in core 2021-12-06 19:50:25 +01:00
dark64
7976774718 apply suggestions, remove mpc crate 2021-12-02 18:38:18 +01:00
schaeff
bc427597a4 use arkff in zokrates_field 2021-12-02 18:29:56 +01:00
dark64
f2481d3dec refactor 2021-11-25 20:07:17 +01:00
schaeff
a5ca49f98c bump versions, changelog 2021-11-23 19:34:10 +01:00
dark64
97c03d12be add zokrates_mpc crate 2021-11-23 15:35:54 +01:00
schaeff
30a04734b5 use iterators where possible, switch to cbor 2021-10-29 13:51:43 +02:00
dark64
b69a7d29a5 first working mpc prototype 2021-10-27 19:18:20 +02:00
dark64
5dd4644989 wip 2021-10-26 14:58:43 +02:00
schaeff
dad17b79e0 proof of concept of iterator treatment starting at flattening 2021-10-25 16:08:45 +02:00
Pete Hunt
61bbc44abc Update lockfiles 2021-10-22 00:23:47 -07:00
schaeff
fd2f2a78b2 use github ark marlin, complete implementation 2021-10-18 12:42:08 +02:00
schaeff
433a32579f merge dev 2021-10-13 02:02:03 +03:00
schaeff
bb3632f57d upgrade cargo lock 2021-10-12 19:56:34 +03:00
dark64
044456418a update changelog, bump versions 2021-10-04 17:45:29 +02:00
schaeff
dfd3d5a7ab bump versions, update changelog 2021-08-16 19:02:42 +02:00
schaeff
81c537769c merge deve, fix conflicts 2021-08-09 14:06:34 +02:00
Thibaut Schaeffer
f717d243b2
Merge pull request #945 from Zokrates/generic-structs
Implement generic structs
2021-08-09 11:58:34 +02:00
schaeff
249187a157 merge dev, fix conflicts, fix comment in test 2021-08-09 11:43:03 +02:00
schaeff
63be983d74 add tests, tweak out of range interpreter 2021-08-05 15:22:46 +02:00
schaeff
63865f8e01 add changelog 2021-07-29 11:48:48 +02:00
schaeff
737d224d6b add gm17 passing test 2021-07-25 16:56:59 +02:00
schaeff
0bb2f899bf bump versions, generate changelog 2021-07-10 13:13:31 +02:00
schaeff
cbb6e4ff97 fix conflicts 2021-07-08 10:53:28 +02:00
Thibaut Schaeffer
ffac53c793
Merge pull request #918 from Zokrates/recursive-verifier
Recursive verification
2021-07-07 18:45:09 +02:00
schaeff
91bb00cf50 Merge branch 'develop' of github.com:Zokrates/ZoKrates into marlin 2021-06-22 17:05:21 +02:00
schaeff
7bc90dd85c bump versions, generate changelog 2021-06-17 15:33:37 +02:00
dark64
59f62d2ffa wip 2021-06-09 18:48:22 +02:00
dark64
af7097bd14 Merge branch 'develop' of github.com:Zokrates/ZoKrates into recursive-verifier 2021-05-25 20:21:00 +02:00
dark64
73b28a9d0b bump version, update changelog 2021-05-19 16:36:22 +02:00
schaeff
9e268860e8 bump versions, generate changelog 2021-05-18 11:00:24 +02:00
dark64
baf18f7e05 wip 2021-05-14 18:10:05 +02:00
schaeff
8652241b12 fix nested struct flattening, derive debug 2021-05-04 15:47:01 +02:00
schaeff
9705da1afc implement marlin with raw keys 2021-04-30 11:13:30 +02:00
schaeff
1a311afb0b Merge branch 'develop' of github.com:Zokrates/ZoKrates into marlin 2021-04-27 16:33:01 +02:00
schaeff
f290de2b58 bump version, generate changelog 2021-04-09 15:09:34 +02:00
schaeff
804c0012be wip 2021-04-06 17:31:37 +02:00
schaeff
186a4f6511 merge dev 2021-03-31 11:25:24 +02:00
schaeff
6162bd095c update ark to crates.io 2021-03-25 18:12:48 +01:00
schaeff
24bdebb524 bump versions 2021-03-19 13:35:30 +01:00
schaeff
1246438ae9 merge dev 2021-03-18 23:47:24 +01:00
dark64
bc1209e890 use random seed in bellman 2021-02-03 13:38:44 +01:00
schaeff
2793e77eac merge dev, clippy, fix conflicts 2021-01-21 17:53:18 +01:00
dark64
f68d887038 wip 2020-12-28 18:18:29 +01:00
Thibaut Schaeffer
5595cf16ca
Merge pull request #716 from Zokrates/remove-array-ssa
Remove array ssa
2020-12-23 10:53:43 +01:00
schaeff
e82bc9d868 merge dev 2020-12-22 17:16:25 +01:00
dark64
fa016127d6 fix conflicts 2020-12-21 12:41:38 +01:00
schaeff
1938a98d2a merge clippy 2020-12-20 20:30:40 +01:00
schaeff
a6569d506a fix conflict 2020-12-20 13:41:09 +01:00
dark64
448821576e check validity of stdlib path 2020-12-17 21:23:11 +01:00
dark64
b06acb55e4 cli commands in separate files 2020-12-17 21:03:45 +01:00
schaeff
f53948ec79 clean comment 2020-12-11 16:40:36 +00:00
schaeff
5f76a0316b featurize zokrates_core 2020-11-30 23:10:36 +00:00
schaeff
6c00679a3b solve conflict 2020-11-23 13:05:39 +00:00
schaeff
f8d857d3b8 migrate zexe to ark 2020-11-20 18:52:27 +00:00
schaeff
5c39785b9b remove unused deps, split zokrates_test 2020-11-18 13:04:50 +00:00
schaeff
ac3b5f864d bump versions 2020-11-10 19:06:18 +00:00
schaeff
e6c8e638a7 add to stdlib and test 2020-11-09 19:36:24 +00:00
dark64
19a25987bc refactoring 2020-10-29 19:24:54 +01:00
dark64
5de2d3a9b2 features fix 2020-10-07 15:23:07 +02:00
dark64
b7270008d0 add verify to zokrates js 2020-10-06 15:08:11 +02:00
dark64
978877a2bc update num-bigint version 2020-10-05 14:11:25 +02:00
dark64
9a35bfae55 revert zexe to offical git repo, use FromBytes to construct g1 and g2 2020-10-02 12:59:14 +02:00
dark64
287b2b8f47 zexe iter-1 2020-09-23 21:08:31 +02:00
dark64
ace1753355 fix conflicts, revert default value for --stdlib-path flag 2020-08-13 19:00:09 +02:00
dark64
8cfe4c9130 merge dev 2020-08-13 17:59:54 +02:00
schaeff
6a50c2e747 bump deps 2020-08-06 18:58:11 +02:00
schaeff
057d5883aa remove bellman embeds, add u32 to stdlib 2020-07-03 18:10:33 +02:00
dark64
8c840f9566 remove default value for stdlib-path 2020-06-30 12:43:23 +02:00
dark64
f1b97a6520 add stdlib-path argument to cli, remove ZOKRATES_HOME env 2020-06-25 13:37:11 +02:00
schaeff
3f2cc02d9e merge dev 2020-06-04 17:01:32 +02:00
schaeff
52d50d12ad fix conflicts 2020-06-04 16:15:10 +02:00
schaeff
7b13fb2233 update example to that of issue, bump version numbers 2020-06-04 12:34:13 +02:00
schaeff
710f7dbffe fix bellman deps 2020-06-03 14:52:29 +02:00
schaeff
e4b5820722 add tests, refine uint optimizer 2020-05-28 15:28:47 +02:00
schaeff
bb2b70593f revert unrelated changes 2020-05-26 16:42:39 +02:00
schaeff
1bd5c06b64 merge dev 2020-05-19 13:35:31 +02:00
schaeff
23ffe25429 Merge branch 'develop' of github.com:Zokrates/ZoKrates into u8-playground 2020-05-19 12:54:57 +02:00
schaeff
1b942bae33 bump version niumbers for bellman tools 2020-05-18 17:40:40 +02:00
schaeff
32d7e18221 improve perf of redefinition optimizer with ignored hashset 2020-05-14 12:21:59 +02:00
schaeff
0951d7d14c merge dev 2020-05-11 16:07:40 +02:00
schaeff
716f9e45ce merge dev 2020-05-07 17:18:22 +02:00
dark64
4dab919d92 merge dev, fix conflicts 2020-04-27 19:46:48 +02:00
dark64
3c45c450bd set strict bellman version 2020-04-23 20:01:46 +02:00
schaeff
aabb9c5964 fix bellman version 2020-04-23 15:47:42 +02:00
schaeff
ddc4c196bf merge dev 2020-04-21 13:19:18 +02:00
schaeff
d05ee17640 make add readjustment logarithmic 2020-04-21 09:34:24 +02:00
schaeff
12bfb538e1 cache bits when calling u32 from bits 2020-04-16 20:10:56 +02:00
dark64
edd7b5bbd1 merge dev, fix conflicts, remove base64 crate 2020-04-14 21:06:14 +02:00
dark64
e8d655e5ce gm17 and pghr13 native verification 2020-04-14 20:48:17 +02:00
schaeff
9ad7c6fe94 use crates.io bellman 2020-04-06 16:51:40 +02:00
schaeff
76ebc229c2 merge 2020-04-03 15:19:50 +02:00
schaeff
f00338bcbe remove non multidef calls 2020-03-31 16:05:49 +02:00
dark64
d6c8f5e88c change encoding for raw formats, use csv crate to parse vk 2020-03-27 17:03:31 +01:00
dark64
1fc679a140 Merge branch 'develop' of github.com:Zokrates/ZoKrates into native-verifier 2020-03-19 19:44:24 +01:00
dark64
efecfedc8b add zokrates_common crate, update resolver trait definition 2020-03-04 20:31:44 +01:00
dark64
8774cbcd6e revert zokrates_fs_resolver cargo.toml 2020-03-03 14:17:25 +01:00
dark64
acd9b9ea86 add resolver trait 2020-03-03 14:03:42 +01:00
schaeff
9859f56328 update lock 2020-02-20 17:28:28 +01:00
schaeff
f680a363b6 bump versions 2020-02-20 15:33:07 +01:00
dark64
b55f941831 g16 native verifier 2020-02-18 17:49:14 +01:00
Darko
80e8f7de43 refactor export-verifier for g16 2020-02-12 14:54:00 +01:00
schaeff
5509330ab6 fix conflicts 2020-01-20 18:04:21 +01:00
schaeff
1ccf74670d merge dev 2020-01-20 17:52:20 +01:00
dark64
a51ec1c9eb update bellman revision 2020-01-16 16:57:53 +01:00
dark64
c68d92d62b revert bellman to specific revision 2020-01-14 03:11:52 +01:00
schaeff
85514eefab merge dev 2019-12-09 17:32:00 +01:00
Thibaut Schaeffer
cfd8964ca3
Merge pull request #531 from Zokrates/master
Merge back
2019-12-06 18:06:00 +01:00
schaeff
3007ca7e15 target bellman master 2019-12-03 17:53:52 +01:00
schaeff
840c268a6a remove wasm helpers, simplify, rename helper to solver 2019-11-25 19:02:15 +01:00
Thibaut Schaeffer
86ba4b708c
add firefox testing. wip (#517)
* add firefox testing. wip

* fix config

* use crates bellman

* install  curl

* move wasm install test install script to sh

* make sh executable

* remove firefox as its suppose to be there already

* confirm install..

* seems like firefox isnt there after all

* firefox-esr

* use fixed bellman

* revert backend api change, only touch env outside wasm

* fix typo in cfg flag
2019-11-22 13:02:02 +01:00
schaeff
4b409af47c merge dev, use multicore in cli 2019-11-21 14:24:31 +01:00
schaeff
87d3860724 use sapling-crypto@0.1.1 2019-11-21 11:37:27 +01:00
schaeff
3abda854e0 bump versions 2019-11-12 19:12:50 +01:00
schaeff
802cbbafa0 merge dev 2019-11-11 20:26:29 +01:00
dark64
c39dd0ea22 Refactor CLI to support new ProofSystem API 2019-11-11 14:53:00 +01:00
dark64
da062f0e27 remove libc, fix i32 types 2019-10-31 14:42:26 +01:00
schaeff
3feac21744 remove gh importer 2019-10-28 15:35:08 +01:00
schaeff
400a2205f3 merge dev, fix flags 2019-10-25 13:13:14 +02:00
schaeff
e5c5c33293 merge dev, implement partialeq by hand to work around wrong derived bounds 2019-10-22 13:29:28 +02:00
schaeff
555bacd035 update cli 2019-10-18 20:01:10 +02:00
schaeff
a6d2778754 update zokrates_field and ir 2019-10-17 15:53:22 +02:00
schaeff
2ae2a1ea00 remove freebsd 2019-10-08 16:34:01 +09:00
Thibaut
29ada15ec1 merge dev 2019-10-07 12:32:09 +09:00
Thibaut
210a8b9f3a remove web incompatible crates, change wasm flag to wasm_solvers, introduce wasm flag 2019-10-03 16:42:15 +02:00
Paul E
bd49bcc369 Merge branch 'develop' of https://github.com/Zokrates/ZoKrates into develop 2019-10-02 10:54:51 +02:00
Thibaut
be14810af9 merge structs 2019-09-30 14:23:33 +02:00
Thibaut
997d2c3862 extract abi to crate, accept raw and abi, add cli flags 2019-09-27 19:23:16 +02:00
schaeff
c413fd64d0 wip 2019-09-25 19:37:05 +02:00
schaeff
5d40fa7083 Merge branch 'develop' of github.com:Zokrates/ZoKrates into zokrates-test-crate 2019-09-17 12:12:27 +02:00
schaeff
9521d5822a create zokrates_core_test crate and move zokrates_core tests there 2019-09-17 12:10:59 +02:00
dark64
5ab258a790 Fix zokrates_embed simpling-crypto dependency 2019-09-16 15:56:42 +02:00
dark64
9a6ddc22ae add g16 wasm supported functions 2019-09-13 18:59:46 +02:00
schaeff
885ccb6e96 test 2019-09-13 15:58:28 +02:00
Paul E
c0ed1440ed resolved merge conflict from upstream pull 2019-09-11 11:38:32 +02:00
schaeff
db87a48540 update lazy static and remove allow(deprecated) 2019-08-28 09:49:58 +02:00
Stefan
2c679a8cb7
Merge pull request #357 from Zokrates/modules-v2
Refactor AST for zero-cost modules
2019-08-22 23:36:31 +02:00
schaeff
5b20449a91 extract testing into test crate 2019-08-22 13:48:34 +02:00
schaeff
549e159492 patch lt output 2019-08-21 10:35:30 +02:00
schaeff
a3f9eafb73 merge dev 2019-08-19 13:45:49 +02:00
schaeff
83577051d6 replace try with ? 2019-08-19 09:11:43 +02:00
schaeff
1960515165 add range check on public inputs in solidity verifiers 2019-07-26 11:48:04 +02:00
Paul E
7c1057e21c changed after build 2019-07-17 12:08:42 +02:00
schaeff
c312d3423d use crate 2019-07-15 11:46:03 +02:00
schaeff
e2e644364e merge dev 2019-07-09 23:29:32 +02:00