Merge #114: Interpret 0x00 as OP_0 instead of b''

8b85aca Interpret 0x00 as OP_0 instead of b'' (Bob McElrath)

Author: petertodd

bitcoin/core/script.py

@@ -621,7 +621,9 @@ def __iter__(self):
         PUSHDATA encodings.
         """
         for (opcode, data, sop_idx) in self.raw_iter():
-            if data is not None:
+            if opcode == 0:
+                yield 0
+            elif data is not None:
                 yield data
             else:
                 opcode = CScriptOp(opcode)

bitcoin/tests/test_script.py

@@ -95,7 +95,7 @@ def T(serialized_script, expected_tokens, test_roundtrip=True):
         T('', [])
 
         # standard pushdata
-        T('00', [b''])
+        T('00', [OP_0])
         T('0100', [b'\x00'])
         T('4b' + 'ff'*0x4b, [b'\xff'*0x4b])
 
@@ -108,6 +108,7 @@ def T(serialized_script, expected_tokens, test_roundtrip=True):
         T('4e04000000deadbeef', [x('deadbeef')], False)
 
         # numbers
+        T('00', [0x0])
         T('4f', [OP_1NEGATE])
         T('51', [0x1])
         T('52', [0x2])
@@ -240,7 +241,7 @@ def T(script, expected_repr):
           "CScript([1, x('7ac977d8373df875eceda362298e5d09d4b72b53'), OP_DROP])")
 
         T(CScript(x('0001ff515261ff')),
-          "CScript([x(''), x('ff'), 1, 2, OP_NOP, OP_INVALIDOPCODE])")
+          "CScript([0, x('ff'), 1, 2, OP_NOP, OP_INVALIDOPCODE])")
 
         # truncated scripts
         T(CScript(x('6101')),