Mercurial > hg > bitcoin

changeset 2968:04987f8907d6 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge branch '0.5.x' into 0.6.0.x Conflicts: src/main.cpp
author Luke Dashjr <luke-jr+git@utopios.org>
date Fri, 04 May 2012 19:55:54 +0000
parents 59540cc9d9d5 (current diff) 0f3d6bfac087 (diff)
children 6d9afd854c97 0172a4a634d5
files src/main.cpp
diffstat 1 files changed, 0 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1669,16 +1669,6 @@
     if (uniqueTx.size() != vtx.size())
         return DoS(100, error("CheckBlock() : duplicate transaction"));
 
-    // Check for duplicate txids. This is caught by ConnectInputs(),
-    // but catching it earlier avoids a potential DoS attack:
-    set<uint256> uniqueTx;
-    BOOST_FOREACH(const CTransaction& tx, vtx)
-    {
-        uniqueTx.insert(tx.GetHash());
-    }
-    if (uniqueTx.size() != vtx.size())
-        return error("CheckBlock() : duplicate transaction");
-
     int nSigOps = 0;
     BOOST_FOREACH(const CTransaction& tx, vtx)
     {