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

2901 commits

Author SHA1 Message Date
dark64
6b5424a7ed merge develop, add u64 embeds 2021-04-02 17:39:27 +02:00
Thibaut Schaeffer
68b9f6409c
Merge pull request #751 from dark64/verbose-flag
Add verbose flag
2021-04-01 19:17:28 +02:00
dark64
1a9d17407f fix clippy warning 2021-04-01 19:00:14 +02:00
dark64
7ee157e028 add changelog 2021-04-01 18:55:31 +02:00
dark64
1762436be0 Merge branch 'develop' into verbose-flag 2021-04-01 18:46:49 +02:00
Thibaut Schaeffer
c094e6e095
Merge pull request #755 from Zokrates/enforce-clippy
Enforce clippy in CI
2021-04-01 18:25:38 +02:00
schaeff
06746bad88 fix conflicts 2021-04-01 18:16:31 +02:00
schaeff
2403bdd5c9 merge dev, fix 2021-04-01 17:41:53 +02:00
Thibaut Schaeffer
a101026f78
Merge pull request #754 from Zokrates/generic-embeds
Generic embeds
2021-04-01 16:38:25 +02:00
schaeff
b14c25965e fix test 2021-04-01 16:29:44 +02:00
schaeff
af0f1f0987 merge dev, fix conflicts, add changelog 2021-04-01 16:14:48 +02:00
Thibaut Schaeffer
38bb0fc771
Merge pull request #695 from Zokrates/compile-time-uint
Constant generics
2021-04-01 16:00:24 +02:00
schaeff
0e386308de fix changelog name 2021-04-01 15:48:48 +02:00
schaeff
775cd8cb81 update docs, add changelog 2021-04-01 15:36:34 +02:00
schaeff
38b6fc76a4 merge dev and fix conflicts 2021-04-01 12:52:05 +02:00
Thibaut Schaeffer
a45dae01db
Merge pull request #783 from Zokrates/u32-shift-arg
Change shifts to take u32 as their second argument
2021-04-01 10:55:36 +02:00
schaeff
4ce88671bf Merge branch 'compile-time-uint' of github.com:Zokrates/ZoKrates into enforce-clippy 2021-03-31 20:45:55 +02:00
schaeff
d29fd34542 change shift crash to unimplemented 2021-03-31 18:39:26 +02:00
Thibaut Schaeffer
feb1fe87cb
Merge pull request #736 from petscheit/adds_bool_pedersen
Adds pedersen bool library
2021-03-31 17:41:00 +02:00
schaeff
0a984b2f91 fmt 2021-03-31 17:36:40 +02:00
schaeff
a8240ccf56 Merge branch 'compile-time-uint' of github.com:Zokrates/ZoKrates into compile-time-uint 2021-03-31 17:33:56 +02:00
schaeff
02d6146f74 clone return types in case of double return 2021-03-31 17:33:42 +02:00
Thibaut Schaeffer
5a164beb17
Merge pull request #788 from Zokrates/rename-master-to-deploy
Rename master to deploy
2021-03-31 17:25:48 +02:00
schaeff
e7eaf9a913 fmt 2021-03-31 12:39:38 +02:00
schaeff
b552a8d997 Merge branch 'compile-time-uint' of github.com:Zokrates/ZoKrates into enforce-clippy 2021-03-31 12:37:44 +02:00
Thibaut Schaeffer
4ab795e839
Update zokrates_core/src/ir/expression.rs
Co-authored-by: JacobEberhardt <jacob.eberhardt@tu-berlin.de>
2021-03-31 12:36:08 +02:00
schaeff
0e455f0b9e remove clippy statement 2021-03-31 12:21:51 +02:00
schaeff
985961001f Merge branch 'compile-time-uint' of github.com:Zokrates/ZoKrates into enforce-clippy 2021-03-31 12:10:45 +02:00
schaeff
d437bd3adb use deploy to write, use latest to read 2021-03-31 11:39:22 +02:00
schaeff
bb561ba247 fix conflict 2021-03-31 11:32:16 +02:00
schaeff
186a4f6511 merge dev 2021-03-31 11:25:24 +02:00
schaeff
fa6aefee08 fmt 2021-03-31 11:23:41 +02:00
Thibaut Schaeffer
cd0501fcb6
Merge pull request #786 from Zokrates/fix-uint-masking
Use mask based on bitwidth instead of u32 max constant
2021-03-31 11:00:47 +02:00
Thibaut Schaeffer
4a6c7ec679
Merge pull request #779 from Zokrates/add-issue-templates
Add issue templates
2021-03-31 10:59:16 +02:00
Thibaut Schaeffer
1b14c93e58
Apply suggestions from code review 2021-03-31 10:58:32 +02:00
dark64
f1138af08b fix git diff command in changelog script 2021-03-30 17:54:57 +02:00
dark64
4d6225fc1e final changelog update 2021-03-30 17:39:24 +02:00
dark64
a78a5c4bf3 update changelog script 2021-03-30 17:31:35 +02:00
schaeff
153221f0d8 move changelog to the right folder :| 2021-03-30 17:11:25 +02:00
schaeff
08d8a4f669 add changelog o/ 2021-03-30 17:09:06 +02:00
schaeff
a77becd0bf Merge branch 'develop' of github.com:Zokrates/ZoKrates into u32-shift-arg 2021-03-30 16:54:34 +02:00
Thibaut Schaeffer
1fdcff373a
Merge pull request #771 from Zokrates/add-changelog
Add changelog scripts
2021-03-30 16:27:48 +02:00
schaeff
2cd5a4aceb add docs 2021-03-30 16:27:07 +02:00
dark64
f89a393488 Merge branch 'develop' into add-changelog 2021-03-30 12:36:54 +02:00
Thibaut Schaeffer
79101db274
Merge pull request #773 from Zokrates/textmate-highlighter
Textmate highlighter
2021-03-30 11:09:53 +02:00
schaeff
2690bcf139 fix zok source 2021-03-30 10:50:28 +02:00
schaeff
e4f7a0422f add tests, make uint optimizer complete§ 2021-03-30 00:07:57 +02:00
dark64
9feb905cb3 add notes to changelog.sh, modify changelog-check.sh to check for main changelog file modifications 2021-03-29 16:01:39 +02:00
dark64
a95ab1d628 use mask based on bitwidth instead of u32 max constant 2021-03-29 15:12:20 +02:00
Thibaut Schaeffer
0f5d835feb
Merge pull request #774 from Zokrates/join-example-tests
Wait for tests to finish running
2021-03-29 14:38:07 +02:00