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_error.cpp | |
| parent | 5aa34c79440f318d54e650c7bdf86d4c058b7de0 (diff) | |
| parent | ffd75adce01a78b3461b3ff05bcc2b530a9ce994 (diff) | |
| download | bitcoin-41076aad0cbdfa4c4cf376e345114a5c29086f81.tar.xz | |
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_error.cpp')
| -rw-r--r-- | src/script/script_error.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/script/script_error.cpp b/src/script/script_error.cpp index d8ecfde1d7..f1aa1fb408 100644 --- a/src/script/script_error.cpp +++ b/src/script/script_error.cpp @@ -47,6 +47,10 @@ const char* ScriptErrorString(const ScriptError serror) return "OP_RETURN was encountered"; case SCRIPT_ERR_UNBALANCED_CONDITIONAL: return "Invalid OP_IF construction"; + case SCRIPT_ERR_NEGATIVE_LOCKTIME: + return "Negative locktime"; + case SCRIPT_ERR_UNSATISFIED_LOCKTIME: + return "Locktime requirement not satisfied"; case SCRIPT_ERR_SIG_HASHTYPE: return "Signature hash type missing or not understood"; case SCRIPT_ERR_SIG_DER: |