Merge #5765: Implement BIP66 (0.8)

bitcoin · 9d11aba4c4770fdd7fa1840aff2c4faa2873d5ca · laanwj committed Feb 17, 2015

This commit was signed with a verified signature.

laanwj Wladimir J. van der Laan

GPG key ID: 74810B012346C9A6 Learn about signing commits · Feb 17, 2015 · 9d11aba
2 parents 6690ef7 + 534e6da
commit 9d11aba4c4770fdd7fa1840aff2c4faa2873d5ca
Unified Split

Showing with 2 additions and 2 deletions.

+1 −1 src/main.cpp

+1 −1 src/main.h
diff --git a/src/main.cpp b/src/main.cpp
@@ -792,7 +792,7 @@ bool CTxMemPool::accept(CValidationState &state, CTransaction &tx, bool fCheckIn
 
         // Check against previous transactions
         // This is done last to help prevent CPU exhaustion denial-of-service attacks.
-        if (!tx.CheckInputs(state, view, true, SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_STRICTENC))
+        if (!tx.CheckInputs(state, view, true, SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_STRICTENC | SCRIPT_VERIFY_DERSIG))
         {
             return error("CTxMemPool::accept() : ConnectInputs failed %s", hash.ToString().c_str());
         }
diff --git a/src/main.h b/src/main.h
@@ -1268,7 +1268,7 @@ class CBlockHeader
 {
 public:
     // header
-    static const int CURRENT_VERSION=2;
+    static const int CURRENT_VERSION=3;
     int nVersion;
     uint256 hashPrevBlock;
     uint256 hashMerkleRoot;