mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-01-19 14:53:43 +01:00
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.
This commit is contained in:
@@ -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:
|
||||
|
||||
Reference in New Issue
Block a user