diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-06-26 14:33:55 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-06-26 14:42:45 +0200 |
| commit | 41076aad0cbdfa4c4cf376e345114a5c29086f81 (patch) | |
| tree | 7c1e46cb4ebf5b8eefffabeb46d2265bef74b287 /src/script/script.h | |
| parent | 5aa34c79440f318d54e650c7bdf86d4c058b7de0 (diff) | |
| parent | ffd75adce01a78b3461b3ff05bcc2b530a9ce994 (diff) | |
Merge pull request #6124
ffd75ad Enable CHECKLOCKTIMEVERIFY as a standard script verify flag (Peter Todd)
bc60b2b Replace NOP2 with CHECKLOCKTIMEVERIFY (BIP65) (Peter Todd)
48e9c57 Move LOCKTIME_THRESHOLD to src/script/script.h (Peter Todd)
99088d6 Make CScriptNum() take nMaxNumSize as an argument (Peter Todd)
Diffstat (limited to 'src/script/script.h')
| -rw-r--r-- | src/script/script.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/script/script.h b/src/script/script.h index d5045005be..c09899aabd 100644 --- a/src/script/script.h +++ b/src/script/script.h @@ -19,6 +19,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) { @@ -151,6 +155,7 @@ enum opcodetype // expansion OP_NOP1 = 0xb0, OP_NOP2 = 0xb1, + OP_CHECKLOCKTIMEVERIFY = OP_NOP2, OP_NOP3 = 0xb2, OP_NOP4 = 0xb3, OP_NOP5 = 0xb4, @@ -196,7 +201,10 @@ public: m_value = n; } - explicit CScriptNum(const std::vector<unsigned char>& vch, bool fRequireMinimal) + static const size_t nDefaultMaxNumSize = 4; + + explicit CScriptNum(const std::vector<unsigned char>& vch, bool fRequireMinimal, + const size_t nMaxNumSize = nDefaultMaxNumSize) { if (vch.size() > nMaxNumSize) { throw scriptnum_error("script number overflow"); @@ -319,8 +327,6 @@ public: return result; } - static const size_t nMaxNumSize = 4; - private: static int64_t set_vch(const std::vector<unsigned char>& vch) { |