diff options
| author | Peter Todd <pete@petertodd.org> | 2014-09-29 01:02:59 -0400 |
|---|---|---|
| committer | Peter Todd <pete@petertodd.org> | 2015-05-09 04:33:49 -0400 |
| commit | 48e9c57cf06352f890eac4285ae022d8746cf3fd (patch) | |
| tree | 100a64bf4a6b04dbeaae983c320a00c65a07441f | |
| parent | 99088d60d8a7747c6d1a7fd5d8cd388be1b3e138 (diff) | |
Move LOCKTIME_THRESHOLD to src/script/script.h
Will now be needed by CHECKLOCKTIMEVERIFY code.
| -rw-r--r-- | src/consensus/consensus.h | 2 | ||||
| -rw-r--r-- | src/script/script.h | 4 |
2 files changed, 4 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 diff --git a/src/script/script.h b/src/script/script.h index a4b9de3046..45a06acc9f 100644 --- a/src/script/script.h +++ b/src/script/script.h @@ -18,6 +18,10 @@ static const unsigned int MAX_SCRIPT_ELEMENT_SIZE = 520; // bytes +// 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 + template <typename T> std::vector<unsigned char> ToByteVector(const T& in) { |