Merge branch 'op_eval'

diff --cc src/bitcoinrpc.cpp
Simple merge

diff --cc src/main.cpp
index e2f3cc9,5db708a..cfd6ac2
--- 1/src/main.cpp
--- 2/src/main.cpp
+++ b/src/main.cpp
@@@ -366,18 -427,9 +427,9 @@@ bool CTransaction::AcceptToMemoryPool(C
          return DoS(100, error("AcceptToMemoryPool() : coinbase as individual tx"));
  
      // To help v0.1.5 clients who would see it as a negative number
 -    if ((int64)nLockTime > INT_MAX)
 +    if ((int64)nLockTime > std::numeric_limits<int>::max())
          return error("AcceptToMemoryPool() : not accepting nLockTime beyond 2038 yet");
  
-     // Safety limits
-     unsigned int nSize = ::GetSerializeSize(*this, SER_NETWORK);
-     // Checking ECDSA signatures is a CPU bottleneck, so to avoid denial-of-service
-     // attacks disallow transactions with more than one SigOp per 34 bytes.
-     // 34 bytes because a TxOut is:
-     //   20-byte address + 8 byte bitcoin amount + 5 bytes of ops + 1 byte script length
-     if (GetSigOpCount() > nSize / 34 || nSize < 100)
-         return error("AcceptToMemoryPool() : transaction with out-of-bounds SigOpCount");
- 
      // Rather not work on nonstandard transactions (unless -testnet)
      if (!fTestNet && !IsStandard())
          return error("AcceptToMemoryPool() : nonstandard transaction type");

diff --cc src/main.h
Simple merge

diff --cc src/wallet.cpp
Simple merge