Commit Graph

23470 Commits

Author SHA1 Message Date
blackjok3r
dbf6a552fc fix 2019-01-12 00:04:49 +08:00
blackjok3r
3bf6b75986 fix miner.cpp 2019-01-12 00:02:06 +08:00
blackjok3r
4cc99073d2 Merge branch 'FSM' of https://github.com/jl777/komodo 2019-01-11 23:43:38 +08:00
jl777
dac67400a4 Merge pull request #1173 from blackjok3rtt/FSM
fix miner lock when run out of utxo
2019-01-11 04:29:52 -11:00
blackjok3r
8b7ca0ed32 Exit LOCK when return(0)! 2019-01-11 23:24:12 +08:00
blackjok3rtt
a5d60caf7d Merge pull request #9 from jl777/FSM
Fsm
2019-01-11 23:23:14 +08:00
blackjok3r
dbf6a1f83d better fix 2019-01-11 17:44:10 +08:00
blackjok3r
1e0e89523c fix segid in pindex, fix help. Remove more pointless prints. 2019-01-11 17:06:06 +08:00
jl777
70018300d9 Merge branch 'dev' into FSM 2019-01-10 18:08:07 -11:00
jl777
fef9d1b2b7 Merge branch 'dev' into FSM 2019-01-10 18:07:43 -11:00
jl777
c4634575fe Merge pull request #1169 from KomodoPlatform/dev
update BIP44 cointype
2019-01-10 18:07:22 -11:00
ca333
4f5c4db615 update BIP44 cointype
we had the wrong cointype - 141 is the correct one and assigned to KMD
https://github.com/satoshilabs/slips/blob/master/slip-0044.md
2019-01-11 05:49:55 +01:00
ca333
d084aaabbf Merge pull request #117 from jl777/dev
update dev
2019-01-11 05:47:43 +01:00
blackjok3r
b8ae55bd3a remove prints 2019-01-10 23:31:10 +08:00
blackjok3r
2cbde4d787 fix wallet expired on load, fix pindex->segid for PoW. 2019-01-10 23:16:28 +08:00
jl777
25f49bcb9b Merge pull request #1168 from blackjok3rtt/FSM
Fix possible crash in PoW miner (OnDemand)
2019-01-10 03:41:55 -11:00
blackjok3r
325f71b713 fix possible miner crash up with PoW, fix possible deadlock with large numbers of import transactions. 2019-01-10 22:36:38 +08:00
blackjok3rtt
896ea15cd9 Merge pull request #8 from jl777/FSM
Fsm
2019-01-10 22:32:26 +08:00
blackjok3r
5cb458b5f2 fix bug with getimports... Fix miner loop deadlock with staker. Remove annoying pointless prints for staker. 2019-01-10 16:44:09 +08:00
blackjok3r
c11f60f532 fix merge problem 2019-01-10 02:51:03 +08:00
blackjok3r
a543b675f6 Merge branch 'FSM' of https://github.com/jl777/komodo 2019-01-10 02:25:59 +08:00
blackjok3r
9646dd709a revert changes to import priority. Re-try flat transaction fee. Change miner lock to something safer. Add lock cs_main to import validation when accepting to mempool. 2019-01-10 01:35:18 +08:00
jl777
c91a1d27ff Merge pull request #1166 from jl777/FSM
FSM
2019-01-09 04:33:27 -11:00
jl777
e755fa0e7b Merge pull request #1165 from jl777/jl777
Jl777
2019-01-09 04:32:35 -11:00
jl777
4f48570935 ; 2019-01-09 04:31:04 -11:00
jl777
512d96862a Help human instructions for -maxreorg 2019-01-09 04:30:24 -11:00
jl777
0a9b09b7df Merge pull request #1163 from jl777/FSM
FSM
2019-01-09 04:27:20 -11:00
jl777
cd10a5ab97 Merge pull request #1162 from jl777/jl777
Workaround for -maxreorg
2019-01-09 04:26:22 -11:00
jl777
2df13c428f Workaround for -maxreorg 2019-01-09 04:24:04 -11:00
ca333
fb18b4489a Merge pull request #116 from jl777/dev
update dev
2019-01-09 14:49:29 +01:00
jl777
74eb31b748 Merge pull request #1161 from jl777/FSM
FSM
2019-01-09 02:33:58 -11:00
jl777
e32ea6efa7 Merge pull request #1160 from jl777/jl777
Jl777
2019-01-09 02:33:24 -11:00
jl777
02d75902ad Move declaration WITNESS_CACHE 2019-01-09 02:30:47 -11:00
jl777
b79f0735b5 Merge branch 'FSM' into jl777 2019-01-09 02:19:20 -11:00
jl777
80f034644a Merge branch 'dev' into FSM 2019-01-09 02:18:52 -11:00
jl777
c5b3b68ace Increase witness cache size for maxreorg 2019-01-09 02:18:19 -11:00
jl777
2b6edd7c99 Merge pull request #1156 from jl777/FSM
FSM
2019-01-09 01:49:11 -11:00
jl777
5f3bb5c06b Merge pull request #1155 from jl777/jl777
Jl777
2019-01-09 01:48:38 -11:00
jl777
2f847e2ef4 Assert 1 arg 2019-01-09 01:40:34 -11:00
jl777
59177fa598 No static assert 2019-01-09 01:39:53 -11:00
jl777
3cfb27213d Merge branch 'FSM' into jl777 2019-01-09 01:29:04 -11:00
jl777
856dcfec88 Merge branch 'dev' into FSM 2019-01-09 01:28:34 -11:00
jl777
10b90968af +comments 2019-01-09 01:28:17 -11:00
jl777
9269bc177c Allow tunable maxreorg 2019-01-09 01:25:23 -11:00
jl777
42911ea6c2 Double maxreorg 2019-01-09 01:21:29 -11:00
jl777
2ec4150345 Merge pull request #1152 from jl777/FSM
FSM
2019-01-09 00:14:25 -11:00
jl777
784f699e0f Merge pull request #1151 from jl777/jl777
Jl777
2019-01-09 00:12:47 -11:00
jl777
bce13f9276 0.3.3b 2019-01-09 00:07:01 -11:00
jl777
0234e33c93 -print 2019-01-09 00:00:46 -11:00
jl777
21ee92f6f3 Grandfather logic 2019-01-08 23:58:46 -11:00