fixes

Author: andkom

composer.json

@@ -15,8 +15,8 @@
   ],
   "require": {
     "php": "^7.1",
-    "ext-gmp": "^7.1",
-    "ext-leveldb": "^0.2.1",
+    "ext-gmp": "*",
+    "ext-leveldb": "*",
     "stephenhill/base58": "^1.1",
     "bitwasp/bech32": "^0.0.1",
     "andkom/php-bcdatastream": "^1.1",

examples/read_blockchain.php

@@ -4,7 +4,7 @@
 
 $dataDir = getenv('HOME') . '/Library/Application Support/Bitcoin';
 
-$reader = new \AndKom\Bitcoin\Blockchain\BlockchainReader($dataDir);
+$reader = new \AndKom\Bitcoin\Blockchain\Reader\DatabaseReader($dataDir);
 
 foreach ($reader->readBlocks(0, 100) as $height => $block) {
     echo $height . " => " . \AndKom\Bitcoin\Blockchain\Utils::hashToHex($block->header->getHash()) . "\n";

examples/read_blocks.php

@@ -6,7 +6,7 @@
 $blocksDir = "$dataDir/blocks";
 $blockFile = "$blocksDir/blk00001.dat";
 
-$reader = new \AndKom\Bitcoin\Blockchain\BlockFileReader();
+$reader = new \AndKom\Bitcoin\Blockchain\Reader\BlockFileReader();
 
 foreach ($reader->read($blockFile) as $block) {
     foreach ($block->transactions as $tx) {

examples/read_chainstate.php

@@ -5,7 +5,7 @@
 $dataDir = getenv('HOME') . '/Library/Application Support/Bitcoin';
 $chainstateDir = "$dataDir/chainstate";
 
-$reader = new \AndKom\Bitcoin\Blockchain\ChainstateReader($chainstateDir);
+$reader = new \AndKom\Bitcoin\Blockchain\Reader\ChainstateReader($chainstateDir);
 
 foreach ($reader->read() as $unspentOutput) {
     echo "TX:       " . \AndKom\Bitcoin\Blockchain\Utils::hashToHex($unspentOutput->hash) . "\n";

examples/read_index.php

@@ -6,7 +6,7 @@
 $blocksDir = "$dataDir/blocks";
 $indexDir = "$blocksDir/index";
 
-$reader = new \AndKom\Bitcoin\Blockchain\IndexReader($indexDir);
+$reader = new \AndKom\Bitcoin\Blockchain\Reader\BlockIndexReader($indexDir);
 
 echo "Reading block index...\n";
 

src/Database/UnspentOutput.php

@@ -141,7 +141,7 @@ public function decompressScript(): ScriptPubKey
                 try {
                     $decompressed = PublicKey::parse($compressed)->decompress()->serialize();
                 } catch (\Exception $exception) {
-                    throw new ScriptException('Unable to decompress public key.');
+                    throw new ScriptException('Unable to decompress public key.', 0, $exception);
                 }
                 $script = chr(65);
                 $script .= $decompressed;

src/Script/Script.php

@@ -5,6 +5,7 @@
 namespace AndKom\Bitcoin\Blockchain\Script;
 
 use AndKom\BCDataStream\Reader;
+use AndKom\Bitcoin\Blockchain\Exception\ScriptException;
 
 /**
  * Class Script
@@ -87,31 +88,39 @@ public function parse(): array
             return $this->operations;
         }
 
+        if (!$this->data) {
+            throw new ScriptException('Empty script.');
+        }
+
         $this->operations = [];
         $stream = new Reader($this->data);
 
-        while ($stream->getPosition() < $stream->getSize()) {
-            $code = ord($stream->read(1));
-            $data = null;
-            $size = 0;
-
-            if ($code == Opcodes::OP_0) {
-                $data = '';
-            } elseif ($code >= 0x01 && $code <= 0x4b) {
-                $data = $stream->read($code);
-                $size = $code;
-            } elseif ($code >= Opcodes::OP_PUSHDATA1 && $code <= Opcodes::OP_PUSHDATA4) {
-                $size = $stream->readCompactSize();
-                $data = $stream->read($size);
-            } elseif ($code == Opcodes::OP_1NEGATE) {
-                $data = chr(-1);
-                $size = 1;
-            } elseif ($code >= Opcodes::OP_1 && $code <= Opcodes::OP_16) {
-                $data = chr($code - Opcodes::OP_1 + 1);
-                $size = 1;
+        try {
+            while ($stream->getPosition() < $stream->getSize()) {
+                $code = ord($stream->read(1));
+                $data = null;
+                $size = 0;
+
+                if ($code == Opcodes::OP_0) {
+                    $data = '';
+                } elseif ($code >= 0x01 && $code <= 0x4b) {
+                    $data = $stream->read($code);
+                    $size = $code;
+                } elseif ($code >= Opcodes::OP_PUSHDATA1 && $code <= Opcodes::OP_PUSHDATA4) {
+                    $size = $stream->readCompactSize();
+                    $data = $stream->read($size);
+                } elseif ($code == Opcodes::OP_1NEGATE) {
+                    $data = chr(-1);
+                    $size = 1;
+                } elseif ($code >= Opcodes::OP_1 && $code <= Opcodes::OP_16) {
+                    $data = chr($code - Opcodes::OP_1 + 1);
+                    $size = 1;
+                }
+
+                $this->operations[] = new Operation($code, $data, $size);
             }
-
-            $this->operations[] = new Operation($code, $data, $size);
+        } catch (\Exception $exception) {
+            throw new ScriptException('Script parse error.', 0, $exception);
         }
 
         return $this->operations;