add secp256k1 & secp256r1 key types generate

xboston · Jul 19, 2019 · 79b6378 · 79b6378
1 parent d732baa
commit 79b6378
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 5 deletions.
diff --git a/examples/generate.php b/examples/generate.php
@@ -0,0 +1,12 @@
+<?php declare(strict_types=1);
+
+require __DIR__.'/../vendor/autoload.php';
+
+use Metahash\MetaHash;
+
+$metaHash = new MetaHash();
+
+
+\var_dump('secp256k1', $metaHash->generateKey(MetaHash::KEY_TYPE_SECP256K1));
+
+\var_dump('secp256r1', $metaHash->generateKey(MetaHash::KEY_TYPE_SECP256R1));
diff --git a/src/MetaHash.php b/src/MetaHash.php
@@ -25,6 +25,9 @@ class MetaHash
     public const NETWORK_TEST = 'test';
     public const NETWORK_DEV = 'dev';
 
+    public const KEY_TYPE_SECP256R1 = 0;
+    public const KEY_TYPE_SECP256K1 = 1;
+
     /**
      * @var int
      */
@@ -129,11 +132,13 @@ public function setDebug(bool $debug): void
      *
      * @see https://developers.metahash.org/hc/en-us/articles/360002712193-Getting-started-with-Metahash-network
      *
+     * @param int $keyType
+     *
      * @return array
      */
-    public function generateKey(): array
+    public function generateKey($keyType = MetaHash::KEY_TYPE_SECP256K1): array
     {
-        return $this->getMetahashCrypto()->generateKey();
+        return $this->getMetahashCrypto()->generateKey($keyType);
     }
 
     /**

diff --git a/src/MetaHashCrypto.php b/src/MetaHashCrypto.php
@@ -35,25 +35,33 @@ class MetaHashCrypto
     public function __construct()
     {
         $this->adapter = EccFactory::getAdapter();
-        $this->generator = EccFactory::getSecgCurves()->generator256r1();
+        $this->generator = EccFactory::getSecgCurves()->generator256k1();
     }
 
     /**
      * Metahash key generate
      *
      * @see https://developers.metahash.org/hc/en-us/articles/360002712193-Getting-started-with-Metahash-network
      *
+     * @param int $keyType
+     *
      * @return array
      */
-    public function generateKey(): array
+    public function generateKey($keyType = MetaHash::KEY_TYPE_SECP256K1): array
     {
         $result = [
             'private' => null,
             'public'  => null,
             'address' => null,
         ];
 
-        $private = $this->generator->createPrivateKey();
+        $generator = $this->generator;
+
+        if ($keyType === MetaHash::KEY_TYPE_SECP256R1) {
+            $generator = EccFactory::getSecgCurves()->generator256r1();
+        }
+
+        $private = $generator->createPrivateKey();
         $serializerPrivate = new DerPrivateKeySerializer($this->adapter);
         $dataPrivate = $serializerPrivate->serialize($private);
         $result['private'] = '0x'.\bin2hex($dataPrivate);