sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-27 21:12:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix IsBlockValueValid/IsOldBudgetBlockValueValid (#2276)

Browse Source
This commit is contained in:
UdjinM6 2018-09-10 17:12:32 +03:00 committed by GitHub
parent c3d6b06518
commit 737353c84c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/masternode-payments.cpp
View File

@ -27,13 +27,17 @@ CCriticalSection cs_mapMasternodePaymentVotes;
bool IsOldBudgetBlockValueValid(const CBlock& block, int nBlockHeight, CAmount blockReward, std::string& strErrorRet) { bool IsOldBudgetBlockValueValid(const CBlock& block, int nBlockHeight, CAmount blockReward, std::string& strErrorRet) {
const Consensus::Params& consensusParams = Params().GetConsensus(); const Consensus::Params& consensusParams = Params().GetConsensus();
bool isBlockRewardValueMet = (block.vtx[0]->GetValueOut() <= blockReward);
if (nBlockHeight >= consensusParams.nSuperblockStartBlock) { if (nBlockHeight < consensusParams.nBudgetPaymentsStartBlock) {
// switched to new budget system (superblocks) strErrorRet = strprintf("Incorrect block %d, old budgets are not activated yet", nBlockHeight);
return true; return false;
} }
bool isBlockRewardValueMet = (block.vtx[0]->GetValueOut() <= blockReward); if (nBlockHeight >= consensusParams.nSuperblockStartBlock) {
strErrorRet = strprintf("Incorrect block %d, old budgets are no longer active", nBlockHeight);
return false;
}
// we are still using budgets, but we have no data about them anymore, // we are still using budgets, but we have no data about them anymore,
// all we know is predefined budget cycle and window // all we know is predefined budget cycle and window
@ -77,13 +81,23 @@ bool IsOldBudgetBlockValueValid(const CBlock& block, int nBlockHeight, CAmount b
bool IsBlockValueValid(const CBlock& block, int nBlockHeight, CAmount blockReward, std::string& strErrorRet) bool IsBlockValueValid(const CBlock& block, int nBlockHeight, CAmount blockReward, std::string& strErrorRet)
{ {
const Consensus::Params& consensusParams = Params().GetConsensus();
bool isBlockRewardValueMet = (block.vtx[0]->GetValueOut() <= blockReward);
strErrorRet = ""; strErrorRet = "";
if (!IsOldBudgetBlockValueValid(block, nBlockHeight, blockReward, strErrorRet)) { if (nBlockHeight < consensusParams.nBudgetPaymentsStartBlock) {
return false; // old budget system is not activated yet, just make sure we do not exceed the regular block reward
if(!isBlockRewardValueMet) {
strErrorRet = strprintf("coinbase pays too much at height %d (actual=%d vs limit=%d), exceeded block reward, old budgets are not activated yet",
nBlockHeight, block.vtx[0]->GetValueOut(), blockReward);
}
return isBlockRewardValueMet;
} else if (nBlockHeight < consensusParams.nSuperblockStartBlock) {
// superblocks are not enabled yet, check if we can pass old budget rules
return IsOldBudgetBlockValueValid(block, nBlockHeight, blockReward, strErrorRet);
} }
bool isBlockRewardValueMet = (block.vtx[0]->GetValueOut() <= blockReward);
if(fDebug) LogPrintf("block.vtx[0]->GetValueOut() %lld <= blockReward %lld\n", block.vtx[0]->GetValueOut(), blockReward); if(fDebug) LogPrintf("block.vtx[0]->GetValueOut() %lld <= blockReward %lld\n", block.vtx[0]->GetValueOut(), blockReward);
CAmount nSuperblockMaxValue = blockReward + CSuperblock::GetPaymentsLimit(nBlockHeight); CAmount nSuperblockMaxValue = blockReward + CSuperblock::GetPaymentsLimit(nBlockHeight);