diff options
| author | Peter Todd <pete@petertodd.org> | 2014-09-29 03:44:25 -0400 |
|---|---|---|
| committer | Peter Todd <pete@petertodd.org> | 2015-06-21 23:56:28 -0400 |
| commit | bc60b2b4b401f0adff5b8b9678903ff8feb5867b (patch) | |
| tree | 07c94b39b1fa36c942112dff9085cd870acf3d1a /src/script/script_error.cpp | |
| parent | 48e9c57cf06352f890eac4285ae022d8746cf3fd (diff) | |
| download | bitcoin-bc60b2b4b401f0adff5b8b9678903ff8feb5867b.tar.xz | |
Replace NOP2 with CHECKLOCKTIMEVERIFY (BIP65)
<nLockTime> CHECKLOCKTIMEVERIFY -> <nLockTime>
Fails if tx.nLockTime < nLockTime, allowing the funds in a txout to be
locked until some block height or block time in the future is reached.
Only the logic and unittests are implemented; this commit does not have
any actual soft-fork logic in it.
Thanks to Pieter Wuille for rebase.
Credit goes to Gregory Maxwell for the suggestion of comparing the
argument against the transaction nLockTime rather than the current
time/blockheight directly.
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: |