DragonX/hush3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'FSM' of https://github.com/jl777/komodo into jl777-FSM

Browse Source
This commit is contained in:
blackjok3r
2019-02-18 19:09:54 +08:00
parent 871b765999 4353f52928
commit cb5aa3c45c
130 changed files with 45226 additions and 1915 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/chainparams.cpp
View File

@@ -91,6 +91,7 @@ static CBlock CreateGenesisBlock(uint32_t nTime, const uint256& nNonce, const st
*/
void *chainparams_commandline(void *ptr);
#include "komodo_defs.h"
uint32_t ASSETCHAINS_BLOCKTIME = 60;
const arith_uint256 maxUint = UintToArith256(uint256S("ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"));
@@ -275,6 +276,11 @@ void *chainparams_commandline(void *ptr)
//fprintf(stderr,">>>>>>>> port.%u\n",ASSETCHAINS_P2PPORT);
if ( ASSETCHAINS_SYMBOL[0] != 0 )
{
if ( ASSETCHAINS_BLOCKTIME != 60 )
{
mainParams.consensus.nMaxFutureBlockTime = 7 * ASSETCHAINS_BLOCKTIME; // 7 blocks
mainParams.consensus.nPowTargetSpacing = ASSETCHAINS_BLOCKTIME;
}
mainParams.SetDefaultPort(ASSETCHAINS_P2PPORT);
if ( ASSETCHAINS_RPCPORT == 0 )
ASSETCHAINS_RPCPORT = ASSETCHAINS_P2PPORT + 1;