multisig out fix

Author: andkom

src/Script/ScriptPubKey.php

@@ -16,6 +16,7 @@
 class ScriptPubKey extends Script
 {
     /**
+     * ScriptPubKey: OP_RETURN ...
      * @return bool
      */
     public function isReturn(): bool
@@ -24,6 +25,7 @@ public function isReturn(): bool
     }
 
     /**
+     * ScriptPubKey: (empty)
      * @return bool
      */
     public function isEmpty(): bool
@@ -53,6 +55,9 @@ protected function isPubKey(int $size, string $prefix): bool
     }
 
     /**
+     * ScriptPubKey: OP_PUSHDATA(33) [0x02] [pubkey compressed] OP_CHECKSIG
+     * ScriptPubKey: OP_PUSHDATA(33) [0x03] [pubkey compressed] OP_CHECKSIG
+     * ScriptPubKey: OP_PUSHDATA(65) [0x04] [pubkey] OP_CHECKSIG
      * @return bool
      */
     public function isPayToPubKey(): bool
@@ -64,6 +69,7 @@ public function isPayToPubKey(): bool
     }
 
     /**
+     * ScriptPubKey: OP_DUP OP_HASH160 OP_PUSHDATA(20) [pubkey hash] OP_EQUALVERIFY OP_CHECKSIG
      * @return bool
      */
     public function isPayToPubKeyHash(): bool
@@ -77,7 +83,8 @@ public function isPayToPubKeyHash(): bool
     }
 
     /**
-     * handle output of TX 059787f0673ab2c00b8f2f9810fdd14b0cd6a3034cc44dc30de124f606d3670a
+     * Handle output of TX 059787f0673ab2c00b8f2f9810fdd14b0cd6a3034cc44dc30de124f606d3670a
+     * ScriptPubKey: OP_DUP OP_HASH160 OP_PUSHDATA1 [pubkey hash] OP_EQUALVERIFY OP_CHECKSIG
      * @return bool
      */
     public function isPayToPubKeyHashAlt(): bool
@@ -92,6 +99,7 @@ public function isPayToPubKeyHashAlt(): bool
     }
 
     /**
+     * ScriptPubKey: OP_HASH160 PUSHDATA(20) [script hash] OP_EQUAL
      * @return bool
      */
     public function isPayToScriptHash(): bool
@@ -103,13 +111,15 @@ public function isPayToScriptHash(): bool
     }
 
     /**
+     * ScriptPubKey: [num sigs] [...pub keys..] [num pub keys] OP_CHECKMULTISIG
      * @return bool
      */
     public function isMultisig(): bool
     {
         $sigs = ord($this->data[0]);
         $keys = ord($this->data[-2]);
 
+        // check pattern
         if (!($this->size >= 37 &&
             $sigs >= Opcodes::OP_1 && $sigs <= Opcodes::OP_16 &&
             $keys >= Opcodes::OP_1 && $keys <= Opcodes::OP_16 &&
@@ -118,20 +128,18 @@ public function isMultisig(): bool
             return false;
         }
 
-        for ($i = 1, $k = 0; $i < $this->size - 2; $k++) {
+        // check valid keys
+        for ($i = 1, $j = $k = 0; $i < $this->size - 2; $j++) {
             $size = ord($this->data[$i]);
-
-            if (!$this->isPubKey($size, $this->data[$i + 1])) {
-                return false;
-            }
-
+            $k += $this->isPubKey($size, $this->data[$i + 1]);
             $i += $size + 1;
         }
 
-        return $keys - Opcodes::OP_1 + 1 == $k;
+        return $k > 0 && $keys - Opcodes::OP_1 + 1 == $j;
     }
 
     /**
+     * ScriptPubKey: [version] OP_PUSHDATA(20) [pubkey hash]
      * @return bool
      */
     public function isPayToWitnessPubKeyHash(): bool
@@ -144,6 +152,7 @@ public function isPayToWitnessPubKeyHash(): bool
     }
 
     /**
+     * ScriptPubKey: [version] OP_PUSHDATA(32) [script hash]
      * @return bool
      */
     public function isPayToWitnessScriptHash(): bool

tests/ScriptPubKeyTest.php

@@ -91,7 +91,7 @@ public function testParseP2SH()
     }
 
     // [numsigs] [...pubkeys...] [numpubkeys] OP_CHECKMULTISIG
-    public function testParseMultisig()
+    public function testParseMultisig1()
     {
         $hex = '51'; // 1
         $hex .= '21'; // 33
@@ -106,6 +106,34 @@ public function testParseMultisig()
         $this->assertTrue($script->isMultisig());
     }
 
+    public function testParseMultisig2()
+    {
+        $hex = '51'; // 1
+        $hex .= '21'; // 33
+        $hex .= '035b219535a5e9238bccc25c71ce4fddf024f5d9b452887225d23057b870d444b9'; // pubkey
+        $hex .= '41'; // 65
+        $hex .= '0479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8'; // pubkey
+        $hex .= '51'; // 1
+        $hex .= 'ae'; // OP_CHECKMULTISIG
+
+        $script = new ScriptPubKey(hex2bin($hex));
+
+        $this->assertFalse($script->isMultisig());
+    }
+
+    public function testParseMultisig3()
+    {
+        $hex = '51'; // 1
+        $hex .= '21'; // 33
+        $hex .= '005b219535a5e9238bccc25c71ce4fddf024f5d9b452887225d23057b870d444b9'; // pubkey
+        $hex .= '51'; // 1
+        $hex .= 'ae'; // OP_CHECKMULTISIG
+
+        $script = new ScriptPubKey(hex2bin($hex));
+
+        $this->assertFalse($script->isMultisig());
+    }
+
     // [segwit ver] [pubkey hash]
     public function testParseP2WPKH()
     {