diff options
| author | Gregory Maxwell <greg@xiph.org> | 2015-11-03 17:12:36 +0000 |
|---|---|---|
| committer | Gregory Maxwell <greg@xiph.org> | 2015-11-03 17:12:36 +0000 |
| commit | e4e5334ef8d923993ef9cf704ea8f3d0b5801350 (patch) | |
| tree | a8298dd0e362e318eaa075c468a5e1b556d7d47b /src/policy | |
| parent | 42f339ef780bff268369e3a7399c8b8f2ef3e8b4 (diff) | |
| download | bitcoin-e4e5334ef8d923993ef9cf704ea8f3d0b5801350.tar.xz | |
Restore MedianTimePast for locktime.
Revert "Revert "Add rules--presently disabled--for using GetMedianTimePast as endpoint for lock-time calculations""
This reverts commit 40cd32e835092c3158175511da5193193ec54939.
After careful analysis it was determined that the change was, in fact, safe and several people were suffering
momentary confusion about locktime semantics.
Diffstat (limited to 'src/policy')
| -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..fdc54a70a1 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 = 0; + bool IsStandard(const CScript& scriptPubKey, txnouttype& whichType); /** * Check for standard transaction types |