diff options
| author | Peter Todd <pete@petertodd.org> | 2014-09-29 01:02:59 -0400 |
|---|---|---|
| committer | Peter Todd <pete@petertodd.org> | 2015-10-08 17:39:17 +0200 |
| commit | 750d54f9510d784c2a502089754241986fb1338a (patch) | |
| tree | 4aa0c72c60a81c8a25224f5b3924f05b84364952 | |
| parent | 689746841afd0f2076a7d93d30974c2f7d29cd83 (diff) | |
| download | bitcoin-750d54f9510d784c2a502089754241986fb1338a.tar.xz | |
Move LOCKTIME_THRESHOLD to src/script/script.h
Will now be needed by CHECKLOCKTIMEVERIFY code.
Rebased-From: 48e9c57cf06352f890eac4285ae022d8746cf3fd
| -rw-r--r-- | src/main.h | 2 | ||||
| -rw-r--r-- | src/script/script.h | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/main.h b/src/main.h index 9a875a0750..52cc4f38bf 100644 --- a/src/main.h +++ b/src/main.h @@ -74,8 +74,6 @@ static const unsigned int BLOCKFILE_CHUNK_SIZE = 0x1000000; // 16 MiB static const unsigned int UNDOFILE_CHUNK_SIZE = 0x100000; // 1 MiB /** 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 /** Maximum number of script-checking threads allowed */ static const int MAX_SCRIPTCHECK_THREADS = 16; /** -par default (number of script-checking threads, 0 = auto) */ diff --git a/src/script/script.h b/src/script/script.h index e3af4a6fd9..6433d1a766 100644 --- a/src/script/script.h +++ b/src/script/script.h @@ -17,6 +17,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) { |