aboutsummaryrefslogtreecommitdiff
path: root/src/script/script.h
diff options
context:
space:
mode:
authorWladimir J. van der Laan <[email protected]>2015-12-22 11:26:09 +0100
committerWladimir J. van der Laan <[email protected]>2015-12-22 11:37:11 +0100
commit595f93977c5636add1f4f2e64cd2d9b19c65a578 (patch)
tree84721f9240186bb35b6ec960b87efc9cd368b3f8 /src/script/script.h
parentMerge pull request #7226 (diff)
parentRename OP_NOP2 to OP_CHECKLOCKTIMEVERIFY. (diff)
downloaddiscoin-595f93977c5636add1f4f2e64cd2d9b19c65a578.tar.xz
discoin-595f93977c5636add1f4f2e64cd2d9b19c65a578.zip
Merge pull request #7213
37d271d Rename OP_NOP2 to OP_CHECKLOCKTIMEVERIFY. (mb300sd)
Diffstat (limited to 'src/script/script.h')
-rw-r--r--src/script/script.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/script/script.h b/src/script/script.h
index 3650957fc..7a37b66cc 100644
--- a/src/script/script.h
+++ b/src/script/script.h
@@ -162,8 +162,8 @@ enum opcodetype
// expansion
OP_NOP1 = 0xb0,
- OP_NOP2 = 0xb1,
- OP_CHECKLOCKTIMEVERIFY = OP_NOP2,
+ OP_CHECKLOCKTIMEVERIFY = 0xb1,
+ OP_NOP2 = OP_CHECKLOCKTIMEVERIFY,
OP_NOP3 = 0xb2,
OP_NOP4 = 0xb3,
OP_NOP5 = 0xb4,