Merge pull request #2012 from luke-jr/invblk_errs

Print error for coinbase-pays-too-much case of ConnectBlock failing
This commit is contained in:
Jeff Garzik 2012-11-15 18:18:55 -08:00
commit a0bf93b809

View File

@ -1610,7 +1610,7 @@ bool CBlock::ConnectBlock(CBlockIndex* pindex, CCoinsViewCache &view, bool fJust
} }
if (vtx[0].GetValueOut() > GetBlockValue(pindex->nHeight, nFees)) if (vtx[0].GetValueOut() > GetBlockValue(pindex->nHeight, nFees))
return false; return error("ConnectBlock() : coinbase pays too much (actual=%lld vs limit=%lld)", (long long)vtx[0].GetValueOut(), (long long)GetBlockValue(pindex->nHeight, nFees));
if (fJustCheck) if (fJustCheck)
return true; return true;