aboutsummaryrefslogtreecommitdiff
path: root/src/consensus
diff options
context:
space:
mode:
authorGregory Maxwell <greg@xiph.org>2015-11-01 20:05:18 +0000
committerGregory Maxwell <greg@xiph.org>2015-11-01 20:05:18 +0000
commit40cd32e835092c3158175511da5193193ec54939 (patch)
treea277d4f0514dc26c86c8fa86ab831acd6ed3e63f /src/consensus
parent8537ecdfc40181249ec37556015a99cfae4b21fd (diff)
downloadbitcoin-40cd32e835092c3158175511da5193193ec54939.tar.xz
Revert "Add rules--presently disabled--for using GetMedianTimePast as endpoint for lock-time calculations"
This reverts commit 9d55050773d57c0e12005e524f2e54d9e622c6e2. As noted by Luke-Jr, under some conditions this will accept transactions which are invalid by the network rules. This happens when the current block time is head of the median time past and a transaction's locktime is in the middle. This could be addressed by changing the rule to MAX(this_block_time, MTP+offset) but this solution and the particular offset used deserve some consideration.
Diffstat (limited to 'src/consensus')
-rw-r--r--src/consensus/consensus.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/consensus/consensus.h b/src/consensus/consensus.h
index 6d6ce7e099..f937844e9f 100644
--- a/src/consensus/consensus.h
+++ b/src/consensus/consensus.h
@@ -13,10 +13,4 @@ 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