remove external dependency

Author: andkom

composer.json

@@ -15,7 +15,6 @@
   ],
   "require": {
     "php": "^7.1",
-    "bitwasp/bitcoin": "~0.0.34",
     "andkom/php-berkeley-db": "^1.1",
     "andkom/php-bcdatastream": "^1.1"
   },
@@ -32,4 +31,4 @@
       "AndKom\\Bitcoin\\Wallet\\Tests\\": "tests/"
     }
   }
-}
+}

src/Item/EncryptedKey.php

@@ -6,45 +6,26 @@
 
 use AndKom\Bitcoin\Wallet\Crypter;
 use AndKom\Bitcoin\Wallet\Exception;
-use BitWasp\Bitcoin\Crypto\EcAdapter\Key\PrivateKeyInterface;
 
 /**
  * Class EncryptedKey
  * @package AndKom\Bitcoin\Wallet\Item
  */
 class EncryptedKey extends Key
 {
-    /**
-     * @var string
-     */
-    protected $encrypted;
-
-    /**
-     * EncryptedKey constructor.
-     * @param string $public
-     * @param string $encrypted
-     * @param KeyMeta|null $meta
-     */
-    public function __construct(string $public, string $encrypted, KeyMeta $meta = null)
-    {
-        $this->public = $public;
-        $this->encrypted = $encrypted;
-        $this->meta = $meta;
-    }
-
     /**
      * @return bool
      */
     public function isEncrypted(): bool
     {
-        return !$this->secret;
+        return !$this->private;
     }
 
     /**
-     * @return PrivateKeyInterface
+     * @return string
      * @throws Exception
      */
-    public function getPrivateKey(): PrivateKeyInterface
+    public function getPrivateKey(): string
     {
         if ($this->isEncrypted()) {
             throw new Exception('Private key is encrypted.');
@@ -58,16 +39,15 @@ public function getPrivateKey(): PrivateKeyInterface
      */
     public function getEncryptedPrivateKey(): string
     {
-        return $this->encrypted;
+        return $this->secret;
     }
 
     /**
      * @return string
-     * @throws Exception
      */
     public function getIv(): string
     {
-        $hash = Crypter::hash($this->getPublicKey()->getBinary());
+        $hash = Crypter::hash($this->getPublicKey());
         $iv = substr($hash, 0, Crypter::WALLET_CRYPTO_IV_SIZE);
 
         return $iv;
@@ -81,7 +61,7 @@ public function getIv(): string
     public function decrypt(string $masterKey): self
     {
         $crypter = new Crypter($masterKey, $this->getIv());
-        $this->secret = $crypter->decrypt($this->getEncryptedPrivateKey());
+        $this->private = $crypter->decrypt($this->getEncryptedPrivateKey());
 
         return $this;
     }

src/Item/Key.php

@@ -4,12 +4,6 @@
 
 namespace AndKom\Bitcoin\Wallet\Item;
 
-use AndKom\Bitcoin\Wallet\Exception;
-use BitWasp\Bitcoin\Crypto\EcAdapter\Key\PrivateKeyInterface;
-use BitWasp\Bitcoin\Crypto\EcAdapter\Key\PublicKeyInterface;
-use BitWasp\Bitcoin\Key\PrivateKeyFactory;
-use BitWasp\Bitcoin\Key\PublicKeyFactory;
-
 /**
  * Class Key
  * @package AndKom\Bitcoin\Wallet\Item
@@ -26,12 +20,12 @@ class Key
     /**
      * @var string
      */
-    protected $private;
+    protected $secret;
 
     /**
      * @var string
      */
-    protected $secret;
+    protected $private;
 
     /**
      * @var KeyMeta
@@ -41,15 +35,14 @@ class Key
     /**
      * Key constructor.
      * @param string $public
-     * @param string $private
+     * @param string $secret
      * @param KeyMeta $meta
      */
-    public function __construct(string $public, string $private, KeyMeta $meta = null)
+    public function __construct(string $public, string $secret, KeyMeta $meta = null)
     {
         $this->public = $public;
-        $this->private = $private;
+        $this->secret = $secret;
         $this->meta = $meta;
-        $this->secret = $this->parseSecret($private);
     }
 
     /**
@@ -70,36 +63,22 @@ protected function parseSecret(string $data): string
     }
 
     /**
-     * @return PublicKeyInterface
-     * @throws Exception
+     * @return string
      */
-    public function getPublicKey(): PublicKeyInterface
+    public function getPublicKey(): string
     {
-        $hex = bin2hex($this->public);
-
-        try {
-            $publicKey = PublicKeyFactory::fromHex($hex);
-        } catch (\Exception $exception) {
-            throw new Exception('Unable to decode public key: ' . $exception->getMessage());
-        }
-
-        return $publicKey;
+        return $this->public;
     }
 
     /**
-     * @return PrivateKeyInterface
-     * @throws Exception
+     * @return string
      */
-    public function getPrivateKey(): PrivateKeyInterface
+    public function getPrivateKey(): string
     {
-        $hex = bin2hex($this->secret);
-
-        try {
-            $privateKey = PrivateKeyFactory::fromHex($hex, $this->getPublicKey()->isCompressed());
-        } catch (\Exception $exception) {
-            throw new Exception('Unable to decode private key: ' . $exception->getMessage());
+        if (!$this->private) {
+            $this->private = $this->parseSecret($this->secret);
         }
 
-        return $privateKey;
+        return $this->private;
     }
 }

src/Item/MasterKey.php

@@ -75,7 +75,7 @@ public function getDerivationIterations(): int
     public function getHash(EncryptedKey $encryptedKey): string
     {
         $encrypted = bin2hex($encryptedKey->getEncryptedPrivateKey());
-        $public = $encryptedKey->getPublicKey()->getHex();
+        $public = bin2hex($encryptedKey->getPublicKey());
         $master = substr(bin2hex($this->getEncryptedKey()), -64); // last two aes blocks should be enough
         $salt = bin2hex($this->getSalt());
 

tests/WalletTest.php

@@ -18,8 +18,8 @@ public function testParse()
 
         $key = \reset($keys);
 
-        $this->assertEquals($key->getPrivateKey()->toWif(), 'L1uaD1GSyvL78gRkBgMggLSUYkMrULFVGeS9wTxhLcBJN83HYRF3');
-        $this->assertEquals($key->getPublicKey()->getPubKeyHash()->getHex(), '3f89ab613c2e51e0254513e1b3305dab0be0a8a4');
+        $this->assertEquals(bin2hex($key->getPrivateKey()), '8bdb39c6f696408a4089a6b6d57007d58662f52bff0a609cdbca14baaa6c0563');
+        $this->assertEquals(bin2hex($key->getPublicKey()), '02d96817786139a4958a2affd281cbc791eec18877fbc7534fdb488e1be5bcbfd6');
     }
 
     public function testMasterKey()
@@ -47,8 +47,8 @@ public function testDecrypt()
         $keys = $wallet->getKeys();
         $key = \reset($keys);
 
-        $this->assertEquals($key->getPrivateKey()->toWif(), 'Kz1MJgnRAmUoeWq6gVwEmeCy1ykKPjNbDK9bcDbCUMipSLMKnwrm');
-        $this->assertEquals($key->getPublicKey()->getPubKeyHash()->getHex(), 'ac1e83e60984cbd690d3b439f37cff88c38413e7');
+        $this->assertEquals(bin2hex($key->getPrivateKey()), '53275c0a5ebc3c5510ad3ca5a0a25568fb0a57428091610455d8afba2edfba57');
+        $this->assertEquals(bin2hex($key->getPublicKey()), '02c98bf925ccfa5e185380d90727358bffc1c7658feec95c30aab8afe20bdf428e');
     }
 
     public function testVersion()