diff options
| author | Max K. <[email protected]> | 2015-06-28 20:42:03 +0200 |
|---|---|---|
| committer | Max K. <[email protected]> | 2015-06-28 20:42:03 +0200 |
| commit | e0ca377684234b1b1443b11dc85e1d8b4931692a (patch) | |
| tree | 0ba84e45cb4bac17f1d4a547eacfa7d284dd4152 /src/main.cpp | |
| parent | Merge pull request #1187 from rnicoll/1.10-scrypt (diff) | |
| parent | Add Dogecoin block subsidy calculations. (diff) | |
| download | discoin-e0ca377684234b1b1443b11dc85e1d8b4931692a.tar.xz discoin-e0ca377684234b1b1443b11dc85e1d8b4931692a.zip | |
Merge pull request #1188 from rnicoll/1.10-reward
Add Dogecoin block subsidy calculations
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp index 28c5b704c..91d89cea7 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -12,6 +12,7 @@ #include "checkpoints.h" #include "checkqueue.h" #include "consensus/validation.h" +#include "dogecoin.h" #include "init.h" #include "merkleblock.h" #include "net.h" @@ -1891,7 +1892,7 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin int64_t nTime1 = GetTimeMicros(); nTimeConnect += nTime1 - nTimeStart; LogPrint("bench", " - Connect %u transactions: %.2fms (%.3fms/tx, %.3fms/txin) [%.2fs]\n", (unsigned)block.vtx.size(), 0.001 * (nTime1 - nTimeStart), 0.001 * (nTime1 - nTimeStart) / block.vtx.size(), nInputs <= 1 ? 0 : 0.001 * (nTime1 - nTimeStart) / (nInputs-1), nTimeConnect * 0.000001); - CAmount blockReward = nFees + GetBlockSubsidy(pindex->nHeight, chainparams.GetConsensus()); + CAmount blockReward = nFees + GetDogecoinBlockSubsidy(pindex->nHeight, chainparams.GetConsensus(), hashPrevBlock); if (block.vtx[0].GetValueOut() > blockReward) return state.DoS(100, error("ConnectBlock(): coinbase pays too much (actual=%d vs limit=%d)", |