diff options
| author | Johnson Lau <jl2012@xbt.hk> | 2016-10-02 01:19:33 +0800 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-10-17 14:10:58 +0200 |
| commit | 821f3e67510b9ea0b5c7b79d162daf5f0f075462 (patch) | |
| tree | 2bf532aa805200ed14248a62457c8087c4b05a1c /src/policy | |
| parent | 540413d9958fd253d4bf99858db431164db275e1 (diff) | |
| download | bitcoin-821f3e67510b9ea0b5c7b79d162daf5f0f075462.tar.xz | |
Require compressed keys in segwit as policy and disable signing with uncompressed keys for segwit scripts
Github-Pull: #8499
Rebased-From: 4c0c25a604cec39675187507df423cff5d707ab5
Diffstat (limited to 'src/policy')
| -rw-r--r-- | src/policy/policy.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/policy/policy.h b/src/policy/policy.h index fb528d7486..814e6c0b6f 100644 --- a/src/policy/policy.h +++ b/src/policy/policy.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2015 The Bitcoin developers +// Copyright (c) 2009-2016 The Bitcoin developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -54,7 +54,8 @@ static const unsigned int STANDARD_SCRIPT_VERIFY_FLAGS = MANDATORY_SCRIPT_VERIFY SCRIPT_VERIFY_CHECKSEQUENCEVERIFY | SCRIPT_VERIFY_LOW_S | SCRIPT_VERIFY_WITNESS | - SCRIPT_VERIFY_DISCOURAGE_UPGRADABLE_WITNESS_PROGRAM; + SCRIPT_VERIFY_DISCOURAGE_UPGRADABLE_WITNESS_PROGRAM | + SCRIPT_VERIFY_WITNESS_PUBKEYTYPE; /** For convenience, standard but not mandatory verify flags. */ static const unsigned int STANDARD_NOT_MANDATORY_VERIFY_FLAGS = STANDARD_SCRIPT_VERIFY_FLAGS & ~MANDATORY_SCRIPT_VERIFY_FLAGS; |