Commit Graph

26988 Commits

Author SHA1 Message Date
jl777
8eb4baf3ff Merge pull request #1488 from himu007/patch-2
Update README.md
2019-05-17 06:30:46 -11:00
SHossain
1970e04175 Update README.md 2019-05-17 17:33:43 +01:00
jl777
31c8388abe Merge pull request #1485 from jl777/kolo
remove MGNX coin
2019-05-15 17:09:09 -11:00
Mihail Fedorov
c2d469d6f9 remove MGNX coin 2019-05-16 04:47:55 +03:00
jl777
29c5b8936a Merge pull request #1476 from Alrighttt/dev
remove ZEX, add ZEXO
2019-05-13 07:02:16 -11:00
Alrighttt
839ee2743c remove ZEX, add ZEXO 2019-05-13 17:40:08 +00:00
jl777
566d101d31 Merge pull request #1460 from blackjok3rtt/dev
fix wallet bug
2019-04-28 18:39:02 -11:00
blackjok3r
cf6f647d1e fix wallet corruption fix, for staking chains, fix forced rescan for ZEX and KMD with ztx in wallet. 2019-04-29 11:25:23 +08:00
jl777
e4d7b9f616 Merge pull request #1459 from blackjok3rtt/dev
add extr print for new fix
2019-04-27 01:39:26 -11:00
blackjok3r
3110814bae add extr print for new fix 2019-04-27 20:36:33 +08:00
jl777
b2c8247e76 Merge pull request #1457 from blackjok3rtt/dev
Fix possible not being able to sync after node crashes, add dpow to BEER
2019-04-26 22:51:19 -11:00
blackjok3r
a19e283715 add dpow to BEER, fix crashed node not being able to sync due to future checkpoints. 2019-04-27 17:48:06 +08:00
blackjok3r
7e173d3c49 Merge branch 'jl777-dev' into dev
x
2019-04-20 22:52:39 +08:00
blackjok3r
b7772e39d5 Merge branch 'dev' of https://github.com/jl777/komodo into jl777-dev
x
2019-04-20 22:52:18 +08:00
jl777
c8fe029487 Merge pull request #1438 from KomodoPlatform/dev
[add] KOIN
2019-04-18 17:51:08 -11:00
ca333
13458b4040 [add] KOIN 2019-04-18 23:15:48 +02:00
ca333
b2da18bc38 Merge pull request #153 from jl777/dev
sync dev
2019-04-18 23:07:26 +02:00
jl777
c6a58be7f2 Merge pull request #1426 from jl777/jl777
fixin staking wallet issue
2019-04-15 18:26:39 -11:00
jl777
d341e1670c Merge pull request #1425 from blackjok3rtt/jl777
wallet code fix
2019-04-15 18:23:49 -11:00
blackjok3r
0bb8c5be22 fix wallet code. Force daemon close and reccomend zapwallettxns for non staking chains. 2019-04-16 13:14:04 +08:00
blackjok3rtt
4049f9f6be Merge pull request #63 from jl777/jl777
Jl777
2019-04-16 11:52:45 +08:00
jl777
189355399a Merge pull request #1423 from jl777/FSM
FSM
2019-04-15 04:04:07 -11:00
jl777
5ee99e866a Merge branch 'FSM' into jl777 2019-04-15 04:03:17 -11:00
jl777
9b76745f12 Merge pull request #1422 from jl777/jl777
Jl777
2019-04-15 04:03:12 -11:00
jl777
4219408809 Merge pull request #1421 from blackjok3rtt/jl777
fix wallet crash
2019-04-15 03:52:30 -11:00
jl777
74125f9cf3 Merge pull request #1420 from Mixa84/FSM
Fix looking for wrong type marker in Oracles CC
2019-04-15 03:14:12 -11:00
Mihailo Milenkovic
f087f49c4d Fix looking for wrong type marker in Oracles CC 2019-04-15 16:00:03 +02:00
blackjok3r
2e727de8ee fix wallet crash 2019-04-15 19:58:13 +08:00
jl777
c07f43dd6e Merge branch 'beta' into dev 2019-04-14 18:20:25 -11:00
jl777
201f1e86c0 Merge pull request #1418 from jl777/FSM
FSM
2019-04-14 18:20:02 -11:00
jl777
25c603c717 Merge branch 'dev' into FSM 2019-04-14 18:19:18 -11:00
jl777
65b6cf85bc Merge pull request #1413 from jl777/jl777
automatically rejoin a prices chain after being stranded
fix OUR staking
2019-04-14 18:18:46 -11:00
jl777
a667d6a596 Merge branch 'FSM' into jl777 2019-04-14 18:17:12 -11:00
jl777
31eb126876 Merge pull request #1417 from blackjok3rtt/jl777
revert miner change
2019-04-14 18:16:47 -11:00
blackjok3rtt
0666dc7cd8 Merge pull request #62 from jl777/dev
Dev
2019-04-15 13:07:42 +08:00
blackjok3rtt
47e290017f Merge pull request #61 from blackjok3rtt/jl777
Jl777
2019-04-15 13:06:25 +08:00
blackjok3r
c9f395f241 revert miner change. Causes crash when staking. 2019-04-15 12:08:58 +08:00
blackjok3rtt
741f5b7d58 Merge pull request #60 from jl777/jl777
Jl777
2019-04-15 12:02:19 +08:00
jl777
35c7165a02 Merge pull request #1416 from phm87/patch-1
init.cpp : Help message for -whitelistaddress=
2019-04-14 06:48:45 -11:00
phm87
35ad4a6bc3 init.cpp : move help message -whitelistaddress=
Move the help message of -whitelistaddress= to the section related to "Wallet options:"
2019-04-14 19:24:29 +02:00
phm87
f7e94b113e init.cpp : Help message for -whitelistaddress=
Few days ago, on discord, blackjok3r said that he hopes that somebody will add a help message for -whitelistaddress=
2019-04-14 18:29:28 +02:00
jl777
2b16669e64 Merge pull request #1415 from jl777/kolo
VOTE2019
2019-04-14 05:09:35 -11:00
Mihail Fedorov
4f3253fdc9 VOTE2019 2019-04-14 18:56:10 +03:00
Mihail Fedorov
914da1ba80 Merge remote-tracking branch 'origin/dev' into kolo 2019-04-14 18:48:25 +03:00
jl777
edfaea0c64 Revert to exit 2019-04-14 02:45:06 -11:00
jl777
9d208da4b6 void StartShutdown() 2019-04-14 02:17:58 -11:00
jl777
aec1884070 StartShutdown(); instead of exit() 2019-04-14 02:16:03 -11:00
jl777
a0136724b0 Merge pull request #1414 from blackjok3rtt/jl777
try wallet fix
2019-04-13 20:56:53 -11:00
blackjok3r
7c56d03474 try wallet fix 2019-04-14 15:51:26 +08:00
jl777
1ca7ee28e0 -) 2019-04-13 20:49:31 -11:00