Merge petertodd#187: CScript.is_witness_scriptpubkey : size must match second byte + 2

629a919 CScript.is_witness_scriptpubkey : size must match second byte + 2 (Dmitry Petukhov)

Pull request description:

  Model CScript.is_witness_scriptpubkey after bitcoind's
  CScript::IsWitnessProgram -- it not only checks for script size
  and first opcode, but also checks that data push size equals
  script size + 2 (entire script consists of version byte
  and data push). In absense of this check, is_witness_scriptpubkey
  wrongfully detects 1-of-1 p2sh redeem script as a witness program.

Top commit has no ACKs.

Tree-SHA512: 83a1ac530a107a0b69b549a81c1c9eb87152dd3c1f06a768f3c469ec3ae28c33d104d69d45aac23b48b76087f869ed1195989880fda5a34b1c78fad8a3504d64

Author: petertodd

bitcoin/core/script.py

@@ -678,9 +678,23 @@ def is_p2sh(self):
                 _bord(self[22]) == OP_EQUAL)
 
     def is_witness_scriptpubkey(self):
-        """Returns true if this is a scriptpubkey signaling segregated witness
-        data. """
-        return 3 <= len(self) <= 42 and CScriptOp(struct.unpack('<b',self[0:1])[0]).is_small_int()
+        """Returns true if this is a scriptpubkey signaling segregated witness data.
+
+        A witness program is any valid CScript that consists of a 1-byte push opcode
+        followed by a data push between 2 and 40 bytes.
+        """
+        size = len(self)
+        if size < 4 or size > 42:
+            return False
+
+        head = struct.unpack('<bb', self[:2])
+        if not CScriptOp(head[0]).is_small_int():
+            return False
+
+        if head[1] + 2 != size:
+            return False
+
+        return True
 
     def witness_version(self):
         """Returns the witness version on [0,16]. """