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/consensus | |
| parent | 42f339ef780bff268369e3a7399c8b8f2ef3e8b4 (diff) | |
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/consensus')
| -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 |