Commit Graph

29578 Commits

Author SHA1 Message Date
jl777
a7b5256fb3 Merge pull request #1176 from jl777/dev
Dev
2019-01-11 04:33:29 -11:00
jl777
07311c0fd3 Merge pull request #1174 from jl777/FSM
FSM
2019-01-11 04:30:43 -11: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
82fd69ae37 Merge pull request #1172 from jl777/dev
Dev
2019-01-10 19:47:46 -11:00
jl777
9d96a434bb Merge pull request #1171 from jl777/FSM
FSM
2019-01-10 19:47:14 -11:00
jl777
7598204bf9 Fix bip44 code 2019-01-10 18:49:38 -11:00
jl777
f15d831884 Merge pull request #1170 from jl777/dev
Dev
2019-01-10 18:48:15 -11:00
jl777
46a1c07e5e Merge branch 'FSM' into jl777 2019-01-10 18:08:52 -11: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
a47ba0cf7a update BIP44 cointype
use correct assigned BIP44 cointype
2019-01-11 05:53:17 +01: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
jl777
5b6a65f30a -prints 2019-01-10 07:30:00 -11: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
3a13fa8d80 Merge branch 'FSM' into jl777 2019-01-10 03:44:30 -11:00
jl777
6b29a3c31b Merge branch 'FSM' into jl777 2019-01-10 03:43:47 -11: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
d7c08abe51 fix miner possible crash, fix dead lock for large numbers of import transactions. 2019-01-10 22:29:01 +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
7f0f70f5ae fix 2019-01-10 12:46:18 +08:00
blackjok3r
775c57ce46 Possible fix for miner crashing on OnDemand Blocks 2019-01-10 12:36:43 +08:00
blackjok3r
c11f60f532 fix merge problem 2019-01-10 02:51:03 +08:00
blackjok3rtt
7bbc40a9a7 Merge pull request #7 from jl777/dev
Dev
2019-01-10 02:30:13 +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
aed8c88a7e Merge pull request #1167 from jl777/dev
Dev
2019-01-09 04:34:04 -11: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
6f788ba421 Merge pull request #1164 from jl777/dev
Dev
2019-01-09 04:27:55 -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
ca333
5119a1d3c9 Merge pull request #115 from jl777/master
update master
2019-01-09 14:46:41 +01:00
jl777
fe18163ab4 Merge pull request #1158 from jl777/dev
Increase witness cache size for maxreorg
2019-01-09 02:34:53 -11: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
93b616becd Move WITNESS_CACHE_SIZE 2019-01-09 02:32:11 -11:00
jl777
02d75902ad Move declaration WITNESS_CACHE 2019-01-09 02:30:47 -11:00