diff options
| author | Wladimir J. van der Laan <[email protected]> | 2016-02-16 10:46:22 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2016-02-16 10:46:34 +0100 |
| commit | 93c85d458ac3e2c496c1a053e1f5925f55e29100 (patch) | |
| tree | 6b26e898d0a727e57faa0c9b1d02f968b34b554c /src/script/script_error.h | |
| parent | Merge #7509: Common argument defaults for NODE_BLOOM stuff and -wallet (diff) | |
| parent | Code style fix. (diff) | |
| download | discoin-93c85d458ac3e2c496c1a053e1f5925f55e29100.tar.xz discoin-93c85d458ac3e2c496c1a053e1f5925f55e29100.zip | |
Merge #7524: BIP-112: Mempool-only CHECKSEQUENCEVERIFY
a381076 Code style fix. (BtcDrak)
c3c3752 Separate CheckLockTime() and CheckSequence() logic (BtcDrak)
53e53a3 BIP112: Implement CHECKSEQUENCEVERIFY (Mark Friedenbach)
Diffstat (limited to 'src/script/script_error.h')
| -rw-r--r-- | src/script/script_error.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/script/script_error.h b/src/script/script_error.h index bb10b8a29..26df33932 100644 --- a/src/script/script_error.h +++ b/src/script/script_error.h @@ -35,7 +35,7 @@ typedef enum ScriptError_t SCRIPT_ERR_INVALID_ALTSTACK_OPERATION, SCRIPT_ERR_UNBALANCED_CONDITIONAL, - /* OP_CHECKLOCKTIMEVERIFY */ + /* CHECKLOCKTIMEVERIFY and CHECKSEQUENCEVERIFY */ SCRIPT_ERR_NEGATIVE_LOCKTIME, SCRIPT_ERR_UNSATISFIED_LOCKTIME, |