Commit Graph
15917 Commits
Author SHA1 Message Date
jl777 29106d94a1 Merge pull request #560 from jl777/jl777
Jl777
2018-04-11 04:25:40 +03:00
jl777 3815678c0d Add segid even if winning block 2018-04-11 04:21:48 +03:00
jl777 234c0ac057 Skew nBits PoS diff to 1 2018-04-11 04:07:06 +03:00
jl777 4c015e6574 Merge pull request #559 from jl777/jl777
-ac_perc and -ac_staking
2018-04-11 03:40:16 +03:00
Mihail «Kolo» Fedorov f60c36925d Merge pull request #558 from jl777/kolo-assets-new
Fat finger (paw) typo
2018-04-10 21:42:19 +03:00
Mihail Fedorov a6cb17f049 fat finger typo 2018-04-10 21:25:36 +03:00
jl777 007aca381b Test 2018-04-10 20:38:12 +03:00
jl777 409c28a2e2 Test 2018-04-10 19:46:33 +03:00
jl777 49c374d7ad Test 2018-04-10 19:34:22 +03:00
jl777 053fef7cfd Test 2018-04-10 19:18:32 +03:00
jl777 7da8410746 Test 2018-04-10 19:11:57 +03:00
jl777 8828785764 Test 2018-04-10 19:10:18 +03:00
jl777 dc60244b09 Test 2018-04-10 19:08:25 +03:00
jl777 e4821a8282 Test 2018-04-10 19:06:11 +03:00
jl777 b7aaca4be3 Test 2018-04-10 19:03:31 +03:00
jl777 294925c70a Test 2018-04-10 18:22:32 +03:00
jl777 b1e74295fd Test 2018-04-10 18:19:27 +03:00
jl777 14bbc7eb1d Test 2018-04-10 18:01:04 +03:00
jl777 25d977f73d Test 2018-04-10 17:58:56 +03:00
jl777 68d0354d9d Test 2018-04-10 17:58:38 +03:00
jl777 4972b74b60 Test 2018-04-10 17:49:11 +03:00
jl777 0d8ffadc4a Test 2018-04-10 17:29:21 +03:00
jl777 7dbeae5dc3 Test 2018-04-10 17:21:31 +03:00
jl777 13691369bf Test 2018-04-10 17:10:41 +03:00
jl777 898a4b9b68 Test 2018-04-10 17:09:50 +03:00
jl777 a8e51a6504 Test 2018-04-10 17:09:15 +03:00
jl777 deba7f2052 Mine PoW for ac_staking 2018-04-10 17:05:51 +03:00
jl777 8706c05352 Test 2018-04-10 16:50:39 +03:00
jl777 2d9c76280a Test 2018-04-10 16:49:15 +03:00
jl777 4786d20c0b PoW targeting in -ac_staking=perc mode 2018-04-10 16:40:59 +03:00
jl777 699634dd8b Merge pull request #557 from jl777/kolo-assets-new
BNTN, CHAIN, PRLPAY chains
2018-04-10 16:28:57 +03:00
Mihail Fedorov 6ff482a509 BNTN, CHAIN, PRLPAY 2018-04-10 15:36:01 +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 MillerandEirik Ogilvie-Wigley 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