diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-11-02 04:44:01 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-11-02 04:44:47 +0100 |
| commit | 8fe30fb4d130532d4a0e4c9d143f03e1b85a749e (patch) | |
| tree | 5442cc39c9cc9e9c88c0b441db4f5b47a950a1c3 /src/policy/policy.h | |
| parent | a6d0d623fc955bba93d8f09e3fd2454284b61472 (diff) | |
| parent | 40cd32e835092c3158175511da5193193ec54939 (diff) | |
| download | bitcoin-8fe30fb4d130532d4a0e4c9d143f03e1b85a749e.tar.xz | |
Merge pull request #6928
40cd32e Revert "Add rules--presently disabled--for using GetMedianTimePast as endpoint for lock-time calculations" (Gregory Maxwell)
8537ecd Revert "Enable policy enforcing GetMedianTimePast as the end point of lock-time constraints" (Gregory Maxwell)
Diffstat (limited to 'src/policy/policy.h')
| -rw-r--r-- | src/policy/policy.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/policy/policy.h b/src/policy/policy.h index f269e8d476..747c5ce8ce 100644 --- a/src/policy/policy.h +++ b/src/policy/policy.h @@ -43,9 +43,6 @@ 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 |