Commit Graph

22103 Commits

Author SHA1 Message Date
jl777
ee3490e235 Merge pull request #1022 from jl777/dev
Dev
2018-12-05 05:03:48 -11:00
jl777
2817aa9a1a Merge remote-tracking branch 'origin/beta' into beta 2018-12-05 05:02:23 -11:00
jl777
89680802e4 Merge pull request #1021 from jl777/FSM
zcash 2.0.2 fixes
2018-12-05 04:59:29 -11:00
jl777
83d4ca0697 Merge pull request #1020 from tonymorony/FSM
added tests for oracles data publishing
2018-12-05 04:46:18 -11:00
Anton Lysakov
3a4366bef4 added tests for oracles data publishing 2018-12-05 21:42:02 +06:00
jl777
8e93a31bf3 Enable coin migration CC 2018-12-05 02:30:36 -11:00
jl777
b739548812 Declare flag 2018-12-05 01:54:15 -11:00
jl777
9641503a27 CBlockIndex 2018-12-05 01:52:56 -11:00
jl777
ab2c621e63 Set tiptime 2018-12-05 01:51:38 -11:00
jl777
db99467890 Enable z_mergetoaddress 2018-12-05 01:48:36 -11:00
jl777
78d607d361 Default experimental mode 2018-12-05 01:36:52 -11:00
jl777
5245f600cd GetHeight() 2018-12-05 01:16:00 -11:00
jl777
e34bb5163a Non-test code from: https://github.com/zcash/zcash/pull/3619 2018-12-05 01:14:05 -11:00
jl777
8c939c1af5 https://github.com/zcash/zcash/pull/3605/files 2018-12-05 00:01:01 -11:00
jl777
9a59f56135 https://github.com/zcash/zcash/pull/3670/files 2018-12-04 23:56:04 -11:00
jl777
a5be135052 https://github.com/zcash/zcash/pull/3684/files 2018-12-04 23:51:14 -11:00
jl777
36b8e1afdc Merge fixes 2018-12-04 01:47:06 -11:00
jl777
ae11e32574 Merge pull request #1018 from himu007/patch-12
Update README.md
2018-12-03 07:13:38 -11:00
SHossain
1ae28c0ea0 Update README.md 2018-12-03 18:05:45 +00:00
jl777
4b984eb540 Merge pull request #1016 from tonymorony/FSM
separated tests for different CCs to different files
2018-12-03 04:32:36 -11:00
Anton Lysakov
08e029bf40 separated tests for different CCs to different files 2018-12-03 21:26:33 +06:00
jl777
1755979283 Merge pull request #1015 from himu007/patch-10
added `-ac_sapling=5000000` for OOT
2018-12-02 06:49:02 -11:00
SHossain
6bd19b0835 added -ac_saplinig=5000000 for OOT
added `-ac_saplinig=5000000` for OOT
2018-12-02 17:47:13 +00:00
jl777
776108f5ab Merge pull request #1014 from himu007/patch-9
added `-ac_saplinig=5000000` for OOT
2018-12-02 06:45:12 -11:00
SHossain
d1e8c8c8fc Update assetchains.old 2018-12-02 17:44:05 +00:00
jl777
a6597a8f83 Merge pull request #1013 from jl777/dev
sync DEV -> FSM
2018-12-01 23:30:21 -11:00
jl777
5238bc4c9f Merge pull request #1012 from jl777/dev
Dev
2018-12-01 08:44:07 -11:00
jl777
b09f1c193a Merge pull request #1011 from jl777/FSM
FSM
2018-12-01 08:43:25 -11:00
jl777
181dcaa02c Merge pull request #1010 from jl777/jl777
dealer0 fixes to create entropytx reliably
2018-12-01 04:00:15 -11:00
jl777
b0b80e69e6 Entropy tx size 1.0 2018-12-01 03:59:11 -11:00
jl777
e5a4fcc4b8 memset(&hashBlock,0,sizeof(hashBlock)); 2018-12-01 03:42:33 -11:00
jl777
2e8f9eda46 Test 2018-12-01 03:40:13 -11:00
jl777
4c1cab06b0 +prints 2018-12-01 03:32:40 -11:00
jl777
2ee44287ad Txs 2018-12-01 03:19:24 -11:00
jl777
d6dfb8c250 numentropytxs 2018-12-01 03:18:45 -11:00
jl777
760d30b22b hashBlock 2018-12-01 03:17:56 -11:00
jl777
4789bf9b8b numentropytxs 2018-12-01 03:17:26 -11:00
jl777
750446a019 Verify entropy tx is confirmed for dealer0 2018-12-01 03:16:26 -11:00
jl777
69f0b8631f Remove 10 entropy cap 2018-12-01 01:56:08 -11:00
jl777
b7ad65f3e2 AddNormalinputs2 bypass bitcoin wallet 2018-12-01 01:50:35 -11:00
jl777
ef9476f367 Limit to 10 2018-12-01 01:23:56 -11:00
jl777
645db3d82b Change entropy tx issuing 2018-12-01 01:19:33 -11:00
jl777
706208ecf9 Merge pull request #1009 from jl777/jl777
fix staking edge case
2018-11-30 23:38:28 -11:00
jl777
d17cc35cc6 -print 2018-11-30 23:36:57 -11:00
jl777
3777611fbc Test 2018-11-30 23:34:51 -11:00
jl777
803d74be34 Test 2018-11-30 23:30:26 -11:00
jl777
345a7838c2 Test 2018-11-30 23:23:35 -11:00
jl777
94d569467e Test 2018-11-30 23:18:36 -11:00
jl777
552294da4a Max to min 2018-11-30 23:13:07 -11:00
jl777
53c4d7a1fb Set blocktime for staking 2018-11-30 23:11:02 -11:00