Commit Graph

27004 Commits

Author SHA1 Message Date
jl777
08743db95e Merge pull request #1490 from chainmakers/beta
add K64
2019-05-19 23:29:05 -11:00
Jorian
9841866380 add K64 2019-05-20 12:05:48 +02:00
jl777
c7f0f89c94 Merge pull request #1487 from blackjok3rtt/beta
bug fixes
2019-05-16 02:39:35 -11:00
blackjok3r
34a57ceb4a fix 2019-05-16 20:31:55 +08:00
blackjok3rtt
a1d78fa74d Merge pull request #84 from jl777/beta
Beta
2019-05-16 20:27:54 +08:00
blackjok3r
bbd24399a2 bit safer 2019-05-16 19:46:47 +08:00
blackjok3r
7df6ab444d fix 2019-05-16 19:37:05 +08:00
blackjok3r
c2261146d9 Fix KMD lockup on pools, try new fix electrum crash. 2019-05-16 19:33:05 +08:00
jl777
1e7e0e4fd1 Merge pull request #1477 from jl777/dev
Dev
2019-05-13 07:55:12 -11: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
blackjok3r
d624038a10 fixed reindex 2019-05-10 02:14:10 +08:00
blackjok3rtt
866d2afa06 Merge pull request #80 from jl777/beta
Beta
2019-05-09 19:36:44 +08:00
jl777
cb6bfed655 Merge pull request #1461 from jl777/dev
Dev
2019-04-28 18:41:40 -11: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
1b3bb3a0a0 Merge pull request #1458 from jl777/dev
Dev
2019-04-26 22:52:24 -11: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
fe3386f6a7 Merge pull request #1439 from jl777/dev
Dev
2019-04-18 21:19:15 -11: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
15377f2fea Merge pull request #1427 from jl777/dev
Dev
2019-04-15 18:28:24 -11: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
c5e89091a6 Merge pull request #1424 from jl777/dev
Dev
2019-04-15 04:08:49 -11: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
8e47705d50 Merge pull request #1419 from jl777/dev
Dev
2019-04-14 18:21:35 -11: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