aboutsummaryrefslogtreecommitdiff
path: root/src/script/script_error.h
diff options
context:
space:
mode:
authorMark Friedenbach <mark@friedenbach.org>2015-09-25 16:18:51 -0700
committerBtcDrak <btcdrak@gmail.com>2016-02-14 11:29:38 +0000
commit53e53a33c939949665f60d5eeb82abbb21f97128 (patch)
tree6f0f956bcfea1408ca8117bef583a82cbe445efe /src/script/script_error.h
parent80d1f2e48364f05b2cdf44239b3a1faa0277e58e (diff)
downloadbitcoin-53e53a33c939949665f60d5eeb82abbb21f97128.tar.xz
BIP112: Implement CHECKSEQUENCEVERIFY
- Replace NOP3 with CHECKSEQUENCEVERIFY (BIP112) <nSequence> CHECKSEQUENCEVERIFY -> <nSequence> - Fails if txin.nSequence < nSequence, allowing funds of a txout to be locked for a number of blocks or a duration of time after its inclusion in a block. - Pull most of CheckLockTime() out into VerifyLockTime(), a local function that will be reused for CheckSequence() - Add bitwise AND operator to CScriptNum - Enable CHECKSEQUENCEVERIFY as a standard script verify flag - Transactions that fail CSV verification will be rejected from the mempool, making it easy to test the feature. However blocks containing "invalid" CSV-using transactions will still be accepted; this is *not* the soft-fork required to actually enable CSV for production use.
Diffstat (limited to 'src/script/script_error.h')
-rw-r--r--src/script/script_error.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/script/script_error.h b/src/script/script_error.h
index bb10b8a293..26df33932f 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,