diff options
author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-11-16 20:44:01 +0000 |
---|---|---|
committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-11-16 20:44:01 +0000 |
commit | c510f571dc580c0460b4054d183255c23f370212 (patch) | |
tree | a5586142ba815fae26d263fe22dd5e141732f989 | |
parent | 13b0b1cd3d64cb1ec9f223512e8dcdc0ce1b2a00 (diff) | |
parent | 3ba638b59a0b210f4469b17adcd455e4e3db4658 (diff) | |
download | bitcoin-c510f571dc580c0460b4054d183255c23f370212.tar.xz |
Merge branch '0.5.x' into 0.6.0.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 5f38fcfc23..5b4b873680 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1378,7 +1378,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. |