Commit Graph

15886 Commits

Author SHA1 Message Date
jl777
4786d20c0b PoW targeting in -ac_staking=perc mode 2018-04-10 16:40:59 +03:00
jl777
b4b84fb273 Merge branch 'dev' into jl777 2018-04-10 14:00:44 +03:00
jl777
58e477a75b Merge pull request #556 from letolabs/dev
Dev
2018-04-10 14:00:29 +03:00
Brad Miller
98a4f6a656 Implement note locking for z_mergetoaddress
Co-authored-by: Eirik Ogilvie-Wigley <eirik@z.cash>
2018-04-10 00:44:39 -07:00
Jack Grigg
70420ff34f Test calling z_mergetoaddress to merge notes while a note merge is ongoing 2018-04-10 00:44:26 -07:00
Jack Grigg
67b849d7d4 Fix z_importviewingkey startHeight parameter
Closes #2937.
2018-04-10 00:39:52 -07:00
Jonathan "Duke" Leto
f08e247d57 jl777 rebased so now we have viewing keys 2018-04-10 00:33:49 -07:00
jl777
5bb3d0fe9f Test 2018-04-10 01:19:49 +03:00
jl777
8b6faa2e84 Test 2018-04-10 01:09:27 +03:00
jl777
1dd815ba0b Test 2018-04-10 00:49:11 +03:00
jl777
22439b8034 Test 2018-04-10 00:43:42 +03:00
jl777
2e90eb0c2a Test 2018-04-10 00:37:13 +03:00
jl777
e07cf6b5f9 Test 2018-04-10 00:28:51 +03:00
jl777
1a2b98fab0 Test 2018-04-10 00:28:19 +03:00
jl777
fa4d9e24af Test 2018-04-10 00:26:00 +03:00
jl777
4da475be2f Test 2018-04-10 00:18:22 +03:00
jl777
af79cd4cfc Test 2018-04-10 00:14:42 +03:00
jl777
8d584a9c91 Test 2018-04-10 00:09:41 +03:00
jl777
9465da966b Test 2018-04-09 23:59:13 +03:00
jl777
1599d4c8ef Test 2018-04-09 23:48:34 +03:00
jl777
f0cfc70ff2 Test 2018-04-09 23:45:45 +03:00
jl777
09cde8ab10 Test 2018-04-09 23:34:24 +03:00
jl777
3f26119e04 Test 2018-04-09 23:29:03 +03:00
jl777
1619474ec9 Test 2018-04-09 23:27:19 +03:00
jl777
d231a6a775 Test 2018-04-09 23:17:34 +03:00
jl777
d10b3e3c62 Test 2018-04-09 23:01:54 +03:00
jl777
a030053610 Test 2018-04-09 22:55:21 +03:00
jl777
37af9d4af9 Test 2018-04-09 22:48:28 +03:00
jl777
34f8b35437 Test 2018-04-09 22:44:23 +03:00
jl777
9dd28ae0a3 Test 2018-04-09 22:41:04 +03:00
jl777
fd331cdc33 Test 2018-04-09 22:30:25 +03:00
jl777
e6eb324020 Test 2018-04-09 22:27:24 +03:00
jl777
28d89a8620 Test 2018-04-09 22:22:12 +03:00
jl777
c4cd166396 Test 2018-04-09 22:19:21 +03:00
jl777
d354a959cd Test 2018-04-09 22:15:42 +03:00
jl777
6d94e8a836 Test 2018-04-09 22:13:18 +03:00
jl777
36067f15e9 Test 2018-04-09 21:58:28 +03:00
jl777
d3aea61d56 Test 2018-04-09 21:55:36 +03:00
jl777
d3b5a9083e Test 2018-04-09 21:52:41 +03:00
jl777
e12ea51956 Test 2018-04-09 21:24:42 +03:00
jl777
6d649e094e Test 2018-04-09 21:24:23 +03:00
jl777
3c3e04c4d3 Test 2018-04-09 21:20:28 +03:00
jl777
8c218b4887 Test 2018-04-09 21:18:40 +03:00
jl777
fd098285ce Test 2018-04-09 21:12:49 +03:00
jl777
e005f57633 Test 2018-04-09 21:12:25 +03:00
jl777
14a53f21a1 Test 2018-04-09 21:08:46 +03:00
jl777
a113461cb0 Test 2018-04-09 21:03:02 +03:00
jl777
d5d586e078 Test 2018-04-09 20:59:16 +03:00
jl777
0eb20a8ada Test 2018-04-09 20:51:52 +03:00
jl777
e1a17ed172 Test 2018-04-09 20:47:37 +03:00