multisig out fix

Author: andkom

src/Script/ScriptPubKey.php

@@ -99,12 +99,12 @@ public function isPayToScriptHash(): bool
      */
     public function isMultisig(): bool
     {
-        $keys = ord($this->data[0]);
-        $sigs = ord($this->data[-2]);
+        $sigs = ord($this->data[0]);
+        $keys = ord($this->data[-2]);
 
         if (!($this->size >= 24 &&
+            $sigs >= Opcodes::OP_1 && $sigs <= Opcodes::OP_16 &&
             $keys >= Opcodes::OP_1 && $keys <= Opcodes::OP_16 &&
-            $sigs && $sigs <= Opcodes::OP_16 &&
             $keys >= $sigs &&
             ord($this->data[-1]) == Opcodes::OP_CHECKMULTISIG)) {
             return false;
@@ -154,6 +154,14 @@ public function getOutputAddress(NetworkInterface $network = null): string
     {
         $addressSerializer = new AddressSerializer($network);
 
+        if ($this->isPayToPubKeyHash()) {
+            return $addressSerializer->getPayToPubKeyHash(substr($this->data, 3, 20));
+        }
+
+        if ($this->isPayToScriptHash()) {
+            return $addressSerializer->getPayToScriptHash(substr($this->data, 2, 20));
+        }
+
         if ($this->isPayToPubKey()) {
             if ($this->size == 35) {
                 $pubKey = substr($this->data, 1, 33);
@@ -168,24 +176,28 @@ public function getOutputAddress(NetworkInterface $network = null): string
             return $addressSerializer->getPayToPubKey($pubKey);
         }
 
-        if ($this->isPayToPubKeyHash()) {
-            return $addressSerializer->getPayToPubKeyHash(substr($this->data, 3, 20));
+        if ($this->isPayToWitnessPubKeyHash()) {
+            return $addressSerializer->getPayToWitnessPubKeyHash(substr($this->data, 2, 20));
         }
 
-        if ($this->isPayToPubKeyHashAlt()) {
-            return $addressSerializer->getPayToPubKeyHash(substr($this->data, 4, 20));
+        if ($this->isPayToWitnessScriptHash()) {
+            return $addressSerializer->getPayToWitnessScriptHash(substr($this->data, 2, 32));
         }
 
-        if ($this->isPayToScriptHash()) {
-            return $addressSerializer->getPayToScriptHash(substr($this->data, 2, 20));
+        if ($this->isMultisig()) {
+            throw new ScriptException('Unable to decode output script (multisig).');
         }
 
-        if ($this->isPayToWitnessPubKeyHash()) {
-            return $addressSerializer->getPayToWitnessPubKeyHash(substr($this->data, 2, 20));
+        if ($this->isReturn()) {
+            throw new ScriptException('Unable to decode output script (OP_RETURN).');
         }
 
-        if ($this->isPayToWitnessScriptHash()) {
-            return $addressSerializer->getPayToWitnessScriptHash(substr($this->data, 2, 32));
+        if ($this->isEmpty()) {
+            throw new ScriptException('Unable to decode output script (empty).');
+        }
+
+        if ($this->isPayToPubKeyHashAlt()) {
+            return $addressSerializer->getPayToPubKeyHash(substr($this->data, 4, 20));
         }
 
         throw new ScriptException('Unable to decode output script.');

tests/ScriptPubKeyTest.php

@@ -93,14 +93,14 @@ public function testParseP2SH()
     // [numsigs] [...pubkeys...] [numpubkeys] OP_CHECKMULTISIG
     public function testParseMultisig()
     {
-        $hex = '53'; // 3
+        $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 .= '52'; // 2
+        $hex .= '53'; // 3
         $hex .= 'ae'; // OP_CHECKMULTISIG
 
         $script = new ScriptPubKey(hex2bin($hex));