Commit Graph

17 Commits

Author SHA1 Message Date
DenioD
813ba56b8e Resolved merge conflict by incorporating both suggestions. 2019-10-21 13:33:00 +02:00
DenioD
2a4201dc52 Resolved merge conflict by incorporating both suggestions. 2019-10-21 13:31:06 +02:00
DenioD
1e3107fe55 manualy merged conflicts 2019-10-21 13:21:49 +02:00
DenioD
7a3285e08a Resolved merge conflicts 2019-10-21 13:05:44 +02:00
Aditya Kulkarni
9ed9e47ff9 Add lightclient encryption test 2019-10-20 20:34:08 -07:00
DenioD
8c9523ad90 merged new updates 2019-10-20 23:12:03 +02:00
Aditya Kulkarni
8ade7caa48 Wallet encryption commands 2019-10-20 11:40:25 -07:00
DenioD
457c3ea61e renamed zatoshis to puposhis, update librustzcash commit high 2019-10-20 17:03:43 +02:00
Aditya Kulkarni
e4f00a78d5 Fix save command return value 2019-10-19 20:29:17 -07:00
Aditya Kulkarni
19d9dfa18e Return results instead of JSON 2019-10-19 20:21:53 -07:00
Aditya Kulkarni
611974c5fa Add bugfix address derivation 2019-10-19 16:41:27 -07:00
Aditya Kulkarni
3ebc46185c Add bug detection 2019-10-19 16:23:32 -07:00
Aditya Kulkarni
bd15a081b1 Allow multiple addresses in send 2019-10-18 10:32:05 -07:00
DenioD
e7d272ce42 port to hush 2019-10-18 09:45:35 +02:00
Aditya Kulkarni
91de0220ab Compiler warnings 2019-10-15 10:15:42 -07:00
Aditya Kulkarni
cec21dbbd8 Rename to ZEC 2019-10-14 10:25:46 -07:00
Aditya Kulkarni
2c2afcc442 Merge 2019-10-12 15:09:13 -07:00