Skip to content

Commit 595f939

Browse files
laanwjlaanwj
committed
Merge pull request bitcoin#7213
37d271d Rename OP_NOP2 to OP_CHECKLOCKTIMEVERIFY. (mb300sd)
2 parents ed095f0 + 37d271d commit 595f939

File tree

11 files changed

+61
-47
lines changed

11 files changed

+61
-47
lines changed

‎doc/release-notes.md‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,20 @@ git merge commit are mentioned.
1818

1919
### RPC and REST
2020

21+
Asm script outputs now contain OP_CHECKLOCKTIMEVERIFY in place of OP_NOP2
22+
-------------------------------------------------------------------------
23+
24+
OP_NOP2 has been renamed to OP_CHECKLOCKTIMEVERIFY by [BIP
25+
65](https://github.com/bitcoin/bips/blob/master/bip-0065.mediawiki)
26+
27+
The following outputs are affected by this change:
28+
- RPC `getrawtransaction` (in verbose mode)
29+
- RPC `decoderawtransaction`
30+
- RPC `decodescript`
31+
- REST `/rest/tx/` (JSON format)
32+
- REST `/rest/block/` (JSON format when including extended tx details)
33+
- `bitcoin-tx -json`
34+
2135
### Configuration and command-line options
2236

2337
### Block and transaction handling

‎qa/rpc-tests/bip65-cltv-p2p.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
from test_framework.mininode import CTransaction, NetworkThread
1010
from test_framework.blocktools import create_coinbase, create_block
1111
from test_framework.comptool import TestInstance, TestManager
12-
from test_framework.script import CScript, OP_1NEGATE, OP_NOP2, OP_DROP
12+
from test_framework.script import CScript, OP_1NEGATE, OP_CHECKLOCKTIMEVERIFY, OP_DROP
1313
from binascii import hexlify, unhexlify
1414
import cStringIO
1515
import time
@@ -19,7 +19,7 @@ def cltv_invalidate(tx):
1919
2020
Prepends -1 CLTV DROP in the scriptSig itself.
2121
'''
22-
tx.vin[0].scriptSig = CScript([OP_1NEGATE, OP_NOP2, OP_DROP] +
22+
tx.vin[0].scriptSig = CScript([OP_1NEGATE, OP_CHECKLOCKTIMEVERIFY, OP_DROP] +
2323
list(CScript(tx.vin[0].scriptSig)))
2424

2525
'''

‎qa/rpc-tests/decodescript.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,13 +102,13 @@ def decodescript_script_pub_key(self):
102102
# OP_IF
103103
# <receiver-pubkey> OP_CHECKSIGVERIFY
104104
# OP_ELSE
105-
# <lock-until> OP_NOP2 OP_DROP
105+
# <lock-until> OP_CHECKLOCKTIMEVERIFY OP_DROP
106106
# OP_ENDIF
107107
# <sender-pubkey> OP_CHECKSIG
108108
#
109109
# lock until block 500,000
110110
rpc_result = self.nodes[0].decodescript('63' + push_public_key + 'ad670320a107b17568' + push_public_key + 'ac')
111-
assert_equal('OP_IF ' + public_key + ' OP_CHECKSIGVERIFY OP_ELSE 500000 OP_NOP2 OP_DROP OP_ENDIF ' + public_key + ' OP_CHECKSIG', rpc_result['asm'])
111+
assert_equal('OP_IF ' + public_key + ' OP_CHECKSIGVERIFY OP_ELSE 500000 OP_CHECKLOCKTIMEVERIFY OP_DROP OP_ENDIF ' + public_key + ' OP_CHECKSIG', rpc_result['asm'])
112112

113113
def decoderawtransaction_asm_sighashtype(self):
114114
"""Tests decoding scripts via RPC command "decoderawtransaction".

‎qa/rpc-tests/test_framework/script.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ def __new__(cls, n):
226226

227227
# expansion
228228
OP_NOP1 = CScriptOp(0xb0)
229-
OP_NOP2 = CScriptOp(0xb1)
229+
OP_CHECKLOCKTIMEVERIFY = CScriptOp(0xb1)
230230
OP_NOP3 = CScriptOp(0xb2)
231231
OP_NOP4 = CScriptOp(0xb3)
232232
OP_NOP5 = CScriptOp(0xb4)
@@ -353,7 +353,7 @@ def __new__(cls, n):
353353
OP_CHECKMULTISIGVERIFY,
354354

355355
OP_NOP1,
356-
OP_NOP2,
356+
OP_CHECKLOCKTIMEVERIFY,
357357
OP_NOP3,
358358
OP_NOP4,
359359
OP_NOP5,
@@ -472,7 +472,7 @@ def __new__(cls, n):
472472
OP_CHECKMULTISIG : 'OP_CHECKMULTISIG',
473473
OP_CHECKMULTISIGVERIFY : 'OP_CHECKMULTISIGVERIFY',
474474
OP_NOP1 : 'OP_NOP1',
475-
OP_NOP2 : 'OP_NOP2',
475+
OP_CHECKLOCKTIMEVERIFY : 'OP_CHECKLOCKTIMEVERIFY',
476476
OP_NOP3 : 'OP_NOP3',
477477
OP_NOP4 : 'OP_NOP4',
478478
OP_NOP5 : 'OP_NOP5',
@@ -591,7 +591,7 @@ def __new__(cls, n):
591591
'OP_CHECKMULTISIG' : OP_CHECKMULTISIG,
592592
'OP_CHECKMULTISIGVERIFY' : OP_CHECKMULTISIGVERIFY,
593593
'OP_NOP1' : OP_NOP1,
594-
'OP_NOP2' : OP_NOP2,
594+
'OP_CHECKLOCKTIMEVERIFY' : OP_CHECKLOCKTIMEVERIFY,
595595
'OP_NOP3' : OP_NOP3,
596596
'OP_NOP4' : OP_NOP4,
597597
'OP_NOP5' : OP_NOP5,

‎src/script/script.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ const char* GetOpName(opcodetype opcode)
131131

132132
// expanson
133133
case OP_NOP1 : return "OP_NOP1";
134-
case OP_NOP2 : return "OP_NOP2";
134+
case OP_CHECKLOCKTIMEVERIFY : return "OP_CHECKLOCKTIMEVERIFY";
135135
case OP_NOP3 : return "OP_NOP3";
136136
case OP_NOP4 : return "OP_NOP4";
137137
case OP_NOP5 : return "OP_NOP5";

‎src/script/script.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,8 @@ enum opcodetype
162162

163163
// expansion
164164
OP_NOP1 = 0xb0,
165-
OP_NOP2 = 0xb1,
166-
OP_CHECKLOCKTIMEVERIFY = OP_NOP2,
165+
OP_CHECKLOCKTIMEVERIFY = 0xb1,
166+
OP_NOP2 = OP_CHECKLOCKTIMEVERIFY,
167167
OP_NOP3 = 0xb2,
168168
OP_NOP4 = 0xb3,
169169
OP_NOP5 = 0xb4,

‎src/test/data/script_invalid.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,12 +160,12 @@
160160
["2 2 LSHIFT", "8 EQUAL", "P2SH,STRICTENC", "disabled"],
161161
["2 1 RSHIFT", "1 EQUAL", "P2SH,STRICTENC", "disabled"],
162162

163-
["1","NOP1 NOP2 NOP3 NOP4 NOP5 NOP6 NOP7 NOP8 NOP9 NOP10 2 EQUAL", "P2SH,STRICTENC"],
164-
["'NOP_1_to_10' NOP1 NOP2 NOP3 NOP4 NOP5 NOP6 NOP7 NOP8 NOP9 NOP10","'NOP_1_to_11' EQUAL", "P2SH,STRICTENC"],
163+
["1","NOP1 CHECKLOCKTIMEVERIFY NOP3 NOP4 NOP5 NOP6 NOP7 NOP8 NOP9 NOP10 2 EQUAL", "P2SH,STRICTENC"],
164+
["'NOP_1_to_10' NOP1 CHECKLOCKTIMEVERIFY NOP3 NOP4 NOP5 NOP6 NOP7 NOP8 NOP9 NOP10","'NOP_1_to_11' EQUAL", "P2SH,STRICTENC"],
165165

166166
["Ensure 100% coverage of discouraged NOPS"],
167167
["1", "NOP1", "P2SH,DISCOURAGE_UPGRADABLE_NOPS"],
168-
["1", "NOP2", "P2SH,DISCOURAGE_UPGRADABLE_NOPS"],
168+
["1", "CHECKLOCKTIMEVERIFY", "P2SH,DISCOURAGE_UPGRADABLE_NOPS"],
169169
["1", "NOP3", "P2SH,DISCOURAGE_UPGRADABLE_NOPS"],
170170
["1", "NOP4", "P2SH,DISCOURAGE_UPGRADABLE_NOPS"],
171171
["1", "NOP5", "P2SH,DISCOURAGE_UPGRADABLE_NOPS"],

‎src/test/data/script_valid.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -232,8 +232,8 @@
232232
["'abcdefghijklmnopqrstuvwxyz'", "HASH256 0x4c 0x20 0xca139bc10c2f660da42666f72e89a225936fc60f193c161124a672050c434671 EQUAL", "P2SH,STRICTENC"],
233233

234234

235-
["1","NOP1 NOP2 NOP3 NOP4 NOP5 NOP6 NOP7 NOP8 NOP9 NOP10 1 EQUAL", "P2SH,STRICTENC"],
236-
["'NOP_1_to_10' NOP1 NOP2 NOP3 NOP4 NOP5 NOP6 NOP7 NOP8 NOP9 NOP10","'NOP_1_to_10' EQUAL", "P2SH,STRICTENC"],
235+
["1","NOP1 CHECKLOCKTIMEVERIFY NOP3 NOP4 NOP5 NOP6 NOP7 NOP8 NOP9 NOP10 1 EQUAL", "P2SH,STRICTENC"],
236+
["'NOP_1_to_10' NOP1 CHECKLOCKTIMEVERIFY NOP3 NOP4 NOP5 NOP6 NOP7 NOP8 NOP9 NOP10","'NOP_1_to_10' EQUAL", "P2SH,STRICTENC"],
237237

238238
["1", "NOP", "P2SH,STRICTENC,DISCOURAGE_UPGRADABLE_NOPS", "Discourage NOPx flag allows OP_NOP"],
239239

@@ -442,7 +442,7 @@
442442
["NOP", "CODESEPARATOR 1", "P2SH,STRICTENC"],
443443

444444
["NOP", "NOP1 1", "P2SH,STRICTENC"],
445-
["NOP", "NOP2 1", "P2SH,STRICTENC"],
445+
["NOP", "CHECKLOCKTIMEVERIFY 1", "P2SH,STRICTENC"],
446446
["NOP", "NOP3 1", "P2SH,STRICTENC"],
447447
["NOP", "NOP4 1", "P2SH,STRICTENC"],
448448
["NOP", "NOP5 1", "P2SH,STRICTENC"],

‎src/test/data/tx_invalid.json‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -127,66 +127,66 @@
127127
["CHECKLOCKTIMEVERIFY tests"],
128128

129129
["By-height locks, with argument just beyond tx nLockTime"],
130-
[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "1 NOP2 1"]],
130+
[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "1 CHECKLOCKTIMEVERIFY 1"]],
131131
"010000000100010000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000", "P2SH,CHECKLOCKTIMEVERIFY"],
132-
[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "499999999 NOP2 1"]],
132+
[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "499999999 CHECKLOCKTIMEVERIFY 1"]],
133133
"0100000001000100000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000fe64cd1d", "P2SH,CHECKLOCKTIMEVERIFY"],
134134

135135
["By-time locks, with argument just beyond tx nLockTime (but within numerical boundaries)"],
136-
[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "500000001 NOP2 1"]],
136+
[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "500000001 CHECKLOCKTIMEVERIFY 1"]],
137137
"01000000010001000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000065cd1d", "P2SH,CHECKLOCKTIMEVERIFY"],
138-
[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4294967295 NOP2 1"]],
138+
[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4294967295 CHECKLOCKTIMEVERIFY 1"]],
139139
"0100000001000100000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000feffffff", "P2SH,CHECKLOCKTIMEVERIFY"],
140140

141141
["Argument missing"],
142-
[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "NOP2 1"]],
142+
[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "CHECKLOCKTIMEVERIFY 1"]],
143143
"010000000100010000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000", "P2SH,CHECKLOCKTIMEVERIFY"],
144144
[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "1"]],
145145
"010000000100010000000000000000000000000000000000000000000000000000000000000000000001b1010000000100000000000000000000000000", "P2SH,CHECKLOCKTIMEVERIFY"],
146146

147147
["Argument negative with by-blockheight nLockTime=0"],
148-
[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "-1 NOP2 1"]],
148+
[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "-1 CHECKLOCKTIMEVERIFY 1"]],
149149
"010000000100010000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000", "P2SH,CHECKLOCKTIMEVERIFY"],
150150

151151
["Argument negative with by-blocktime nLockTime=500,000,000"],
152-
[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "-1 NOP2 1"]],
152+
[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "-1 CHECKLOCKTIMEVERIFY 1"]],
153153
"01000000010001000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000065cd1d", "P2SH,CHECKLOCKTIMEVERIFY"],
154154
[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "1"]],
155155
"010000000100010000000000000000000000000000000000000000000000000000000000000000000004005194b1010000000100000000000000000002000000", "P2SH,CHECKLOCKTIMEVERIFY"],
156156

157157
["Input locked"],
158-
[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0 NOP2 1"]],
158+
[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0 CHECKLOCKTIMEVERIFY 1"]],
159159
"010000000100010000000000000000000000000000000000000000000000000000000000000000000000ffffffff0100000000000000000000000000", "P2SH,CHECKLOCKTIMEVERIFY"],
160160
[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0"]],
161161
"01000000010001000000000000000000000000000000000000000000000000000000000000000000000251b1ffffffff0100000000000000000002000000", "P2SH,CHECKLOCKTIMEVERIFY"],
162162

163163
["Another input being unlocked isn't sufficient; the CHECKLOCKTIMEVERIFY-using input must be unlocked"],
164-
[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0 NOP2 1"] ,
164+
[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0 CHECKLOCKTIMEVERIFY 1"] ,
165165
["0000000000000000000000000000000000000000000000000000000000000200", 1, "1"]],
166166
"010000000200010000000000000000000000000000000000000000000000000000000000000000000000ffffffff00020000000000000000000000000000000000000000000000000000000000000100000000000000000100000000000000000000000000", "P2SH,CHECKLOCKTIMEVERIFY"],
167167

168168
["Argument/tx height/time mismatch, both versions"],
169-
[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0 NOP2 1"]],
169+
[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0 CHECKLOCKTIMEVERIFY 1"]],
170170
"01000000010001000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000065cd1d", "P2SH,CHECKLOCKTIMEVERIFY"],
171171
[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0"]],
172172
"01000000010001000000000000000000000000000000000000000000000000000000000000000000000251b100000000010000000000000000000065cd1d", "P2SH,CHECKLOCKTIMEVERIFY"],
173-
[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "499999999 NOP2 1"]],
173+
[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "499999999 CHECKLOCKTIMEVERIFY 1"]],
174174
"01000000010001000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000065cd1d", "P2SH,CHECKLOCKTIMEVERIFY"],
175-
[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "500000000 NOP2 1"]],
175+
[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "500000000 CHECKLOCKTIMEVERIFY 1"]],
176176
"010000000100010000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000", "P2SH,CHECKLOCKTIMEVERIFY"],
177-
[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "500000000 NOP2 1"]],
177+
[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "500000000 CHECKLOCKTIMEVERIFY 1"]],
178178
"0100000001000100000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000ff64cd1d", "P2SH,CHECKLOCKTIMEVERIFY"],
179179

180180
["Argument 2^32 with nLockTime=2^32-1"],
181-
[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4294967296 NOP2 1"]],
181+
[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4294967296 CHECKLOCKTIMEVERIFY 1"]],
182182
"0100000001000100000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000ffffffff", "P2SH,CHECKLOCKTIMEVERIFY"],
183183

184184
["Same, but with nLockTime=2^31-1"],
185-
[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "2147483648 NOP2 1"]],
185+
[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "2147483648 CHECKLOCKTIMEVERIFY 1"]],
186186
"0100000001000100000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000ffffff7f", "P2SH,CHECKLOCKTIMEVERIFY"],
187187

188188
["6 byte non-minimally-encoded arguments are invalid even if their contents are valid"],
189-
[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0x06 0x000000000000 NOP2 1"]],
189+
[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0x06 0x000000000000 CHECKLOCKTIMEVERIFY 1"]],
190190
"010000000100010000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000", "P2SH,CHECKLOCKTIMEVERIFY"],
191191

192192
["Failure due to failing CHECKLOCKTIMEVERIFY in scriptSig"],

‎src/test/data/tx_valid.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -190,35 +190,35 @@
190190
["CHECKLOCKTIMEVERIFY tests"],
191191

192192
["By-height locks, with argument == 0 and == tx nLockTime"],
193-
[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0 NOP2 1"]],
193+
[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0 CHECKLOCKTIMEVERIFY 1"]],
194194
"010000000100010000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000", "P2SH,CHECKLOCKTIMEVERIFY"],
195-
[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "499999999 NOP2 1"]],
195+
[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "499999999 CHECKLOCKTIMEVERIFY 1"]],
196196
"0100000001000100000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000ff64cd1d", "P2SH,CHECKLOCKTIMEVERIFY"],
197-
[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0 NOP2 1"]],
197+
[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0 CHECKLOCKTIMEVERIFY 1"]],
198198
"0100000001000100000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000ff64cd1d", "P2SH,CHECKLOCKTIMEVERIFY"],
199199

200200
["By-time locks, with argument just beyond tx nLockTime (but within numerical boundaries)"],
201-
[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "500000000 NOP2 1"]],
201+
[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "500000000 CHECKLOCKTIMEVERIFY 1"]],
202202
"01000000010001000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000065cd1d", "P2SH,CHECKLOCKTIMEVERIFY"],
203-
[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4294967295 NOP2 1"]],
203+
[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4294967295 CHECKLOCKTIMEVERIFY 1"]],
204204
"0100000001000100000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000ffffffff", "P2SH,CHECKLOCKTIMEVERIFY"],
205-
[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "500000000 NOP2 1"]],
205+
[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "500000000 CHECKLOCKTIMEVERIFY 1"]],
206206
"0100000001000100000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000ffffffff", "P2SH,CHECKLOCKTIMEVERIFY"],
207207

208208
["Any non-maxint nSequence is fine"],
209-
[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0 NOP2 1"]],
209+
[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0 CHECKLOCKTIMEVERIFY 1"]],
210210
"010000000100010000000000000000000000000000000000000000000000000000000000000000000000feffffff0100000000000000000000000000", "P2SH,CHECKLOCKTIMEVERIFY"],
211211

212212
["The argument can be calculated rather than created directly by a PUSHDATA"],
213-
[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "499999999 1ADD NOP2 1"]],
213+
[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "499999999 1ADD CHECKLOCKTIMEVERIFY 1"]],
214214
"01000000010001000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000065cd1d", "P2SH,CHECKLOCKTIMEVERIFY"],
215215

216216
["Perhaps even by an ADD producing a 5-byte result that is out of bounds for other opcodes"],
217-
[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "2147483647 2147483647 ADD NOP2 1"]],
217+
[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "2147483647 2147483647 ADD CHECKLOCKTIMEVERIFY 1"]],
218218
"0100000001000100000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000feffffff", "P2SH,CHECKLOCKTIMEVERIFY"],
219219

220220
["5 byte non-minimally-encoded arguments are valid"],
221-
[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0x05 0x0000000000 NOP2 1"]],
221+
[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0x05 0x0000000000 CHECKLOCKTIMEVERIFY 1"]],
222222
"010000000100010000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000", "P2SH,CHECKLOCKTIMEVERIFY"],
223223

224224
["Valid CHECKLOCKTIMEVERIFY in scriptSig"],

0 commit comments

Comments
 (0)