diff options
| author | Johnson Lau <jl2012@users.noreply.github.com> | 2016-07-20 18:31:45 +0800 |
|---|---|---|
| committer | Johnson Lau <jl2012@xbt.hk> | 2016-07-22 06:35:07 +0000 |
| commit | 1ffaff2f747af683513d6d74a7241d41e3f6e051 (patch) | |
| tree | e1f4f43215830297e1c1e2781e7b9c2313a45200 /src/policy/policy.h | |
| parent | 8e048f40cc25b6ad3f49d2828c8562b657d91ced (diff) | |
| download | bitcoin-1ffaff2f747af683513d6d74a7241d41e3f6e051.tar.xz | |
Make witness v0 outputs non-standard before segwit activation
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 f5f8652fb5..ad209d0306 100644 --- a/src/policy/policy.h +++ b/src/policy/policy.h @@ -53,12 +53,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 |