From 052583500ab37a4fcfb453a2c17544d36a9812f9 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sat, 29 Oct 2016 09:16:48 -0300 Subject: [PATCH] test --- src/chainparams.cpp | 6 +++--- src/chainparamsbase.cpp | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 694750f42..2dd0831fe 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -184,7 +184,7 @@ CBlock CreateGenesisBlock(const char* pszTimestamp, const CScript& genesisOutput CBlock genesis; genesis.nTime = nTime; genesis.nBits = nBits; - genesis.nNonce = nNonce; + memcpy(&genesis.nNonce,&nNonce,sizeof(nNonce)); genesis.nVersion = nVersion; genesis.vtx.push_back(txNew); genesis.hashPrevBlock.SetNull(); @@ -246,10 +246,10 @@ void *chainparams_commandline(void *ptr) fprintf(stderr,">>>>>>>>>> %u: merkle %s hash %s <= target %s\n",nonce,genesis.hashMerkleRoot.ToString().c_str(),genesis.GetHash().ToString().c_str(),tmp.ToString().c_str()); mainParams.consensus.hashGenesisBlock = genesis.GetHash(); mainParams.recalc_genesis(nonce); - fprintf(stderr,">>>>>>>>>> %u: hash %s merkle %s timestamp.%u\n",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); - SelectBaseParams((char *)"main"); + SelectBaseParams(0); //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); ASSETCHAIN_INIT = 1; diff --git a/src/chainparamsbase.cpp b/src/chainparamsbase.cpp index 0c75b69f4..c1ab23a90 100644 --- a/src/chainparamsbase.cpp +++ b/src/chainparamsbase.cpp @@ -73,6 +73,7 @@ const CBaseChainParams& BaseParams() void SelectBaseParams(CBaseChainParams::Network network) { switch (network) { + case 0: case CBaseChainParams::MAIN: pCurrentBaseParams = &mainParams; break;