Commit Graph

24173 Commits

Author SHA1 Message Date
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
blackjok3rtt
dbada96ce0 Merge pull request #55 from StakedChain/noStreamer
Merge sapling into master
2018-12-05 18:47:18 +08:00
blackjok3r
d84aad9651 remove sleep does nothign 2018-12-05 18:41:28 +08:00
blackjok3r
1602f04ac8 fix miner try to stop staker pegging a core 2018-12-05 16:59:28 +08:00
blackjok3r
3a705a843e fix 2018-12-05 01:39:27 +08:00
blackjok3r
f27f8c2821 fix 2018-12-05 01:38:19 +08:00
blackjok3r
0545cb9ba6 prints 2018-12-05 01:28:29 +08:00
blackjok3r
ffef8efa1e Merge branch 'noStreamer' of https://github.com/StakedChain/komodo into noStreamer
a
2018-12-05 01:22:01 +08:00
blackjok3r
6595ab0201 try fix wallet get corrupt, add prints 2018-12-05 01:21:12 +08:00
blackjok3rtt
70f32532eb Merge pull request #54 from jl777/FSM
Fsm
2018-12-04 22:16:15 +08:00
jl777
77865cc9e9 Merge branch 'beta'
Sapling Release Candidate.
auto activates sapling 60 blocks after Dec 15th midnite
2018-12-04 01:47:20 -11:00
jl777
36b8e1afdc Merge fixes 2018-12-04 01:47:06 -11:00
blackjok3r
4ba6f2bc28 Merge branch 'noStreamer' of https://github.com/StakedChain/komodo into noStreamer
p
2018-12-04 12:51:25 +08:00
blackjok3r
52b1898322 p 2018-12-04 11:19:44 +08: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
blackjok3r
df4732ac23 Merge branch 'FSM' of https://github.com/jl777/komodo into noStreamer
a
2018-12-03 13:14:23 +08: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
ca333
8f64ee0379 Merge pull request #79 from jl777/dev
update dev
2018-12-01 23:00:32 +01: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