Merge branch '0.5.x' into 0.6.0.x

Conflicts:
	src/main.cpp
	src/serialize.h

diff --cc bitcoin-qt.pro
Simple merge

diff --cc src/main.cpp
index 1bb64a6,ff4e2f0..0599b25
--- 1/src/main.cpp
--- 2/src/main.cpp
+++ b/src/main.cpp
@@@ -1659,12 -1492,28 +1659,32 @@@ bool CBlock::CheckBlock() cons
          if (!tx.CheckTransaction())
              return DoS(tx.nDoS, error("CheckBlock() : CheckTransaction failed"));
  
+     // 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 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");
+ 
 -    // Check that it's not full of nonstandard transactions
 -    if (GetSigOpCount() > MAX_BLOCK_SIGOPS)
 +    int nSigOps = 0;
 +    BOOST_FOREACH(const CTransaction& tx, vtx)
 +    {
 +        nSigOps += tx.GetLegacySigOpCount();
 +    }
 +    if (nSigOps > MAX_BLOCK_SIGOPS)
          return DoS(100, error("CheckBlock() : out-of-bounds SigOpCount"));
  
      // Check merkleroot

diff --cc src/serialize.h
index 25777fe,6bdf378..2cb3563
--- 1/src/serialize.h
--- 2/src/serialize.h
+++ b/src/serialize.h
@@@ -1234,9 -1245,7 +1234,7 @@@ public
      int nType;
      int nVersion;
  
-     typedef FILE element_type;
- 
 -    CAutoFile(FILE* filenew=NULL, int nTypeIn=SER_DISK, int nVersionIn=VERSION)
 +    CAutoFile(FILE* filenew=NULL, int nTypeIn=SER_DISK, int nVersionIn=PROTOCOL_VERSION)
      {
          file = filenew;
          nType = nTypeIn;

diff --cc src/util.cpp
Simple merge

diff --cc src/wallet.h
Simple merge