diff options
| author | Wladimir J. van der Laan <[email protected]> | 2015-12-22 11:26:09 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2015-12-22 11:37:11 +0100 |
| commit | 595f93977c5636add1f4f2e64cd2d9b19c65a578 (patch) | |
| tree | 84721f9240186bb35b6ec960b87efc9cd368b3f8 /src/script | |
| parent | Merge pull request #7226 (diff) | |
| parent | Rename OP_NOP2 to OP_CHECKLOCKTIMEVERIFY. (diff) | |
| download | discoin-595f93977c5636add1f4f2e64cd2d9b19c65a578.tar.xz discoin-595f93977c5636add1f4f2e64cd2d9b19c65a578.zip | |
Merge pull request #7213
37d271d Rename OP_NOP2 to OP_CHECKLOCKTIMEVERIFY. (mb300sd)
Diffstat (limited to 'src/script')
| -rw-r--r-- | src/script/script.cpp | 2 | ||||
| -rw-r--r-- | src/script/script.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/script/script.cpp b/src/script/script.cpp index 9c77ed9fc..a7ba57e65 100644 --- a/src/script/script.cpp +++ b/src/script/script.cpp @@ -131,7 +131,7 @@ const char* GetOpName(opcodetype opcode) // expanson case OP_NOP1 : return "OP_NOP1"; - case OP_NOP2 : return "OP_NOP2"; + case OP_CHECKLOCKTIMEVERIFY : return "OP_CHECKLOCKTIMEVERIFY"; case OP_NOP3 : return "OP_NOP3"; case OP_NOP4 : return "OP_NOP4"; case OP_NOP5 : return "OP_NOP5"; 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, |