multisig out fix

Author: andkom

src/Script/ScriptPubKey.php

@@ -32,29 +32,37 @@ public function isEmpty(): bool
     }
 
     /**
+     * @param int $size
+     * @param string $prefix
      * @return bool
      */
-    public function isPayToPubKey(): bool
+    protected function isPubKey(int $size, string $prefix): bool
     {
-        // compressed pubkey
-        if ($this->size == PublicKey::LENGTH_COMPRESSED + 2 &&
-            ord($this->data[0]) == PublicKey::LENGTH_COMPRESSED &&
-            ($this->data[1] == PublicKey::PREFIX_COMPRESSED_EVEN || $this->data[1] == PublicKey::PREFIX_COMPRESSED_ODD) &&
-            ord($this->data[-1]) == Opcodes::OP_CHECKSIG) {
+        if ($size == PublicKey::LENGTH_COMPRESSED &&
+            ($prefix == PublicKey::PREFIX_COMPRESSED_EVEN ||
+                $prefix == PublicKey::PREFIX_COMPRESSED_ODD)) {
             return true;
         }
 
-        // uncompressed pubkey
-        if ($this->size == PublicKey::LENGTH_UNCOMPRESSED + 2 &&
-            ord($this->data[0]) == PublicKey::LENGTH_UNCOMPRESSED &&
-            $this->data[1] == PublicKey::PREFIX_UNCOMPRESSED &&
-            ord($this->data[-1]) == Opcodes::OP_CHECKSIG) {
+        if ($size == PublicKey::LENGTH_UNCOMPRESSED &&
+            $prefix == PublicKey::PREFIX_UNCOMPRESSED) {
             return true;
         }
 
         return false;
     }
 
+    /**
+     * @return bool
+     */
+    public function isPayToPubKey(): bool
+    {
+        return (($this->size == PublicKey::LENGTH_COMPRESSED + 2 ||
+                $this->size == PublicKey::LENGTH_UNCOMPRESSED + 2) &&
+            $this->isPubKey(ord($this->data[0]), $this->data[1]) &&
+            ord($this->data[-1]) == Opcodes::OP_CHECKSIG);
+    }
+
     /**
      * @return bool
      */
@@ -102,18 +110,22 @@ public function isMultisig(): bool
         $sigs = ord($this->data[0]);
         $keys = ord($this->data[-2]);
 
-        if (!($this->size >= 24 &&
+        if (!($this->size >= 37 &&
             $sigs >= Opcodes::OP_1 && $sigs <= Opcodes::OP_16 &&
             $keys >= Opcodes::OP_1 && $keys <= Opcodes::OP_16 &&
             $keys >= $sigs &&
             ord($this->data[-1]) == Opcodes::OP_CHECKMULTISIG)) {
             return false;
         }
 
-        for ($i = 1, $k = 0; $i < $this->size - 2; $i += 21, $k++) {
-            if (ord($this->data[$i]) != 20) {
+        for ($i = 1, $k = 0; $i < $this->size - 2; $k++) {
+            $size = ord($this->data[$i]);
+
+            if (!$this->isPubKey($size, $this->data[$i + 1])) {
                 return false;
             }
+
+            $i += $size + 1;
         }
 
         return $keys - Opcodes::OP_1 + 1 == $k;

tests/ScriptPubKeyTest.php

@@ -93,14 +93,12 @@ public function testParseP2SH()
     // [numsigs] [...pubkeys...] [numpubkeys] OP_CHECKMULTISIG
     public function testParseMultisig()
     {
-        $hex = '52'; // 2
-        $hex .= '14'; // 20
-        $hex .= '91b24bf9f5288532960ac687abb035127b1d28a5'; // pubkey hash
-        $hex .= '14'; // 20
-        $hex .= 'd6c8e828c1eca1bba065e1b83e1dc2a36e387a42'; // pubkey hash
-        $hex .= '14'; // 20
-        $hex .= 'ec7eced2c57ed1292bc4eb9bfd13c9f7603bc338'; // pubkey hash
-        $hex .= '53'; // 3
+        $hex = '51'; // 1
+        $hex .= '21'; // 33
+        $hex .= '035b219535a5e9238bccc25c71ce4fddf024f5d9b452887225d23057b870d444b9'; // pubkey
+        $hex .= '41'; // 65
+        $hex .= '0479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8'; // pubkey
+        $hex .= '52'; // 2
         $hex .= 'ae'; // OP_CHECKMULTISIG
 
         $script = new ScriptPubKey(hex2bin($hex));