aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Dashjr <luke-jr+git@utopios.org>2012-11-16 20:43:23 +0000
committerLuke Dashjr <luke-jr+git@utopios.org>2012-11-16 20:43:23 +0000
commit3ba638b59a0b210f4469b17adcd455e4e3db4658 (patch)
treeaa3ea946ec7c2db8cc00876fecbee7a2e8ce6d45
parentbbd76e071717d1805a68e4db51721644b80d6293 (diff)
parent6d6bf32064f22b61526c6b3bcd1ac9950a3413b6 (diff)
downloadbitcoin-3ba638b59a0b210f4469b17adcd455e4e3db4658.tar.xz
Merge branch '0.4.x' into 0.5.x
-rw-r--r--src/main.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 460b5ddf84..32b1ea0e8b 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.