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

test

Browse Source
This commit is contained in:
jl777
2016-10-29 09:20:10 -03:00
parent 052583500a
commit 9ce73740f7
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/chainparams.cpp
View File

@@ -188,7 +188,7 @@ CBlock CreateGenesisBlock(const char* pszTimestamp, const CScript& genesisOutput
genesis.nVersion = nVersion; genesis.nVersion = nVersion;
genesis.vtx.push_back(txNew); genesis.vtx.push_back(txNew);
genesis.hashPrevBlock.SetNull(); genesis.hashPrevBlock.SetNull();
genesis.hashMerkleRoot = BlockMerkleRoot(genesis); genesis.hashMerkleRoot = txNew.GetHash();//BlockMerkleRoot(genesis);
return genesis; return genesis;
} }
#define GENESIS_STRING "The Times 03/Jan/2009 Chancellor on brink of second bailout for banks" #define GENESIS_STRING "The Times 03/Jan/2009 Chancellor on brink of second bailout for banks"
@@ -249,7 +249,7 @@ void *chainparams_commandline(void *ptr)
fprintf(stderr,">>>>>>>>>> %u: hash %s merkle %s timestamp.%u\n",*(uint32_t *)&mainParams.GenesisBlock().nNonce,mainParams.GenesisBlock().GetHash().ToString().c_str(),mainParams.GenesisBlock().hashMerkleRoot.ToString().c_str(),mainParams.GenesisBlock().nTime); fprintf(stderr,">>>>>>>>>> %u: hash %s merkle %s timestamp.%u\n",*(uint32_t *)&mainParams.GenesisBlock().nNonce,mainParams.GenesisBlock().GetHash().ToString().c_str(),mainParams.GenesisBlock().hashMerkleRoot.ToString().c_str(),mainParams.GenesisBlock().nTime);
//set_genesis_tip(hash); //set_genesis_tip(hash);
SelectBaseParams(0); SelectBaseParams(MAIN);
//BaseParams().nRPCPort = ASSETCHAINS_PORT + 1; //BaseParams().nRPCPort = ASSETCHAINS_PORT + 1;
fprintf(stderr,">>>>>>>>>> %s: port.%u/%u magic.%08x %u nonce.%u time.%u nbits.%08x %u coins\n",ASSETCHAINS_SYMBOL,ASSETCHAINS_PORT,ASSETCHAINS_PORT+1,ASSETCHAINS_MAGIC,ASSETCHAINS_MAGIC,nonce,ASSETCHAINS_TIMESTAMP,GENESIS_NBITS,(uint32_t)ASSETCHAINS_SUPPLY); fprintf(stderr,">>>>>>>>>> %s: port.%u/%u magic.%08x %u nonce.%u time.%u nbits.%08x %u coins\n",ASSETCHAINS_SYMBOL,ASSETCHAINS_PORT,ASSETCHAINS_PORT+1,ASSETCHAINS_MAGIC,ASSETCHAINS_MAGIC,nonce,ASSETCHAINS_TIMESTAMP,GENESIS_NBITS,(uint32_t)ASSETCHAINS_SUPPLY);
ASSETCHAIN_INIT = 1; ASSETCHAIN_INIT = 1;

1
src/chainparamsbase.cpp
View File

@@ -73,7 +73,6 @@ const CBaseChainParams& BaseParams()
void SelectBaseParams(CBaseChainParams::Network network) void SelectBaseParams(CBaseChainParams::Network network)
{ {
switch (network) { switch (network) {
case 0:
case CBaseChainParams::MAIN: case CBaseChainParams::MAIN:
pCurrentBaseParams = &mainParams; pCurrentBaseParams = &mainParams;
break; break;