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/consensus/consensus.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/consensus/consensus.h')
| -rw-r--r-- | src/consensus/consensus.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/consensus/consensus.h b/src/consensus/consensus.h index f937844e9f..6d6ce7e099 100644 --- a/src/consensus/consensus.h +++ b/src/consensus/consensus.h @@ -13,4 +13,10 @@ static const unsigned int MAX_BLOCK_SIGOPS = MAX_BLOCK_SIZE/50; /** Coinbase transaction outputs can only be spent after this number of new blocks (network rule) */ static const int COINBASE_MATURITY = 100; +/** Flags for LockTime() */ +enum { + /* Use GetMedianTimePast() instead of nTime for end point timestamp. */ + LOCKTIME_MEDIAN_TIME_PAST = (1 << 1), +}; + #endif // BITCOIN_CONSENSUS_CONSENSUS_H |