Commit Graph
31056 Commits
Author SHA1 Message Date
blackjok3r 4f212c841d Fix floating point exception. Problem was POW target trying to calculate when not all blocks avalible. These changes leave us even more open to PoS attack, we need to get temp block file working as soon as we can. 2019-01-28 16:13:25 +08:00
blackjok3rtt 1a26a2b4ed Merge pull request #17 from jl777/dev
Dev
2019-01-28 14:16:45 +08:00
Anton Lysakov 7bd8f456c3 tests adjusted for heirCC json enhancement 2019-01-28 00:03:25 +07:00
jl777 d4b0c5ee3b Merge pull request #1215 from dimxy/heir-json-issues
Heir json issues
2019-01-27 04:57:12 -11:00
blackjok3r 6756fa3ad7 disable orphan purge 2019-01-27 23:56:48 +08:00
jl777 e7f7495492 Merge pull request #1218 from jl777/dev
Dev
2019-01-27 04:53:59 -11:00
jl777 a8ea6eb7ea Merge pull request #1217 from jl777/FSM
FSM
2019-01-27 04:53:12 -11:00
jl777 76024c356e Merge pull request #1216 from jl777/jl777
Disable removeorphan
2019-01-27 04:52:32 -11:00
jl777 fbd07edee2 Disable removeorphan 2019-01-27 04:51:48 -11:00
dimxy 134534b384 var naming improved 2019-01-27 17:56:08 +05:00
dimxy daf34e2315 corrected rpc param size check 2019-01-27 17:17:27 +05:00
dimxy fdcc9d71c2 heirinfo var names corrected
memo field added
2019-01-27 17:03:38 +05:00
blackjok3r 1a70313da0 fix cclib fresh clone 2019-01-27 13:59:50 +08:00
ca333 ee46e71c36 sync dev
update DEV
2019-01-27 04:31:22 +01:00
ca333 728c8f1e3d Merge pull request #119 from jl777/master
update master
2019-01-27 04:30:51 +01:00
blackjok3r 7609e7dcd5 fix assetchains founders reward 2019-01-27 09:53:23 +08:00
blackjok3r cdb64ae0e5 fix verushash staker 2019-01-27 08:54:47 +08:00
Anton Lysakov dc510cdde4 checking channelsaddress 2019-01-27 03:32:24 +07:00
Anton Lysakov 45d35fb971 actualize comment 2019-01-27 03:21:16 +07:00
Anton Lysakov 6901ed6266 Merge branch 'FSM' of https://github.com/tonymorony/komodo into FSM 2019-01-27 03:17:32 +07:00
Anton Lysakov d963a55cc8 added valid tokens heir case 2019-01-27 03:16:53 +07:00
dimxy 82956c357a removed heir list header - simply txid array 2019-01-26 20:31:48 +05:00
dimxy 9bad115496 in heirlist added list header 2019-01-26 20:18:00 +05:00
dimxy 2ac92d7d6e result changed to VARR 2019-01-26 19:10:46 +05:00
dimxy 4b6b2a5540 'throw' changed to 'return result' on incorrect params
tx hex name = 'hex'
heirlist returns simple txid array now
2019-01-26 18:31:46 +05:00
jl777 c27493d9ac Merge pull request #1213 from jl777/dev
Dev
2019-01-26 01:31:13 -11:00
jl777 57f6fd813a Merge pull request #1212 from jl777/FSM
FSM
2019-01-26 01:30:36 -11:00
jl777 f5ac1e19d9 Merge pull request #1211 from jl777/jl777
Jl777
2019-01-26 01:29:35 -11:00
jl777 9484ddf59b Merge pull request #1210 from KomodoPlatform/cclib_dyn
update linux makefile
2019-01-26 01:28:16 -11:00
ca333 25965a5307 Merge pull request #124 from jl777/jl777
sync cclib_dyn->jl777:jl777
2019-01-26 13:11:17 +01:00
ca333 18f8c77197 update linux makefile 2019-01-26 13:09:27 +01:00
ca333 fe4b34e9e3 add linux headers 2019-01-26 13:08:29 +01:00
blackjok3r 83387a82d3 wtf 2019-01-26 16:32:56 +08:00
blackjok3r 6d17cb5dec oopps 2019-01-26 16:00:03 +08:00
blackjok3r 3da846ce85 Merge branch 'FSM' of https://github.com/jl777/komodo 2019-01-26 15:59:29 +08:00
blackjok3r 9bf744ef26 fix getgenerate better 2019-01-26 15:08:00 +08:00
blackjok3r 17b2d1ed06 Fix staking output in getgenerate 2019-01-26 15:00:32 +08:00
blackjok3r 80a8414b83 fix lock up with staker when trying to startum mine and stake. 2019-01-26 14:37:11 +08:00
blackjok3r 304de9777d fix getblocktemplate for PoW while staking 2019-01-26 12:57:05 +08:00
jl777 7c81fe3200 Merge pull request #1209 from jl777/dev
Dev
2019-01-25 17:20:22 -11:00
jl777 c990c403b3 Merge pull request #1208 from jl777/FSM
FSM
2019-01-25 17:19:11 -11:00
jl777 b778dbef8e Merge pull request #1207 from jl777/jl777
Jl777
2019-01-25 17:16:59 -11:00
jl777 932b358243 +comments how to update to 8MB blocks 2019-01-25 17:15:56 -11:00
jl777 352c93f2c4 -<<<<< HEAD 2019-01-25 16:59:55 -11:00
jl777 61821dd51a Merge branch 'FSM' into jl777 2019-01-25 16:54:51 -11:00
jl777 91f213c4b8 +// 2019-01-25 16:54:42 -11:00
jl777 1231c3240d Merge remote-tracking branch 'origin/FSM' into FSM
# Conflicts:
#	src/cc/CCtx.cpp
2019-01-25 16:45:19 -11:00
jl777 524342f7ba Single #define _MAX_BLOCK_SIZE to set max block size 2019-01-25 16:43:57 -11:00
jl777 fc515c1f4a Merge pull request #1206 from DeckerSU/patch-gcc-8
Patch gcc 8
2019-01-25 16:37:17 -11:00
jl777 e4791f54e6 Merge branch 'FSM' into patch-gcc-8 2019-01-25 16:33:13 -11:00