pubkey validation

Author: andkom

src/AddressSerializer.php

@@ -40,6 +40,10 @@ public function __construct(Bitcoin $network = null)
      */
     public function hashToAddress(string $hash160, int $prefix): string
     {
+        if (strlen($hash160) != 20) {
+            throw new \InvalidArgumentException('Invalid hash160 size.');
+        }
+
         $hash160 = chr($prefix) . $hash160;
         $checksum = substr(Utils::hash256($hash160, true), 0, 4);
         $address = $hash160 . $checksum;
@@ -54,6 +58,10 @@ public function hashToAddress(string $hash160, int $prefix): string
      */
     public function pubKeyToAddress(string $pubKey, int $prefix): string
     {
+        if (!PublicKey::parse($pubKey)->isValid()) {
+            throw new \InvalidArgumentException('Invalid public key.');
+        }
+
         return $this->hashToAddress(Utils::hash160($pubKey, true), $prefix);
     }
 

src/PublicKey.php

@@ -83,6 +83,20 @@ public function isCompressed(): bool
         return is_null($this->y);
     }
 
+    /**
+     * @return bool
+     */
+    public function isValid(): bool
+    {
+        try {
+            $this->getEccPublicKey();
+        } catch (\Exception $exception) {
+            return false;
+        }
+
+        return true;
+    }
+
     /**
      * @return PublicKey
      * @throws PublicKeyException
@@ -133,7 +147,7 @@ public function getEccPublicKey(): \Mdanter\Ecc\Crypto\Key\PublicKey
             $key = $this;
         }
 
-        $point = $curve->getPoint($key->getX(), $this->getY());
+        $point = $curve->getPoint($key->getX(), $key->getY());
 
         return new \Mdanter\Ecc\Crypto\Key\PublicKey($adapter, $generator, $point);
     }

tests/PublicKeyTest.php

@@ -76,4 +76,12 @@ public function testSerializeCompressed()
 
         $this->assertEquals($pk->serialize(), hex2bin($key));
     }
+
+    public function testValid()
+    {
+        $key = '040a464653204c756b652d4a72206c656176652074686520626c6f636b636861696e20616c6f6e65210a4f682c20616e6420676f642069736e2774207265616c0a';
+
+        $pk = PublicKey::parse(hex2bin($key));
+        $this->assertFalse($pk->isValid());
+    }
 }