X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=blobdiff_plain;f=src%2Fminer.cpp;fp=src%2Fminer.cpp;h=dfb99ef09eec925e19c72e74676588668ac316c9;hp=f91b3bda5e85c6f32d96e431bcb5d08a42fb18eb;hb=61dd3edaf09345a424ce4ce9bc46f44508da3ff9;hpb=bd7dcdc7ebad4420f75ea6b3007d47e4f21ffb47 diff --git a/src/miner.cpp b/src/miner.cpp index f91b3bd..dfb99ef 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -348,15 +348,17 @@ CBlock* CreateNewBlock(CWallet* pwallet, bool fProofOfStake) nLastBlockTx = nBlockTx; nLastBlockSize = nBlockSize; - if (fDebug && GetBoolArg("-printpriority")) - printf("CreateNewBlock(): total size %" PRI64u "\n", nBlockSize); - if (!fProofOfStake) { - bool fProtocol048 = fTestNet || VALIDATION_SWITCH_TIME < pblock->nTime; - pblock->vtx[0].vout[0].nValue = GetProofOfWorkReward(pblock->nBits, fProtocol048 ? nFees : 0); + pblock->vtx[0].vout[0].nValue = GetProofOfWorkReward(pblock->nBits, nFees); + + if (fDebug) + printf("CreateNewBlock(): reward %" PRI64u "\n", pblock->vtx[0].vout[0].nValue); } + if (fDebug && GetBoolArg("-printpriority")) + printf("CreateNewBlock(): total size %" PRI64u "\n", nBlockSize); + // Fill in header pblock->hashPrevBlock = pindexPrev->GetBlockHash(); pblock->nTime = max(pindexPrev->GetMedianTimePast()+1, pblock->GetMaxTransactionTime());