diff options
| author | Luke Dashjr <[email protected]> | 2012-11-16 20:43:23 +0000 |
|---|---|---|
| committer | Luke Dashjr <[email protected]> | 2012-11-16 20:43:23 +0000 |
| commit | 3ba638b59a0b210f4469b17adcd455e4e3db4658 (patch) | |
| tree | aa3ea946ec7c2db8cc00876fecbee7a2e8ce6d45 | |
| parent | Update supported translations (diff) | |
| parent | Print error for coinbase-pays-too-much case of ConnectBlock failing (diff) | |
| download | discoin-3ba638b59a0b210f4469b17adcd455e4e3db4658.tar.xz discoin-3ba638b59a0b210f4469b17adcd455e4e3db4658.zip | |
Merge branch '0.4.x' into 0.5.x
| -rw-r--r-- | src/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp index 460b5ddf8..32b1ea0e8 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1271,7 +1271,7 @@ bool CBlock::ConnectBlock(CTxDB& txdb, CBlockIndex* pindex) } 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)); // Update block index on disk without changing it in memory. // The memory index structure will be changed after the db commits. |