diff options
| author | Luke Dashjr <[email protected]> | 2012-05-04 19:55:54 +0000 |
|---|---|---|
| committer | Luke Dashjr <[email protected]> | 2012-05-04 19:55:54 +0000 |
| commit | ee932c6e35f40360fbc3bce44840a82b19599ea2 (patch) | |
| tree | 8d0ec1f8c831e8fe5fcc44448fe57cf1d24875c5 /src/main.cpp | |
| parent | Merge branch '0.6.0.x' of gitorious.org:+bitcoin-stable-developers/bitcoin/bi... (diff) | |
| parent | Bugfix: Remove redundant duplicate transaction check (diff) | |
| download | discoin-ee932c6e35f40360fbc3bce44840a82b19599ea2.tar.xz discoin-ee932c6e35f40360fbc3bce44840a82b19599ea2.zip | |
Merge branch '0.5.x' into 0.6.0.x
Conflicts:
src/main.cpp
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/main.cpp b/src/main.cpp index 0599b25d1..e78dc49df 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1669,16 +1669,6 @@ bool CBlock::CheckBlock() const 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) { |