diff options
| author | Luke Dashjr <[email protected]> | 2012-11-16 20:48:58 +0000 |
|---|---|---|
| committer | Luke Dashjr <[email protected]> | 2012-11-16 20:48:58 +0000 |
| commit | ab67ec869521a4b8b687103eb1ea01cb8b023eef (patch) | |
| tree | 368f581e69d33197d919e9677472574bc64d4d4e /src | |
| parent | VariantClear@4 + shutdown@8 patch (diff) | |
| parent | Merge branch '0.6.0.x' into 0.6.x (diff) | |
| download | discoin-ab67ec869521a4b8b687103eb1ea01cb8b023eef.tar.xz discoin-ab67ec869521a4b8b687103eb1ea01cb8b023eef.zip | |
Merge branch '0.6.x' into 0.7.x
Conflicts:
src/main.cpp
Diffstat (limited to 'src')
| -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 6ab908733..b63d68187 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1484,7 +1484,7 @@ bool CBlock::ConnectBlock(CTxDB& txdb, CBlockIndex* pindex, bool fJustCheck) } 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) return true; |