segwit check fixes

andkom · andkom · commit 54d9e8f12786 · 2018-09-09T21:54:26.000+03:00
diff --git a/src/ScriptPubKey.php b/src/ScriptPubKey.php
@@ -84,8 +84,9 @@ public function isPayToWitnessPubKeyHash(): bool
     {
         $operations = $this->parse();
 
-        return (count($operations) == 2) &&
-            ord($operations[0]->data) == 0 &&
+        return count($operations) == 2 &&
+            $operations[0]->code >= Opcodes::OP_0 &&
+            $operations[0]->code <= Opcodes::OP_16 &&
             $operations[1]->size == 20;
     }
 
@@ -96,8 +97,9 @@ public function isPayToWitnessScriptHash(): bool
     {
         $operations = $this->parse();
 
-        return (count($operations) == 2) &&
-            ord($operations[0]->data) == 0 &&
+        return count($operations) == 2 &&
+            $operations[0]->code >= Opcodes::OP_0 &&
+            $operations[0]->code <= Opcodes::OP_16 &&
             $operations[1]->size == 32;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -84,8 +84,9 @@ public function isPayToWitnessPubKeyHash(): bool`
`84`	`84`	`{`
`85`	`85`	`$operations = $this->parse();`
`86`	`86`
`87`		`- return (count($operations) == 2) &&`
`88`		`- ord($operations[0]->data) == 0 &&`
	`87`	`+ return count($operations) == 2 &&`
	`88`	`+ $operations[0]->code >= Opcodes::OP_0 &&`
	`89`	`+ $operations[0]->code <= Opcodes::OP_16 &&`
`89`	`90`	`$operations[1]->size == 20;`
`90`	`91`	`}`
`91`	`92`
`@@ -96,8 +97,9 @@ public function isPayToWitnessScriptHash(): bool`
`96`	`97`	`{`
`97`	`98`	`$operations = $this->parse();`
`98`	`99`
`99`		`- return (count($operations) == 2) &&`
`100`		`- ord($operations[0]->data) == 0 &&`
	`100`	`+ return count($operations) == 2 &&`
	`101`	`+ $operations[0]->code >= Opcodes::OP_0 &&`
	`102`	`+ $operations[0]->code <= Opcodes::OP_16 &&`
`101`	`103`	`$operations[1]->size == 32;`
`102`	`104`	`}`
`103`	`105`