Commit Graph

23948 Commits

Author SHA1 Message Date
jl777
fe0671145e Fix 2018-12-10 10:19:12 -11:00
jl777
80198244d4 New prints 2018-12-10 10:18:42 -11:00
jl777
fcb709c5e8 +print 2018-12-10 09:56:26 -11:00
jl777
27606f3e0b Fix typow == 0 2018-12-10 09:44:50 -11:00
jl777
43cb92bdba Merge pull request #1056 from jl777/dev
Dev
2018-12-10 06:40:59 -11:00
jl777
b10a04973e Merge pull request #1055 from jl777/FSM
Revert txfee changes
2018-12-10 06:40:28 -11:00
jl777
5a1e12de88 Merge branch 'FSM' into jl777 2018-12-10 05:47:19 -11:00
jl777
a2ea9de06f Revert txfee changes 2018-12-10 05:45:59 -11:00
jl777
1c83c86b29 Merge pull request #1054 from DeckerSU/generate-fix
genproclimit fix
2018-12-09 09:27:47 -11:00
DeckerSU
01a684cd95 genproclimit fix
by default when we start komodod only with -gen arg
genproclimit automatically become -1. this behaviour derived
from VRSC after last merge (as i remember, vrsc has -1 by default,
0 - for staking, and >= 1 - for mining and staking), so we need
to set genproclimit=1 if we pass gen and want to actually start
mining.
2018-12-09 23:23:42 +03:00
jl777
f9cbbf91c3 Merge pull request #1053 from jl777/dev
Merge branch 'beta' into dev
2018-12-09 08:46:23 -11:00
jl777
9f0c084b50 Merge pull request #1052 from jl777/FSM
FSM
2018-12-09 08:46:00 -11:00
jl777
239d9d33d4 Merge pull request #1051 from jl777/jl777
Jl777
2018-12-09 08:43:56 -11:00
jl777
5ea3f23ac9 Update three 2018-12-09 08:41:08 -11:00
SHossain
3473e324ef Merge pull request #92 from jl777/dev
Dev
2018-12-08 15:38:02 +00:00
jl777
07921af3fd Merge branch 'FSM' into jl777 2018-12-08 01:37:27 -11:00
jl777
e831503936 Merge branch 'dev' into FSM 2018-12-08 01:35:25 -11:00
jl777
0b1a452eac Merge branch 'beta' into dev 2018-12-08 01:34:10 -11:00
jl777
bb48971246 Merge pull request #1050 from jl777/beta
Prevent height -> nLockTime
2018-12-08 01:33:55 -11:00
jl777
54431fd74a Prevent height -> nLockTime 2018-12-08 01:33:23 -11:00
jl777
f2befab32d Merge pull request #1049 from jl777/beta
Beta
2018-12-08 00:59:24 -11:00
jl777
e1e0ae1357 Merge pull request #1048 from jl777/dev
Dev
2018-12-08 00:58:47 -11:00
jl777
3c414c466f Merge pull request #1047 from jl777/FSM
Synchronize version number with agama 0.3.0
2018-12-08 00:58:11 -11:00
jl777
ba6f37bb65 Synchronize version number with agama 0.3.0 2018-12-08 00:57:32 -11:00
jl777
69a1eb9add Merge pull request #1046 from jl777/beta
Beta
2018-12-07 01:48:31 -11:00
jl777
b12b0c5339 Merge pull request #1045 from jl777/dev
Dev
2018-12-07 01:47:59 -11:00
jl777
57976990e8 Merge pull request #1044 from jl777/FSM
FSM
2018-12-07 01:47:32 -11:00
jl777
f0cc5e2d8d Merge branch 'FSM' into jl777 2018-12-07 01:46:52 -11:00
jl777
03815c8450 Merge pull request #1043 from Mixa84/FSM
Fix hanging of oracles
2018-12-07 01:46:31 -11:00
Mihailo Milenkovic
2ad557a4ca Fix hanging of oracles 2018-12-07 13:41:45 +01:00
jl777
a802c40d24 Merge pull request #1042 from jl777/beta
Beta
2018-12-06 08:55:01 -11:00
jl777
26c0ecc417 Merge pull request #1041 from jl777/dev
Dev
2018-12-06 08:54:28 -11:00
jl777
1f2552f68c Merge pull request #1040 from jl777/FSM
FSM
2018-12-06 08:53:52 -11:00
jl777
9b0ee5fb94 Merge branch 'FSM' into jl777 2018-12-06 08:52:52 -11:00
jl777
0647cc2bfd Merge pull request #1039 from Mixa84/FSM
Fix reorder of vins in FinalizeCCTx
2018-12-06 08:39:54 -11:00
Mihailo Milenkovic
b4a5d1531a Fix reorder of vins in FinalizeCCTx 2018-12-06 18:07:25 +01:00
jl777
3ee50e0caa Merge pull request #1038 from jl777/FSM
FSM
2018-12-06 04:54:50 -11:00
jl777
eeaa224a52 Merge pull request #1037 from jl777/jl777
Fix inconsistent CC data
2018-12-06 04:53:42 -11:00
jl777
a9935f7657 Fix inconsistent CC data 2018-12-06 04:53:01 -11:00
blackjok3rtt
5f3a589dff Merge pull request #20 from jl777/FSM
Fsm
2018-12-06 22:00:39 +08:00
jl777
9001b75c34 Merge pull request #1036 from jl777/beta
Beta
2018-12-06 02:13:34 -11:00
jl777
6f776df5b4 Merge pull request #1035 from jl777/dev
Dev
2018-12-06 02:13:05 -11:00
jl777
a08fa6d107 Merge pull request #1034 from jl777/FSM
FSM
2018-12-06 02:12:34 -11:00
jl777
a1e2dffa62 Merge pull request #1033 from jl777/jl777
GetHeight()
2018-12-06 02:12:02 -11:00
jl777
d8282c5739 GetHeight() 2018-12-06 02:08:39 -11:00
jl777
d4f269a90f Merge branch 'FSM' into jl777 2018-12-06 02:04:24 -11:00
jl777
b5c97c33c9 Merge pull request #1032 from jl777/beta
Beta
2018-12-06 02:03:58 -11:00
jl777
771ea29dad Merge pull request #1031 from jl777/dev
Dev
2018-12-06 02:03:21 -11:00
jl777
c35d279b53 Merge pull request #1030 from jl777/FSM
FSM
2018-12-06 01:48:18 -11:00
jl777
1611558b46 Merge pull request #1028 from libscott/migrate_flip_import
Migrate flip import
2018-12-06 01:47:57 -11:00