Commit Graph

26556 Commits

Author SHA1 Message Date
blackjok3r
5fa97bf208 fix asgin 2018-12-05 23:31:02 +08:00
blackjok3r
11a9543ba3 fix 2018-12-05 23:29:44 +08:00
blackjok3r
d361307ffa ;# 2018-12-05 23:28:24 +08:00
blackjok3r
d7a2e9ff2c fix splling 2018-12-05 23:26:31 +08:00
blackjok3r
d29eed22d5 try periodic founders payment first time 2018-12-05 23:14:50 +08:00
jl777
6d10847814 Merge branch 'FSM' into jl777 2018-12-05 03:13:56 -11:00
jl777
8e93a31bf3 Enable coin migration CC 2018-12-05 02:30:36 -11:00
blackjok3r
0ae2e97a1d FIX COMMENTED OUT COIN IMPORT 2018-12-05 20:57:21 +08: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
blackjok3rtt
9b8bd2c605 Merge pull request #56 from StakedChain/noStreamer
No streamer
2018-12-05 20:13:56 +08:00
blackjok3rtt
6b8d3d392a Delete rpcmisc.cpp 2018-12-05 20:13:30 +08:00
blackjok3r
3dd1038988 what 2018-12-05 20:09:57 +08:00
blackjok3r
e9719a96b0 disavle DNS seeds 2018-12-05 20:08:01 +08: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
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
blackjok3rtt
478bf49c3c Merge pull request #17 from jl777/dev
Dev
2018-12-03 13:41:40 +08: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