diff options
| author | Wladimir J. van der Laan <[email protected]> | 2016-07-08 11:26:01 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2016-07-08 11:39:10 +0200 |
| commit | ff46dd4a3457c321aef14f9778094c9db9b00083 (patch) | |
| tree | c9fbd49c2335ddb271c1ae1370ddc4cbc5f771c7 /src/script/script.h | |
| parent | Merge #8303: [Doc] Update bips.md for CSV softfork. (diff) | |
| parent | Rename NOP3 to CHECSEQUENCEVERIFY in rpc tests (diff) | |
| download | discoin-ff46dd4a3457c321aef14f9778094c9db9b00083.tar.xz discoin-ff46dd4a3457c321aef14f9778094c9db9b00083.zip | |
Merge #7540: Rename OP_NOP3 to OP_CHECKSEQUENCEVERIFY
18c975c Rename NOP3 to CHECSEQUENCEVERIFY in rpc tests (BtcDrak)
14d0130 Rename OP_NOP3 to OP_CHECKSEQUENCEVERIFY (BtcDrak)
Diffstat (limited to 'src/script/script.h')
| -rw-r--r-- | src/script/script.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/script/script.h b/src/script/script.h index 71af3754b..278774d32 100644 --- a/src/script/script.h +++ b/src/script/script.h @@ -167,8 +167,8 @@ enum opcodetype OP_NOP1 = 0xb0, OP_CHECKLOCKTIMEVERIFY = 0xb1, OP_NOP2 = OP_CHECKLOCKTIMEVERIFY, - OP_NOP3 = 0xb2, - OP_CHECKSEQUENCEVERIFY = OP_NOP3, + OP_CHECKSEQUENCEVERIFY = 0xb2, + OP_NOP3 = OP_CHECKSEQUENCEVERIFY, OP_NOP4 = 0xb3, OP_NOP5 = 0xb4, OP_NOP6 = 0xb5, |