diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2013-02-06 12:58:52 -0800 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2013-02-06 12:58:52 -0800 |
| commit | 8f66aedfaa80c52a1d7af9ca18b56c9b67cbb81f (patch) | |
| tree | 78e15622d249ef46214facca59baeca128515b96 /src/main.cpp | |
| parent | 817c44a00dbc9365432bedfeb7cf38dfaa112d5e (diff) | |
| parent | 7cdc37c0a427a378944cf58798164320110efe39 (diff) | |
| download | bitcoin-8f66aedfaa80c52a1d7af9ca18b56c9b67cbb81f.tar.xz | |
Merge pull request #2279 from sipa/cvrbip30
Bugfix CValidationResult for BIP30 + add DoS
Diffstat (limited to 'src/main.cpp')
| -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 4304840fb7..8c115c26f9 100644 --- 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")); } } |