diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-07-26 14:21:04 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-07-26 14:24:11 +0200 |
| commit | 4b1a4d8810f9d84d0e03dc02b53fd910606a5544 (patch) | |
| tree | 9c4a37f2790206db491774e3b9b882bccfe02a37 /src/policy/policy.h | |
| parent | 618c9dd8c651f15ea37a09d3ee4fa4426c75ac02 (diff) | |
| parent | c59c434b7d1211c13f7904b9bc675e16910a1c0a (diff) | |
| download | bitcoin-4b1a4d8810f9d84d0e03dc02b53fd910606a5544.tar.xz | |
Merge #8381: Make witness v0 outputs non-standard
c59c434 qa: Add test for standardness of segwit v0 outputs (Suhas Daftuar)
1ffaff2 Make witness v0 outputs non-standard before segwit activation (Johnson Lau)
Diffstat (limited to 'src/policy/policy.h')
| -rw-r--r-- | src/policy/policy.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/policy/policy.h b/src/policy/policy.h index b82c9e66b8..6bf5ca0ee5 100644 --- a/src/policy/policy.h +++ b/src/policy/policy.h @@ -55,12 +55,12 @@ static const unsigned int STANDARD_NOT_MANDATORY_VERIFY_FLAGS = STANDARD_SCRIPT_ static const unsigned int STANDARD_LOCKTIME_VERIFY_FLAGS = LOCKTIME_VERIFY_SEQUENCE | LOCKTIME_MEDIAN_TIME_PAST; -bool IsStandard(const CScript& scriptPubKey, txnouttype& whichType); +bool IsStandard(const CScript& scriptPubKey, txnouttype& whichType, const bool witnessEnabled = false); /** * Check for standard transaction types * @return True if all outputs (scriptPubKeys) use only standard transaction forms */ -bool IsStandardTx(const CTransaction& tx, std::string& reason); +bool IsStandardTx(const CTransaction& tx, std::string& reason, const bool witnessEnabled = false); /** * Check for standard transaction types * @param[in] mapInputs Map of previous transactions that have outputs we're spending |