Commit Graph

26378 Commits

Author SHA1 Message Date
blackjok3r
19335b2c62 Merge branch 'master' of https://github.com/StakedChain/komodo
a
2018-12-28 15:44:25 +08:00
blackjok3r
292962b36d Fix flood of send block on chain sync. Make net code to ignore KMD peers for LABS faster. 2018-12-28 15:42:23 +08:00
blackjok3r
b94c9770fe Merge branch 'dev' of https://github.com/jl777/komodo into dev
merge
2018-12-28 10:14:28 +08:00
blackjok3r
2c32100ccd Merge branch 'dev' of https://github.com/blackjok3rtt/komodo into dev
z
2018-12-28 10:11:52 +08:00
jl777
722964362a Fix -ac_import 2018-12-27 08:28:37 -11:00
jl777
141560e39a Fix define 2018-12-27 01:14:33 -11:00
jl777
33f99eb34a Allow any ac_pubkey import for testing 2018-12-27 01:12:37 -11:00
jl777
75ecbdebb4 selfimports 2018-12-27 01:11:03 -11:00
jl777
ac96ea5178 std 2018-12-27 01:09:24 -11:00
jl777
2d5537af00 Stubs for -ac_import 2018-12-27 00:59:35 -11:00
jl777
2472cdb7e9 Merge pull request #1123 from Mixa84/FSM
Channels fix (#6)
2018-12-25 06:45:25 -11:00
jl777
569d960832 Merge pull request #1122 from tonymorony/FSM
Made CC tests pass
2018-12-25 05:14:51 -11:00
Mihailo Milenkovic
478a31f463 Channels fix (#6)
- Fix bug for not able to issue last payment in channel
- Add more info in channelsinfo
2018-12-25 17:13:54 +01:00
Anton Lysakov
07555bf237 temporary disabled gateways tests 2018-12-25 20:05:24 +06:00
Anton Lysakov
2e9bcdc6b8 adjusted channels tests for new RPC call 2018-12-25 20:00:29 +06:00
jl777
8421131673 Merge pull request #1121 from himu007/patch-13
Update assetchains.old
2018-12-21 04:15:36 -11:00
SHossain
0f7b6c1438 Update assetchains.old 2018-12-21 15:14:38 +00:00
jl777
d722a5522e Merge pull request #1120 from jl777/kolo
KSB
2018-12-20 12:05:54 -11:00
Mihail Fedorov
254467774e KSB 2018-12-21 01:12:53 +03:00
blackjok3r
66bac37186 fixed 2018-12-21 00:00:11 +08:00
blackjok3r
2a60644323 fix 2018-12-20 23:58:26 +08:00
blackjok3r
5a09ff96c5 fix 2018-12-20 23:56:33 +08:00
blackjok3r
227a0cec3c Merge branch 'FSM' of https://github.com/jl777/komodo
fix
2018-12-20 23:23:24 +08:00
jl777
45f444efbe Merge branch 'FSM' into jl777 2018-12-20 03:49:09 -11:00
jl777
733720b3a3 Merge branch 'FSM' into jl777 2018-12-20 03:46:48 -11:00
jl777
8ee384869f Merge pull request #1119 from blackjok3rtt/FSM
Fix mempool and staker
2018-12-20 03:46:09 -11:00
blackjok3r
5bcdcf0a75 fix build 2018-12-20 21:23:56 +08:00
blackjok3r
d2a7d55272 test git diff 2018-12-20 21:13:32 +08:00
blackjok3rtt
fe8f79cd50 Merge pull request #2 from jl777/FSM
Fsm
2018-12-20 20:13:34 +08:00
blackjok3r
f128d49d2f fix mempool fix, to allow adding transactions out of order. 2018-12-20 19:56:00 +08:00
jl777
b9cbd35954 Merge pull request #1116 from jl777/FSM
FSM
2018-12-19 09:34:07 -11:00
jl777
e89d25e4ac Merge pull request #1115 from jl777/jl777
Jl777
2018-12-19 09:33:26 -11:00
jl777
2d9c9864d7 Skip unspendables in zmigrate 2018-12-19 09:26:37 -11:00
jl777
93f18db31a Skip unspendable addresses in migrate 2018-12-19 09:25:38 -11:00
jl777
97658a0c03 z_mergetoaddress fix 2018-12-19 09:03:54 -11:00
blackjok3r
261dfbcead fix staking crash on shutdown. fix segid in block index. 2018-12-19 17:22:44 +08:00
ca333
8da329cfdb Merge pull request #103 from jl777/master
update master
2018-12-18 23:04:14 +01:00
jl777
4fc0f19775 Fix warnings 2018-12-18 10:13:04 -11:00
jl777
b3837525ee New migrate 2018-12-18 09:00:04 -11:00
jl777
6d0086ba8a Merge pull request #1113 from jl777/FSM
FSM
2018-12-18 08:46:54 -11:00
jl777
99c9922b07 Merge branch 'FSM' into jl777 2018-12-18 08:16:27 -11:00
blackjok3r
ce8f41325a this is fine 2018-12-19 00:53:05 +08:00
jl777
1cfd8030e3 Merge pull request #1112 from jl777/jl777
Jl777
2018-12-18 05:45:46 -11:00
jl777
5488101f95 Rename shutoff process 2018-12-18 05:22:38 -11:00
jl777
95f4ecf06e Serial mergetoaddress 2018-12-18 05:12:26 -11:00
blackjok3r
134ae5436f Merge branch 'FSM' of https://github.com/jl777/komodo
f
2018-12-18 23:45:37 +08:00
jl777
37c9636c39 Merge pull request #1111 from jl777/jl777
improve z_migrate with initial z_mergetoaddress
2018-12-18 04:41:47 -11:00
jl777
776e525083 \" 2018-12-18 04:38:02 -11:00
jl777
45df581240 Test 2018-12-18 04:36:36 -11:00
blackjok3r
6a2e2b414c Fix lockups with ram staker! 2018-12-18 23:36:00 +08:00