github-mig/ZoKrates
github-mig/ZoKrates
1
0
Fork 0
mirror of synced 2025-09-23 12:18:44 +00:00
Code Issues Projects Releases Wiki Activity
4576 commits 186 branches 59 tags 32 MiB
Commit graph

358 commits

Author SHA1 Message Date
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
schaeff
4dde51a828 fix wasmi version 2019-07-09 17:45:10 +02:00
Thibaut Schaeffer
18d7efcde2
Merge branch 'develop' into app_testing 2019-07-05 23:35:58 +02:00
schaeff
ac46518c96 integrate ethereum deployment with integration tests, remove duplicated code in js script 2019-07-04 18:11:02 +02:00
schaeff
6bf9b46eaf merge dev, github resolver unimplemented 2019-07-03 20:34:29 +02:00
schaeff
60cc804b53 mock github in resolver only 2019-06-29 00:20:27 +02:00
schaeff
87312a55e9 remove invalid test case 2019-06-23 13:35:03 +02:00
schaeff
30d9efd793 remove print 2019-06-16 23:17:25 +02:00
schaeff
31b4196d61 add array initializer sugar 2019-06-14 18:25:14 +02:00
schaeff
0f40498ba9 reset cargo.lock 2019-06-12 20:08:32 +02:00
schaeff
9144bc2574 enable imports with arena 2019-06-11 18:55:07 +02:00
schaeff
cdf394c7e1 solve conflicts except compile loop 2019-06-11 11:12:37 +02:00
schaeff
c4dec182d0 implement array flattening, remove bimap 2019-06-06 14:12:56 +02:00
schaeff
365d03be65 bring pest parser and AST into tree as crates, adjust testing 2019-06-03 10:22:59 +02:00
schaeff
20e12c10ea merge dev 2019-05-30 10:02:32 +02:00
schaeff
5e96d26bf5 change main to lib for stdlib to prevent binary creation 2019-05-29 10:33:15 +02:00
schaeff
801c63384d fix typo in proof serialization... 🤦 2019-05-10 16:04:25 +02:00
schaeff
20790b72ff switch to regex for parsing 2019-05-09 17:45:41 +02:00
schaeff
da3ef6ae63 merge dev 2019-05-07 14:53:13 +02:00
schaeff
84c28c421b bump versions 2019-04-11 23:33:52 +02:00
Thibaut Schaeffer
b93bf6f1ef
Create binaries with libsnark disabled on new tags (#319) 
* add appveyor, travis, remove libsnark as default, add push to gh

* fix appveyor

* change appveyor to nightly

* use cargo for build job

* change to build everywhere

* update token, reduce targets

* add more targets

* add on liner script

* remove rustc dep

* add need_cmd

* add check cmd

* simple brackets

* use check_cmd for curl

* copy stdlib to OUT_DIR

* ship stdlib in archive

* install stdlib, give PATH hints after build script

* clean

* comment

* scripts: ensure one-liner install script works with FreeBSD

* remove appveyor for now

* clean, remove windows, remove appveyor, remove travis test

* put back cross install

* fix stdlib test generation

* disable tests in travis

* restore test script to prevent tests to run..

* change scripts to keep same behaviour now that libsnark is disabled by default

* update docs with installer

* change docker to dockerhub

* change repo
 2019-04-11 23:20:44 +02:00
schaeff
fa3f72f6b7 merge develop 2019-04-08 22:37:18 +02:00
schaeff
0be493fdd1 fix following review: extract witness with write read, rename scheme to proving scheme, typos 2019-04-08 14:56:07 +02:00
schaeff
5b4da4c91c remove xor, remove field dep, clean 2019-04-02 14:24:33 +02:00
schaeff
f8fa3efccf implement sha256 on bellman, remove libsnark version 2019-04-01 19:59:43 +02:00
schaeff
88c755ff79 fix signature and visibility 2019-03-21 22:58:22 +01:00
schaeff
2980d8da02 implement unary operators, currently only '!' 2019-03-21 21:38:58 +01:00
schaeff
e999ba6a3f add imports 2019-03-21 01:00:40 +01:00
schaeff
f1b0461f1c use gh pest-ast 2019-03-21 00:09:48 +01:00
schaeff
3f71b24172 add all translation cases, remove old parser 2019-03-21 00:02:18 +01:00
schaeff
aab1ab80e9 integrate with pest parser. WIP 2019-03-19 12:11:19 +01:00
schaeff
333adeb3ed merge develop 2019-03-18 12:20:41 +01:00
schaeff
aa1e94626b merge and resolve conflicts 2019-03-18 11:11:42 +01:00
schaeff
951bff8fc5 remove bits from flattener struct 2019-03-15 15:25:36 +01:00
schaeff
39db4fdfa7 fix breaking bellman deps by providing explicit version numbers 2019-03-06 12:48:51 +01:00
schaeff
0551facbc6 bump patch 2019-03-05 18:09:06 +01:00
schaeff
799f528481 make contracts solidity 0.5 compatible 2019-02-28 16:10:27 +01:00
schaeff
440a1887e9 make stdlib a crate, add integration tests using fs resolver 2019-02-26 15:20:43 +01:00
schaeff
09de78aab6 get cli version from env 2019-02-25 20:02:32 +01:00
schaeff
ba51910b7a fix cli and cli tests 2019-02-21 19:37:27 +01:00
schaeff
39a3a6764b update integration test to avoid unconstrained variables 2019-02-21 10:54:38 +01:00
schaeff
172e1be1d2 use csv for witness serialization, clean libsnark, rename backends to schemes 2019-02-21 10:28:23 +01:00
schaeff
b0e8b9d042 integrate with backend api, activate with --backend g16 2019-02-15 11:41:35 +01:00
schaeff
4cf22faef3 move metadata to struct, move r1cs_program inside backend, simplify API 2019-02-13 18:21:01 +01:00
Thibaut Schaeffer
f2a7101500
Merge pull request #270 from Zokrates/master 
Merge back master after patch
 2019-02-11 18:23:58 +01:00
schaeff
f998a087ce merge develop 2019-02-11 17:22:29 +01:00
schaeff
6ecc2c9885 patch unconstrained cast 2019-02-11 16:15:43 +01:00
schaeff
781b7c3a0d Merge branch 'develop' of github.com:JacobEberhardt/ZoKrates into move-libsnark-fetch-to-build 2019-02-08 18:15:38 +01:00
schaeff
826168240b move libsnark fetch to build 2019-02-07 17:22:28 +01:00
schaeff
8bf0d72725 bump versions 2019-02-06 11:24:03 +01:00
schaeff
541cd44997 bump versions: fs_resolver and cli minor, core and field patch 2019-02-01 18:30:36 +01:00
schaeff
ef5e8fff6c merge dev 2019-01-21 14:21:03 +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
edd07957a5 resolve cargo.lock conflict 2019-01-21 13:48:17 +01:00
schaeff
5c0b5e84ad add /Users/obit/sides/zokrates/zokrates_stdlib/stdlib to Dockerfiles, add stdlib with dummy file 2019-01-16 17:58:46 +01:00
schaeff
e1abb3e54b merge develop, resolve conflicts 2019-01-16 14:07:05 +01:00
schaeff
f8b029ea28 fallback to /Users/obit/.zokrates when importing source files 2019-01-14 19:45:17 +01:00
Guillaume Ballet
a5a94bea89 Upgrade to wasmi 0.4.2 2019-01-14 14:46:21 +01:00
Guillaume Ballet
163f2b42f4 Implement support for WASM helpers 2019-01-14 14:39:36 +01:00
schaeff
8e1821dca8 merge, solve conflicts, make tests pass 2019-01-14 00:03:28 +01:00
schaeff
0770db761d fix import paths 2019-01-10 10:21:13 +01:00
schaeff
a5290fab39 upgrade num, derive serialize 2019-01-10 10:13:50 +01:00
schaeff
29403cfb50 bump patch 2019-01-06 22:41:43 +01:00
schaeff
760a7c5322 upgrade image in dockerfile, add serialization for keys and proofs. wip 2019-01-01 23:04:02 +01:00
Guillaume Ballet
5a9f5c8060 Make field its own crate 2018-12-27 11:02:48 +01:00
schaeff
72ec55827e generate proof with bellman 2018-12-11 14:29:05 +01:00
schaeff
49569e808c wip 2018-12-09 18:37:01 +01:00
schaeff
648a78601a bump patch 2018-11-30 17:10:30 +01:00
schaeff
0c491f47d7 merge develop 2018-11-10 11:28:18 +01:00
schaeff
019a4ea388 format with rustfmt 0.99.6, add to circleci 2018-11-10 11:22:27 +01:00
schaeff
53b5b7ca40 add cargo lock from master 2018-11-10 09:55:07 +01:00
schaeff
f89a43654b remove cargo lock 2018-11-10 00:19:50 +01:00
Thibaut Schaeffer
b01cadd5ba
Add CircleCi config (#160) 
* add circleci config

* replace gcc with cc

* format cpp, use release in test

* remove sha256 example, revert circleci
 2018-11-10 00:16:27 +01:00
JacobEberhardt
5f68001973
Merge pull request #131 from Schaeff/string-free-flat-absy 
Remove Strings from the flat absy
 2018-10-05 10:55:00 +02:00
schaeff
584960248d fix version number 2018-10-05 10:19:13 +02:00
schaeff
6c0eea26d7 wip 2018-09-19 18:38:40 +02:00
schaeff
a2239ddb29 merge master changes 2018-09-17 11:24:49 +02:00
schaeff
ea5d73cc0d merge develop 2018-08-15 18:10:23 +02:00
schaeff
c226c3eb2a remove local num dependency 2018-08-15 17:26:08 +02:00
schaeff
5b5a6e87a6 remove path from zokrates_core, delegate alias and location responsibility to resolvers 2018-08-15 17:17:02 +02:00
schaeff
7deae155d5 merge master changes 2018-08-09 18:40:02 +02:00
schaeff
b3c0009615 extract fs resolver into new crate, rename crates, refactor importer 2018-07-31 16:57:21 +02:00
schaeff
9c2940ca0b merge develop in 2018-07-09 16:53:05 +02:00
Thibaut Schaeffer
90859abd1e Merge 0.2.0 into develop (#82) 
* Add version tag to dockerhub

* Add major, minor, patch version to dockerhub

* Bump version 0.2.0

* remove grammar as it is outdated

* complete merge
 2018-07-09 11:01:14 +02:00
schaeff
1d3204c90f split into cli and lib 2018-06-30 00:32:15 -04:00
schaeff
4889989de2 invert lhs and rhs in r1cs import to please the R1CS exporter. Replace fold with reduce for more concise output 2018-06-13 17:22:20 +02:00
schaeff
b4b5ae708a remove grammar as it is outdated 2018-06-12 14:11:50 +02:00
schaeff
63f49278da fix conflicts 2018-06-08 14:54:09 +02:00
schaeff
401624c0dd upgrade libsnark to latest master 2018-06-07 16:57:47 +02:00
schaeff
b8e29e50cf merge r1cs import 2018-05-28 16:51:52 +02:00
David Terry
c58a484be9 build with latest version of libsnark 2018-05-12 16:54:31 +02:00
Steffen Haertlein
5235a24503 Merge remote-tracking branch 'origin/develop' into feature/r1cs_import 2018-03-07 09:11:21 +01:00
Steffen Haertlein
8e84f13eba added missing dependency, implemented r1cs import from json file 2018-03-05 16:23:07 +01:00
schaeff
c0600779f2 read arguments from json, walk folder to run tests 2018-02-26 19:52:28 +01:00
schaeff
14da7f6004 fix rust and cpp warnings 2018-02-15 21:37:37 +01:00
schaeff
df1cfd968f upgrade rust to 2018-02-10, adjust C build 2018-02-13 00:14:42 +01:00
schaeff
f2bbb05c28 add assert_cli and simple test 2018-02-05 18:01:14 +01:00