diff options
| author | Wladimir J. van der Laan <[email protected]> | 2015-05-19 11:41:41 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2015-05-19 11:42:47 +0200 |
| commit | 377711ff3fdb0f30f04988fc0998dbd597c442ef (patch) | |
| tree | b1198b30bdb21ad3a9d1fcc0f911e8f117f7beb2 /src/miner.cpp | |
| parent | qt: fix unused function warning in scicon.cpp (diff) | |
| parent | Chainparams: Refactor: Decouple main::GetBlockValue() from Params() [renamed ... (diff) | |
| download | discoin-377711ff3fdb0f30f04988fc0998dbd597c442ef.tar.xz discoin-377711ff3fdb0f30f04988fc0998dbd597c442ef.zip | |
Merge pull request #5996
935bd0a Chainparams: Refactor: Decouple main::GetBlockValue() from Params() [renamed GetBlockSubsidy] (Jorge Timón)
Diffstat (limited to 'src/miner.cpp')
| -rw-r--r-- | src/miner.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/miner.cpp b/src/miner.cpp index 4bceb7d7b..804a68852 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -91,6 +91,7 @@ void UpdateTime(CBlockHeader* pblock, const Consensus::Params& consensusParams, CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn) { + const CChainParams& chainparams = Params(); // Create new block auto_ptr<CBlockTemplate> pblocktemplate(new CBlockTemplate()); if(!pblocktemplate.get()) @@ -320,7 +321,7 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn) LogPrintf("CreateNewBlock(): total size %u\n", nBlockSize); // Compute final coinbase transaction. - txNew.vout[0].nValue = GetBlockValue(nHeight, nFees); + txNew.vout[0].nValue = nFees + GetBlockSubsidy(nHeight, chainparams.GetConsensus()); txNew.vin[0].scriptSig = CScript() << nHeight << OP_0; pblock->vtx[0] = txNew; pblocktemplate->vTxFees[0] = -nFees; |