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

1856 commits

Author SHA1 Message Date
schaeff
e1bf046eb3 bump versions, generate changelog, generate js lock 2022-07-06 16:31:24 +02:00
schaeff
8b35413169 bump nightly, fix clippy errors 2022-07-06 15:51:45 +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
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
schaeff
950ac08b0e apply suggestions 2022-07-05 13:40:43 +02:00
schaeff
8f5e4d9985 fix conflicts 2022-07-04 19:50:12 +02:00
Thibaut Schaeffer
393896daa4
Merge pull request #1176 from Zokrates/deploy
Merge back deploy
2022-07-04 17:20:04 +02:00
schaeff
81d670e531 merge split 2022-07-04 17:02:48 +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
schaeff
61f9b33aa9 merge staging 2022-06-29 11:45:46 +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
dark64
44b212bc99 fix naming 2022-06-28 10:46:11 +02:00
dark64
f560413ccc fmt 2022-06-27 16:16:16 +02:00
dark64
0736c4b976 fix tests 2022-06-27 14:24:09 +02:00
dark64
935930ccc5 add changelog 2022-06-25 02:07:02 +02:00
dark64
3f1358acfe use signature ouput for inference 2022-06-25 01:58:53 +02:00
dark64
91d14017d9 apply suggestions 2022-06-23 13:31:22 +02:00
schaeff
b677374e7c remove print, fix test 2022-06-23 11:02:01 +02:00
schaeff
40b5891323 clippy 2022-06-22 18:41:18 +02:00
schaeff
5239d5eb0b Merge branch 'develop' of github.com:Zokrates/ZoKrates into log-statement 2022-06-22 18:18:24 +02:00
schaeff
6ce383f70d merge crate split, implement string interpolation 2022-06-22 17:38:06 +02:00
schaeff
57f42b5d5f add debug flag to enable logs, add expression logging without abi and interpolation 2022-06-22 11:09:53 +02:00
dark64
63c1e22978 merge syntax-revamp 2022-06-21 15:10:33 +02:00
dark64
b7e787dfd1 deprecate multi returns 2022-06-21 15:03:53 +02:00
dark64
cfce5910a7 fold in result folder 2022-06-21 11:01:27 +02:00
schaeff
5ea93bb677 implement basic log statement 2022-06-20 17:51:44 +02:00
dark64
44451ec581 fix constant inlining for tuples 2022-06-20 01:30:40 +02:00
schaeff
4a593664e3 clean 2022-06-15 17:46:06 +02:00
schaeff
aad6622488 fix tests 2022-06-15 14:28:40 +02:00
dark64
4d9d000742 revert hacky formatting on conditional expression 2022-06-14 10:43:05 +02:00
schaeff
241447a09c implement and update zok files 2022-06-13 20:17:40 +02:00
schaeff
5fd4af7f58 merge syntax revamp 2022-06-08 10:34:14 +02:00
dark64
86990c81e0 fix format, apply suggestions 2022-06-03 15:24:14 +02:00
dark64
a047fe3c18 clippy 2022-06-01 00:05:36 +02:00
dark64
65d5df091e merge develop 2022-05-31 23:55:38 +02:00
dark64
dc29b70957 revert removal of if-else expression 2022-05-31 23:52:09 +02:00
schaeff
6fd88653ee merge dev 2022-05-31 18:04:30 +02:00
schaeff
1e3342bc7f merge dev, fix issues 2022-05-31 17:04:13 +02:00
schaeff
11c8a5d272 refactor flat expression utils to reduce expression tree depth 2022-05-31 15:30:18 +02:00
schaeff
b3273d1141 bump versions, generate changelog 2022-05-30 12:06:58 +02:00
schaeff
4cee2d7f03 update zjs 2022-05-20 16:19:57 +02:00
schaeff
6b36e4b23b clippy 2022-05-18 13:33:22 +02:00
schaeff
dac05b5a90 fix libsnark 2022-05-18 13:12:06 +02:00
schaeff
5cfb2a9055 add curve and scheme to vk and proof, remove options from cli and detect automatically 2022-05-18 12:55:49 +02:00
dark64
82491f3275 fix code in comments 2022-05-17 14:17:15 +02:00
schaeff
8a1e02de1f remove libsnark feature from core, updates test script 2022-05-17 11:43:07 +02:00