aboutsummaryrefslogtreecommitdiff
path: root/src/consensus
diff options
context:
space:
mode:
authorPeter Todd <pete@petertodd.org>2014-09-29 01:02:59 -0400
committerPeter Todd <pete@petertodd.org>2015-10-08 17:46:55 +0200
commit6ec08db33805ba5688917e6da73cf19cdb64721e (patch)
tree8a309e08f621179aa48722d44c86fb7e5c955fab /src/consensus
parent684636ba67c3eba145a0af8890ed9a7a15deb60a (diff)
downloadbitcoin-6ec08db33805ba5688917e6da73cf19cdb64721e.tar.xz
Move LOCKTIME_THRESHOLD to src/script/script.h
Will now be needed by CHECKLOCKTIMEVERIFY code. Rebased-From: 48e9c57cf06352f890eac4285ae022d8746cf3fd
Diffstat (limited to 'src/consensus')
-rw-r--r--src/consensus/consensus.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/consensus/consensus.h b/src/consensus/consensus.h
index 9c5b7d4ffb..f937844e9f 100644
--- a/src/consensus/consensus.h
+++ b/src/consensus/consensus.h
@@ -12,7 +12,5 @@ static const unsigned int MAX_BLOCK_SIZE = 1000000;
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;
-/** Threshold for nLockTime: below this value it is interpreted as block number, otherwise as UNIX timestamp. */
-static const unsigned int LOCKTIME_THRESHOLD = 500000000; // Tue Nov 5 00:53:20 1985 UTC
#endif // BITCOIN_CONSENSUS_CONSENSUS_H