diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-11-05 12:12:50 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-11-05 12:13:04 +0100 |
| commit | 3038eb63e8a674b4818cb5d5e461f1ccf4b2932f (patch) | |
| tree | 1017d21cb0b94b3108b079a8c0611dbc7ba5851e /src/policy/policy.h | |
| parent | 3694b74fa9c85e07ddbd3583154b38cd3b39f640 (diff) | |
| parent | d1c3762ae8c8c73ddd47766041507a6c131afaf2 (diff) | |
| download | bitcoin-3038eb63e8a674b4818cb5d5e461f1ccf4b2932f.tar.xz | |
Merge pull request #6934
d1c3762 Revert "Revert "Enable policy enforcing GetMedianTimePast as the end point of lock-time constraints"" (Gregory Maxwell)
e4e5334 Restore MedianTimePast for locktime. (Gregory Maxwell)
Diffstat (limited to 'src/policy/policy.h')
| -rw-r--r-- | src/policy/policy.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/policy/policy.h b/src/policy/policy.h index 747c5ce8ce..f269e8d476 100644 --- a/src/policy/policy.h +++ b/src/policy/policy.h @@ -43,6 +43,9 @@ static const unsigned int STANDARD_SCRIPT_VERIFY_FLAGS = MANDATORY_SCRIPT_VERIFY /** 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; +/** Used as the flags parameter to CheckFinalTx() in non-consensus code */ +static const unsigned int STANDARD_LOCKTIME_VERIFY_FLAGS = LOCKTIME_MEDIAN_TIME_PAST; + bool IsStandard(const CScript& scriptPubKey, txnouttype& whichType); /** * Check for standard transaction types |