Merge pull request #2279 from sipa/cvrbip30

Bugfix CValidationResult for BIP30 + add DoS
12 years ago · 8f66aedfaa
parent 817c44a00d 7cdc37c0a4
commit 8f66aedfaa
1 changed files with 1 additions and 1 deletions
--- a/src/main.cpp
+++ b/src/main.cpp
@ -1605,7 +1605,7 @@ bool CBlock::ConnectBlock(CValidationState &state, CBlockIndex* pindex, CCoinsVi
        for (unsigned int i=0; i<vtx.size(); i++) {
            uint256 hash = GetTxHash(i);
            if (view.HaveCoins(hash) && !view.GetCoins(hash).IsPruned())
-                return error("ConnectBlock() : tried to overwrite transaction");
+                return state.DoS(100, error("ConnectBlock() : tried to overwrite transaction"));
        }
    }