block refactor

Author: andkom

src/Block.php

@@ -14,34 +14,9 @@
 class Block
 {
     /**
-     * @var int
-     */
-    public $version;
-
-    /**
-     * @var string
-     */
-    public $prevBlockHash;
-
-    /**
-     * @var string
+     * @var Header
      */
-    public $merkleRootHash;
-
-    /**
-     * @var int
-     */
-    public $time;
-
-    /**
-     * @var int
-     */
-    public $bits;
-
-    /**
-     * @var int
-     */
-    public $nonce;
+    public $header;
 
     /**
      * @var int
@@ -60,12 +35,7 @@ class Block
     static public function parse(Reader $stream): self
     {
         $block = new self;
-        $block->version = $stream->readUInt32();
-        $block->prevBlockHash = bin2hex(strrev($stream->read(32)));
-        $block->merkleRootHash = bin2hex(strrev($stream->read(32)));
-        $block->time = $stream->readUInt32();
-        $block->bits = $stream->readUInt32();
-        $block->nonce = $stream->readUInt32();
+        $block->header = Header::parse($stream);
         $block->transactionsCount = $stream->readVarInt();
 
         for ($i = 0; $i < $block->transactionsCount; $i++) {
@@ -81,25 +51,13 @@ static public function parse(Reader $stream): self
      */
     public function serialize(Writer $stream): self
     {
-        $stream->writeUInt32($this->version);
-        $stream->write(strrev(hex2bin($this->prevBlockHash)));
-        $stream->write(strrev(hex2bin($this->merkleRootHash)));
-        $stream->writeUInt32($this->time);
-        $stream->writeUInt32($this->bits);
-        $stream->writeUInt32($this->nonce);
-        return $this;
-    }
+        $this->header->serialize($stream);
+        $stream->writeVarInt(count($this->transactions));
 
-    /**
-     * @return string
-     */
-    public function getHash(): string
-    {
-        $stream = new Writer();
-        $this->serialize($stream);
-        $hash = Utils::hash($stream->getBuffer(), true);
-        $hash = strrev($hash);
-        $hash = bin2hex($hash);
-        return $hash;
+        foreach ($this->transactions as $transaction) {
+            $transaction->serialize($stream);
+        }
+
+        return $this;
     }
 }

src/Header.php

@@ -0,0 +1,89 @@
+<?php
+
+declare(strict_types=1);
+
+namespace AndKom\PhpBitcoinBlockchain;
+
+use AndKom\BCDataStream\Reader;
+use AndKom\BCDataStream\Writer;
+
+/**
+ * Class Header
+ * @package AndKom\PhpBitcoinBlockchain
+ */
+class Header
+{
+    /**
+     * @var int
+     */
+    public $version;
+
+    /**
+     * @var string
+     */
+    public $prevBlockHash;
+
+    /**
+     * @var string
+     */
+    public $merkleRootHash;
+
+    /**
+     * @var int
+     */
+    public $time;
+
+    /**
+     * @var int
+     */
+    public $bits;
+
+    /**
+     * @var int
+     */
+    public $nonce;
+
+    /**
+     * @param Reader $stream
+     * @return Header
+     */
+    static public function parse(Reader $stream): self
+    {
+        $header = new self;
+        $header->version = $stream->readUInt32();
+        $header->prevBlockHash = bin2hex(strrev($stream->read(32)));
+        $header->merkleRootHash = bin2hex(strrev($stream->read(32)));
+        $header->time = $stream->readUInt32();
+        $header->bits = $stream->readUInt32();
+        $header->nonce = $stream->readUInt32();
+        return $header;
+    }
+
+    /**
+     * @param Writer $stream
+     * @return Header
+     */
+    public function serialize(Writer $stream): self
+    {
+        $stream->writeUInt32($this->version);
+        $stream->write(strrev(hex2bin($this->prevBlockHash)));
+        $stream->write(strrev(hex2bin($this->merkleRootHash)));
+        $stream->writeUInt32($this->time);
+        $stream->writeUInt32($this->bits);
+        $stream->writeUInt32($this->nonce);
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getHash(): string
+    {
+        $stream = new Writer();
+        $this->serialize($stream);
+        $hash = Utils::hash($stream->getBuffer(), true);
+        $hash = strrev($hash);
+        $hash = bin2hex($hash);
+        return $hash;
+    }
+}

tests/BlockTest.php

@@ -5,6 +5,7 @@
 namespace AndKom\PhpBitcoinBlockchain\Tests;
 
 use AndKom\BCDataStream\Reader;
+use AndKom\BCDataStream\Writer;
 use AndKom\PhpBitcoinBlockchain\Block;
 use PHPUnit\Framework\TestCase;
 
@@ -32,13 +33,13 @@ public function testParse()
         $genesis .= "00000000"; // lock time
 
         $block = Block::parse(new Reader(hex2bin($genesis)));
-        $this->assertEquals($block->getHash(), '000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f');
-        $this->assertEquals($block->version, 1);
-        $this->assertEquals($block->prevBlockHash, '0000000000000000000000000000000000000000000000000000000000000000');
-        $this->assertEquals($block->merkleRootHash, '4a5e1e4baab89f3a32518a88c31bc87f618f76673e2cc77ab2127b7afdeda33b');
-        $this->assertEquals($block->time, 1231006505);
-        $this->assertEquals($block->bits, 486604799);
-        $this->assertEquals($block->nonce, 2083236893);
+        $this->assertEquals($block->header->getHash(), '000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f');
+        $this->assertEquals($block->header->version, 1);
+        $this->assertEquals($block->header->prevBlockHash, '0000000000000000000000000000000000000000000000000000000000000000');
+        $this->assertEquals($block->header->merkleRootHash, '4a5e1e4baab89f3a32518a88c31bc87f618f76673e2cc77ab2127b7afdeda33b');
+        $this->assertEquals($block->header->time, 1231006505);
+        $this->assertEquals($block->header->bits, 486604799);
+        $this->assertEquals($block->header->nonce, 2083236893);
         $this->assertEquals($block->transactions[0]->getHash(), '4a5e1e4baab89f3a32518a88c31bc87f618f76673e2cc77ab2127b7afdeda33b');
         $this->assertEquals($block->transactions[0]->version, 1);
         $this->assertEquals($block->transactions[0]->inCount, 1);
@@ -50,5 +51,10 @@ public function testParse()
         $this->assertEquals($block->transactions[0]->outputs[0]->scriptPubKey->getData(), hex2bin('4104678afdb0fe5548271967f1a67130b7105cd6a828e03909a67962e0ea1f61deb649f6bc3f4cef38c4f35504e51ec112de5c384df7ba0b8d578a4c702b6bf11d5fac'));
         $this->assertEquals($block->transactions[0]->lockTime, 0);
         $this->assertTrue($block->transactions[0]->isCoinbase());
+
+        $stream = new Writer();
+        $block->serialize($stream);
+
+        $this->assertEquals($stream->getBuffer(), hex2bin($genesis));
     }
 }