103 Commits

Author SHA1 Message Date
Ivan Ivanitskiy
1f8fe13a0d pull from master, conflict fix 2019-06-23 15:57:41 +03:00
Ivan Ivanitskiy
0a4dbd1cdc little fixes in scheme and readme 2019-06-23 15:55:52 +03:00
Evgeny Marchenko
2c9d625863 fix typo 2019-06-23 15:06:32 +03:00
Игорь Соболев
d7d8d7d506 Updated truffle config 2019-06-23 15:02:03 +03:00
Игорь Соболев
b49a62f44c Updated migrations 2019-06-23 15:01:34 +03:00
Evgeny Marchenko
d62711c27c readme 2019-06-23 15:00:23 +03:00
Evgeny Marchenko
c4da270b1d test 2019-06-23 14:59:32 +03:00
Drygin Alexander
0fd901c072 delete tests 2019-06-23 14:19:14 +03:00
Drygin Alexander
74d7d3946d add readme to fluence back 2019-06-23 14:16:21 +03:00
Drygin Alexander
4133293dd4 add zk readme 2019-06-23 13:42:16 +03:00
Drygin Alexander
b018412439 add readme to zk back 2019-06-23 13:23:19 +03:00
Evgeny Marchenko
18f2db8e91 fix sc 2019-06-23 13:18:25 +03:00
Drygin Alexander
1edf7314c2 add verifier layout 2019-06-23 13:09:54 +03:00
Evgeny
e623c8a1fc
Merge pull request #9 from smartkek/fluence_back
Fluence back
2019-06-23 12:31:20 +03:00
Drygin Alexander
cba820c471 remove build 2019-06-23 12:25:48 +03:00
Drygin Alexander
f230e37483 work for demo 2019-06-23 12:20:20 +03:00
Evgeny Marchenko
1f4616a7b2 deploy with some proofs 2019-06-23 12:12:05 +03:00
Evgeny
4bf2dbffbe
Merge pull request #8 from smartkek/frontend
Frontend
2019-06-23 12:08:42 +03:00
Ivan Ivanitskiy
0dfb198dc5
Merge pull request #7 from smartkek/ivan/readme
Ivan/readme
2019-06-23 12:05:48 +03:00
Игорь Соболев
f17baf2447 Merge branch 'master' of https://github.com/smartkek/lazy-snark into frontend 2019-06-23 12:05:16 +03:00
Ivan Ivanitskiy
34ed63c957 Merge branch 'ivan/readme' of github.com:smartkek/lazy-snark into ivan/readme 2019-06-23 12:04:34 +03:00
Игорь Соболев
7dedd56ee6 Fixed initial html 2019-06-23 12:03:50 +03:00
Ivan Ivanitskiy
ae572eadfe scheme added 2019-06-23 12:03:22 +03:00
Игорь Соболев
3907a1fdf1 Version ready for deploy 2019-06-23 12:01:09 +03:00
Игорь Соболев
ff7e3ce92b Version ready for deploy 2019-06-23 11:51:31 +03:00
Evgeny Marchenko
30de596bc2 readme 2019-06-23 11:36:46 +03:00
Ivan Ivanitskiy
cf42286c3e
Merge pull request #6 from smartkek/ivan/readme
readme indentation fixed more
2019-06-23 10:19:46 +03:00
Ivan Ivanitskiy
daaa54f136 readme indentation fixed more 2019-06-23 10:19:15 +03:00
Evgeny Marchenko
c377a1d849 ... 2019-06-23 09:54:34 +03:00
Drygin Alexander
e46caf1bb1 add fluence mock back 2019-06-22 23:24:01 +03:00
Игорь Соболев
1610284b41 Refactored code 2019-06-22 23:22:55 +03:00
Ivan Ivanitskiy
09eaafcd4f
Merge pull request #5 from smartkek/ivan/readme
readme indentation fixed
2019-06-22 23:12:55 +03:00
Ivan Ivanitskiy
03dc55dd6e readme indentation fixed 2019-06-22 23:11:40 +03:00
Ivan Ivanitskiy
866b1d79e0
Merge pull request #4 from smartkek/ivan/readme
readme started
2019-06-22 23:07:57 +03:00
Ivan Ivanitskiy
87d64aeb95 readme started 2019-06-22 23:06:30 +03:00
Игорь Соболев
9da7f55b50 Added fluence 2019-06-22 22:45:16 +03:00
Игорь Соболев
65e2930408 Fixed button name 2019-06-22 22:14:54 +03:00
Игорь Соболев
ec8236bebc Full Eth interaction 2019-06-22 22:10:05 +03:00
Evgeny Marchenko
fba084516b Merge branch 'simple_task_getter' of https://github.com/smartkek/lazy-snark into frontend 2019-06-22 21:29:36 +03:00
Evgeny Marchenko
470fc06a9d simplify getter even more 2019-06-22 21:28:57 +03:00
Evgeny Marchenko
024eaab74c yet another getter 2019-06-22 20:33:01 +03:00
Игорь Соболев
2aa7ea91a4 Added initial frontend 2019-06-22 20:11:28 +03:00
Evgeny
c4cc87650d
Merge pull request #3 from smartkek/link_sc_zkp
Link prover and smart contract
2019-06-22 19:57:13 +03:00
Игорь Соболев
ec7688a9bd Updated contract name 2019-06-22 19:29:10 +03:00
Evgeny Marchenko
39cdc6e0e5 test solidity-zokratos integration 2019-06-22 19:10:54 +03:00
Evgeny
49aa30e5ad
Merge pull request #2 from smartkek/zk
add zkp for "sum four numbers is equal"
2019-06-22 17:57:03 +03:00
Evgeny
7a7f7e5ad6
Merge pull request #1 from smartkek/contracts
Lazy contract and truffle
2019-06-22 17:55:57 +03:00
Игорь Соболев
5917bac0b5 Updated contract name 2019-06-22 17:54:52 +03:00
Evgeny Marchenko
050c26f392 add gitignore 2019-06-22 17:36:00 +03:00
Evgeny Marchenko
5cede74b52 truffle 2019-06-22 17:33:56 +03:00