aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2015-02-17 10:03:33 +0100
committerWladimir J. van der Laan <laanwj@gmail.com>2015-02-17 10:04:23 +0100
commit9d11aba4c4770fdd7fa1840aff2c4faa2873d5ca (patch)
treeae273def7790386f475c63498abd7c908eb863e2
parent6690ef7fea5ae7785809e04fc6de3995b0dfae17 (diff)
parent534e6dac47c87d078a8870c810cd6d1dbce91a99 (diff)
Merge #5765: Implement BIP66 (0.8)v0.8-final
-rw-r--r--src/main.cpp2
-rw-r--r--src/main.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main.cpp b/src/main.cpp
index b4f69f8c96..41322d6a80 100644
--- 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
index 6665e5af02..82d40787a3 100644
--- 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;