fix: add pubKeyHash and use it as network identifier (#97)

Author: faustbrian

.gitignore

@@ -2,3 +2,5 @@ composer.lock
 phpunit.xml
 vendor
 clover.xml
+.php_cs.cache
+.phpunit.result.cache

.php_cs.cache

@@ -64,10 +64,7 @@ public function version(): int
         return hexdec($this->getAddressByte());
     }
 
-    /**
-     * Create a new network instance.
-     *
-     * @return string
-     */
+    abstract public function pubKeyHash(): int;
+
     abstract public function epoch(): string;
 }

src/Networks/AbstractNetwork.php

@@ -41,6 +41,14 @@ class Devnet extends AbstractNetwork
         self::BIP32_PREFIX_XPRV => '46089520',
     ];
 
+    /**
+     * {@inheritdoc}
+     */
+    public function pubKeyHash(): int
+    {
+        return 30;
+    }
+
     /**
      * {@inheritdoc}
      */

src/Networks/Devnet.php

@@ -41,6 +41,14 @@ class Mainnet extends AbstractNetwork
         self::BIP32_PREFIX_XPRV => '46089520',
     ];
 
+    /**
+     * {@inheritdoc}
+     */
+    public function pubKeyHash(): int
+    {
+        return 23;
+    }
+
     /**
      * {@inheritdoc}
      */

src/Networks/Mainnet.php

@@ -41,6 +41,14 @@ class Testnet extends AbstractNetwork
         self::BIP32_PREFIX_XPRV => '70615956',
     ];
 
+    /**
+     * {@inheritdoc}
+     */
+    public function pubKeyHash(): int
+    {
+        return 23;
+    }
+
     /**
      * {@inheritdoc}
      */

src/Networks/Testnet.php

@@ -14,6 +14,7 @@
 namespace ArkEcosystem\Crypto\Transactions\Builder;
 
 use ArkEcosystem\Crypto\Configuration\Fee;
+use ArkEcosystem\Crypto\Configuration\Network;
 use ArkEcosystem\Crypto\Identities\PrivateKey;
 use ArkEcosystem\Crypto\Transactions\Types\Transaction;
 
@@ -36,7 +37,7 @@ public function __construct()
         $this->transaction->data['amount']    = '0';
         $this->transaction->data['fee']       = $this->getFee();
         $this->transaction->data['version']   = 2;
-        $this->transaction->data['network']   = 23;
+        $this->transaction->data['network']   = Network::get()->pubKeyHash();
     }
 
     /**

src/Transactions/Builder/AbstractTransactionBuilder.php

@@ -13,8 +13,10 @@
 
 namespace ArkEcosystem\Tests\Crypto\Identities;
 
+use ArkEcosystem\Crypto\Configuration\Network;
 use ArkEcosystem\Crypto\Identities\Address as TestClass;
 use ArkEcosystem\Crypto\Identities\PrivateKey;
+use ArkEcosystem\Crypto\Networks\Devnet;
 use ArkEcosystem\Tests\Crypto\TestCase;
 
 /**
@@ -25,6 +27,13 @@
  */
 class AddressTest extends TestCase
 {
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        Network::set(Devnet::new());
+    }
+
     /** @test */
     public function it_should_get_the_address_from_passphrase()
     {

tests/Identities/AddressTest.php

@@ -26,6 +26,8 @@ class DevnetTest extends NetworkTestCase
 {
     protected $epoch = '2017-03-21T13:00:00.000Z';
 
+    protected $pubKeyHash = 30;
+
     public function getTestSubject()
     {
         return Devnet::new();

tests/Networks/DevnetTest.php

@@ -26,6 +26,8 @@ class MainnetTest extends NetworkTestCase
 {
     protected $epoch = '2017-03-21T13:00:00.000Z';
 
+    protected $pubKeyHash = 23;
+
     public function getTestSubject()
     {
         return Mainnet::new();