diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2015-02-06 10:42:01 -0800 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2015-02-06 10:42:01 -0800 |
| commit | 3230b329ea84d234e04b36044f288ea05b1f116e (patch) | |
| tree | d424fd13c08d615356f100f8ac0e709dd90e448d | |
| parent | 989d49921bd8981acaab2d2e5e9e06d7b1a29bd3 (diff) | |
| download | bitcoin-3230b329ea84d234e04b36044f288ea05b1f116e.tar.xz | |
Raise version of created blocks, and enforce DERSIG in mempool
| -rw-r--r-- | src/core.h | 2 | ||||
| -rw-r--r-- | src/main.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/core.h b/src/core.h index 5eb953610d..d89f06b121 100644 --- a/src/core.h +++ b/src/core.h @@ -345,7 +345,7 @@ class CBlockHeader { public: // header - static const int CURRENT_VERSION=2; + static const int CURRENT_VERSION=3; int nVersion; uint256 hashPrevBlock; uint256 hashMerkleRoot; diff --git a/src/main.cpp b/src/main.cpp index 1aac4b31dd..58255682b6 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -974,7 +974,7 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa // Check against previous transactions // This is done last to help prevent CPU exhaustion denial-of-service attacks. - if (!CheckInputs(tx, state, view, true, SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_STRICTENC)) + if (!CheckInputs(tx, state, view, true, SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_STRICTENC | SCRIPT_VERIFY_DERSIG)) { return error("AcceptToMemoryPool: : ConnectInputs failed %s", hash.ToString()); } |