From 6e8a6519804c44200332e8ad4a47180d616dc23e Mon Sep 17 00:00:00 2001
From: marcdeb1 <marcdebrouchev@laposte.net>
Date: Mon, 17 Dec 2018 00:49:26 +0100
Subject: [PATCH 01/43] Tx and index page

---
 config/app.default.php                |  10 +-
 src/Controller/MainController.php     |  75 +++++-------
 src/Model/Entity/Block.php            |   3 +
 src/Model/Entity/Claim.php            |  18 +--
 src/Model/Entity/ClaimStream.php      |  11 --
 src/Model/Entity/Transaction.php      |  11 ++
 src/Model/Table/AddressesTable.php    |   4 +-
 src/Model/Table/BlocksTable.php       |   4 +-
 src/Model/Table/ClaimStreamsTable.php |  18 ---
 src/Model/Table/ClaimsTable.php       |  20 +--
 src/Model/Table/InputsTable.php       |  14 +--
 src/Model/Table/OutputsTable.php      |  20 +--
 src/Model/Table/TransactionsTable.php |   4 +-
 src/Template/Main/blocks.ctp          |  58 ++++-----
 src/Template/Main/index.ctp           |  44 +++----
 src/Template/Main/tx.ctp              |  52 ++++----
 webroot/css/bids-chart.css            |   8 ++
 webroot/js/bids-chart.js              | 170 ++++++++++++++++++++++++++
 18 files changed, 341 insertions(+), 203 deletions(-)
 delete mode 100644 src/Model/Entity/ClaimStream.php
 delete mode 100644 src/Model/Table/ClaimStreamsTable.php
 create mode 100644 webroot/css/bids-chart.css
 create mode 100644 webroot/js/bids-chart.js

diff --git a/config/app.default.php b/config/app.default.php
index c06599e..7fbc837 100644
--- a/config/app.default.php
+++ b/config/app.default.php
@@ -222,16 +222,16 @@ return [
             'className' => 'Cake\Database\Connection',
             'driver' => 'Cake\Database\Driver\Mysql',
             'persistent' => false,
-            'host' => 'localhost',
+            'host' => 'chainquery.lbry.io:3600',
             /**
              * CakePHP will use the default DB port based on the driver selected
              * MySQL on MAMP uses port 8889, MAMP users will want to uncomment
              * the following line and set the port accordingly
              */
             //'port' => 'non_standard_port_number',
-            'username' => 'my_app',
-            'password' => 'secret',
-            'database' => 'my_app',
+            'username' => 'marcdeb',
+            'password' => '3885fc6d0b71befe72a327f47f36c0911057',
+            'database' => 'lbry',
             'encoding' => 'utf8',
             'timezone' => 'UTC',
             'flags' => [],
@@ -257,7 +257,7 @@ return [
              */
             //'init' => ['SET GLOBAL innodb_stats_on_metadata = 0'],
 
-            'url' => env('DATABASE_URL', null),
+            'url' => env('DATABASE_URL', 'chainquery.lbry.io:3600'),
         ],
 
         /**
diff --git a/src/Controller/MainController.php b/src/Controller/MainController.php
index cc5d715..f144f0c 100644
--- a/src/Controller/MainController.php
+++ b/src/Controller/MainController.php
@@ -14,6 +14,7 @@ use Endroid\QrCode\ErrorCorrectionLevel;
 use Endroid\QrCode\LabelAlignment;
 use Endroid\QrCode\QrCode;
 
+
 class MainController extends AppController {
 
     public static $rpcurl;
@@ -92,21 +93,23 @@ class MainController extends AppController {
         $lbcUsdPrice = $this->_getLatestPrice();
         $this->set('lbcUsdPrice', $lbcUsdPrice);
 
-        $blocks = $this->Blocks->find()->select(['Chainwork', 'Confirmations', 'Difficulty', 'Hash', 'Height', 'TransactionHashes', 'BlockTime', 'BlockSize'])->
-            order(['Height' => 'desc'])->limit(6)->toArray();
+        $blocks = $this->Blocks->find()->select(['chainwork', 'confirmations', 'difficulty', 'hash', 'height', 'transaction_hashes', 'block_time', 'block_size'])->order(['height' => 'desc'])->limit(6)->toArray();
         for ($i = 0; $i < count($blocks); $i++) {
-            $tx_hashes = json_decode($blocks[$i]->TransactionHashes);
-            $blocks[$i]->TransactionCount = count($tx_hashes);
+            $tx_hashes = json_decode($blocks[$i]->transaction_hashes, true);
+            $blocks[$i]->transaction_count = count($tx_hashes);
         }
 
         // hash rate
         $hashRate = $this->_formatHashRate($this->_gethashrate());
 
         // recent claims
-        $claims = $this->Claims->find()->select(['TransactionHash', 'Name', 'Vout', 'ClaimId', 'ClaimType', 'Author', 'Title', 'Description', 'ContentType',
-                                                 'IsNSFW', 'Language', 'ThumbnailUrl', 'Created'])->
-            distinct(['Claims.ClaimId'])->
-            contain(['Publisher' => ['fields' => ['Name']]])->order(['Claims.Created' => 'DESC'])->limit(5)->toArray();
+        $claims = $this->Claims->find()->select(['transaction_hash_id', 'name', 'vout', 'claim_id', 'claim_type', 'author', 'title', 'description', 'content_type', 'is_nsfw', 'language', 'thumbnail_url', 'created_at'])->
+            distinct(['Claims.claim_id'])->order(['Claims.created_at' => 'DESC'])->limit(5)->toArray();
+
+        foreach($claims as $claim) {
+            $publisher = $this->Claims->find()->select(['name'])->where(['claim_id' => $claim->publisher_id])->first();
+            $claim->publisher = $publisher;
+        }
 
         $this->set('recentBlocks', $blocks);
         $this->set('recentClaims', $claims);
@@ -399,10 +402,10 @@ class MainController extends AppController {
             }
 
             $offset = ($page - 1) * $pageLimit;
-            $currentBlock = $this->Blocks->find()->select(['Height'])->order(['Height' => 'DESC'])->first();
+            $currentBlock = $this->Blocks->find()->select(['height'])->order(['height' => 'DESC'])->first();
             $blocks = $this->Blocks->find()->select(
-                ['Height', 'Difficulty', 'TransactionHashes', 'BlockSize', 'Nonce', 'BlockTime']
-            )->offset($offset)->limit($pageLimit)->order(['Height' => 'DESC'])->toArray();
+                ['height', 'difficulty', 'transaction_hashes', 'block_size', 'nonce', 'block_time']
+            )->offset($offset)->limit($pageLimit)->order(['height' => 'DESC'])->toArray();
             $this->set('currentBlock', $currentBlock);
             $this->set('blocks', $blocks);
             $this->set('pageLimit', $pageLimit);
@@ -416,28 +419,13 @@ class MainController extends AppController {
                 return $this->redirect('/');
             }
 
-            $block = $this->Blocks->find()->where(['Height' => $height])->first();
+            $block = $this->Blocks->find()->where(['height' => $height])->first();
             if (!$block) {
                 return $this->redirect('/');
             }
 
-            try {
-                // update the block confirmations
-                $req = ['method' => 'getblock', 'params' => [$block->Hash]];
-                $response = self::curl_json_post(self::$rpcurl, json_encode($req));
-                $json = json_decode($response);
-                $rpc_block = $json->result;
-                if (isset($rpc_block->confirmations)) {
-                    $block->Confirmations = $rpc_block->confirmations;
-                    $conn = ConnectionManager::get('default');
-                    $conn->execute('UPDATE Blocks SET Confirmations = ? WHERE Id = ?', [$rpc_block->confirmations, $block->Id]);
-                }
-            } catch (\Exception $e) {
-                // try again next time
-            }
-
             // Get the basic block transaction info
-            $txs = $this->Transactions->find()->select(['InputCount', 'OutputCount', 'Hash', 'Value', 'Version'])->where(['BlockHash' => $block->Hash])->toArray();
+            $txs = $this->Transactions->find()->select(['input_count', 'output_count', 'hash', 'version'])->where(['block_hash_id' => $block->hash])->toArray();
 
             $this->set('block', $block);
             $this->set('blockTxs', $txs);
@@ -449,32 +437,27 @@ class MainController extends AppController {
         $this->loadModel('Transactions');
         $this->loadModel('Inputs');
         $this->loadModel('Outputs');
+        $this->loadModel('Addresses');
         $this->loadModel('Claims');
         
         $sourceAddress = $this->request->query('address');
 
         $tx = $this->Transactions->find()->select(
-            ['Id', 'BlockHash', 'InputCount', 'OutputCount', 'Hash', 'Value', 'TransactionTime', 'TransactionSize', 'Created', 'Version', 'LockTime', 'Raw'])->where(['Hash' => $hash])->first();
+            ['id', 'block_hash_id', 'input_count', 'output_count', 'hash', 'transaction_time', 'transaction_size', 'created_at', 'version', 'lock_time', 'raw'])->where(['hash' => $hash])->first();
         if (!$tx) {
             return $this->redirect('/');
         }
 
-        if ($tx->TransactionSize == 0) {
-            $tx->TransactionSize = (strlen($tx->Raw) / 2);
-            $conn = ConnectionManager::get('default');
-            $conn->execute('UPDATE Transactions SET TransactionSize = ? WHERE Id = ?', [$tx->TransactionSize, $tx->Id]);
-        }
-
-        $maxBlock = $this->Blocks->find()->select(['Height'])->order(['Height' => 'desc'])->first();
-        $block = $this->Blocks->find()->select(['Confirmations', 'Height'])->where(['Hash' => $tx->BlockHash])->first();
-        $confirmations = $block ? (($maxBlock->Height - $block->Height) + 1) : '0';
-        $inputs = $this->Inputs->find()->contain(['InputAddresses'])->where(['TransactionId' => $tx->Id])->order(['PrevoutN' => 'asc'])->toArray();
-        $outputs = $this->Outputs->find()->contain(['OutputAddresses', 'SpendInput' => ['fields' => ['Id', 'TransactionHash', 'PrevoutN', 'PrevoutHash']]])->where(['Outputs.TransactionId' => $tx->Id])->order(['Vout' => 'asc'])->toArray();
+        $block = $this->Blocks->find()->select(['confirmations', 'height'])->where(['hash' => $tx->block_hash_id])->first();
+        $confirmations = $block->confirmations;
+        $inputs = $this->Inputs->find()->where(['transaction_id' => $tx->id])->order(['prevout_n' => 'asc'])->toArray();
+        $inputAddresses = $this->Addresses->find()->where(['input_address_id'])->toArray();
+        $outputs = $this->Outputs->find()->where(['transaction_id' => $tx->id])->order(['vout' => 'asc'])->toArray();
         for ($i = 0; $i < count($outputs); $i++) {
-            $outputs[$i]->IsClaim = (strpos($outputs[$i]->ScriptPubKeyAsm, 'CLAIM') > -1);
-            $outputs[$i]->IsSupportClaim = (strpos($outputs[$i]->ScriptPubKeyAsm, 'SUPPORT_CLAIM') > -1);
-            $outputs[$i]->IsUpdateClaim = (strpos($outputs[$i]->ScriptPubKeyAsm, 'UPDATE_CLAIM') > -1);
-            $claim = $this->Claims->find()->where(['TransactionHash' => $tx->Hash, 'Vout' => $outputs[$i]->Vout])->first();
+            $outputs[$i]->IsClaim = (strpos($outputs[$i]->script_pub_key_asm, 'CLAIM') > -1);
+            $outputs[$i]->IsSupportClaim = (strpos($outputs[$i]->script_pub_key_asm, 'SUPPORT_CLAIM') > -1);
+            $outputs[$i]->IsUpdateClaim = (strpos($outputs[$i]->script_pub_key_asm, 'UPDATE_CLAIM') > -1);
+            $claim = $this->Claims->find()->where(['transaction_hash_id' => $tx->hash, 'vout' => $outputs[$i]->vout])->first();
             $outputs[$i]->Claim = $claim;
         }
 
@@ -482,10 +465,10 @@ class MainController extends AppController {
         $totalOut = 0;
         $fee = 0;
         foreach ($inputs as $in) {
-            $totalIn = bcadd($totalIn, $in->Value, 8);
+            $totalIn = bcadd($totalIn, $in->value, 8);
         }
         foreach ($outputs as $out) {
-            $totalOut = bcadd($totalOut, $out->Value, 8);
+            $totalOut = bcadd($totalOut, $out->value, 8);
         }
         $fee = bcsub($totalIn, $totalOut, 8);
 
diff --git a/src/Model/Entity/Block.php b/src/Model/Entity/Block.php
index 7858813..8f66eac 100644
--- a/src/Model/Entity/Block.php
+++ b/src/Model/Entity/Block.php
@@ -5,6 +5,9 @@ namespace App\Model\Entity;
 use Cake\ORM\Entity;
 
 class Block extends Entity {
+    public function target() {
+        
+    }
 
 }
 
diff --git a/src/Model/Entity/Claim.php b/src/Model/Entity/Claim.php
index 18a5734..d12c480 100644
--- a/src/Model/Entity/Claim.php
+++ b/src/Model/Entity/Claim.php
@@ -6,7 +6,7 @@ use Cake\ORM\Entity;
 
 class Claim extends Entity {
     function getLbryLink() {
-        $link = $this->Name;
+        $link = $this->name;
         if (isset($this->Publisher->Name)) {
             $link = $this->Publisher->Name . '/' . $link;
         }
@@ -15,21 +15,21 @@ class Claim extends Entity {
     }
 
     function getExplorerLink() {
-        $link = '/claims/' . $this->ClaimId;
+        $link = '/claims/' . $this->claim_id;
         return $link;
     }
     
     function getContentTag() {
         $ctTag = null;
-        if (substr($this->ContentType, 0, 5) === 'audio') {
+        if (substr($this->content_type, 0, 5) === 'audio') {
             $ctTag = 'audio';
-        } else if (substr($this->ContentType, 0, 5) === 'video') {
+        } else if (substr($this->content_type, 0, 5) === 'video') {
             $ctTag = 'video';
-        } else if (substr($this->ContentType, 0, 5) === 'image') {
+        } else if (substr($this->content_type, 0, 5) === 'image') {
             $ctTag = 'image';
         }
     
-        if (!$ctTag && $this->ClaimType == 1) {
+        if (!$ctTag && $this->claim_type == 1) {
             $ctTag = 'identity';
         }
         return $ctTag;
@@ -37,10 +37,10 @@ class Claim extends Entity {
     
     function getAutoThumbText() {
         $autoThumbText = '';
-        if ($this->ClaimType == 1) { 
-            $autoThumbText = strtoupper(substr($this->Name, 1, min( strlen($this->Name), 3 ))); 
+        if ($this->claim_type == 1) { 
+            $autoThumbText = strtoupper(substr($this->name, 1, min( strlen($this->name), 3 ))); 
         } else {
-            $str = (strlen(trim($this->Title)) > 0) ? $this->Title : $this->Name;
+            $str = (strlen(trim($this->title)) > 0) ? $this->title : $this->name;
             $autoThumbText = strtoupper(substr($str, 0, min (strlen($str), 2 )));
         }
         return $autoThumbText;
diff --git a/src/Model/Entity/ClaimStream.php b/src/Model/Entity/ClaimStream.php
deleted file mode 100644
index 6a51882..0000000
--- a/src/Model/Entity/ClaimStream.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-namespace App\Model\Entity;
-
-use Cake\ORM\Entity;
-
-class ClaimStream extends Entity {
-
-}
-
-?>
\ No newline at end of file
diff --git a/src/Model/Entity/Transaction.php b/src/Model/Entity/Transaction.php
index 631f08c..b491ed7 100644
--- a/src/Model/Entity/Transaction.php
+++ b/src/Model/Entity/Transaction.php
@@ -3,8 +3,19 @@
 namespace App\Model\Entity;
 
 use Cake\ORM\Entity;
+use Cake\ORM\TableRegistry;
+
 
 class Transaction extends Entity {
+    public function value() {
+        $OutputModel = TableRegistry::get('Outputs');
+        $outputs = $OutputModel->find()->select(['value'])->where(['transaction_id' => $this->id])->toArray();
+        $value = 0;
+        foreach($outputs as $o) {
+            $value += $o->value;
+        }
+        return $value;
+    }
 
 }
 
diff --git a/src/Model/Table/AddressesTable.php b/src/Model/Table/AddressesTable.php
index 1876136..daa47f2 100644
--- a/src/Model/Table/AddressesTable.php
+++ b/src/Model/Table/AddressesTable.php
@@ -8,8 +8,8 @@ class AddressesTable extends Table {
     public function initialize(array $config) {
         parent::initialize($config);
 
-        $this->primaryKey('Id');
-        $this->table('Addresses');
+        $this->primaryKey('id');
+        $this->table('address');
 
         $this->addBehavior('SimpleAudit');
     }
diff --git a/src/Model/Table/BlocksTable.php b/src/Model/Table/BlocksTable.php
index 0b2a8ed..bc58288 100644
--- a/src/Model/Table/BlocksTable.php
+++ b/src/Model/Table/BlocksTable.php
@@ -8,8 +8,8 @@ class BlocksTable extends Table {
     public function initialize(array $config) {
         parent::initialize($config);
 
-        $this->primaryKey('Id');
-        $this->table('Blocks');
+        $this->primaryKey('id');
+        $this->table('block');
 
         $this->addBehavior('SimpleAudit');
     }
diff --git a/src/Model/Table/ClaimStreamsTable.php b/src/Model/Table/ClaimStreamsTable.php
deleted file mode 100644
index eb77edf..0000000
--- a/src/Model/Table/ClaimStreamsTable.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace App\Model\Table;
-
-use Cake\ORM\Table;
-
-class ClaimStreamsTable extends Table {
-    public function initialize(array $config) {
-        parent::initialize($config);
-
-        $this->primaryKey('Id');
-        $this->table('ClaimStreams');
-
-        //$this->addBehavior('SimpleAudit');
-    }
-}
-
-?>
\ No newline at end of file
diff --git a/src/Model/Table/ClaimsTable.php b/src/Model/Table/ClaimsTable.php
index 4177faa..9f826da 100644
--- a/src/Model/Table/ClaimsTable.php
+++ b/src/Model/Table/ClaimsTable.php
@@ -8,25 +8,17 @@ class ClaimsTable extends Table {
     public function initialize(array $config) {
         parent::initialize($config);
 
-        $this->primaryKey('Id');
-        $this->table('Claims');
+        $this->primaryKey('id');
+        $this->table('claim');
 
         //$this->addBehavior('SimpleAudit');
         $this->addAssociations([
             'belongsTo' => [
-                'Publisher' => [
+                'publisher' => [
                     'className' => 'App\Model\Table\ClaimsTable',
-                    'foreignKey' => 'PublisherId',
-                    'bindingKey' => 'ClaimId',
-                    'propertyName' => 'Publisher'
-                ]
-            ],
-            'hasOne' => [
-                'Stream' => [
-                    'className' => 'App\Model\Table\ClaimStreamsTable',
-                    'foreignKey' => 'Id',
-                    'bindingKey' => 'Id',
-                    'propertyName' => 'Stream'
+                    'foreignKey' => 'publisher_id',
+                    'bindingKey' => 'claim_id',
+                    'propertyName' => 'publisher'
                 ]
             ]
         ]);
diff --git a/src/Model/Table/InputsTable.php b/src/Model/Table/InputsTable.php
index c1c06e7..58776b6 100644
--- a/src/Model/Table/InputsTable.php
+++ b/src/Model/Table/InputsTable.php
@@ -8,19 +8,19 @@ class InputsTable extends Table {
     public function initialize(array $config) {
         parent::initialize($config);
 
-        $this->primaryKey('Id');
-        $this->table('Inputs');
+        $this->primaryKey('id');
+        $this->table('input');
 
         $this->addBehavior('SimpleAudit');
 
         $this->addAssociations([
             'belongsToMany' => [
-                'InputAddresses' => [
+                'input_addresses' => [
                     'className' => 'App\Model\Table\AddressesTable',
-                    'joinTable' => 'InputsAddresses',
-                    'foreignKey' => 'InputId',
-                    'targetForeignKey' => 'AddressId',
-                    'propertyName' => 'InputAddresses'
+                    'joinTable' => 'input_addresses',
+                    'foreignKey' => 'input_id',
+                    'targetForeignKey' => 'address_id',
+                    'propertyName' => 'input_addresses'
                 ]
             ]
         ]);
diff --git a/src/Model/Table/OutputsTable.php b/src/Model/Table/OutputsTable.php
index 1840aa7..dbb58fc 100644
--- a/src/Model/Table/OutputsTable.php
+++ b/src/Model/Table/OutputsTable.php
@@ -8,26 +8,26 @@ class OutputsTable extends Table {
     public function initialize(array $config) {
         parent::initialize($config);
 
-        $this->primaryKey('Id');
-        $this->table('Outputs');
+        $this->primaryKey('id');
+        $this->table('output');
 
         $this->addBehavior('SimpleAudit');
 
         $this->addAssociations([
             'belongsTo' => [
-                'SpendInput' => [
+                'spend_input' => [
                     'className' => 'App\Model\Table\InputsTable',
-                    'foreignKey' => 'SpentByInputId',
-                    'propertyName' => 'SpendInput'
+                    'foreignKey' => 'spent_by_input_id',
+                    'propertyName' => 'spend_input'
                 ]
             ],
             'belongsToMany' => [
-                'OutputAddresses' => [
+                'output_addresses' => [
                     'className' => 'App\Model\Table\AddressesTable',
-                    'joinTable' => 'OutputsAddresses',
-                    'foreignKey' => 'OutputId',
-                    'targetForeignKey' => 'AddressId',
-                    'propertyName' => 'OutputAddresses'
+                    'joinTable' => 'output_addresses',
+                    'foreignKey' => 'output_id',
+                    'targetForeignKey' => 'address_id',
+                    'propertyName' => 'output_addresses'
                 ]
             ]
         ]);
diff --git a/src/Model/Table/TransactionsTable.php b/src/Model/Table/TransactionsTable.php
index 613512d..7d1a180 100644
--- a/src/Model/Table/TransactionsTable.php
+++ b/src/Model/Table/TransactionsTable.php
@@ -8,8 +8,8 @@ class TransactionsTable extends Table {
     public function initialize(array $config) {
         parent::initialize($config);
 
-        $this->primaryKey('Id');
-        $this->table('Transactions');
+        $this->primaryKey('id');
+        $this->table('transaction');
 
         $this->addBehavior('SimpleAudit');
     }
diff --git a/src/Template/Main/blocks.ctp b/src/Template/Main/blocks.ctp
index 38b8543..3c1512f 100644
--- a/src/Template/Main/blocks.ctp
+++ b/src/Template/Main/blocks.ctp
@@ -21,20 +21,20 @@
     </script>
     <?php $this->end(); ?>
 
-    <?php $this->assign('title', 'Block Height ' . $block->Height) ?>
+    <?php $this->assign('title', 'Block Height ' . $block->height) ?>
 
     <div class="block-head">
-        <h3>LBRY Block <?php echo $block->Height ?></h3>
-        <h4><?php echo $block->Hash ?></h4>
+        <h3>LBRY Block <?php echo $block->height ?></h3>
+        <h4><?php echo $block->hash ?></h4>
     </div>
 
     <div class="block-nav">
-        <?php if (strlen(trim($block->PreviousBlockHash)) > 0): ?>
-        <a class="btn btn-prev" href="/blocks/<?php echo ($block->Height - 1); ?>">&laquo; Previous Block</a>
+        <?php if (strlen(trim($block->previous_block_hash)) > 0): ?>
+        <a class="btn btn-prev" href="/blocks/<?php echo ($block->height - 1); ?>">&laquo; Previous Block</a>
         <?php endif; ?>
 
-        <?php if (strlen(trim($block->NextBlockHash)) > 0): ?>
-        <a class="btn btn-next" href="/blocks/<?php echo ($block->Height + 1); ?>">Next Block &raquo;</a>
+        <?php if (strlen(trim($block->next_block_hash)) > 0): ?>
+        <a class="btn btn-next" href="/blocks/<?php echo ($block->height + 1); ?>">Next Block &raquo;</a>
         <?php endif; ?>
 
         <div class="clear"></div>
@@ -47,44 +47,44 @@
             <div class="label half-width">Block Size (bytes)</div>
             <div class="label half-width">Block Time</div>
 
-            <div class="value half-width"><?php echo number_format($block->BlockSize, 0, '', ',') ?></div>
-            <div class="value half-width"><?php echo \DateTime::createFromFormat('U', $block->BlockTime)->format('j M Y H:i:s') . ' UTC' ?></div>
+            <div class="value half-width"><?php echo number_format($block->block_size, 0, '', ',') ?></div>
+            <div class="value half-width"><?php echo \DateTime::createFromFormat('U', $block->block_time)->format('j M Y H:i:s') . ' UTC' ?></div>
 
             <div class="clear spacer"></div>
 
             <div class="label half-width">Bits</div>
             <div class="label half-width">Confirmations</div>
 
-            <div class="value half-width"><?php echo $block->Bits ?></div>
-            <div class="value half-width"><?php echo number_format($block->Confirmations, 0, '', ',') ?></div>
+            <div class="value half-width"><?php echo $block->bits ?></div>
+            <div class="value half-width"><?php echo number_format($block->confirmations, 0, '', ',') ?></div>
 
             <div class="clear spacer"></div>
 
             <div class="label half-width">Difficulty</div>
             <div class="label half-width">Nonce</div>
 
-            <div class="value half-width"><?php echo $this->Amount->format($block->Difficulty, '') ?></div>
-            <div class="value half-width"><?php echo $block->Nonce ?></div>
+            <div class="value half-width"><?php echo $this->Amount->format($block->difficulty, '') ?></div>
+            <div class="value half-width"><?php echo $block->nonce ?></div>
 
             <div class="clear spacer"></div>
 
-            <div class="label">Chainwork</div> <div class="value"><?php echo $block->Chainwork ?></div>
+            <div class="label">Chainwork</div> <div class="value"><?php echo $block->chainwork ?></div>
 
             <div class="spacer"></div>
 
-            <div class="label">MerkleRoot</div> <div class="value"><?php echo $block->MerkleRoot ?></div>
+            <div class="label">MerkleRoot</div> <div class="value"><?php echo $block->merkle_root ?></div>
 
             <div class="spacer"></div>
 
-            <div class="label">NameClaimRoot</div> <div class="value"><?php echo $block->NameClaimRoot ?></div>
+            <div class="label">NameClaimRoot</div> <div class="value"><?php echo $block->name_claim_root ?></div>
 
             <div class="spacer"></div>
 
-            <div class="label">Target</div> <div class="value"><?php echo $block->Target ?></div>
+            <div class="label">Target</div> <div class="value"><?php echo '$block->Target' ?></div>
 
             <div class="spacer"></div>
 
-            <div class="label">Version</div> <div class="value"><?php echo $block->Version ?></div>
+            <div class="label">Version</div> <div class="value"><?php echo $block->version ?></div>
         </div>
 
         <div class="block-transactions">
@@ -109,10 +109,10 @@
 
                         <?php foreach ($blockTxs as $tx): ?>
                         <tr>
-                            <td class="w300"><div><a href="/tx/<?php echo $tx->Hash ?>"><?php echo $tx->Hash ?></a></div></td>
-                            <td class="right"><?php echo $tx->InputCount ?></td>
-                            <td class="right"><?php echo $tx->OutputCount ?></td>
-                            <td class="right"><div title="<?php echo $tx->Value ?> LBC"><?php echo $this->Amount->formatCurrency($tx->Value) ?> LBC</div></td>
+                            <td class="w300"><div><a href="/tx/<?php echo $tx->hash ?>"><?php echo $tx->hash ?></a></div></td>
+                            <td class="right"><?php echo $tx->input_count ?></td>
+                            <td class="right"><?php echo $tx->output_count ?></td>
+                            <td class="right"><div title="<?php echo $tx->value() ?> LBC"><?php echo $this->Amount->formatCurrency($tx->value()) ?> LBC</div></td>
                         </tr>
                         <?php endforeach; ?>
                     </tbody>
@@ -181,13 +181,13 @@
         <tbody>
             <?php foreach ($blocks as $block): ?>
             <tr>
-                <td class="right"><a href="/blocks/<?php echo $block->Height ?>"><?php echo $block->Height ?></a></td>
-                <td class="pad-left"><?php echo number_format($block->Difficulty, 8, '.', '') ?></td>
-                <td class="right"><?php echo number_format((($currentBlock->Height - $block->Height) + 1), 0, '', ',') ?></td>
-                <td class="right"><?php echo count(json_decode($block->TransactionHashes)) ?></td>
-                <td class="right"><?php echo round($block->BlockSize / 1024, 2) . 'KB' ?></td>
-                <td class="right pad-left"><?php echo $block->Nonce ?></td>
-                <td class="pad-left"><?php echo \DateTime::createFromFormat('U', $block->BlockTime)->format('d M Y H:i:s') ?> UTC</td>
+                <td class="right"><a href="/blocks/<?php echo $block->height ?>"><?php echo $block->Height ?></a></td>
+                <td class="pad-left"><?php echo number_format($block->d0ifficulty, 8, '.', '') ?></td>
+                <td class="right"><?php echo number_format((($currentBlock->height - $block->height) + 1), 0, '', ',') ?></td>
+                <td class="right"><?php echo count(json_decode($block->transaction_hashes)) ?></td>
+                <td class="right"><?php echo round($block->block_size / 1024, 2) . 'KB' ?></td>
+                <td class="right pad-left"><?php echo $block->nonce ?></td>
+                <td class="pad-left"><?php echo \DateTime::createFromFormat('U', $block->block_time)->format('d M Y H:i:s') ?> UTC</td>
             </tr>
             <?php endforeach; ?>
         </tbody>
diff --git a/src/Template/Main/index.ctp b/src/Template/Main/index.ctp
index 8b0ecf3..5866da6 100644
--- a/src/Template/Main/index.ctp
+++ b/src/Template/Main/index.ctp
@@ -129,12 +129,12 @@
         <div class="stats">
             <div class="box box-20">
                 <div class="title">Block Height</div>
-                <div class="value"><?php echo $recentBlocks[0]->Height ?></div>
+                <div class="value"><?php echo $recentBlocks[0]->height ?></div>
             </div>
 
             <div class="box box-30">
                 <div class="title">Difficulty</div>
-                <div class="value" title="<?php echo $recentBlocks[0]->Difficulty ?>"><?php echo number_format($recentBlocks[0]->Difficulty, 2, '.', '') ?></div>
+                <div class="value" title="<?php echo $recentBlocks[0]->difficulty ?>"><?php echo number_format($recentBlocks[0]->difficulty, 2, '.', '') ?></div>
             </div>
 
             <div class="box box-30">
@@ -167,13 +167,13 @@
 
                 <tbody>
                     <?php foreach ($recentBlocks as $block): ?>
-                    <tr data-height="<?php echo $block->Height ?>" data-time="<?php echo $block->BlockTime ?>">
-                        <td><a href="/blocks/<?php echo $block->Height ?>"><?php echo $block->Height ?></a></td>
-                        <td><?php echo \Carbon\Carbon::createFromTimestamp($block->BlockTime)->diffForHumans(); ?></td>
-                        <td class="right"><?php echo round($block->BlockSize / 1024, 2) . 'KB' ?></td>
-                        <td class="right"><?php echo $block->TransactionCount ?></td>
-                        <td class="right"><?php echo number_format($block->Difficulty, 2, '.', '') ?></td>
-                        <td class="last-cell"><?php echo DateTime::createFromFormat('U', $block->BlockTime)->format('d M Y H:i:s') . ' UTC' ?></td>
+                    <tr data-height="<?php echo $block->height ?>" data-time="<?php echo $block->block_time ?>">
+                        <td><a href="/blocks/<?php echo $block->height ?>"><?php echo $block->height ?></a></td>
+                        <td><?php echo \Carbon\Carbon::createFromTimestamp($block->block_time)->diffForHumans(); ?></td>
+                        <td class="right"><?php echo round($block->block_size / 1024, 2) . 'KB' ?></td>
+                        <td class="right"><?php echo $block->transaction_count ?></td>
+                        <td class="right"><?php echo number_format($block->difficulty, 2, '.', '') ?></td>
+                        <td class="last-cell"><?php echo DateTime::createFromFormat('U', $block->block_time)->format('d M Y H:i:s') . ' UTC' ?></td>
                     </tr>
                     <?php endforeach; ?>
                 </tbody>
@@ -186,11 +186,11 @@
             <?php $idx = 0; $a = ['purple', 'orange', 'blue', 'teal', 'green', 'yellow']; foreach ($recentClaims as $claim):
                 $idx++;
                 $autoThumbText = $claim->getAutoThumbText();
-                $link = $claim->Name;
-                $rawLink = $claim->Name;
-                if (isset($claim->Publisher->Name)) {
-                    $link = urlencode($claim->Publisher->Name) . '/' . $link;
-                    $rawLink = $claim->Publisher->Name . '/' . $link;
+                $link = $claim->name;
+                $rawLink = $claim->name;
+                if (isset($claim->publisher->name)) {
+                    $link = urlencode($claim->publisher->name) . '/' . $link;
+                    $rawLink = $claim->publisher->name . '/' . $link;
                 }
                 $link = 'lbry://' . $link;
                 $rawLink = 'lbry://' . $rawLink;
@@ -198,35 +198,35 @@
                 // content type
                 $ctTag = $claim->getContentTag();
             ?>
-            <div data-id="<?php echo $claim->ClaimId ?>" class="claim-box<?php if ($idx == 5): ?> last<?php endif; ?>">
+            <div data-id="<?php echo $claim->claim_id ?>" class="claim-box<?php if ($idx == 5): ?> last<?php endif; ?>">
                 <div class="tags">
                     <?php if ($ctTag): ?>
                     <div class="content-type"><?php echo strtoupper($ctTag) ?></div>
                     <?php endif; ?>
-                    <?php if ($claim->IsNSFW): ?>
+                    <?php if ($claim->is_nsfw): ?>
                     <div class="nsfw">NSFW</div>
                     <?php endif; ?>
                 </div>
 
                 <div data-autothumb="<?php echo $autoThumbText ?>" class="thumbnail <?php echo $a[mt_rand(0, count($a) - 1)] ?>">
-                    <?php if (!$claim->IsNSFW && strlen(trim($claim->ThumbnailUrl)) > 0): ?>
-                        <img src="<?php echo strip_tags($claim->ThumbnailUrl) ?>" alt="" />
+                    <?php if (!$claim->is_nsfw && strlen(trim($claim->thumbnail_url)) > 0): ?>
+                        <img src="<?php echo strip_tags($claim->thumbnail_url) ?>" alt="" />
                     <?php else: ?>
                         <div class="autothumb"><?php echo $autoThumbText ?></div>
                     <?php endif; ?>
                 </div>
 
                 <div class="metadata">
-                    <div class="title" title="<?php echo $claim->ClaimType == 1 ? $claim->Name : ((strlen(trim($claim->Title)) > 0) ? $claim->Title : ''); ?>"><?php echo $claim->ClaimType == 1 ? $claim->Name : ((strlen(trim($claim->Title)) > 0) ? $claim->Title : '<em>No Title</em>') ?></div>
+                    <div class="title" title="<?php echo $claim->claim_type == 1 ? $claim->name : ((strlen(trim($claim->title)) > 0) ? $claim->title : ''); ?>"><?php echo $claim->claim_type == 1 ? $claim->name : ((strlen(trim($claim->title)) > 0) ? $claim->title : '<em>No Title</em>') ?></div>
                     <div class="link" title="<?php echo $rawLink ?>"><a href="<?php echo $link ?>"><?php echo $rawLink ?></a></div>
 
                     <div class="clear"></div>
-                    <?php if ($claim->ClaimType == 2 && strlen(trim($claim->Description)) > 0): ?>
-                    <div class="desc"><?php echo $claim->Description ?></div>
+                    <?php if ($claim->claim_type == 2 && strlen(trim($claim->description)) > 0): ?>
+                    <div class="desc"><?php echo $claim->description ?></div>
                     <?php endif; ?>
                 </div>
 
-                <a class="tx-link" href="/tx/<?php echo $claim->TransactionHash ?>#output-<?php echo $claim->Vout ?>" target="_blank">Transaction</a>
+                <a class="tx-link" href="/tx/<?php echo $claim->transaction_hash ?>#output-<?php echo $claim->vout ?>" target="_blank">Transaction</a>
             </div>
             <?php endforeach; ?>
 
diff --git a/src/Template/Main/tx.ctp b/src/Template/Main/tx.ctp
index f4f4523..7372812 100644
--- a/src/Template/Main/tx.ctp
+++ b/src/Template/Main/tx.ctp
@@ -14,22 +14,22 @@
 
 <div class="tx-head">
     <h3>LBRY Transaction</h3>
-    <h4><?php echo $tx->Hash ?></h4>
+    <h4><?php echo $tx->hash ?></h4>
 </div>
 
 <div class="tx-time">
     <div class="created-time">
         <h3 title="Represents the time this transaction was created on the explorer">Time Created</h3>
-        <div><?php echo $tx->Created->format('j M Y H:i:s') . ' UTC '; ?></div>
+        <div><?php echo $tx->created_at->format('j M Y H:i:s') . ' UTC '; ?></div>
     </div>
 
     <div class="conf-time">
         <h3 title="The time the first confirmation of this transaction happened on the blockchain">Block Time</h3>
-        <div><?php echo ($tx->TransactionTime == null || strlen(trim($tx->TransactionTime)) == 0) ? '<em>Not yet confirmed</em>' :
-            \DateTime::createFromFormat('U', $tx->TransactionTime)->format('j M Y H:i:s') . ' UTC' ?>
+        <div><?php echo ($tx->transaction_time == null || strlen(trim($tx->transaction_time)) == 0) ? '<em>Not yet confirmed</em>' :
+            \DateTime::createFromFormat('U', $tx->transaction_time)->format('j M Y H:i:s') . ' UTC' ?>
 
-            <?php if ($tx->TransactionTime > $tx->Created->getTimestamp()):
-                $diffSeconds = $tx->TransactionTime - $tx->Created->getTimestamp();
+            <?php if ($tx->transaction_time > $tx->created_at->getTimestamp()):
+                $diffSeconds = $tx->transaction_time - $tx->created_at->getTimestamp();
                 if ($diffSeconds <= 60) {
                     echo sprintf(' (+%s second%s)', $diffSeconds, $diffSeconds == 1 ? '' : 's');
                 } else {
@@ -47,15 +47,15 @@
 <div class="tx-summary">
     <div class="box p25">
         <div class="title">Amount (LBC)</div>
-        <div class="value"><?php echo $this->Amount->format($tx->Value) ?></div>
+        <div class="value"><?php echo $this->Amount->format($tx->value()) ?></div>
     </div>
 
     <div class="box p15">
         <div class="title">Block Height</div>
-        <?php if (!isset($tx->BlockHash) || strlen(trim($tx->BlockHash)) === 0): ?>
+        <?php if (!isset($tx->block_hash_id) || strlen(trim($tx->block_hash_id)) === 0): ?>
         <div class="value" title="Unconfirmed">Unconf.</div>
         <?php else: ?>
-        <div class="value" title="<?php echo $tx->BlockHash ?>"><a href="/blocks/<?php echo $block->Height ?>"><?php echo $block->Height ?></a></div>
+        <div class="value" title="<?php echo $tx->block_hash_id ?>"><a href="/blocks/<?php echo $block->height ?>"><?php echo $block->height ?></a></div>
         <?php endif; ?>
     </div>
 
@@ -66,17 +66,17 @@
 
     <div class="box p15">
         <div class="title">Size (bytes)</div>
-        <div class="value"><?php echo number_format($tx->TransactionSize, 0, '', ',') ?></div>
+        <div class="value"><?php echo number_format($tx->transaction_size, 0, '', ',') ?></div>
     </div>
 
     <div class="box p15">
         <div class="title">Inputs</div>
-        <div class="value"><?php echo $tx->InputCount ?></div>
+        <div class="value"><?php echo $tx->input_count ?></div>
     </div>
 
     <div class="box p15 last">
         <div class="title">Outputs</div>
-        <div class="value"><?php echo $tx->OutputCount ?></div>
+        <div class="value"><?php echo $tx->output_count ?></div>
     </div>
 
     <div class="clear"></div>
@@ -86,28 +86,28 @@
     <h3>Details</h3>
     <div class="tx-details-layout">
         <div class="inputs">
-            <div class="subtitle"><?php echo $tx->InputCount ?> input<?php echo $tx->InputCount === 1 ? '' : 's'; ?></div>
+            <div class="subtitle"><?php echo $tx->input_count ?> input<?php echo $tx->input_count === 1 ? '' : 's'; ?></div>
 
             <?php
                     $setAddressIds = [];
                     foreach ($inputs as $in):
             ?>
-            <div id="input-<?php echo $in->Id ?>" class="input <?php if (isset($in['InputAddresses']) && count($in['InputAddresses']) > 0 && $in['InputAddresses'][0]->Address == $sourceAddress): ?>is-source<?php endif; ?>">
-                <?php if ($in['IsCoinbase']): ?>
+            <div id="input-<?php echo $in->id ?>" class="input <?php if (isset($in['InputAddresses']) && count($in['InputAddresses']) > 0 && $in['InputAddresses'][0]->address == $sourceAddress): ?>is-source<?php endif; ?>">
+                <?php if ($in->is_coinbase): ?>
                     <div>Block Reward (New Coins)</div>
                 <?php else: ?>
-                    <?php if (strlen(trim($in->Value)) == 0): ?>
+                    <?php if (strlen(trim($in->value)) == 0): ?>
                     <div>Incomplete data</div>
                     <?php else:
                             $addr = $in['InputAddresses'][0];
 
-                            if (!isset($setAddressIds[$addr->Address])):
-                                $setAddressIds[$addr->Address] = 1; ?>
-                    <a id="<?php echo $addr->Address ?>"></a>
+                            if (!isset($setAddressIds[$addr->address])):
+                                $setAddressIds[$addr->address] = 1; ?>
+                    <a id="<?php echo $addr->address ?>"></a>
                     <?php   endif; ?>
-                    <div><span class="value"><?php echo $this->Amount->format($in['Value']) ?> LBC</span> from</div>
-                    <div class="address"><a href="/address/<?php echo $addr->Address ?>"><?php echo $addr->Address ?></a>
-                    (<a class="output-link" href="/tx/<?php echo $in->PrevoutHash ?>#output-<?php echo $in->PrevoutN ?>">output</a>)
+                    <div><span class="value"><?php echo $this->Amount->format($in->value) ?> LBC</span> from</div>
+                    <div class="address"><a href="/address/<?php echo $addr->address ?>"><?php echo $addr->address ?></a>
+                    (<a class="output-link" href="/tx/<?php echo $in->prevout_hash ?>#output-<?php echo $in->prevout_n ?>">output</a>)
                     <?php  if (isset($addr->Tag) && strlen(trim($addr->Tag)) > 0): ?>
                     <div class="tag">
                         <?php if (strlen(trim($addr->TagUrl)) > 0): ?><a href="<?php echo $addr->TagUrl ?>" target="_blank" rel="nofollow"><?php echo $addr->Tag ?></a><?php else: echo $addr->Tag; endif; ?>
@@ -125,7 +125,7 @@
         </div>
 
         <div class="outputs">
-            <div class="subtitle"><?php echo $tx->OutputCount ?> output<?php echo $tx->OutputCount === 1 ? '' : 's'; ?>
+            <div class="subtitle"><?php echo $tx->output_count ?> output<?php echo $tx->output_count === 1 ? '' : 's'; ?>
 
             <?php if ($fee > 0): ?>
             <span class="fee"><span class="label">Fee</span> <span class="value"><?php echo $this->Amount->format($fee) ?> LBC</span></span>
@@ -134,7 +134,7 @@
 
             <?php
             foreach ($outputs as $out): ?>
-            <div id="output-<?php echo $out->Vout ?>" class="output <?php if (isset($out['OutputAddresses']) && count($out['OutputAddresses']) > 0 && $out['OutputAddresses'][0]->Address == $sourceAddress): ?>is-source<?php endif; ?>">
+            <div id="output-<?php echo $out->Vout ?>" class="output <?php if (isset($out['OutputAddresses']) && count($out['OutputAddresses']) > 0 && $out['OutputAddresses'][0]->address == $sourceAddress): ?>is-source<?php endif; ?>">
                 <div class="labels">
                     <?php if($out->Claim && ($out->IsClaim or $out->IsSupportClaim or $out->IsUpdateClaim)): ?><a class="view-claim" href="<?php echo $out->Claim->getExplorerLink() ?>">View</a><?php endif; ?>
                     <?php if($out->IsSupportClaim): ?><div class="support">SUPPORT</div><?php endif; ?>
@@ -152,9 +152,9 @@
                 <a id="<?php echo $addr->Address ?>"></a>
                 <?php   endif; ?>
                 <div><span class="value"><?php echo $this->Amount->format($out['Value']) ?> LBC</span> to</div>
-                <div class="address"><a href="/address/<?php echo $addr->Address ?>"><?php echo $addr->Address ?></a>
+                <div class="address"><a href="/address/<?php echo $addr->Address ?>"><?php echo $addr->address ?></a>
 
-                <?php if ($out->IsSpent): ?>(<a href="/tx/<?php echo $out->SpendInput->TransactionHash ?>#input-<?php echo $out->SpendInput->Id ?>">spent</a>)<?php else: ?>(unspent)<?php endif; ?>
+                <?php if ($out->is_spent): ?>(<a href="/tx/<?php echo $out->spend_input->transaction_hash_id ?>#input-<?php echo $out->spend_input->id ?>">spent</a>)<?php else: ?>(unspent)<?php endif; ?>
 
                 <?php if (isset($addr->Tag) && strlen(trim($addr->Tag)) > 0): ?>
                 <div class="tag">
diff --git a/webroot/css/bids-chart.css b/webroot/css/bids-chart.css
new file mode 100644
index 0000000..48a41f4
--- /dev/null
+++ b/webroot/css/bids-chart.css
@@ -0,0 +1,8 @@
+.bids-chart-container { width: 1200px; margin: 0 auto 48px auto; box-shadow: 0 2px 6px rgba(0,0,0,.175); border: 1px solid rgba(0,0,0,.15); padding: 24px 36px; position: relative; overflow: hidden }
+.bids-chart-container .load-progress { position: absolute; top: 0; left: 0; width: 100%; height: 3px; background: #1e88e5; animation: indeterminate 4s linear infinite; }
+.bids-chart-container .chart { height: 414px }
+.bids-chart-container .btn-chart-export { position: absolute; right: 40px; bottom: 36px }
+@keyframes indeterminate {
+   from { left: -70%; }
+   to { left: 100% }
+}
\ No newline at end of file
diff --git a/webroot/js/bids-chart.js b/webroot/js/bids-chart.js
new file mode 100644
index 0000000..d025d04
--- /dev/null
+++ b/webroot/js/bids-chart.js
@@ -0,0 +1,170 @@
+function buildChartData(claimsData) {
+	var chartData = [];
+    var lastDate = 0;
+    var nbClaimsDay = 0;
+    var nbClaimsTotal = 0;
+    var bidClaimsDay = 0;
+    var bidClaimsTotal = 0;
+    var nbChannelsDay = 0;
+    var nbChannelsTotal = 0;
+	for(var i = 0; i < claimsData.length; i++) {
+        if(claimsData[i].transaction_time == 0) {
+            continue;
+        }
+        var transactionDate = new Date(claimsData[i].transaction_time * 1000);
+        transactionDate.setHours(0,0,0,0)
+        if(lastDate == 0) {
+            lastDate = transactionDate;
+        }
+        if(transactionDate.toString() != lastDate.toString()) {
+            nbClaimsTotal += nbClaimsDay;
+            bidClaimsTotal += bidClaimsDay;
+            var dateData = {
+				date: lastDate,
+				NumberClaims: nbClaimsTotal,
+                BidsClaims: bidClaimsTotal,
+			};
+            chartData.push(dateData);
+            nbClaimsDay = 0;
+            bidClaimsDay = 0;
+            lastDate = transactionDate;
+        }
+        if(claimsData[i].claim_type == 1) {
+            nbClaimsDay += 1;
+            bidClaimsDay += claimsData[i].effective_amount/100000000;
+        }
+	}
+	return chartData;
+}
+
+function loadChartData() {
+    var api_url = "https://chainquery.lbry.io/api/sql?query=";
+	var query = "SELECT c1.claim_type, c1.bid_state, c1.effective_amount, c1.transaction_time, o.transaction_time AS 'spent_time' FROM claim c1 LEFT JOIN (SELECT output.claim_id, tx.transaction_time FROM output INNER JOIN input ON input.prevout_hash = output.transaction_hash AND input.prevout_n = output.vout INNER JOIN transaction tx ON tx.id = input.transaction_id) o ON o.claim_id=c1.claim_id AND c1.bid_state='Spent' ORDER BY c1.transaction_time ASC";
+    var url = api_url + query;
+  var loadProgress = $('.bids-chart-container .load-progress');
+  $.ajax({
+    url: url,
+    type: 'get',
+    dataType: 'json',
+    beforeSend: function() {
+      chartLoadInProgress = true;
+      loadProgress.css({ display: 'block' });
+    },
+		success: function(response) {
+		if(response.success) {
+		chartData = buildChartData(response.data);
+      if(chart) {
+      	chart.dataProvider = chartData;
+        chart.validateNow();
+        chart.validateData();
+      }
+  	}
+  	else {
+  		console.log("Could not fetch block data.");
+  	}
+	},
+    complete: function() {
+      chartLoadInProgress = false;
+      loadProgress.css({ display: 'none' });
+    }
+});
+}
+
+var chart;
+var chartData = [];
+var chartLoadInProgress = false;
+AmCharts.ready(function() {
+chart = AmCharts.makeChart('bids-chart', {
+type: 'serial',
+theme: 'light',
+mouseWheelZoomEnabled: true,
+height: '100%',
+categoryField: 'date',
+synchronizeGrid: true,
+dataProvider: chartData,
+responsive: {
+       enabled: true,
+},
+valueAxes: [
+{
+	id: 'v-number-claims',
+	axisColor: '#1e88e5',
+	axisThickness: 2,
+	position: 'left',
+},
+{
+	id: 'v-bids-claims',
+	axisColor: '#0b7a06',
+	axisThickness: 2,
+	position: 'left',
+	offset: 75,
+},
+],
+categoryAxis: {
+parseDates: true,
+autoGridCount: false,
+minorGridEnabled: true,
+minorGridAlpha: 0.04,
+axisColor: '#dadada',
+twoLineMode: true
+},
+graphs: [
+{
+	id: 'g-number-claims',
+	valueAxis: 'v-number-claims',
+	title: 'Number of claims',
+	valueField: 'NumberClaims',
+	bullet: 'round',
+	bulletBorderThickness: 1,
+	bulletBorderAlpha: 1,
+	bulletColor: '#ffffff',
+	bulletSize: 5,
+	useLineColorForBulletBorder: true,
+	lineColor: '#1e88e5',
+	hideBulletsCount: 101,
+	balloonText: '[[NumberClaims]]',
+},
+{
+	id: 'g-bids-claims',
+	valueAxis: 'v-bids-claims',
+	title: 'Bids for claims (LBC)',
+	valueField: 'BidsClaims',
+	bullet: 'round',
+	bulletBorderThickness: 1,
+	bulletBorderAlpha: 1,
+	bulletColor: '#ffffff',
+	bulletSize: 5,
+	useLineColorForBulletBorder: true,
+	lineColor: '#0b7a06',
+	balloonText: '[[BidsClaims]] LBC',
+	hideBulletsCount: 101
+},
+],
+chartCursor: {
+cursorAlpha: 0.1,
+fullWidth: true,
+valueLineBalloonEnabled: true,
+categoryBalloonColor: '#333333',
+cursorColor: '#1e88e5'
+},
+chartScrollbar: {
+scrollbarHeight: 36,
+color: '#888888',
+gridColor: '#bbbbbb'
+},
+legend: {
+marginLeft: 110,
+useGraphSettings: true,
+valueText: "",
+spacing: 64,
+
+},
+export: {
+enabled: true,
+fileName: 'lbry-bids-chart',
+position: 'bottom-right',
+divId: 'chart-export'
+}
+});
+loadChartData();
+});
\ No newline at end of file
-- 
2.45.2


From 94682cc4d428d3dd56933a59604793bcdd5377db Mon Sep 17 00:00:00 2001
From: marcdeb1 <marcdebrouchev@laposte.net>
Date: Mon, 17 Dec 2018 12:35:54 +0100
Subject: [PATCH 02/43] Fixed transaction value issue

---
 src/Controller/MainController.php | 7 +++++--
 src/Template/Main/blocks.ctp      | 4 +---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/Controller/MainController.php b/src/Controller/MainController.php
index f144f0c..fdf30bb 100644
--- a/src/Controller/MainController.php
+++ b/src/Controller/MainController.php
@@ -381,6 +381,8 @@ class MainController extends AppController {
     
     public function blocks($height = null) {
         $this->loadModel('Blocks');
+        $this->loadModel('Outputs');
+        $this->loadModel('Transactions');
 
         if ($height === null) {
             // paginate blocks
@@ -413,7 +415,6 @@ class MainController extends AppController {
             $this->set('numRecords', $numBlocks);
             $this->set('currentPage', $page);
         } else {
-            $this->loadModel('Transactions');
             $height = intval($height);
             if ($height < 0) {
                 return $this->redirect('/');
@@ -425,7 +426,8 @@ class MainController extends AppController {
             }
 
             // Get the basic block transaction info
-            $txs = $this->Transactions->find()->select(['input_count', 'output_count', 'hash', 'version'])->where(['block_hash_id' => $block->hash])->toArray();
+            $txs = $this->Transactions->find()->select(['id', 'input_count', 'output_count', 'hash', 'version'])->where(['block_hash_id' => $block->hash])->toArray();
+            
 
             $this->set('block', $block);
             $this->set('blockTxs', $txs);
@@ -444,6 +446,7 @@ class MainController extends AppController {
 
         $tx = $this->Transactions->find()->select(
             ['id', 'block_hash_id', 'input_count', 'output_count', 'hash', 'transaction_time', 'transaction_size', 'created_at', 'version', 'lock_time', 'raw'])->where(['hash' => $hash])->first();
+        $tx->value = $tx->value();
         if (!$tx) {
             return $this->redirect('/');
         }
diff --git a/src/Template/Main/blocks.ctp b/src/Template/Main/blocks.ctp
index 3c1512f..9c8fb17 100644
--- a/src/Template/Main/blocks.ctp
+++ b/src/Template/Main/blocks.ctp
@@ -29,13 +29,11 @@
     </div>
 
     <div class="block-nav">
-        <?php if (strlen(trim($block->previous_block_hash)) > 0): ?>
+        <?php if ($block->height > 0): ?>
         <a class="btn btn-prev" href="/blocks/<?php echo ($block->height - 1); ?>">&laquo; Previous Block</a>
         <?php endif; ?>
 
-        <?php if (strlen(trim($block->next_block_hash)) > 0): ?>
         <a class="btn btn-next" href="/blocks/<?php echo ($block->height + 1); ?>">Next Block &raquo;</a>
-        <?php endif; ?>
 
         <div class="clear"></div>
     </div>
-- 
2.45.2


From 86a1631144e7ad1692284835cb5dcc47e7ee2d10 Mon Sep 17 00:00:00 2001
From: marcdeb1 <marcdebrouchev@laposte.net>
Date: Mon, 17 Dec 2018 22:36:13 +0100
Subject: [PATCH 03/43] Fix index transaction hash bug

---
 src/Controller/MainController.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Controller/MainController.php b/src/Controller/MainController.php
index fdf30bb..f6fd254 100644
--- a/src/Controller/MainController.php
+++ b/src/Controller/MainController.php
@@ -96,9 +96,12 @@ class MainController extends AppController {
         $blocks = $this->Blocks->find()->select(['chainwork', 'confirmations', 'difficulty', 'hash', 'height', 'transaction_hashes', 'block_time', 'block_size'])->order(['height' => 'desc'])->limit(6)->toArray();
         for ($i = 0; $i < count($blocks); $i++) {
             $tx_hashes = json_decode($blocks[$i]->transaction_hashes, true);
-            $blocks[$i]->transaction_count = count($tx_hashes);
+            if(!empty($tx_hashes)) {
+                $blocks[$i]->transaction_count = count($tx_hashes);
+            } else {
+                $blocks[$i]->transaction_count = 0;
+            }
         }
-
         // hash rate
         $hashRate = $this->_formatHashRate($this->_gethashrate());
 
-- 
2.45.2


From b61a1545a77c9a3e42e12005cf435933d8033fe5 Mon Sep 17 00:00:00 2001
From: marcdeb1 <marcdebrouchev@laposte.net>
Date: Tue, 18 Dec 2018 01:20:54 +0100
Subject: [PATCH 04/43] Realtime action

---
 src/Controller/MainController.php | 327 +++++++++++++++---------------
 src/Model/Entity/Claim.php        |   8 +-
 src/Model/Entity/Transaction.php  |   1 -
 src/Template/Main/claims.ctp      | 123 +++++------
 src/Template/Main/index.ctp       |   5 +-
 src/Template/Main/realtime.ctp    |  14 +-
 6 files changed, 250 insertions(+), 228 deletions(-)

diff --git a/src/Controller/MainController.php b/src/Controller/MainController.php
index f6fd254..afc1d49 100644
--- a/src/Controller/MainController.php
+++ b/src/Controller/MainController.php
@@ -106,7 +106,7 @@ class MainController extends AppController {
         $hashRate = $this->_formatHashRate($this->_gethashrate());
 
         // recent claims
-        $claims = $this->Claims->find()->select(['transaction_hash_id', 'name', 'vout', 'claim_id', 'claim_type', 'author', 'title', 'description', 'content_type', 'is_nsfw', 'language', 'thumbnail_url', 'created_at'])->
+        $claims = $this->Claims->find()->select(['transaction_hash_id', 'name', 'vout', 'claim_id', 'claim_type', 'author', 'title', 'description', 'content_type', 'is_nsfw', 'language', 'thumbnail_url', 'created_at', 'publisher_id'])->
             distinct(['Claims.claim_id'])->order(['Claims.created_at' => 'DESC'])->limit(5)->toArray();
 
         foreach($claims as $claim) {
@@ -124,7 +124,9 @@ class MainController extends AppController {
         $this->loadModel('Transactions');
 
         $canConvert = false;
-        $priceInfo = json_decode($this->redis->get(self::lbcPriceKey));
+        if(isset($this->redis)) {
+            $priceInfo = json_decode($this->redis->get(self::lbcPriceKey));
+        }
         if (isset($priceInfo->price)) {
             $canConvert = true;
         }
@@ -136,7 +138,7 @@ class MainController extends AppController {
             $page = intval($this->request->query('page'));
 
             $conn = ConnectionManager::get('default');
-            $stmt = $conn->execute('SELECT COUNT(Id) AS Total FROM Claims');
+            $stmt = $conn->execute('SELECT COUNT(Id) AS Total FROM claim');
             $count = $stmt->fetch(\PDO::FETCH_OBJ);
             $numClaims = $count->Total;
 
@@ -149,12 +151,19 @@ class MainController extends AppController {
             }
 
             $offset = ($page - 1) * $pageLimit;
-            $claims = $this->Claims->find()->distinct(['Claims.ClaimId'])->contain(['Stream', 'Publisher' => ['fields' => ['Name']]])->order(['Claims.Created' => 'DESC'])->offset($offset)->limit($pageLimit)->toArray();
-            for ($i = 0; $i < count($claims); $i++) {
-                if ($canConvert && $claims[$i]->Fee > 0 && $claims[$i]->FeeCurrency == 'USD') {
-                    $claims[$i]->Price = $claims[$i]->Fee / $priceInfo->price;
+            $claims = $this->Claims->find()->distinct(['claim_id'])->order(['created_at' => 'DESC'])->offset($offset)->limit($pageLimit)->toArray();
+            foreach($claims as $claim) {
+                if(isset($claim->publisher_id)) {
+                    $publisher = $this->Claims->find()->select(['name'])->where(['claim_id' => $claim->publisher_id])->first();
+                    $claim->publisher = $publisher;
                 }
-
+            }
+            
+            for ($i = 0; $i < count($claims); $i++) {
+                if ($canConvert && $claims[$i]->Fee > 0 && $claims[$i]->fee_currency == 'USD') {
+                    $claims[$i]->price = $claims[$i]->fee / $priceInfo->price;
+                }
+                
                 if (isset($claims[$i]->Stream)) {
                     $json = json_decode($claims[$i]->Stream->Stream);
                     if (isset($json->metadata->license)) {
@@ -172,13 +181,16 @@ class MainController extends AppController {
             $this->set('currentPage', $page);
             $this->set('claims', $claims);
         } else {
-            $claim = $this->Claims->find()->contain(['Stream', 'Publisher' => ['fields' => ['ClaimId', 'Name']]])->where(['Claims.ClaimId' => $id])->order(['Claims.Created' => 'DESC'])->first();
+            $claim = $this->Claims->find()->where(['claim_id' => $id])->order(['created_at' => 'DESC'])->first();
+            $publisher = $this->Claims->find()->select(['name'])->where(['claim_id' => $claim->publisher_id])->first();
+            $claim->publisher = $publisher;
+            
             if (!$claim) {
                 return $this->redirect('/');
             }
 
-            if ($canConvert && $claim->Fee > 0 && $claim->FeeCurrency == 'USD') {
-                $claim->Price = $claim->Fee / $priceInfo->price;
+            if ($canConvert && $claim->fee > 0 && $claim->fee_currency == 'USD') {
+                $claim->price = $claim->fee / $priceInfo->price;
             }
 
             if (isset($claim->Stream)) {
@@ -192,14 +204,13 @@ class MainController extends AppController {
             }
 
             $moreClaims = [];
-            if (isset($claim->Publisher) || $claim->ClaimType == 1) {
+            if (isset($claim->publisher) || $claim->claim_type == 1) {
                 // find more claims for the publisher
-                $moreClaims = $this->Claims->find()->contain(['Stream', 'Publisher' => ['fields' => ['Name']]])->
-                    where(['Claims.ClaimType' => 2, 'Claims.Id <>' => $claim->Id, 'Claims.PublisherId' => isset($claim->Publisher) ? $claim->Publisher->ClaimId : $claim->ClaimId])->
-                    limit(9)->order(['Claims.Fee' => 'DESC', 'RAND()' => 'DESC'])->toArray();
+                $moreClaims = $this->Claims->find()->where(['claim_type' => 2, 'id <>' => $claim->id, 'publisher_id' => isset($claim->publisher) ? $claim->publisher_id : $claim->claim_id])->
+                    limit(9)->order(['fee' => 'DESC', 'RAND()' => 'DESC'])->toArray();
                 for ($i = 0; $i < count($moreClaims); $i++) {
-                    if ($canConvert && $moreClaims[$i]->Fee > 0 && $moreClaims[$i]->FeeCurrency == 'USD') {
-                        $moreClaims[$i]->Price = $moreClaims[$i]->Fee / $priceInfo->price;
+                    if ($canConvert && $moreClaims[$i]->fee > 0 && $moreClaims[$i]->fee_currency == 'USD') {
+                        $moreClaims[$i]->price = $moreClaims[$i]->fee / $priceInfo->price;
                     }
 
                     if (isset($moreClaims[$i]->Stream)) {
@@ -225,114 +236,20 @@ class MainController extends AppController {
 
         // load 10 blocks and transactions
         $conn = ConnectionManager::get('default');
-        $blocks = $this->Blocks->find()->select(['Height', 'BlockTime', 'TransactionHashes'])->order(['Height' => 'desc'])->limit(10)->toArray();
+        $blocks = $this->Blocks->find()->select(['height', 'block_time', 'transaction_hashes'])->order(['height' => 'desc'])->limit(10)->toArray();
         for ($i = 0; $i < count($blocks); $i++) {
-            $tx_hashes = json_decode($blocks[$i]->TransactionHashes);
-            $blocks[$i]->TransactionCount = count($tx_hashes);
+            $tx_hashes = json_decode($blocks[$i]->transaction_hashes);
+            $blocks[$i]->transaction_count = count($tx_hashes);
         }
 
-        $stmt = $conn->execute('SELECT T.Hash, T.InputCount, T.OutputCount, T.Value, IFNULL(T.TransactionTime, T.CreatedTime) AS TxTime ' .
-                               'FROM Transactions T ORDER BY CreatedTime DESC LIMIT 10');
+        $stmt = $conn->execute('SELECT T.id, T.hash, T.input_count, T.output_count, IFNULL(T.transaction_time, T.created_at) AS TxTime ' .
+                               'FROM  transaction T ORDER BY created_at DESC LIMIT 10');
         $txs = $stmt->fetchAll(\PDO::FETCH_OBJ);
 
         $this->set('blocks', $blocks);
         $this->set('txs', $txs);
     }
 
-    public function apiblocksize($timePeriod = '24h') {
-        $this->autoRender = false;
-
-        if (!$this->request->is('get')) {
-            return $this->_jsonError('Invalid HTTP request method.', 400);
-        }
-
-        $validPeriods = ['24h', '72h', '168h', '30d', '90d', '1y'];
-        if (!in_array($timePeriod, $validPeriods)) {
-            return $this->_jsonError('Invalid time period specified.', 400);
-        }
-
-        $isHourly = (strpos($timePeriod, 'h') !== false);
-        $now = new \DateTime('now', new \DateTimeZone('UTC'));
-        $dateFormat = $isHourly ? 'Y-m-d H:00:00' : 'Y-m-d';
-        $sqlDateFormat = $isHourly ? '%Y-%m-%d %H:00:00' : '%Y-%m-%d';
-        $intervalPrefix = $isHourly ? 'PT' : 'P';
-        $start = $now->sub(new \DateInterval($intervalPrefix . strtoupper($timePeriod)));
-
-        $resultSet = [];
-
-        $conn = ConnectionManager::get('default');
-
-        // get avg block sizes for the time period
-        $stmt = $conn->execute("SELECT AVG(BlockSize) AS AvgBlockSize, DATE_FORMAT(FROM_UNIXTIME(BlockTime), '$sqlDateFormat') AS TimePeriod " .
-                               "FROM Blocks WHERE DATE_FORMAT(FROM_UNIXTIME(BlockTime), '$sqlDateFormat') >= ? GROUP BY TimePeriod ORDER BY TimePeriod ASC", [$start->format($dateFormat)]);
-        $avgBlockSizes = $stmt->fetchAll(\PDO::FETCH_OBJ);
-        foreach ($avgBlockSizes as $size) {
-            if (!isset($resultSet[$size->TimePeriod])) {
-                $resultSet[$size->TimePeriod] = [];
-            }
-            $resultSet[$size->TimePeriod]['AvgBlockSize'] = (float) $size->AvgBlockSize;
-        }
-
-        // get avg prices
-        $stmt = $conn->execute("SELECT AVG(USD) AS AvgUSD, DATE_FORMAT(Created, '$sqlDateFormat') AS TimePeriod " .
-                               "FROM PriceHistory WHERE DATE_FORMAT(Created, '$sqlDateFormat') >= ? GROUP BY TimePeriod ORDER BY TimePeriod ASC", [$start->format($dateFormat)]);
-        $avgPrices = $stmt->fetchAll(\PDO::FETCH_OBJ);
-        foreach ($avgPrices as $price) {
-            if (!isset($resultSet[$price->TimePeriod])) {
-                $resultSet[$price->TimePeriod] = [];
-            }
-            $resultSet[$price->TimePeriod]['AvgUSD'] = (float) $price->AvgUSD;
-        }
-
-        return $this->_jsonResponse(['success' => true, 'data' => $resultSet]);
-    }
-
-    public function apirealtimeblocks() {
-        // load 10 blocks
-        $this->autoRender = false;
-        $this->loadModel('Blocks');
-        $blocks = $this->Blocks->find()->select(['Height', 'BlockTime', 'TransactionHashes'])->order(['Height' => 'desc'])->limit(10)->toArray();
-        for ($i = 0; $i < count($blocks); $i++) {
-            $tx_hashes = json_decode($blocks[$i]->TransactionHashes);
-            $blocks[$i]->TransactionCount = count($tx_hashes);
-            unset($blocks[$i]->TransactionHashes);
-        }
-
-        $this->_jsonResponse(['success' => true, 'blocks' => $blocks]);
-    }
-
-    public function apirealtimetx() {
-        // load 10 transactions
-        $this->autoRender = false;
-        $conn = ConnectionManager::get('default');
-        $stmt = $conn->execute('SELECT T.Hash, T.InputCount, T.OutputCount, T.Value, IFNULL(T.TransactionTime, T.CreatedTime) AS TxTime ' .
-                               'FROM Transactions T ORDER BY CreatedTime DESC LIMIT 10');
-        $txs = $stmt->fetchAll(\PDO::FETCH_OBJ);
-
-        $this->_jsonResponse(['success' => true, 'txs' => $txs]);
-    }
-
-    protected function _formatHashRate($value) {
-        if ($value === 'N/A') {
-            return $value;
-        }
-
-        /*if ($value > 1000000000000) {
-            return number_format( $value / 1000000000000, 2, '.', '' ) . ' TH';
-        }*/
-        if ($value > 1000000000) {
-            return number_format( $value / 1000000000, 2, '.', '' ) . ' GH/s';
-        }
-        if ($value > 1000000) {
-            return number_format( $value / 1000000, 2, '.', '' ) . ' MH/s';
-        }
-        if ($value > 1000) {
-            return number_format( $value / 1000, 2, '.', '' ) . ' KH/s';
-        }
-
-        return number_format($value) . ' H/s';
-    }
-
     public function find() {
         $criteria = $this->request->query('q');
 
@@ -650,53 +567,78 @@ class MainController extends AppController {
         echo $qrCode->writeString();
         exit(0);
     }
+    
+    public function apiblocksize($timePeriod = '24h') {
+        $this->autoRender = false;
 
-    public static function curl_get($url) {
-        $ch = curl_init();
-        curl_setopt($ch, CURLOPT_URL, $url);
-        curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-
-        $response = curl_exec($ch);
-        Log::debug('Request execution completed.');
-
-        if ($response === false) {
-            $error = curl_error($ch);
-            $errno = curl_errno($ch);
-            curl_close($ch);
-
-            throw new \Exception(sprintf('The request failed: %s', $error), $errno);
-        } else {
-            curl_close($ch);
+        if (!$this->request->is('get')) {
+            return $this->_jsonError('Invalid HTTP request method.', 400);
         }
 
-        return $response;
+        $validPeriods = ['24h', '72h', '168h', '30d', '90d', '1y'];
+        if (!in_array($timePeriod, $validPeriods)) {
+            return $this->_jsonError('Invalid time period specified.', 400);
+        }
+
+        $isHourly = (strpos($timePeriod, 'h') !== false);
+        $now = new \DateTime('now', new \DateTimeZone('UTC'));
+        $dateFormat = $isHourly ? 'Y-m-d H:00:00' : 'Y-m-d';
+        $sqlDateFormat = $isHourly ? '%Y-%m-%d %H:00:00' : '%Y-%m-%d';
+        $intervalPrefix = $isHourly ? 'PT' : 'P';
+        $start = $now->sub(new \DateInterval($intervalPrefix . strtoupper($timePeriod)));
+
+        $resultSet = [];
+
+        $conn = ConnectionManager::get('default');
+
+        // get avg block sizes for the time period
+        $stmt = $conn->execute("SELECT AVG(BlockSize) AS AvgBlockSize, DATE_FORMAT(FROM_UNIXTIME(BlockTime), '$sqlDateFormat') AS TimePeriod " .
+                               "FROM Blocks WHERE DATE_FORMAT(FROM_UNIXTIME(BlockTime), '$sqlDateFormat') >= ? GROUP BY TimePeriod ORDER BY TimePeriod ASC", [$start->format($dateFormat)]);
+        $avgBlockSizes = $stmt->fetchAll(\PDO::FETCH_OBJ);
+        foreach ($avgBlockSizes as $size) {
+            if (!isset($resultSet[$size->TimePeriod])) {
+                $resultSet[$size->TimePeriod] = [];
+            }
+            $resultSet[$size->TimePeriod]['AvgBlockSize'] = (float) $size->AvgBlockSize;
+        }
+
+        // get avg prices
+        $stmt = $conn->execute("SELECT AVG(USD) AS AvgUSD, DATE_FORMAT(Created, '$sqlDateFormat') AS TimePeriod " .
+                               "FROM PriceHistory WHERE DATE_FORMAT(Created, '$sqlDateFormat') >= ? GROUP BY TimePeriod ORDER BY TimePeriod ASC", [$start->format($dateFormat)]);
+        $avgPrices = $stmt->fetchAll(\PDO::FETCH_OBJ);
+        foreach ($avgPrices as $price) {
+            if (!isset($resultSet[$price->TimePeriod])) {
+                $resultSet[$price->TimePeriod] = [];
+            }
+            $resultSet[$price->TimePeriod]['AvgUSD'] = (float) $price->AvgUSD;
+        }
+
+        return $this->_jsonResponse(['success' => true, 'data' => $resultSet]);
+    }
+    
+    public function apirealtimeblocks() {
+        // load 10 blocks
+        $this->autoRender = false;
+        $this->loadModel('Blocks');
+        $blocks = $this->Blocks->find()->select(['Height', 'BlockTime', 'TransactionHashes'])->order(['Height' => 'desc'])->limit(10)->toArray();
+        for ($i = 0; $i < count($blocks); $i++) {
+            $tx_hashes = json_decode($blocks[$i]->TransactionHashes);
+            $blocks[$i]->TransactionCount = count($tx_hashes);
+            unset($blocks[$i]->TransactionHashes);
+        }
+
+        $this->_jsonResponse(['success' => true, 'blocks' => $blocks]);
     }
 
-    private function _gethashrate() {
-        $req = ['method' => 'getnetworkhashps', 'params' => []];
-        try {
-            $res = json_decode(self::curl_json_post(self::$rpcurl, json_encode($req)));
-            if (!isset($res->result)) {
-                return 0;
-            }
-            return $res->result;
-        } catch (\Exception $e) {
-            return 'N/A';
-        }
-    }
+    public function apirealtimetx() {
+        // load 10 transactions
+        $this->autoRender = false;
+        $conn = ConnectionManager::get('default');
+        $stmt = $conn->execute('SELECT T.Hash, T.InputCount, T.OutputCount, T.Value, IFNULL(T.TransactionTime, T.CreatedTime) AS TxTime ' .
+                               'FROM Transactions T ORDER BY CreatedTime DESC LIMIT 10');
+        $txs = $stmt->fetchAll(\PDO::FETCH_OBJ);
 
-    private function _gettxoutsetinfo() {
-        $req = ['method' => 'gettxoutsetinfo', 'params' => []];
-        try {
-            $res = json_decode(self::curl_json_post(self::$rpcurl, json_encode($req)));
-            if (!isset($res->result)) {
-                return 0;
-            }
-            return $res->result;
-        } catch (\Exception $e) {
-            return 'N/A';
-        }
+        $this->_jsonResponse(['success' => true, 'txs' => $txs]);
     }
 
     public function apistatus() {
@@ -868,7 +810,7 @@ class MainController extends AppController {
         return $this->_jsonResponse(['success' => true, 'utxo' => $utxo]);
     }
 
-      public function apiutxosupply() {
+    public function apiutxosupply() {
         $this->autoRender = false;
         $this->loadModel('Addresses');
 
@@ -902,6 +844,75 @@ class MainController extends AppController {
 
         return $this->_jsonResponse(['success' => true, 'utxosupply' => ['total' => $txoutsetinfo->total_amount, 'circulating' => $circulating]]);
     }
+    
+    protected function _formatHashRate($value) {
+        if ($value === 'N/A') {
+            return $value;
+        }
+
+        /*if ($value > 1000000000000) {
+            return number_format( $value / 1000000000000, 2, '.', '' ) . ' TH';
+        }*/
+        if ($value > 1000000000) {
+            return number_format( $value / 1000000000, 2, '.', '' ) . ' GH/s';
+        }
+        if ($value > 1000000) {
+            return number_format( $value / 1000000, 2, '.', '' ) . ' MH/s';
+        }
+        if ($value > 1000) {
+            return number_format( $value / 1000, 2, '.', '' ) . ' KH/s';
+        }
+
+        return number_format($value) . ' H/s';
+    }
+
+    public static function curl_get($url) {
+        $ch = curl_init();
+        curl_setopt($ch, CURLOPT_URL, $url);
+        curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+
+        $response = curl_exec($ch);
+        Log::debug('Request execution completed.');
+
+        if ($response === false) {
+            $error = curl_error($ch);
+            $errno = curl_errno($ch);
+            curl_close($ch);
+
+            throw new \Exception(sprintf('The request failed: %s', $error), $errno);
+        } else {
+            curl_close($ch);
+        }
+
+        return $response;
+    }
+
+    private function _gethashrate() {
+        $req = ['method' => 'getnetworkhashps', 'params' => []];
+        try {
+            $res = json_decode(self::curl_json_post(self::$rpcurl, json_encode($req)));
+            if (!isset($res->result)) {
+                return 0;
+            }
+            return $res->result;
+        } catch (\Exception $e) {
+            return 'N/A';
+        }
+    }
+
+    private function _gettxoutsetinfo() {
+        $req = ['method' => 'gettxoutsetinfo', 'params' => []];
+        try {
+            $res = json_decode(self::curl_json_post(self::$rpcurl, json_encode($req)));
+            if (!isset($res->result)) {
+                return 0;
+            }
+            return $res->result;
+        } catch (\Exception $e) {
+            return 'N/A';
+        }
+    }
 
     private static function curl_json_post($url, $data, $headers = []) {
         $ch = curl_init();
diff --git a/src/Model/Entity/Claim.php b/src/Model/Entity/Claim.php
index d12c480..eab2204 100644
--- a/src/Model/Entity/Claim.php
+++ b/src/Model/Entity/Claim.php
@@ -3,12 +3,16 @@
 namespace App\Model\Entity;
 
 use Cake\ORM\Entity;
+use Cake\ORM\TableRegistry;
 
 class Claim extends Entity {
     function getLbryLink() {
         $link = $this->name;
-        if (isset($this->Publisher->Name)) {
-            $link = $this->Publisher->Name . '/' . $link;
+        $ClaimModel = TableRegistry::get('Claims');
+        $publisher = $ClaimModel->find()->select(['name'])->where(['claim_id' => $this->publisher_id])->first();
+        
+        if (isset($publisher->name)) {
+            $link = $publisher->name . '/' . $link;
         }
         $link = 'lbry://' . $link;
         return $link;
diff --git a/src/Model/Entity/Transaction.php b/src/Model/Entity/Transaction.php
index b491ed7..aa0ed81 100644
--- a/src/Model/Entity/Transaction.php
+++ b/src/Model/Entity/Transaction.php
@@ -5,7 +5,6 @@ namespace App\Model\Entity;
 use Cake\ORM\Entity;
 use Cake\ORM\TableRegistry;
 
-
 class Transaction extends Entity {
     public function value() {
         $OutputModel = TableRegistry::get('Outputs');
diff --git a/src/Template/Main/claims.ctp b/src/Template/Main/claims.ctp
index 0d4bfad..963205f 100644
--- a/src/Template/Main/claims.ctp
+++ b/src/Template/Main/claims.ctp
@@ -41,13 +41,13 @@
 $a = ['purple', 'orange', 'blue', 'teal', 'green', 'yellow'];
 $autoThumbText = $claim->getAutoThumbText();
 $cost = 'Free';
-if (isset($claim->Price) && $claim->Price > 0) {
-    $cost = $this->Amount->formatCurrency($claim->Price) . ' LBC';
-} else if (isset($claim->Fee) && strtolower($claim->FeeCurrency) === 'lbc') {
-    $cost = $this->Amount->formatCurrency($claim->Fee) . ' LBC';
+if (isset($claim->price) && $claim->price > 0) {
+    $cost = $this->Amount->formatCurrency($claim->price) . ' LBC';
+} else if (isset($claim->fee) && strtolower($claim->fee_currency) === 'lbc') {
+    $cost = $this->Amount->formatCurrency($claim->fee) . ' LBC';
 }
 
-$desc = $claim->Description;
+$desc = $claim->description;
 if (strlen(trim($desc)) == 0) {
     $desc = '<em>No description available.</em>';
 } else {
@@ -57,29 +57,29 @@ if (strlen(trim($desc)) == 0) {
 
 ?>
 
-<?php $this->assign('title', 'Claim &bull; ' . $claim->Name) ?>
+<?php $this->assign('title', 'Claim &bull; ' . $claim->name) ?>
 
 <div class="claims-head">
-    <h3><a href="/claims">LBRY Claims</a> &bull; <?php echo $claim->Name ?></h3>
-    <h4><?php echo $claim->ClaimId ?></h4>
+    <h3><a href="/claims">LBRY Claims</a> &bull; <?php echo $claim->name ?></h3>
+    <h4><?php echo $claim->claim_id ?></h4>
 </div>
 
 <div class="claims-body">
     <div class="claim-info">
         <div data-autothumb="<?php echo $autoThumbText ?>" class="thumbnail <?php echo $a[mt_rand(0, count($a) - 1)] ?>">
-            <?php if (!$claim->IsNSFW && strlen(trim($claim->ThumbnailUrl)) > 0): ?>
-                <img src="<?php echo htmlspecialchars($claim->ThumbnailUrl) ?>" alt="" />
+            <?php if (!$claim->is_nsfw && strlen(trim($claim->thumbnail_url)) > 0): ?>
+                <img src="<?php echo htmlspecialchars($claim->thumbnail_url) ?>" alt="" />
             <?php else: ?>
                 <div class="autothumb"><?php echo $autoThumbText ?></div>
             <?php endif; ?>
         </div>
 
         <div class="content">
-            <?php if ($claim->ClaimType == 2): ?>
+            <?php if ($claim->claim_type == 2): ?>
             <div class="label">Published By</div>
             <div class="value">
-                <?php if (isset($claim->Publisher)): ?>
-                    <a href="lbry://<?php echo $claim->Publisher->Name ?>"><?php echo $claim->Publisher->Name ?></a>
+                <?php if (isset($claim->publisher)): ?>
+                    <a href="lbry://<?php echo $claim->publisher->name ?>"><?php echo $claim->publisher->name ?></a>
                 <?php else: ?>
                     <em>Anonymous</em>
                 <?php endif; ?>
@@ -87,17 +87,17 @@ if (strlen(trim($desc)) == 0) {
             <?php endif; ?>
 
             <div class="label">Created On</div>
-            <div class="value"><?php echo \DateTime::createFromFormat('U', $claim->TransactionTime > 0 ? $claim->TransactionTime : $claim->Created->format('U'))->format('j M Y H:i:s') ?> UTC</div>
+            <div class="value"><?php echo \DateTime::createFromFormat('U', $claim->transaction_time > 0 ? $claim->transaction_time : $claim->created_at->format('U'))->format('j M Y H:i:s') ?> UTC</div>
 
             <div class="label">Transaction ID</div>
-            <div class="value"><a href="/tx/<?php echo $claim->TransactionHash ?>#output-<?php echo $claim->Vout ?>"><?php echo $claim->TransactionHash ?></a></div>
+            <div class="value"><a href="/tx/<?php echo $claim->transaction_hash_id ?>#output-<?php echo $claim->vout ?>"><?php echo $claim->transaction_hash_id ?></a></div>
 
-            <?php if ($claim->ClaimType == 2): ?>
+            <?php if ($claim->claim_type == 2): ?>
             <div class="label half-width">Cost</div>
             <div class="label half-width">Safe for Work</div>
 
             <div class="value half-width"><?php echo $cost ?></div>
-            <div class="value half-width"><?php echo $claim->IsNSFW ? 'No' : 'Yes' ?></div>
+            <div class="value half-width"><?php echo $claim->is_nsfw ? 'No' : 'Yes' ?></div>
 
             <div class="clear"></div>
             <?php endif; ?>
@@ -105,11 +105,11 @@ if (strlen(trim($desc)) == 0) {
     </div>
 
     <div class="claim-metadata">
-        <?php if ($claim->ClaimType == 1): ?>
+        <?php if ($claim->claim_type == 2): ?>
             <div class="title">Identity Claim</div>
             <div class="desc">This is an identity claim.</div>
         <?php else: ?>
-            <div class="title"><?php echo $claim->Title ?></div>
+            <div class="title"><?php echo $claim->title ?></div>
             <div class="desc"><?php echo str_replace("\n", '<br />', $desc) ?></div>
 
             <div class="details">
@@ -117,18 +117,20 @@ if (strlen(trim($desc)) == 0) {
                 <div class="label half-width">Content Type</div>
 
 
-                <div class="value half-width"><?php echo strlen(trim($claim->Author)) > 0 ? $claim->Author : '<em>Unspecified</em>' ?></div>
-                <div class="value half-width"><?php echo strlen(trim($claim->ContentType)) > 0 ? $claim->ContentType : '<em>Unspecified</em>' ?></div>
+                <div class="value half-width"><?php echo strlen(trim($claim->author)) > 0 ? $claim->author : '<em>Unspecified</em>' ?></div>
+                <div class="value half-width"><?php echo strlen(trim($claim->content_type)) > 0 ? $claim->content_type : '<em>Unspecified</em>' ?></div>
 
                 <div class="label half-width">License</div>
                 <div class="label half-width">Language</div>
 
-                <div class="value half-width"<?php if(strlen(trim($claim->License)) > 0): ?> title="<?php echo $claim->License ?>"<?php endif; ?>>
-                    <?php if (strlen(trim($claim->LicenseUrl)) > 0): ?><a href="<?php echo $claim->LicenseUrl ?>" rel="nofollow" target="_blank"><?php endif; ?>
+                <!--
+                <div class="value half-width"<?php if(strlen(trim($claim->license)) > 0): ?> title="<?php echo $claim->license ?>"<?php endif; ?>>
+                    <?php if (strlen(trim($claim->license_url)) > 0): ?><a href="<?php echo $claim->LicenseUrl ?>" rel="nofollow" target="_blank"><?php endif; ?>
                     <?php echo strlen(trim($claim->License)) > 0 ? $claim->License : '<em>Unspecified</em>' ?>
                     <?php if (strlen(trim($claim->LicenseUrl))): ?></a><?php endif; ?>
                 </div>
-                <div class="value half-width"><?php echo strlen(trim($claim->Language)) > 0 ? ($claim->Language == 'en' ? 'English' : '') : '<em>Unspecified</em>' ?></div>
+                -->
+                <div class="value half-width"><?php echo strlen(trim($claim->language)) > 0 ? ($claim->language == 'en' ? 'English' : '') : '<em>Unspecified</em>' ?></div>
             </div>
         <?php endif; ?>
         <a href="<?php echo $claim->getLbryLink() ?>" class="open-lbry-link">Open in LBRY</a>
@@ -140,7 +142,7 @@ if (strlen(trim($desc)) == 0) {
     <?php if (count($moreClaims) > 0): ?>
 
     <div class="more-claims">
-        <h4><?php echo isset($claim->Publisher) ? 'More from the publisher' : 'Published by this identity' ?></h4>
+        <h4><?php echo isset($claim->publisher) ? 'More from the publisher' : 'Published by this identity' ?></h4>
 
         <div class="claims-grid">
         <?php $idx = 1; $row = 1; $rowCount = ceil(count($moreClaims) / 3);
@@ -153,16 +155,16 @@ if (strlen(trim($desc)) == 0) {
 
             $autoThumbText = $claim->getAutoThumbText();
             $cost = '';
-            if (isset($claim->Price) && $claim->Price > 0) {
-                $cost = $this->Amount->formatCurrency($claim->Price) . ' LBC';
-            } else if (isset($claim->Fee) && strtolower($claim->FeeCurrency) === 'lbc') {
+            if (isset($claim->price) && $claim->price > 0) {
+                $cost = $this->Amount->formatCurrency($claim->price) . ' LBC';
+            } else if (isset($claim->fee) && strtolower($claim->fee_currency) === 'lbc') {
                 $cost = $this->Amount->formatCurrency($claim->Fee) . ' LBC';
             }
 
             // content type
             $ctTag = $claim->getContentTag();
         ?>
-        <div data-id="<?php echo $claim->ClaimId ?>" class="claim-grid-item<?php if ($idx % 3 == 0): ?> last-item<?php endif; ?><?php if ($last_row): ?> last-row<?php endif; ?>">
+        <div data-id="<?php echo $claim->claim_id ?>" class="claim-grid-item<?php if ($idx % 3 == 0): ?> last-item<?php endif; ?><?php if ($last_row): ?> last-row<?php endif; ?>">
             <?php if (strlen(trim($cost)) > 0): ?>
                 <div class="price-tag"><?php echo $cost ?></div>
             <?php endif; ?>
@@ -171,53 +173,55 @@ if (strlen(trim($desc)) == 0) {
                 <?php if ($ctTag): ?>
                 <div class="content-type"><?php echo strtoupper($ctTag) ?></div>
                 <?php endif; ?>
-                <?php if ($claim->IsNSFW): ?>
+                <?php if ($claim->is_nsfw): ?>
                 <div class="nsfw">NSFW</div>
                 <?php endif; ?>
             </div>
 
             <div data-autothumb="<?php echo $autoThumbText ?>" class="thumbnail <?php echo $a[mt_rand(0, count($a) - 1)] ?>">
-                <?php if (!$claim->IsNSFW && strlen(trim($claim->ThumbnailUrl)) > 0): ?>
-                    <img src="<?php echo htmlspecialchars($claim->ThumbnailUrl) ?>" alt="" />
+                <?php if (!$claim->is_nsfw && strlen(trim($claim->thumbnail_url)) > 0): ?>
+                    <img src="<?php echo htmlspecialchars($claim->thumbnail_url) ?>" alt="" />
                 <?php else: ?>
                     <div class="autothumb"><?php echo $autoThumbText ?></div>
                 <?php endif; ?>
             </div>
 
             <div class="metadata">
-                <div class="title" title="<?php echo $claim->ClaimType == 1 ? $claim->Name : ((strlen(trim($claim->Title)) > 0) ? $claim->Title : '') ?>"><?php echo $claim->ClaimType == 1 ? $claim->Name : ((strlen(trim($claim->Title)) > 0) ? $claim->Title : '<em>No Title</em>') ?></div>
+                <div class="title" title="<?php echo $claim->claim_type == 1 ? $claim->name : ((strlen(trim($claim->title)) > 0) ? $claim->title : '') ?>"><?php echo $claim->claim_type == 1 ? $claim->name : ((strlen(trim($claim->title)) > 0) ? $claim->title : '<em>No Title</em>') ?></div>
                 <div class="link" title="<?php echo $claim->getLbryLink() ?>"><a href="<?php echo $claim->getLbryLink() ?>" rel="nofollow"><?php echo $claim->getLbryLink() ?></a></div>
 
-                <div class="desc"><?php echo strlen(trim($claim->Description)) > 0 ? $claim->Description : '<em>No description available</em>' ?></div>
+                <div class="desc"><?php echo strlen(trim($claim->description)) > 0 ? $claim->description : '<em>No description available</em>' ?></div>
 
                 <div class="label half-width">Transaction</div>
                 <div class="label half-width">Created</div>
 
-                <div class="value half-width"><a href="/tx/<?php echo $claim->TransactionHash ?>#output-<?php echo $claim->Vout ?>" title="<?php echo $claim->TransactionHash ?>"><?php echo $claim->TransactionHash ?></a></div>
-                <div class="value half-width" title="<?php echo $claim->Created->format('j M Y H:i:s') ?> UTC">
-                    <?php echo \Carbon\Carbon::createFromTimestamp($claim->Created->format('U'))->diffForHumans(); ?>
+                <div class="value half-width"><a href="/tx/<?php echo $claim->transaction_hash_id ?>#output-<?php echo $claim->vout ?>" title="<?php echo $claim->transaction_hash_id ?>"><?php echo $claim->transaction_hash_id ?></a></div>
+                <div class="value half-width" title="<?php echo $claim->created_at->format('j M Y H:i:s') ?> UTC">
+                    <?php echo \Carbon\Carbon::createFromTimestamp($claim->created_at->format('U'))->diffForHumans(); ?>
                 </div>
 
                 <div class="clear spacer"></div>
 
-                <?php if ($claim->ClaimType == 2): ?>
+                <?php if ($claim->claim_type == 2): ?>
                 <div class="label half-width">Content Type</div>
                 <div class="label half-width">Language</div>
 
-                <div class="value half-width" title="<?php echo $claim->ContentType ?>"><?php echo $claim->ContentType ?></div>
-                <div class="value half-width" title="<?php echo $claim->Language == 'en' ? 'English' : $claim->Language ?>"><?php echo $claim->Language == 'en' ? 'English' : $claim->Language ?></div>
+                <div class="value half-width" title="<?php echo $claim->content_type ?>"><?php echo $claim->content_type ?></div>
+                <div class="value half-width" title="<?php echo $claim->language == 'en' ? 'English' : $claim->language ?>"><?php echo $claim->language == 'en' ? 'English' : $claim->language ?></div>
 
                 <div class="clear spacer"></div>
 
                 <div class="label half-width">Author</div>
                 <div class="label half-width">License</div>
 
-                <div class="value half-width" title="<?php echo strlen(trim($claim->Author)) > 0 ? $claim->Author : '<em>Unspecified</em>' ?>"><?php echo strlen(trim($claim->Author)) > 0 ? $claim->Author : '<em>Unspecified</em>' ?></div>
+                <div class="value half-width" title="<?php echo strlen(trim($claim->author)) > 0 ? $claim->author : '<em>Unspecified</em>' ?>"><?php echo strlen(trim($claim->author)) > 0 ? $claim->author : '<em>Unspecified</em>' ?></div>
+                <!--
                 <div class="value half-width" title="<?php echo strlen(trim($claim->License)) > 0 ? $claim->License : '' ?>">
                     <?php if (strlen(trim($claim->LicenseUrl)) > 0): ?><a href="<?php echo $claim->LicenseUrl ?>" rel="nofollow" target="_blank"><?php endif; ?>
                     <?php echo strlen(trim($claim->License)) > 0 ? $claim->License : '<em>Unspecified</em>' ?>
                     <?php if (strlen(trim($claim->LicenseUrl))): ?></a><?php endif; ?>
                 </div>
+                -->
                 <?php endif; ?>
 
             </div>
@@ -254,16 +258,16 @@ if (strlen(trim($desc)) == 0) {
         }
         $autoThumbText = $claim->getAutoThumbText();
         $cost = '';
-        if (isset($claim->Price) && $claim->Price > 0) {
-            $cost = $this->Amount->formatCurrency($claim->Price) . ' LBC';
-        } else if (isset($claim->Fee) && strtolower($claim->FeeCurrency) === 'lbc') {
-            $cost = $this->Amount->formatCurrency($claim->Fee) . ' LBC';
+        if (isset($claim->price) && $claim->price > 0) {
+            $cost = $this->Amount->formatCurrency($claim->price) . ' LBC';
+        } else if (isset($claim->fee) && strtolower($claim->fee_currency) === 'lbc') {
+            $cost = $this->Amount->formatCurrency($claim->fee) . ' LBC';
         }
 
         // content type
         $ctTag = $claim->getContentTag();
     ?>
-    <div data-id="<?php echo $claim->ClaimId ?>" class="claim-grid-item<?php if ($idx % 3 == 0): ?> last-item<?php endif; ?><?php if ($last_row): ?> last-row<?php endif; ?>">
+    <div data-id="<?php echo $claim->claim_id ?>" class="claim-grid-item<?php if ($idx % 3 == 0): ?> last-item<?php endif; ?><?php if ($last_row): ?> last-row<?php endif; ?>">
         <?php if (strlen(trim($cost)) > 0): ?>
         <div class="price-tag"><?php echo $cost ?></div>
         <?php endif; ?>
@@ -272,53 +276,56 @@ if (strlen(trim($desc)) == 0) {
             <?php if ($ctTag): ?>
             <div class="content-type"><?php echo strtoupper($ctTag) ?></div>
             <?php endif; ?>
-            <?php if ($claim->IsNSFW): ?>
+            <?php if ($claim->is_nsfw): ?>
             <div class="nsfw">NSFW</div>
             <?php endif; ?>
         </div>
 
         <div data-autothumb="<?php echo $autoThumbText ?>" class="thumbnail <?php echo $a[mt_rand(0, count($a) - 1)] ?>">
-            <?php if (!$claim->IsNSFW && strlen(trim($claim->ThumbnailUrl)) > 0): ?>
-                <img src="<?php echo htmlspecialchars($claim->ThumbnailUrl) ?>" alt="" />
+            <?php if (!$claim->is_nsfw && strlen(trim($claim->thumbnail_url)) > 0): ?>
+                <img src="<?php echo htmlspecialchars($claim->thumbnail_url) ?>" alt="" />
             <?php else: ?>
                 <div class="autothumb"><?php echo $autoThumbText ?></div>
             <?php endif; ?>
         </div>
 
         <div class="metadata">
-            <div class="title" title="<?php echo $claim->ClaimType == 1 ? $claim->Name : ((strlen(trim($claim->Title)) > 0) ? $claim->Title : '') ?>"><?php echo $claim->ClaimType == 1 ? $claim->Name : ((strlen(trim($claim->Title)) > 0) ? $claim->Title : '<em>No Title</em>') ?></div>
+            <div class="title" title="<?php echo $claim->claim_type == 1 ? $claim->name : ((strlen(trim($claim->title)) > 0) ? $claim->title : '') ?>"><?php echo $claim->claim_type == 1 ? $claim->name : ((strlen(trim($claim->title)) > 0) ? $claim->title : '<em>No Title</em>') ?></div>
             <div class="link" title="<?php echo $claim->getLbryLink() ?>"><a href="<?php echo $claim->getLbryLink() ?>" rel="nofollow"><?php echo $claim->getLbryLink() ?></a></div>
 
-            <div class="desc"><?php echo strlen(trim($claim->Description)) > 0 ? $claim->Description : '<em>No description available</em>' ?></div>
+            <div class="desc"><?php echo strlen(trim($claim->description)) > 0 ? $claim->description : '<em>No description available</em>' ?></div>
 
             <div class="label half-width">Transaction</div>
             <div class="label half-width">Created</div>
 
-            <div class="value half-width"><a href="/tx/<?php echo $claim->TransactionHash ?>#output-<?php echo $claim->Vout ?>" title="<?php echo $claim->TransactionHash ?>"><?php echo $claim->TransactionHash ?></a></div>
-            <div class="value half-width" title="<?php echo $claim->Created->format('j M Y H:i:s') ?> UTC">
-                <?php echo \Carbon\Carbon::createFromTimestamp($claim->TransactionTime > 0 ? $claim->TransactionTime : $claim->Created->format('U'))->diffForHumans(); ?>
+            <div class="value half-width"><a href="/tx/<?php echo $claim->transaction_hash_id ?>#output-<?php echo $claim->Vout ?>" title="<?php echo $claim->transaction_hash_id ?>"><?php echo $claim->transaction_hash_id ?></a></div>
+            <div class="value half-width" title="<?php echo $claim->created_at->format('j M Y H:i:s') ?> UTC">
+                <?php echo \Carbon\Carbon::createFromTimestamp($claim->transaction_time > 0 ? $claim->transaction_time : $claim->created_at->format('U'))->diffForHumans(); ?>
             </div>
 
             <div class="clear spacer"></div>
 
-            <?php if ($claim->ClaimType == 2): ?>
+            <?php if ($claim->claim_type == 2): ?>
             <div class="label half-width">Content Type</div>
             <div class="label half-width">Language</div>
 
-            <div class="value half-width" title="<?php echo $claim->ContentType ?>"><?php echo $claim->ContentType ?></div>
-            <div class="value half-width" title="<?php echo $claim->Language == 'en' ? 'English' : $claim->Language ?>"><?php echo $claim->Language == 'en' ? 'English' : $claim->Language ?></div>
+            <div class="value half-width" title="<?php echo $claim->content_type ?>"><?php echo $claim->content_type ?></div>
+            <div class="value half-width" title="<?php echo $claim->language == 'en' ? 'English' : $claim->language ?>"><?php echo $claim->language == 'en' ? 'English' : $claim->language ?></div>
 
             <div class="clear spacer"></div>
 
             <div class="label half-width">Author</div>
             <div class="label half-width">License</div>
 
-            <div class="value half-width" title="<?php echo strlen(trim($claim->Author)) > 0 ? $claim->Author : '<em>Unspecified</em>' ?>"><?php echo strlen(trim($claim->Author)) > 0 ? $claim->Author : '<em>Unspecified</em>' ?></div>
+            <div class="value half-width" title="<?php echo strlen(trim($claim->author)) > 0 ? $claim->author : '<em>Unspecified</em>' ?>"><?php echo strlen(trim($claim->author)) > 0 ? $claim->author : '<em>Unspecified</em>' ?></div>
+            
+            <!--
             <div class="value half-width" title="<?php echo strlen(trim($claim->License)) > 0 ? $claim->License : '' ?>">
                 <?php if (strlen(trim($claim->LicenseUrl)) > 0): ?><a href="<?php echo $claim->LicenseUrl ?>" rel="nofollow" target="_blank"><?php endif; ?>
                 <?php echo strlen(trim($claim->License)) > 0 ? $claim->License : '<em>Unspecified</em>' ?>
                 <?php if (strlen(trim($claim->LicenseUrl))): ?></a><?php endif; ?>
             </div>
+            -->
             <?php endif; ?>
         </div>
     </div>
diff --git a/src/Template/Main/index.ctp b/src/Template/Main/index.ctp
index 5866da6..8bd3aed 100644
--- a/src/Template/Main/index.ctp
+++ b/src/Template/Main/index.ctp
@@ -183,7 +183,8 @@
         <div class="recent-claims">
             <h3>Recent Claims</h3>
             <a class="claim-explorer-link" href="/claims">Claims Explorer</a>
-            <?php $idx = 0; $a = ['purple', 'orange', 'blue', 'teal', 'green', 'yellow']; foreach ($recentClaims as $claim):
+            <?php $idx = 0; $a = ['purple', 'orange', 'blue', 'teal', 'green', 'yellow']; 
+            foreach ($recentClaims as $claim):
                 $idx++;
                 $autoThumbText = $claim->getAutoThumbText();
                 $link = $claim->name;
@@ -226,7 +227,7 @@
                     <?php endif; ?>
                 </div>
 
-                <a class="tx-link" href="/tx/<?php echo $claim->transaction_hash ?>#output-<?php echo $claim->vout ?>" target="_blank">Transaction</a>
+                <a class="tx-link" href="/tx/<?php echo $claim->transaction_hash_id ?>#output-<?php echo $claim->vout ?>" target="_blank">Transaction</a>
             </div>
             <?php endforeach; ?>
 
diff --git a/src/Template/Main/realtime.ctp b/src/Template/Main/realtime.ctp
index 3b29f04..777855b 100644
--- a/src/Template/Main/realtime.ctp
+++ b/src/Template/Main/realtime.ctp
@@ -128,10 +128,10 @@
 
             <tbody>
                 <?php foreach ($blocks as $block): ?>
-                <tr data-height="<?php echo $block->Height ?>" data-time="<?php echo $block->BlockTime ?>">
-                    <td><a href="/blocks/<?php echo $block->Height ?>" target="_blank"><?php echo $block->Height ?></a></td>
-                    <td><?php echo \Carbon\Carbon::createFromTimestamp($block->BlockTime)->diffForHumans(); ?></td>
-                    <td class="right"><?php echo $block->TransactionCount ?></td>
+                <tr data-height="<?php echo $block->height ?>" data-time="<?php echo $block->block_time ?>">
+                    <td><a href="/blocks/<?php echo $block->height ?>" target="_blank"><?php echo $block->height ?></a></td>
+                    <td><?php echo \Carbon\Carbon::createFromTimestamp($block->block_time)->diffForHumans(); ?></td>
+                    <td class="right"><?php echo $block->transaction_count ?></td>
                 </tr>
                 <?php endforeach; ?>
             </tbody>
@@ -156,9 +156,9 @@
                 <tr data-hash="<?php echo $tx->Hash ?>" data-time="<?php echo $tx->TxTime ?>">
                     <td class="w200"><div><a href="/tx/<?php echo $tx->Hash ?>" target="_blank"><?php echo $tx->Hash ?></a></div></td>
                     <td><?php echo \Carbon\Carbon::createFromTimestamp($tx->TxTime)->diffForHumans(); ?></td>
-                    <td class="right"><?php echo $tx->InputCount ?></td>
-                    <td class="right"><?php echo $tx->OutputCount ?></td>
-                    <td class="right"><?php echo number_format($tx->Value, 8, '.', '') ?> LBC</td>
+                    <td class="right"><?php echo $tx->input_count ?></td>
+                    <td class="right"><?php echo $tx->output_count ?></td>
+                    <td class="right"><?php echo number_format($tx->value(), 8, '.', '') ?> LBC</td>
                 </tr>
                 <?php endforeach; ?>
             </tbody>
-- 
2.45.2


From 25a50ca2aa171746f74793cec5a1d3ba076c8e85 Mon Sep 17 00:00:00 2001
From: marcdeb1 <marcdebrouchev@laposte.net>
Date: Tue, 18 Dec 2018 13:42:45 +0100
Subject: [PATCH 05/43] API realtime actions

---
 src/Controller/MainController.php | 56 ++++++++++++++-----------------
 1 file changed, 25 insertions(+), 31 deletions(-)

diff --git a/src/Controller/MainController.php b/src/Controller/MainController.php
index afc1d49..e6edb6b 100644
--- a/src/Controller/MainController.php
+++ b/src/Controller/MainController.php
@@ -95,12 +95,8 @@ class MainController extends AppController {
 
         $blocks = $this->Blocks->find()->select(['chainwork', 'confirmations', 'difficulty', 'hash', 'height', 'transaction_hashes', 'block_time', 'block_size'])->order(['height' => 'desc'])->limit(6)->toArray();
         for ($i = 0; $i < count($blocks); $i++) {
-            $tx_hashes = json_decode($blocks[$i]->transaction_hashes, true);
-            if(!empty($tx_hashes)) {
-                $blocks[$i]->transaction_count = count($tx_hashes);
-            } else {
-                $blocks[$i]->transaction_count = 0;
-            }
+            $tx_hashes = preg_split('#,#', $blocks[$i]->transaction_hashes);
+            $blocks[$i]->transaction_count = count($tx_hashes);
         }
         // hash rate
         $hashRate = $this->_formatHashRate($this->_gethashrate());
@@ -238,7 +234,7 @@ class MainController extends AppController {
         $conn = ConnectionManager::get('default');
         $blocks = $this->Blocks->find()->select(['height', 'block_time', 'transaction_hashes'])->order(['height' => 'desc'])->limit(10)->toArray();
         for ($i = 0; $i < count($blocks); $i++) {
-            $tx_hashes = json_decode($blocks[$i]->transaction_hashes);
+            $tx_hashes = preg_split('#,#', $blocks[$i]->transaction_hashes);
             $blocks[$i]->transaction_count = count($tx_hashes);
         }
 
@@ -311,7 +307,7 @@ class MainController extends AppController {
             $page = intval($this->request->query('page'));
 
             $conn = ConnectionManager::get('default');
-            $stmt = $conn->execute('SELECT COUNT(Id) AS Total FROM Blocks');
+            $stmt = $conn->execute('SELECT COUNT(id) AS Total FROM Blocks');
             $count = $stmt->fetch(\PDO::FETCH_OBJ);
             $numBlocks = $count->Total;
 
@@ -592,8 +588,8 @@ class MainController extends AppController {
         $conn = ConnectionManager::get('default');
 
         // get avg block sizes for the time period
-        $stmt = $conn->execute("SELECT AVG(BlockSize) AS AvgBlockSize, DATE_FORMAT(FROM_UNIXTIME(BlockTime), '$sqlDateFormat') AS TimePeriod " .
-                               "FROM Blocks WHERE DATE_FORMAT(FROM_UNIXTIME(BlockTime), '$sqlDateFormat') >= ? GROUP BY TimePeriod ORDER BY TimePeriod ASC", [$start->format($dateFormat)]);
+        $stmt = $conn->execute("SELECT AVG(BlockSize) AS AvgBlockSize, DATE_FORMAT(FROM_UNIXTIME(block_time), '$sqlDateFormat') AS TimePeriod " .
+                               "FROM block WHERE DATE_FORMAT(FROM_UNIXTIME(block_time), '$sqlDateFormat') >= ? GROUP BY TimePeriod ORDER BY TimePeriod ASC", [$start->format($dateFormat)]);
         $avgBlockSizes = $stmt->fetchAll(\PDO::FETCH_OBJ);
         foreach ($avgBlockSizes as $size) {
             if (!isset($resultSet[$size->TimePeriod])) {
@@ -603,8 +599,8 @@ class MainController extends AppController {
         }
 
         // get avg prices
-        $stmt = $conn->execute("SELECT AVG(USD) AS AvgUSD, DATE_FORMAT(Created, '$sqlDateFormat') AS TimePeriod " .
-                               "FROM PriceHistory WHERE DATE_FORMAT(Created, '$sqlDateFormat') >= ? GROUP BY TimePeriod ORDER BY TimePeriod ASC", [$start->format($dateFormat)]);
+        $stmt = $conn->execute("SELECT AVG(USD) AS AvgUSD, DATE_FORMAT(created_at, '$sqlDateFormat') AS TimePeriod " .
+                               "FROM PriceHistory WHERE DATE_FORMAT(created_at, '$sqlDateFormat') >= ? GROUP BY TimePeriod ORDER BY TimePeriod ASC", [$start->format($dateFormat)]);
         $avgPrices = $stmt->fetchAll(\PDO::FETCH_OBJ);
         foreach ($avgPrices as $price) {
             if (!isset($resultSet[$price->TimePeriod])) {
@@ -617,26 +613,24 @@ class MainController extends AppController {
     }
     
     public function apirealtimeblocks() {
-        // load 10 blocks
+        // Load 10 blocks
         $this->autoRender = false;
         $this->loadModel('Blocks');
-        $blocks = $this->Blocks->find()->select(['Height', 'BlockTime', 'TransactionHashes'])->order(['Height' => 'desc'])->limit(10)->toArray();
+        $blocks = $this->Blocks->find()->select(['height', 'block_time', 'transaction_hashes'])->order(['height' => 'desc'])->limit(10)->toArray();
         for ($i = 0; $i < count($blocks); $i++) {
-            $tx_hashes = json_decode($blocks[$i]->TransactionHashes);
-            $blocks[$i]->TransactionCount = count($tx_hashes);
-            unset($blocks[$i]->TransactionHashes);
+            $tx_hashes = preg_split('#,#', $blocks[$i]->transaction_hashes);
+            $blocks[$i]->transaction_count = count($tx_hashes);
+            unset($blocks[$i]->transaction_hashes);
         }
 
         $this->_jsonResponse(['success' => true, 'blocks' => $blocks]);
     }
 
     public function apirealtimetx() {
-        // load 10 transactions
+        // Load 10 transactions
         $this->autoRender = false;
-        $conn = ConnectionManager::get('default');
-        $stmt = $conn->execute('SELECT T.Hash, T.InputCount, T.OutputCount, T.Value, IFNULL(T.TransactionTime, T.CreatedTime) AS TxTime ' .
-                               'FROM Transactions T ORDER BY CreatedTime DESC LIMIT 10');
-        $txs = $stmt->fetchAll(\PDO::FETCH_OBJ);
+        $this->loadModel('Transactions');
+        $txs = $this->Transactions->find()->select(['id', 'hash', 'input_count', 'output_count', 'transaction_time'])->order(['transaction_time' => 'desc'])->        limit(10);
 
         $this->_jsonResponse(['success' => true, 'txs' => $txs]);
     }
@@ -648,9 +642,9 @@ class MainController extends AppController {
         // Get the max height block
         $height = 0;
         $difficulty = 0;
-        $highestBlock = $this->Blocks->find()->select(['Height', 'Difficulty'])->order(['Height' => 'desc'])->first();
-        $height = $highestBlock->Height;
-        $difficulty = $highestBlock->Difficulty;
+        $highestBlock = $this->Blocks->find()->select(['height', 'difficulty'])->order(['height' => 'desc'])->first();
+        $height = $highestBlock->height;
+        $difficulty = $highestBlock->difficulty;
         $lbcUsdPrice = $this->_getLatestPrice();
 
         // Calculate hash rate
@@ -667,13 +661,13 @@ class MainController extends AppController {
     public function apirecentblocks() {
         $this->autoRender = false;
         $this->loadModel('Blocks');
-        $blocks = $this->Blocks->find()->select(['Difficulty', 'Hash', 'Height', 'TransactionHashes', 'BlockTime', 'BlockSize'])->
-            order(['Height' => 'desc'])->limit(6)->toArray();
+        $blocks = $this->Blocks->find()->select(['difficulty', 'hash', 'height', 'transaction_hashes', 'block_time', 'block_size'])->
+            order(['height' => 'desc'])->limit(6)->toArray();
         for ($i = 0; $i < count($blocks); $i++) {
-            $tx_hashes = json_decode($blocks[$i]->TransactionHashes);
-            $blocks[$i]->TransactionCount = count($tx_hashes);
-            $blocks[$i]->Difficulty = number_format($blocks[$i]->Difficulty, 2, '.', '');
-            unset($blocks[$i]->TransactionHashes);
+            $tx_hashes = preg_split('#,#', $blocks[$i]->transaction_hashes);
+            $blocks[$i]->transaction_count = count($tx_hashes);
+            $blocks[$i]->difficulty = number_format($blocks[$i]->difficulty, 2, '.', '');
+            unset($blocks[$i]->transaction_hashes);
         }
         return $this->_jsonResponse(['success' => true, 'blocks' => $blocks]);
     }
-- 
2.45.2


From 5c681657cb9873601757480b05407a4fed02757b Mon Sep 17 00:00:00 2001
From: marcdeb1 <marcdebrouchev@laposte.net>
Date: Tue, 18 Dec 2018 13:51:19 +0100
Subject: [PATCH 06/43] Added old database for PriceHistory

---
 config/app.default.php | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/config/app.default.php b/config/app.default.php
index 7fbc837..c9998be 100644
--- a/config/app.default.php
+++ b/config/app.default.php
@@ -222,16 +222,16 @@ return [
             'className' => 'Cake\Database\Connection',
             'driver' => 'Cake\Database\Driver\Mysql',
             'persistent' => false,
-            'host' => 'chainquery.lbry.io:3600',
+            'host' => 'chainquery.lbry.io',
             /**
              * CakePHP will use the default DB port based on the driver selected
              * MySQL on MAMP uses port 8889, MAMP users will want to uncomment
              * the following line and set the port accordingly
              */
-            //'port' => 'non_standard_port_number',
+            'port' => '3306',
             'username' => 'marcdeb',
             'password' => '3885fc6d0b71befe72a327f47f36c0911057',
-            'database' => 'lbry',
+            'database' => 'chainquery',
             'encoding' => 'utf8',
             'timezone' => 'UTC',
             'flags' => [],
@@ -259,6 +259,27 @@ return [
 
             'url' => env('DATABASE_URL', 'chainquery.lbry.io:3600'),
         ],
+        
+        'localdb' => [
+            'className' => 'Cake\Database\Connection',
+            'driver' => 'Cake\Database\Driver\Mysql',
+            'persistent' => false,
+            'host' => 'localhost',
+            /**
+             * CakePHP will use the default DB port based on the driver selected
+             * MySQL on MAMP uses port 8889, MAMP users will want to uncomment
+             * the following line and set the port accordingly
+             */
+            //'port' => '3306',
+            'username' => 'my_app',
+            'password' => 'secret',
+            'database' => 'my_app',
+            'encoding' => 'utf8',
+            'timezone' => 'UTC',
+            'flags' => [],
+            'cacheMetadata' => true,
+            'log' => false,
+        ],
 
         /**
          * The test connection is used during the test suite.
-- 
2.45.2


From 695f85262b320be5a14720372102373ae3f36087 Mon Sep 17 00:00:00 2001
From: marcdeb1 <marcdebrouchev@laposte.net>
Date: Tue, 18 Dec 2018 13:53:03 +0100
Subject: [PATCH 07/43] DB in app.default

---
 config/app.default.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/app.default.php b/config/app.default.php
index c9998be..e9008bc 100644
--- a/config/app.default.php
+++ b/config/app.default.php
@@ -228,10 +228,10 @@ return [
              * MySQL on MAMP uses port 8889, MAMP users will want to uncomment
              * the following line and set the port accordingly
              */
-            'port' => '3306',
-            'username' => 'marcdeb',
-            'password' => '3885fc6d0b71befe72a327f47f36c0911057',
-            'database' => 'chainquery',
+            'port' => '3000',
+            'username' => 'username',
+            'password' => 'secret',
+            'database' => 'my_db',
             'encoding' => 'utf8',
             'timezone' => 'UTC',
             'flags' => [],
-- 
2.45.2


From 9a32c9a930b0370fbdd1459e144fb2d57d4bc97e Mon Sep 17 00:00:00 2001
From: marcdeb1 <marcdebrouchev@laposte.net>
Date: Tue, 18 Dec 2018 16:09:37 +0100
Subject: [PATCH 08/43] Transaction page improvement

---
 src/Controller/MainController.php | 13 ++++++++++++-
 src/Template/Main/tx.ctp          | 23 ++++++++++++-----------
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/src/Controller/MainController.php b/src/Controller/MainController.php
index e6edb6b..d3b9111 100644
--- a/src/Controller/MainController.php
+++ b/src/Controller/MainController.php
@@ -370,9 +370,20 @@ class MainController extends AppController {
         $block = $this->Blocks->find()->select(['confirmations', 'height'])->where(['hash' => $tx->block_hash_id])->first();
         $confirmations = $block->confirmations;
         $inputs = $this->Inputs->find()->where(['transaction_id' => $tx->id])->order(['prevout_n' => 'asc'])->toArray();
-        $inputAddresses = $this->Addresses->find()->where(['input_address_id'])->toArray();
+        foreach($inputs as $input) {
+            $inputAddresses = $this->Addresses->find()->where(['id' => 'input_address_id'])->toArray();
+            $input->input_addresses = $inputAddresses;
+        }
+        
         $outputs = $this->Outputs->find()->where(['transaction_id' => $tx->id])->order(['vout' => 'asc'])->toArray();
         for ($i = 0; $i < count($outputs); $i++) {
+            $spend_input = $this->Inputs->find()->select(['transaction_hash', 'id'])->where(['id' => $outputs[$i]->spent_by_input_id])->first();
+            $outputs[$i]->spend_input = $spend_input;
+            
+            $output_address = trim($outputs[$i]->address_list, '[""]');
+            $address = $this->Addresses->find()->select(['address'])->where(['address' => $output_address])->first();
+            $outputs[$i]->output_addresses = [$address];
+            
             $outputs[$i]->IsClaim = (strpos($outputs[$i]->script_pub_key_asm, 'CLAIM') > -1);
             $outputs[$i]->IsSupportClaim = (strpos($outputs[$i]->script_pub_key_asm, 'SUPPORT_CLAIM') > -1);
             $outputs[$i]->IsUpdateClaim = (strpos($outputs[$i]->script_pub_key_asm, 'UPDATE_CLAIM') > -1);
diff --git a/src/Template/Main/tx.ctp b/src/Template/Main/tx.ctp
index 7372812..92ca341 100644
--- a/src/Template/Main/tx.ctp
+++ b/src/Template/Main/tx.ctp
@@ -92,14 +92,14 @@
                     $setAddressIds = [];
                     foreach ($inputs as $in):
             ?>
-            <div id="input-<?php echo $in->id ?>" class="input <?php if (isset($in['InputAddresses']) && count($in['InputAddresses']) > 0 && $in['InputAddresses'][0]->address == $sourceAddress): ?>is-source<?php endif; ?>">
+            <div id="input-<?php echo $in->id ?>" class="input <?php if (isset($in->input_addresses) && count($in->input_addresses) > 0 && $in->input_addresses[0]->address == $sourceAddress): ?>is-source<?php endif; ?>">
                 <?php if ($in->is_coinbase): ?>
                     <div>Block Reward (New Coins)</div>
                 <?php else: ?>
                     <?php if (strlen(trim($in->value)) == 0): ?>
                     <div>Incomplete data</div>
                     <?php else:
-                            $addr = $in['InputAddresses'][0];
+                            $addr = $in->input_addresses[0];
 
                             if (!isset($setAddressIds[$addr->address])):
                                 $setAddressIds[$addr->address] = 1; ?>
@@ -108,6 +108,7 @@
                     <div><span class="value"><?php echo $this->Amount->format($in->value) ?> LBC</span> from</div>
                     <div class="address"><a href="/address/<?php echo $addr->address ?>"><?php echo $addr->address ?></a>
                     (<a class="output-link" href="/tx/<?php echo $in->prevout_hash ?>#output-<?php echo $in->prevout_n ?>">output</a>)
+                    
                     <?php  if (isset($addr->Tag) && strlen(trim($addr->Tag)) > 0): ?>
                     <div class="tag">
                         <?php if (strlen(trim($addr->TagUrl)) > 0): ?><a href="<?php echo $addr->TagUrl ?>" target="_blank" rel="nofollow"><?php echo $addr->Tag ?></a><?php else: echo $addr->Tag; endif; ?>
@@ -134,7 +135,7 @@
 
             <?php
             foreach ($outputs as $out): ?>
-            <div id="output-<?php echo $out->Vout ?>" class="output <?php if (isset($out['OutputAddresses']) && count($out['OutputAddresses']) > 0 && $out['OutputAddresses'][0]->address == $sourceAddress): ?>is-source<?php endif; ?>">
+            <div id="output-<?php echo $out->vout ?>" class="output <?php if (isset($out->output_addresses) && count($out->output_addresses) > 0 && $out->output_addresses[0]->address == $sourceAddress): ?>is-source<?php endif; ?>">
                 <div class="labels">
                     <?php if($out->Claim && ($out->IsClaim or $out->IsSupportClaim or $out->IsUpdateClaim)): ?><a class="view-claim" href="<?php echo $out->Claim->getExplorerLink() ?>">View</a><?php endif; ?>
                     <?php if($out->IsSupportClaim): ?><div class="support">SUPPORT</div><?php endif; ?>
@@ -142,19 +143,19 @@
                     <?php if($out->IsClaim): ?><div class="claim">CLAIM</div><?php endif; ?>
                 </div>
 
-                <?php if (strlen(trim($out['Value'])) == 0): ?>
+                <?php if (strlen(trim($out->value)) == 0): ?>
                 <div>Incomplete data</div>
                 <?php else:
-                        $addr = $out['OutputAddresses'][0];
+                        $addr = $out->output_addresses[0];
 
-                        if (!isset($setAddressIds[$addr->Address])):
-                                $setAddressIds[$addr->Address] = 1; ?>
-                <a id="<?php echo $addr->Address ?>"></a>
+                        if (!isset($setAddressIds[$addr->address])):
+                                $setAddressIds[$addr->address] = 1; ?>
+                <a id="<?php echo $addr->address ?>"></a>
                 <?php   endif; ?>
-                <div><span class="value"><?php echo $this->Amount->format($out['Value']) ?> LBC</span> to</div>
-                <div class="address"><a href="/address/<?php echo $addr->Address ?>"><?php echo $addr->address ?></a>
+                <div><span class="value"><?php echo $this->Amount->format($out->value) ?> LBC</span> to</div>
+                <div class="address"><a href="/address/<?php echo $addr->address ?>"><?php echo $addr->address ?></a>
 
-                <?php if ($out->is_spent): ?>(<a href="/tx/<?php echo $out->spend_input->transaction_hash_id ?>#input-<?php echo $out->spend_input->id ?>">spent</a>)<?php else: ?>(unspent)<?php endif; ?>
+                <?php if ($out->is_spent): ?>(<a href="/tx/<?php echo $out->spend_input->transaction_hash ?>#input-<?php echo $out->spend_input->id ?>">spent</a>)<?php else: ?>(unspent)<?php endif; ?>
 
                 <?php if (isset($addr->Tag) && strlen(trim($addr->Tag)) > 0): ?>
                 <div class="tag">
-- 
2.45.2


From e7a030ddf99b26f52c41e2bc065d77a79993fff1 Mon Sep 17 00:00:00 2001
From: marcdeb1 <marcdebrouchev@laposte.net>
Date: Tue, 18 Dec 2018 16:20:19 +0100
Subject: [PATCH 09/43] Rename API fields

---
 src/Controller/MainController.php | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/Controller/MainController.php b/src/Controller/MainController.php
index d3b9111..06415d6 100644
--- a/src/Controller/MainController.php
+++ b/src/Controller/MainController.php
@@ -627,10 +627,10 @@ class MainController extends AppController {
         // Load 10 blocks
         $this->autoRender = false;
         $this->loadModel('Blocks');
-        $blocks = $this->Blocks->find()->select(['height', 'block_time', 'transaction_hashes'])->order(['height' => 'desc'])->limit(10)->toArray();
+        $blocks = $this->Blocks->find()->select(['height' => 'Height', 'block_time' => 'BlockTime', 'transaction_hashes'])->order(['Height' => 'desc'])->limit(10)->toArray();
         for ($i = 0; $i < count($blocks); $i++) {
             $tx_hashes = preg_split('#,#', $blocks[$i]->transaction_hashes);
-            $blocks[$i]->transaction_count = count($tx_hashes);
+            $blocks[$i]->TransactionCount = count($tx_hashes);
             unset($blocks[$i]->transaction_hashes);
         }
 
@@ -641,7 +641,10 @@ class MainController extends AppController {
         // Load 10 transactions
         $this->autoRender = false;
         $this->loadModel('Transactions');
-        $txs = $this->Transactions->find()->select(['id', 'hash', 'input_count', 'output_count', 'transaction_time'])->order(['transaction_time' => 'desc'])->        limit(10);
+        $txs = $this->Transactions->find()->select(['id', 'hash' => 'Hash', 'input_count' => 'InputCount', 'output_count' => 'OutputCount', 'transaction_time' => 'TxTime'])->order(['TxTime' => 'desc'])->limit(10);
+        foreach($txs as $tx) {
+            $tx->Value = $tx->value();
+        }
 
         $this->_jsonResponse(['success' => true, 'txs' => $txs]);
     }
@@ -672,12 +675,12 @@ class MainController extends AppController {
     public function apirecentblocks() {
         $this->autoRender = false;
         $this->loadModel('Blocks');
-        $blocks = $this->Blocks->find()->select(['difficulty', 'hash', 'height', 'transaction_hashes', 'block_time', 'block_size'])->
+        $blocks = $this->Blocks->find()->select(['difficulty' => 'Difficulty', 'hash' => 'Hash', 'height' => 'Height', 'transaction_hashes', 'block_time' => 'BlockTime', 'block_size' => 'BlockSize'])->
             order(['height' => 'desc'])->limit(6)->toArray();
         for ($i = 0; $i < count($blocks); $i++) {
             $tx_hashes = preg_split('#,#', $blocks[$i]->transaction_hashes);
-            $blocks[$i]->transaction_count = count($tx_hashes);
-            $blocks[$i]->difficulty = number_format($blocks[$i]->difficulty, 2, '.', '');
+            $blocks[$i]->TransactionCount = count($tx_hashes);
+            $blocks[$i]->Difficulty = number_format($blocks[$i]->difficulty, 2, '.', '');
             unset($blocks[$i]->transaction_hashes);
         }
         return $this->_jsonResponse(['success' => true, 'blocks' => $blocks]);
-- 
2.45.2


From 3cddd6ece144da4a62b934b8b7a43a1e535ee9c2 Mon Sep 17 00:00:00 2001
From: marcdeb1 <marcdebrouchev@laposte.net>
Date: Tue, 18 Dec 2018 17:47:49 +0100
Subject: [PATCH 10/43] Tx spend input

---
 src/Template/Main/tx.ctp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Template/Main/tx.ctp b/src/Template/Main/tx.ctp
index 92ca341..56a15f3 100644
--- a/src/Template/Main/tx.ctp
+++ b/src/Template/Main/tx.ctp
@@ -155,7 +155,7 @@
                 <div><span class="value"><?php echo $this->Amount->format($out->value) ?> LBC</span> to</div>
                 <div class="address"><a href="/address/<?php echo $addr->address ?>"><?php echo $addr->address ?></a>
 
-                <?php if ($out->is_spent): ?>(<a href="/tx/<?php echo $out->spend_input->transaction_hash ?>#input-<?php echo $out->spend_input->id ?>">spent</a>)<?php else: ?>(unspent)<?php endif; ?>
+                <?php if ($out->is_spent): ?>(<a href="/tx/<?php if(isset($out->spend_input)) { echo $out->spend_input->transaction_hash; } ?>#input-<?php if(isset($out->spend_input)) {echo $out->spend_input->id; } ?>">spent</a>)<?php else: ?>(unspent)<?php endif; ?>
 
                 <?php if (isset($addr->Tag) && strlen(trim($addr->Tag)) > 0): ?>
                 <div class="tag">
-- 
2.45.2


From e5d16d0100ae455e476b90c705fce5657be07e1d Mon Sep 17 00:00:00 2001
From: marcdeb1 <marcdebrouchev@laposte.net>
Date: Tue, 18 Dec 2018 17:58:49 +0100
Subject: [PATCH 11/43] Find action

---
 src/Controller/MainController.php | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/Controller/MainController.php b/src/Controller/MainController.php
index 06415d6..c55d980 100644
--- a/src/Controller/MainController.php
+++ b/src/Controller/MainController.php
@@ -256,38 +256,38 @@ class MainController extends AppController {
 
         if (is_numeric($criteria)) {
             $height = (int) $criteria;
-            $block = $this->Blocks->find()->select(['Id'])->where(['Height' => $height])->first();
+            $block = $this->Blocks->find()->select(['id'])->where(['height' => $height])->first();
             if ($block) {
                 return $this->redirect('/blocks/' . $height);
             }
         } else if (strlen(trim($criteria)) === 34) {
             // Address
-            $address = $this->Addresses->find()->select(['Id', 'Address'])->where(['Address' => $criteria])->first();
+            $address = $this->Addresses->find()->select(['id', 'address'])->where(['address' => $criteria])->first();
             if ($address) {
-                return $this->redirect('/address/' . $address->Address);
+                return $this->redirect('/address/' . $address->address);
             }
         } else if (strlen(trim($criteria)) === 40) {
             // Claim ID
-            $claim = $this->Claims->find()->select(['ClaimId'])->where(['ClaimId' => $criteria])->first();
+            $claim = $this->Claims->find()->select(['claim_id'])->where(['claim_id' => $criteria])->first();
             if ($claim) {
-                return $this->redirect('/claims/' . $claim->ClaimId);
+                return $this->redirect('/claims/' . $claim->claim_id);
             }
         } else if (strlen(trim($criteria)) === 64) { // block or tx hash
             // Try block hash first
-            $block = $this->Blocks->find()->select(['Height'])->where(['Hash' => $criteria])->first();
+            $block = $this->Blocks->find()->select(['height'])->where(['hash' => $criteria])->first();
             if ($block) {
-                return $this->redirect('/blocks/' . $block->Height);
+                return $this->redirect('/blocks/' . $block->height);
             } else {
-                $tx = $this->Transactions->find()->select(['Hash'])->where(['Hash' => $criteria])->first();
+                $tx = $this->Transactions->find()->select(['hash'])->where(['hash' => $criteria])->first();
                 if ($tx) {
-                    return $this->redirect('/tx/' . $tx->Hash);
+                    return $this->redirect('/tx/' . $tx->hash);
                 }
             }
         } else {
             // finally, try exact claim name match
-            $claims = $this->Claims->find()->distinct(['Claims.ClaimId'])->where(['Name' => $criteria])->order(['Claims.Created' => 'DESC'])->limit(10)->toArray();
+            $claims = $this->Claims->find()->distinct(['claim_id'])->where(['name' => $criteria])->order(['created_at' => 'DESC'])->limit(10)->toArray();
             if (count($claims) == 1) {
-                return $this->redirect('/claims/' . $claims[0]->ClaimId);
+                return $this->redirect('/claims/' . $claims[0]->claim_id);
             }
             else {
                 $this->set('claims', $claims);
@@ -371,7 +371,7 @@ class MainController extends AppController {
         $confirmations = $block->confirmations;
         $inputs = $this->Inputs->find()->where(['transaction_id' => $tx->id])->order(['prevout_n' => 'asc'])->toArray();
         foreach($inputs as $input) {
-            $inputAddresses = $this->Addresses->find()->where(['id' => 'input_address_id'])->toArray();
+            $inputAddresses = $this->Addresses->find()->select(['id', 'address'])->where(['id' => $input->input_address_id])->toArray();
             $input->input_addresses = $inputAddresses;
         }
         
@@ -387,7 +387,7 @@ class MainController extends AppController {
             $outputs[$i]->IsClaim = (strpos($outputs[$i]->script_pub_key_asm, 'CLAIM') > -1);
             $outputs[$i]->IsSupportClaim = (strpos($outputs[$i]->script_pub_key_asm, 'SUPPORT_CLAIM') > -1);
             $outputs[$i]->IsUpdateClaim = (strpos($outputs[$i]->script_pub_key_asm, 'UPDATE_CLAIM') > -1);
-            $claim = $this->Claims->find()->where(['transaction_hash_id' => $tx->hash, 'vout' => $outputs[$i]->vout])->first();
+            $claim = $this->Claims->find()->select(['id', 'claim_id', 'vout', 'transaction_hash_id'])->where(['transaction_hash_id' => $tx->hash, 'vout' => $outputs[$i]->vout])->first();
             $outputs[$i]->Claim = $claim;
         }
 
-- 
2.45.2


From 0bd3836b31c027e295d1b1c1f604a099dc7356bb Mon Sep 17 00:00:00 2001
From: marcdeb1 <marcdebrouchev@laposte.net>
Date: Tue, 18 Dec 2018 18:14:42 +0100
Subject: [PATCH 12/43] Claim box

---
 src/Template/Main/claims.ctp | 157 ++---------------------------------
 src/Template/Main/find.ctp   |  74 +----------------
 2 files changed, 9 insertions(+), 222 deletions(-)

diff --git a/src/Template/Main/claims.ctp b/src/Template/Main/claims.ctp
index 963205f..a17dc57 100644
--- a/src/Template/Main/claims.ctp
+++ b/src/Template/Main/claims.ctp
@@ -152,82 +152,9 @@ if (strlen(trim($desc)) == 0) {
             if ($idx % 3 == 0) {
                 $row++;
             }
-
-            $autoThumbText = $claim->getAutoThumbText();
-            $cost = '';
-            if (isset($claim->price) && $claim->price > 0) {
-                $cost = $this->Amount->formatCurrency($claim->price) . ' LBC';
-            } else if (isset($claim->fee) && strtolower($claim->fee_currency) === 'lbc') {
-                $cost = $this->Amount->formatCurrency($claim->Fee) . ' LBC';
-            }
-
-            // content type
-            $ctTag = $claim->getContentTag();
-        ?>
-        <div data-id="<?php echo $claim->claim_id ?>" class="claim-grid-item<?php if ($idx % 3 == 0): ?> last-item<?php endif; ?><?php if ($last_row): ?> last-row<?php endif; ?>">
-            <?php if (strlen(trim($cost)) > 0): ?>
-                <div class="price-tag"><?php echo $cost ?></div>
-            <?php endif; ?>
-
-            <div class="tags">
-                <?php if ($ctTag): ?>
-                <div class="content-type"><?php echo strtoupper($ctTag) ?></div>
-                <?php endif; ?>
-                <?php if ($claim->is_nsfw): ?>
-                <div class="nsfw">NSFW</div>
-                <?php endif; ?>
-            </div>
-
-            <div data-autothumb="<?php echo $autoThumbText ?>" class="thumbnail <?php echo $a[mt_rand(0, count($a) - 1)] ?>">
-                <?php if (!$claim->is_nsfw && strlen(trim($claim->thumbnail_url)) > 0): ?>
-                    <img src="<?php echo htmlspecialchars($claim->thumbnail_url) ?>" alt="" />
-                <?php else: ?>
-                    <div class="autothumb"><?php echo $autoThumbText ?></div>
-                <?php endif; ?>
-            </div>
-
-            <div class="metadata">
-                <div class="title" title="<?php echo $claim->claim_type == 1 ? $claim->name : ((strlen(trim($claim->title)) > 0) ? $claim->title : '') ?>"><?php echo $claim->claim_type == 1 ? $claim->name : ((strlen(trim($claim->title)) > 0) ? $claim->title : '<em>No Title</em>') ?></div>
-                <div class="link" title="<?php echo $claim->getLbryLink() ?>"><a href="<?php echo $claim->getLbryLink() ?>" rel="nofollow"><?php echo $claim->getLbryLink() ?></a></div>
-
-                <div class="desc"><?php echo strlen(trim($claim->description)) > 0 ? $claim->description : '<em>No description available</em>' ?></div>
-
-                <div class="label half-width">Transaction</div>
-                <div class="label half-width">Created</div>
-
-                <div class="value half-width"><a href="/tx/<?php echo $claim->transaction_hash_id ?>#output-<?php echo $claim->vout ?>" title="<?php echo $claim->transaction_hash_id ?>"><?php echo $claim->transaction_hash_id ?></a></div>
-                <div class="value half-width" title="<?php echo $claim->created_at->format('j M Y H:i:s') ?> UTC">
-                    <?php echo \Carbon\Carbon::createFromTimestamp($claim->created_at->format('U'))->diffForHumans(); ?>
-                </div>
-
-                <div class="clear spacer"></div>
-
-                <?php if ($claim->claim_type == 2): ?>
-                <div class="label half-width">Content Type</div>
-                <div class="label half-width">Language</div>
-
-                <div class="value half-width" title="<?php echo $claim->content_type ?>"><?php echo $claim->content_type ?></div>
-                <div class="value half-width" title="<?php echo $claim->language == 'en' ? 'English' : $claim->language ?>"><?php echo $claim->language == 'en' ? 'English' : $claim->language ?></div>
-
-                <div class="clear spacer"></div>
-
-                <div class="label half-width">Author</div>
-                <div class="label half-width">License</div>
-
-                <div class="value half-width" title="<?php echo strlen(trim($claim->author)) > 0 ? $claim->author : '<em>Unspecified</em>' ?>"><?php echo strlen(trim($claim->author)) > 0 ? $claim->author : '<em>Unspecified</em>' ?></div>
-                <!--
-                <div class="value half-width" title="<?php echo strlen(trim($claim->License)) > 0 ? $claim->License : '' ?>">
-                    <?php if (strlen(trim($claim->LicenseUrl)) > 0): ?><a href="<?php echo $claim->LicenseUrl ?>" rel="nofollow" target="_blank"><?php endif; ?>
-                    <?php echo strlen(trim($claim->License)) > 0 ? $claim->License : '<em>Unspecified</em>' ?>
-                    <?php if (strlen(trim($claim->LicenseUrl))): ?></a><?php endif; ?>
-                </div>
-                -->
-                <?php endif; ?>
-
-            </div>
-        </div>
-        <?php $idx++; endforeach; ?>
-
+            echo $this->element('claimbox', array('claim' => $claim));
+            $idx++; 
+            endforeach; ?>
         <div class="clear"></div>
     </div>
     </div>
@@ -256,81 +183,9 @@ if (strlen(trim($desc)) == 0) {
         if ($idx % 3 == 0) {
             $row++;
         }
-        $autoThumbText = $claim->getAutoThumbText();
-        $cost = '';
-        if (isset($claim->price) && $claim->price > 0) {
-            $cost = $this->Amount->formatCurrency($claim->price) . ' LBC';
-        } else if (isset($claim->fee) && strtolower($claim->fee_currency) === 'lbc') {
-            $cost = $this->Amount->formatCurrency($claim->fee) . ' LBC';
-        }
-
-        // content type
-        $ctTag = $claim->getContentTag();
-    ?>
-    <div data-id="<?php echo $claim->claim_id ?>" class="claim-grid-item<?php if ($idx % 3 == 0): ?> last-item<?php endif; ?><?php if ($last_row): ?> last-row<?php endif; ?>">
-        <?php if (strlen(trim($cost)) > 0): ?>
-        <div class="price-tag"><?php echo $cost ?></div>
-        <?php endif; ?>
-
-        <div class="tags">
-            <?php if ($ctTag): ?>
-            <div class="content-type"><?php echo strtoupper($ctTag) ?></div>
-            <?php endif; ?>
-            <?php if ($claim->is_nsfw): ?>
-            <div class="nsfw">NSFW</div>
-            <?php endif; ?>
-        </div>
-
-        <div data-autothumb="<?php echo $autoThumbText ?>" class="thumbnail <?php echo $a[mt_rand(0, count($a) - 1)] ?>">
-            <?php if (!$claim->is_nsfw && strlen(trim($claim->thumbnail_url)) > 0): ?>
-                <img src="<?php echo htmlspecialchars($claim->thumbnail_url) ?>" alt="" />
-            <?php else: ?>
-                <div class="autothumb"><?php echo $autoThumbText ?></div>
-            <?php endif; ?>
-        </div>
-
-        <div class="metadata">
-            <div class="title" title="<?php echo $claim->claim_type == 1 ? $claim->name : ((strlen(trim($claim->title)) > 0) ? $claim->title : '') ?>"><?php echo $claim->claim_type == 1 ? $claim->name : ((strlen(trim($claim->title)) > 0) ? $claim->title : '<em>No Title</em>') ?></div>
-            <div class="link" title="<?php echo $claim->getLbryLink() ?>"><a href="<?php echo $claim->getLbryLink() ?>" rel="nofollow"><?php echo $claim->getLbryLink() ?></a></div>
-
-            <div class="desc"><?php echo strlen(trim($claim->description)) > 0 ? $claim->description : '<em>No description available</em>' ?></div>
-
-            <div class="label half-width">Transaction</div>
-            <div class="label half-width">Created</div>
-
-            <div class="value half-width"><a href="/tx/<?php echo $claim->transaction_hash_id ?>#output-<?php echo $claim->Vout ?>" title="<?php echo $claim->transaction_hash_id ?>"><?php echo $claim->transaction_hash_id ?></a></div>
-            <div class="value half-width" title="<?php echo $claim->created_at->format('j M Y H:i:s') ?> UTC">
-                <?php echo \Carbon\Carbon::createFromTimestamp($claim->transaction_time > 0 ? $claim->transaction_time : $claim->created_at->format('U'))->diffForHumans(); ?>
-            </div>
-
-            <div class="clear spacer"></div>
-
-            <?php if ($claim->claim_type == 2): ?>
-            <div class="label half-width">Content Type</div>
-            <div class="label half-width">Language</div>
-
-            <div class="value half-width" title="<?php echo $claim->content_type ?>"><?php echo $claim->content_type ?></div>
-            <div class="value half-width" title="<?php echo $claim->language == 'en' ? 'English' : $claim->language ?>"><?php echo $claim->language == 'en' ? 'English' : $claim->language ?></div>
-
-            <div class="clear spacer"></div>
-
-            <div class="label half-width">Author</div>
-            <div class="label half-width">License</div>
-
-            <div class="value half-width" title="<?php echo strlen(trim($claim->author)) > 0 ? $claim->author : '<em>Unspecified</em>' ?>"><?php echo strlen(trim($claim->author)) > 0 ? $claim->author : '<em>Unspecified</em>' ?></div>
-            
-            <!--
-            <div class="value half-width" title="<?php echo strlen(trim($claim->License)) > 0 ? $claim->License : '' ?>">
-                <?php if (strlen(trim($claim->LicenseUrl)) > 0): ?><a href="<?php echo $claim->LicenseUrl ?>" rel="nofollow" target="_blank"><?php endif; ?>
-                <?php echo strlen(trim($claim->License)) > 0 ? $claim->License : '<em>Unspecified</em>' ?>
-                <?php if (strlen(trim($claim->LicenseUrl))): ?></a><?php endif; ?>
-            </div>
-            -->
-            <?php endif; ?>
-        </div>
-    </div>
-    <?php $idx++; endforeach; ?>
-
+        echo $this->element('claimbox', array('claim' => $claim));
+        $idx++; 
+        endforeach; ?>
     <div class="clear"></div>
 </div>
 
diff --git a/src/Template/Main/find.ctp b/src/Template/Main/find.ctp
index 4148e81..e1051bc 100644
--- a/src/Template/Main/find.ctp
+++ b/src/Template/Main/find.ctp
@@ -54,77 +54,9 @@
         if ($idx % 3 == 0) {
             $row++;
         }
-        $autoThumbText = $claim->getAutoThumbText();
-        $cost = '';
-        if (isset($claim->Price) && $claim->Price > 0) {
-            $cost = $this->Amount->formatCurrency($claim->Price) . ' LBC';
-        } else if (isset($claim->Fee) && strtolower($claim->FeeCurrency) === 'lbc') {
-            $cost = $this->Amount->formatCurrency($claim->Fee) . ' LBC';
-        }
-
-        // content type
-        $ctTag = $claim->getContentTag();
-    ?>
-    <div data-id="<?php echo $claim->ClaimId ?>" class="claim-grid-item<?php if ($idx % 3 == 0): ?> last-item<?php endif; ?><?php if ($last_row): ?> last-row<?php endif; ?>">
-        <?php if (strlen(trim($cost)) > 0): ?>
-        <div class="price-tag"><?php echo $cost ?></div>
-        <?php endif; ?>
-
-        <div class="tags">
-            <?php if ($ctTag): ?>
-            <div class="content-type"><?php echo strtoupper($ctTag) ?></div>
-            <?php endif; ?>
-            <?php if ($claim->IsNSFW): ?>
-            <div class="nsfw">NSFW</div>
-            <?php endif; ?>
-        </div>
-
-        <div data-autothumb="<?php echo $autoThumbText ?>" class="thumbnail <?php echo $a[mt_rand(0, count($a) - 1)] ?>">
-            <?php if (!$claim->IsNSFW && strlen(trim($claim->ThumbnailUrl)) > 0): ?>
-                <img src="<?php echo htmlspecialchars($claim->ThumbnailUrl) ?>" alt="" />
-            <?php else: ?>
-                <div class="autothumb"><?php echo $autoThumbText ?></div>
-            <?php endif; ?>
-        </div>
-
-        <div class="metadata">
-            <div class="title" title="<?php echo $claim->ClaimType == 1 ? $claim->Name : ((strlen(trim($claim->Title)) > 0) ? $claim->Title : '') ?>"><?php echo $claim->ClaimType == 1 ? $claim->Name : ((strlen(trim($claim->Title)) > 0) ? $claim->Title : '<em>No Title</em>') ?></div>
-            <div class="link" title="<?php echo $claim->getLbryLink() ?>"><a href="<?php echo $claim->getLbryLink() ?>" rel="nofollow"><?php echo $claim->getLbryLink() ?></a></div>
-
-            <div class="desc"><?php echo strlen(trim($claim->Description)) > 0 ? $claim->Description : '<em>No description available</em>' ?></div>
-
-            <div class="label half-width">Transaction</div>
-            <div class="label half-width">Created</div>
-
-            <div class="value half-width"><a href="/tx/<?php echo $claim->TransactionHash ?>#output-<?php echo $claim->Vout ?>" title="<?php echo $claim->TransactionHash ?>"><?php echo $claim->TransactionHash ?></a></div>
-            <div class="value half-width" title="<?php echo $claim->Created->format('j M Y H:i:s') ?> UTC">
-                    <?php echo \Carbon\Carbon::createFromTimestamp($claim->Created->format('U'))->diffForHumans(); ?>
-                </div>
-            <div class="clear spacer"></div>
-
-            <?php if ($claim->ClaimType == 2): ?>
-            <div class="label half-width">Content Type</div>
-            <div class="label half-width">Language</div>
-
-            <div class="value half-width" title="<?php echo $claim->ContentType ?>"><?php echo $claim->ContentType ?></div>
-            <div class="value half-width" title="<?php echo $claim->Language == 'en' ? 'English' : $claim->Language ?>"><?php echo $claim->Language == 'en' ? 'English' : $claim->Language ?></div>
-
-            <div class="clear spacer"></div>
-
-            <div class="label half-width">Author</div>
-            <div class="label half-width">License</div>
-
-            <div class="value half-width" title="<?php echo strlen(trim($claim->Author)) > 0 ? $claim->Author : '<em>Unspecified</em>' ?>"><?php echo strlen(trim($claim->Author)) > 0 ? $claim->Author : '<em>Unspecified</em>' ?></div>
-            <div class="value half-width" title="<?php echo strlen(trim($claim->License)) > 0 ? $claim->License : '' ?>">
-                <?php if (strlen(trim($claim->LicenseUrl)) > 0): ?><a href="<?php echo $claim->LicenseUrl ?>" rel="nofollow" target="_blank"><?php endif; ?>
-                <?php echo strlen(trim($claim->License)) > 0 ? $claim->License : '<em>Unspecified</em>' ?>
-                <?php if (strlen(trim($claim->LicenseUrl))): ?></a><?php endif; ?>
-            </div>
-            <?php endif; ?>
-        </div>
-    </div>
-    <?php $idx++; endforeach; ?>
-
+        echo $this->element('claimbox', array('claim' => $claim));
+        $idx++; 
+        endforeach; ?>
     <?php else: ?>
         <div class="no-results">No results were found.</div>
     <?php endif; ?>
-- 
2.45.2


From edbc11db7fd6385a81fc7c34f28d14c898993cf9 Mon Sep 17 00:00:00 2001
From: marcdeb1 <marcdebrouchev@laposte.net>
Date: Tue, 18 Dec 2018 19:21:12 +0100
Subject: [PATCH 13/43] API tests

---
 config/app.default.php            |  6 +++---
 src/Controller/MainController.php | 17 +++++++++--------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/config/app.default.php b/config/app.default.php
index e9008bc..5a29506 100644
--- a/config/app.default.php
+++ b/config/app.default.php
@@ -271,9 +271,9 @@ return [
              * the following line and set the port accordingly
              */
             //'port' => '3306',
-            'username' => 'my_app',
-            'password' => 'secret',
-            'database' => 'my_app',
+            'username' => 'root',
+            //'password' => 'secret',
+            'database' => 'lbry',
             'encoding' => 'utf8',
             'timezone' => 'UTC',
             'flags' => [],
diff --git a/src/Controller/MainController.php b/src/Controller/MainController.php
index c55d980..141a682 100644
--- a/src/Controller/MainController.php
+++ b/src/Controller/MainController.php
@@ -599,7 +599,7 @@ class MainController extends AppController {
         $conn = ConnectionManager::get('default');
 
         // get avg block sizes for the time period
-        $stmt = $conn->execute("SELECT AVG(BlockSize) AS AvgBlockSize, DATE_FORMAT(FROM_UNIXTIME(block_time), '$sqlDateFormat') AS TimePeriod " .
+        $stmt = $conn->execute("SELECT AVG(block_size) AS AvgBlockSize, DATE_FORMAT(FROM_UNIXTIME(block_time), '$sqlDateFormat') AS TimePeriod " .
                                "FROM block WHERE DATE_FORMAT(FROM_UNIXTIME(block_time), '$sqlDateFormat') >= ? GROUP BY TimePeriod ORDER BY TimePeriod ASC", [$start->format($dateFormat)]);
         $avgBlockSizes = $stmt->fetchAll(\PDO::FETCH_OBJ);
         foreach ($avgBlockSizes as $size) {
@@ -610,8 +610,10 @@ class MainController extends AppController {
         }
 
         // get avg prices
-        $stmt = $conn->execute("SELECT AVG(USD) AS AvgUSD, DATE_FORMAT(created_at, '$sqlDateFormat') AS TimePeriod " .
-                               "FROM PriceHistory WHERE DATE_FORMAT(created_at, '$sqlDateFormat') >= ? GROUP BY TimePeriod ORDER BY TimePeriod ASC", [$start->format($dateFormat)]);
+        
+        $conn = ConnectionManager::get('localdb');
+        $stmt = $conn->execute("SELECT AVG(USD) AS AvgUSD, DATE_FORMAT(Created, '$sqlDateFormat') AS TimePeriod " .
+                               "FROM PriceHistory WHERE DATE_FORMAT(Created, '$sqlDateFormat') >= ? GROUP BY TimePeriod ORDER BY TimePeriod ASC", [$start->format($dateFormat)]);
         $avgPrices = $stmt->fetchAll(\PDO::FETCH_OBJ);
         foreach ($avgPrices as $price) {
             if (!isset($resultSet[$price->TimePeriod])) {
@@ -627,7 +629,7 @@ class MainController extends AppController {
         // Load 10 blocks
         $this->autoRender = false;
         $this->loadModel('Blocks');
-        $blocks = $this->Blocks->find()->select(['height' => 'Height', 'block_time' => 'BlockTime', 'transaction_hashes'])->order(['Height' => 'desc'])->limit(10)->toArray();
+        $blocks = $this->Blocks->find()->select(['Height' => 'height', 'BlockTime' => 'block_time', 'transaction_hashes'])->order(['Height' => 'desc'])->limit(10)->toArray();
         for ($i = 0; $i < count($blocks); $i++) {
             $tx_hashes = preg_split('#,#', $blocks[$i]->transaction_hashes);
             $blocks[$i]->TransactionCount = count($tx_hashes);
@@ -641,7 +643,7 @@ class MainController extends AppController {
         // Load 10 transactions
         $this->autoRender = false;
         $this->loadModel('Transactions');
-        $txs = $this->Transactions->find()->select(['id', 'hash' => 'Hash', 'input_count' => 'InputCount', 'output_count' => 'OutputCount', 'transaction_time' => 'TxTime'])->order(['TxTime' => 'desc'])->limit(10);
+        $txs = $this->Transactions->find()->select(['id', 'Hash' => 'hash', 'InputCount' => 'input_count', 'OutputCount' => 'output_count', 'TxTime' => 'transaction_time'])->order(['TxTime' => 'desc'])->limit(10);
         foreach($txs as $tx) {
             $tx->Value = $tx->value();
         }
@@ -675,12 +677,11 @@ class MainController extends AppController {
     public function apirecentblocks() {
         $this->autoRender = false;
         $this->loadModel('Blocks');
-        $blocks = $this->Blocks->find()->select(['difficulty' => 'Difficulty', 'hash' => 'Hash', 'height' => 'Height', 'transaction_hashes', 'block_time' => 'BlockTime', 'block_size' => 'BlockSize'])->
-            order(['height' => 'desc'])->limit(6)->toArray();
+        $blocks = $this->Blocks->find()->select(['Difficulty' => 'difficulty', 'Hash' => 'hash', 'Height' => 'height', 'transaction_hashes', 'BlockTime' => 'block_time', 'BlockSize' => 'block_size'])->order(['Height' => 'desc'])->limit(6)->toArray();
         for ($i = 0; $i < count($blocks); $i++) {
             $tx_hashes = preg_split('#,#', $blocks[$i]->transaction_hashes);
             $blocks[$i]->TransactionCount = count($tx_hashes);
-            $blocks[$i]->Difficulty = number_format($blocks[$i]->difficulty, 2, '.', '');
+            $blocks[$i]->Difficulty = number_format($blocks[$i]->Difficulty, 2, '.', '');
             unset($blocks[$i]->transaction_hashes);
         }
         return $this->_jsonResponse(['success' => true, 'blocks' => $blocks]);
-- 
2.45.2


From fbfd5b8f39a310b248fa79e68804b406867c764e Mon Sep 17 00:00:00 2001
From: marcdeb1 <marcdebrouchev@laposte.net>
Date: Tue, 18 Dec 2018 20:17:34 +0100
Subject: [PATCH 14/43] Price history db name

---
 src/Controller/MainController.php | 5 ++---
 src/Shell/AuxShell.php            | 2 +-
 src/Template/Main/blocks.ctp      | 4 +++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/Controller/MainController.php b/src/Controller/MainController.php
index 141a682..44a43b1 100644
--- a/src/Controller/MainController.php
+++ b/src/Controller/MainController.php
@@ -597,7 +597,6 @@ class MainController extends AppController {
         $resultSet = [];
 
         $conn = ConnectionManager::get('default');
-
         // get avg block sizes for the time period
         $stmt = $conn->execute("SELECT AVG(block_size) AS AvgBlockSize, DATE_FORMAT(FROM_UNIXTIME(block_time), '$sqlDateFormat') AS TimePeriod " .
                                "FROM block WHERE DATE_FORMAT(FROM_UNIXTIME(block_time), '$sqlDateFormat') >= ? GROUP BY TimePeriod ORDER BY TimePeriod ASC", [$start->format($dateFormat)]);
@@ -611,8 +610,8 @@ class MainController extends AppController {
 
         // get avg prices
         
-        $conn = ConnectionManager::get('localdb');
-        $stmt = $conn->execute("SELECT AVG(USD) AS AvgUSD, DATE_FORMAT(Created, '$sqlDateFormat') AS TimePeriod " .
+        $conn_local = ConnectionManager::get('localdb');
+        $stmt = $conn_local->execute("SELECT AVG(USD) AS AvgUSD, DATE_FORMAT(Created, '$sqlDateFormat') AS TimePeriod " .
                                "FROM PriceHistory WHERE DATE_FORMAT(Created, '$sqlDateFormat') >= ? GROUP BY TimePeriod ORDER BY TimePeriod ASC", [$start->format($dateFormat)]);
         $avgPrices = $stmt->fetchAll(\PDO::FETCH_OBJ);
         foreach ($avgPrices as $price) {
diff --git a/src/Shell/AuxShell.php b/src/Shell/AuxShell.php
index 2495a9c..cfb6f8f 100644
--- a/src/Shell/AuxShell.php
+++ b/src/Shell/AuxShell.php
@@ -127,7 +127,7 @@ class AuxShell extends Shell {
     public function pricehistory() {
         self::lock('pricehistory');
 
-        $conn = ConnectionManager::get('default');
+        $conn = ConnectionManager::get('localdb');
         $redis = new \Predis\Client(Configure::read('Redis.Url'));
 
         try {
diff --git a/src/Template/Main/blocks.ctp b/src/Template/Main/blocks.ctp
index 9c8fb17..17ff11c 100644
--- a/src/Template/Main/blocks.ctp
+++ b/src/Template/Main/blocks.ctp
@@ -76,9 +76,11 @@
 
             <div class="label">NameClaimRoot</div> <div class="value"><?php echo $block->name_claim_root ?></div>
 
+            <!-- 
             <div class="spacer"></div>
 
-            <div class="label">Target</div> <div class="value"><?php echo '$block->Target' ?></div>
+            <div class="label">Target</div> <div class="value"><?php echo $block->Target ?></div>
+            -->
 
             <div class="spacer"></div>
 
-- 
2.45.2


From af39804ce792fd7d89d14f35272f6c279b3bce24 Mon Sep 17 00:00:00 2001
From: marcdeb1 <marcdebrouchev@laposte.net>
Date: Tue, 18 Dec 2018 21:56:41 +0100
Subject: [PATCH 15/43] Address action

---
 config/app.default.php            |  6 +--
 src/Controller/MainController.php | 49 ++++++++++----------
 src/Template/Main/address.ctp     | 24 +++++-----
 src/Template/Main/claims.ctp      | 74 ++++++++++++++++++++++++++++++-
 4 files changed, 111 insertions(+), 42 deletions(-)

diff --git a/config/app.default.php b/config/app.default.php
index 5a29506..6a00e95 100644
--- a/config/app.default.php
+++ b/config/app.default.php
@@ -228,7 +228,7 @@ return [
              * MySQL on MAMP uses port 8889, MAMP users will want to uncomment
              * the following line and set the port accordingly
              */
-            'port' => '3000',
+            //'port' => '3000',
             'username' => 'username',
             'password' => 'secret',
             'database' => 'my_db',
@@ -271,8 +271,8 @@ return [
              * the following line and set the port accordingly
              */
             //'port' => '3306',
-            'username' => 'root',
-            //'password' => 'secret',
+            'username' => 'username',
+            'password' => 'secret',
             'database' => 'lbry',
             'encoding' => 'utf8',
             'timezone' => 'UTC',
diff --git a/src/Controller/MainController.php b/src/Controller/MainController.php
index 44a43b1..8a49618 100644
--- a/src/Controller/MainController.php
+++ b/src/Controller/MainController.php
@@ -134,7 +134,7 @@ class MainController extends AppController {
             $page = intval($this->request->query('page'));
 
             $conn = ConnectionManager::get('default');
-            $stmt = $conn->execute('SELECT COUNT(Id) AS Total FROM claim');
+            $stmt = $conn->execute('SELECT COUNT(id) AS Total FROM claim');
             $count = $stmt->fetch(\PDO::FETCH_OBJ);
             $numClaims = $count->Total;
 
@@ -156,7 +156,7 @@ class MainController extends AppController {
             }
             
             for ($i = 0; $i < count($claims); $i++) {
-                if ($canConvert && $claims[$i]->Fee > 0 && $claims[$i]->fee_currency == 'USD') {
+                if ($canConvert && $claims[$i]->fee > 0 && $claims[$i]->fee_currency == 'USD') {
                     $claims[$i]->price = $claims[$i]->fee / $priceInfo->price;
                 }
                 
@@ -477,11 +477,11 @@ class MainController extends AppController {
             $tagRequestAmount = '25.' . rand(11111111, 99999999);
         }
 
-        $address = $this->Addresses->find()->where(['Address' => $addr])->first();
+        $address = $this->Addresses->find()->where(['address' => $addr])->first();
         if (!$address) {
             if (strlen($addr) === 34) {
                 $address = new \stdClass();
-                $address->Address = $addr;
+                $address->address = $addr;
             } else {
                 return $this->redirect('/');
             }
@@ -489,11 +489,11 @@ class MainController extends AppController {
             $conn = ConnectionManager::get('default');
 
             $canTag = true;
-            $addressId = $address->Id;
-
-            $stmt = $conn->execute('SELECT COUNT(TransactionId) AS Total FROM TransactionsAddresses WHERE AddressId = ?', [$addressId]);
-            $count = $stmt->fetch(\PDO::FETCH_OBJ);
-            $numTransactions = $count->Total;
+            $addressId = $address->id;
+            
+            $stmt = $conn->execute('SELECT * FROM transaction_address WHERE address_id = ?', [$addressId]);
+            $transactionAddresses = $stmt->fetch(\PDO::FETCH_OBJ);
+            $numTransactions = count($transactionAddresses);
             $all = $this->request->query('all');
             if ($all === 'true') {
                 $offset = 0;
@@ -512,26 +512,25 @@ class MainController extends AppController {
                 $offset = ($page - 1) * $pageLimit;
             }
 
-            $stmt = $conn->execute('SELECT A.TotalReceived, A.TotalSent, A.Balance FROM Addresses A WHERE A.Id = ?', [$address->Id]);
-            $totals = $stmt->fetch(\PDO::FETCH_OBJ);
-
-            $currentBlock = $this->Blocks->find()->select(['Height'])->order(['Height' => 'desc'])->first();
-            $currentHeight = $currentBlock ? intval($currentBlock->Height) : 0;
+            $currentBlock = $this->Blocks->find()->select(['height'])->order(['height' => 'desc'])->first();
+            $currentHeight = $currentBlock ? intval($currentBlock->height) : 0;
 
             $stmt = $conn->execute(sprintf(
-                'SELECT T.Id, T.Hash, T.InputCount, T.OutputCount, T.Value, ' .
-                '    TA.DebitAmount, TA.CreditAmount, ' .
-                '    B.Height, (CASE WHEN B.Height IS NOT NULL THEN ((' . $currentHeight . ' - B.Height) + 1) ELSE NULL END) AS Confirmations, ' .
-                '    IFNULL(T.TransactionTime, T.CreatedTime) AS TxTime ' .
-                'FROM Transactions T ' .
-                'LEFT JOIN Blocks B ON T.BlockHash = B.Hash ' .
-                'RIGHT JOIN (SELECT TransactionId, DebitAmount, CreditAmount FROM TransactionsAddresses ' .
-                '            WHERE AddressId = ? ORDER BY TransactionTime DESC LIMIT %d, %d) TA ON TA.TransactionId = T.Id', $offset, $pageLimit), [$addressId]);
+                'SELECT T.id, T.hash, T.input_count, T.output_count' .
+                '    TA.debit_amount, TA.credit_amount, ' .
+                '    B.height, B.confirmations, ' .
+                '    IFNULL(T.transaction_time, T.created_at) AS transaction_time ' .
+                'FROM transaction T ' .
+                'LEFT JOIN block B ON T.block_hash_id = B.hash ' .
+                'RIGHT JOIN (SELECT transaction_id, debit_amount, credit_amount FROM transaction_address ' .
+                '            WHERE address_id = ? ORDER BY transaction_time DESC LIMIT %d, %d) TA ON TA.transaction_id = T.id', $offset, $pageLimit), [$addressId]);
             $recentTxs = $stmt->fetchAll(\PDO::FETCH_OBJ);
 
-            $totalRecvAmount = $totals->TotalReceived == 0 ? '0' : $totals->TotalReceived + 0;
-            $totalSentAmount = $totals->TotalSent == 0 ? '0' : $totals->TotalSent + 0;
-            $balanceAmount = $totals->Balance == 0 ? '0' : $totals->Balance + 0;
+            foreach($transactionAddresses as $ta) {
+                $totalRecvAmount += $ta->credit_amount + 0;
+                $totalSentAmount += $ta->debit_amount + 0;
+            }
+            $balanceAmount = $totalSentAmount - $totalRecvAmount;
         }
 
         $this->set('offset', $offset);
diff --git a/src/Template/Main/address.ctp b/src/Template/Main/address.ctp
index 940c7f5..748bdf3 100644
--- a/src/Template/Main/address.ctp
+++ b/src/Template/Main/address.ctp
@@ -1,4 +1,4 @@
-<?php $this->assign('title', 'Address ' . $address->Address) ?>
+<?php $this->assign('title', 'Address ' . $address->address) ?>
 
 <?php $this->start('script') ?>
 <script type="text/javascript">
@@ -40,7 +40,7 @@
 
             var btnClose = $('.btn-close');
             $.ajax({
-                url: '/api/v1/address/<?php echo $address->Address ?>/tag',
+                url: '/api/v1/address/<?php echo $address->address ?>/tag',
                 type: 'post',
                 dataType: 'json',
                 data: req,
@@ -87,7 +87,7 @@
 
 <div class="address-head">
     <h3>LBRY Address</h3>
-    <h4><?php echo $address->Address ?></h4>
+    <h4><?php echo $address->address ?></h4>
     <?php if (isset($address->Tag) && strlen(trim($address->Tag)) > 0): ?>
         <?php if (strlen(trim($address->TagUrl)) > 0): ?><a href="<?php echo $address->TagUrl ?>" target="_blank" rel="nofollow"><?php echo $address->Tag ?></a><?php else: echo $address->Tag; endif; ?>
     <?php endif; ?>
@@ -95,7 +95,7 @@
 
 <div class="address-subhead">
     <div class="address-qr">
-        <img src="/qr/lbry%3A<?php echo $address->Address ?>" alt="lbry:<?php echo $address->Address ?>" />
+        <img src="/qr/lbry%3A<?php echo $address->address ?>" alt="lbry:<?php echo $address->address ?>" />
     </div>
 
     <div class="address-summary">
@@ -152,14 +152,14 @@
 
             <?php foreach ($recentTxs as $tx): ?>
             <tr>
-                <td class="w125"><?php if ($tx->Height === null): ?><em>Unconfirmed</em><?php else: ?><a href="/blocks/<?php echo $tx->Height ?>"><?php echo $tx->Height ?></a><?php endif; ?></td>
-                <td class="w250"><div><a href="/tx/<?php echo $tx->Hash ?>?address=<?php echo $address->Address ?>#<?php echo $address->Address ?>"><?php echo $tx->Hash ?></a></div></td>
-                <td><?php echo \DateTime::createFromFormat('U', $tx->TxTime)->format('d M Y H:i:s') . ' UTC'; ?></td>
-                <td class="right"><?php echo number_format($tx->Confirmations, 0, '', ',') ?></td>
-                <td class="right"><?php echo $tx->InputCount ?></td>
-                <td class="right"><?php echo $tx->OutputCount ?></td>
-                <td class="right<?php echo ' ' . ($tx->DebitAmount > 0 && $tx->CreditAmount > 0 ? 'diff' : ($tx->DebitAmount > 0 ? 'debit' : 'credit')) ?>">
-                    <?php echo number_format($tx->CreditAmount - $tx->DebitAmount, 8, '.', ',') ?> LBC
+                <td class="w125"><?php if ($tx->height === null): ?><em>Unconfirmed</em><?php else: ?><a href="/blocks/<?php echo $tx->height ?>"><?php echo $tx->height ?></a><?php endif; ?></td>
+                <td class="w250"><div><a href="/tx/<?php echo $tx->Hash ?>?address=<?php echo $address->address ?>#<?php echo $address->address ?>"><?php echo $tx->Hash ?></a></div></td>
+                <td><?php echo \DateTime::createFromFormat('U', $tx->transaction_time)->format('d M Y H:i:s') . ' UTC'; ?></td>
+                <td class="right"><?php echo number_format($tx->confirmations, 0, '', ',') ?></td>
+                <td class="right"><?php echo $tx->input_count ?></td>
+                <td class="right"><?php echo $tx->output_count ?></td>
+                <td class="right<?php echo ' ' . ($tx->debit_amount > 0 && $tx->credit_amount > 0 ? 'diff' : ($tx->debit_amount > 0 ? 'debit' : 'credit')) ?>">
+                    <?php echo number_format($tx->credit_amount - $tx->debit_amount, 8, '.', ',') ?> LBC
                 </td>
             </tr>
             <?php endforeach; ?>
diff --git a/src/Template/Main/claims.ctp b/src/Template/Main/claims.ctp
index a17dc57..c84602c 100644
--- a/src/Template/Main/claims.ctp
+++ b/src/Template/Main/claims.ctp
@@ -183,8 +183,78 @@ if (strlen(trim($desc)) == 0) {
         if ($idx % 3 == 0) {
             $row++;
         }
-        echo $this->element('claimbox', array('claim' => $claim));
-        $idx++; 
+$autoThumbText = $claim->getAutoThumbText();
+$cost = '';
+if (isset($claim->Price) && $claim->Price > 0) {
+    $cost = $this->Amount->formatCurrency($claim->Price) . ' LBC';
+} else if (isset($claim->fee) && strtolower($claim->fee_currency) === 'lbc') {
+    $cost = $this->Amount->formatCurrency($claim->fee) . ' LBC';
+}
+
+// content type
+$ctTag = $claim->getContentTag();
+?>
+<div data-id="<?php echo $claim->claim_id ?>" class="claim-grid-item<?php if ($idx % 3 == 0): ?> last-item<?php endif; ?><?php if ($last_row): ?> last-row<?php endif; ?>">
+    <?php if (strlen(trim($cost)) > 0): ?>
+    <div class="price-tag"><?php echo $cost ?></div>
+    <?php endif; ?>
+
+    <div class="tags">
+        <?php if ($ctTag): ?>
+        <div class="content-type"><?php echo strtoupper($ctTag) ?></div>
+        <?php endif; ?>
+        <?php if ($claim->is_nsfw): ?>
+        <div class="nsfw">NSFW</div>
+        <?php endif; ?>
+    </div>
+
+    <div data-autothumb="<?php echo $autoThumbText ?>" class="thumbnail <?php echo $a[mt_rand(0, count($a) - 1)] ?>">
+        <?php if (!$claim->is_nsfw && strlen(trim($claim->thumbnail_url)) > 0): ?>
+            <img src="<?php echo htmlspecialchars($claim->thumbnail_url) ?>" alt="" />
+        <?php else: ?>
+            <div class="autothumb"><?php echo $autoThumbText ?></div>
+        <?php endif; ?>
+    </div>
+
+    <div class="metadata">
+        <div class="title" title="<?php echo $claim->claim_type == 1 ? $claim->name : ((strlen(trim($claim->title)) > 0) ? $claim->title : '') ?>"><?php echo $claim->claim_type == 1 ? $claim->name : ((strlen(trim($claim->title)) > 0) ? $claim->title : '<em>No Title</em>') ?></div>
+        <div class="link" title="<?php echo $claim->getLbryLink() ?>"><a href="<?php echo $claim->getLbryLink() ?>" rel="nofollow"><?php echo $claim->getLbryLink() ?></a></div>
+
+        <div class="desc"><?php echo strlen(trim($claim->description)) > 0 ? $claim->description : '<em>No description available</em>' ?></div>
+
+        <div class="label half-width">Transaction</div>
+        <div class="label half-width">Created</div>
+
+        <div class="value half-width"><a href="/tx/<?php echo $claim->transaction_hash ?>#output-<?php echo $claim->vout ?>" title="<?php echo $claim->transaction_hash ?>"><?php echo $claim->transaction_hash ?></a></div>
+        <div class="value half-width" title="<?php echo $claim->created_at->format('j M Y H:i:s') ?> UTC">
+                <?php echo \Carbon\Carbon::createFromTimestamp($claim->created_at->format('U'))->diffForHumans(); ?>
+            </div>
+        <div class="clear spacer"></div>
+
+        <?php if ($claim->claim_type == 2): ?>
+        <div class="label half-width">Content Type</div>
+        <div class="label half-width">Language</div>
+
+        <div class="value half-width" title="<?php echo $claim->content_type ?>"><?php echo $claim->content_type ?></div>
+        <div class="value half-width" title="<?php echo $claim->language == 'en' ? 'English' : $claim->language ?>"><?php echo $claim->language == 'en' ? 'English' : $claim->language ?></div>
+
+        <div class="clear spacer"></div>
+
+        <div class="label half-width">Author</div>
+        <div class="label half-width">License</div>
+        
+        <!--
+        <div class="value half-width" title="<?php echo strlen(trim($claim->author)) > 0 ? $claim->author : '<em>Unspecified</em>' ?>"><?php echo strlen(trim($claim->author)) > 0 ? $claim->author : '<em>Unspecified</em>' ?></div>
+        <div class="value half-width" title="<?php echo strlen(trim($claim->license)) > 0 ? $claim->license : '' ?>">
+            <?php if (strlen(trim($claim->LicenseUrl)) > 0): ?><a href="<?php echo $claim->LicenseUrl ?>" rel="nofollow" target="_blank"><?php endif; ?>
+            <?php echo strlen(trim($claim->License)) > 0 ? $claim->License : '<em>Unspecified</em>' ?>
+            <?php if (strlen(trim($claim->LicenseUrl))): ?></a><?php endif; ?>
+        </div>
+        -->
+        <?php endif; ?>
+    </div>
+</div><?php
+        $idx++;
         endforeach; ?>
     <div class="clear"></div>
 </div>
-- 
2.45.2


From 830df53d74b9837c827659da6766c0eec7acbd6a Mon Sep 17 00:00:00 2001
From: marcdeb1 <marcdebrouchev@laposte.net>
Date: Tue, 18 Dec 2018 22:11:00 +0100
Subject: [PATCH 16/43] Address balance API

---
 src/Controller/MainController.php | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/Controller/MainController.php b/src/Controller/MainController.php
index 8a49618..91cc67d 100644
--- a/src/Controller/MainController.php
+++ b/src/Controller/MainController.php
@@ -729,13 +729,13 @@ class MainController extends AppController {
         }
 
         // check if the tag is taken
-        $addrTag = $this->Addresses->find()->select(['Id'])->where(['LOWER(Tag)' => strtolower($entity->Tag)])->first();
+        $addrTag = $this->Addresses->find()->select(['id'])->where(['LOWER(Tag)' => strtolower($entity->Tag)])->first();
         if ($addrTag) {
             return $this->_jsonError('Oops! The tag is already taken. Please specify a different tag.', 400);
         }
 
         // check for existing verification
-        $exist = $this->TagAddressRequests->find()->select(['Id'])->where(['Address' => $base58address, 'IsVerified' => 0])->first();
+        $exist = $this->TagAddressRequests->find()->select(['id'])->where(['Address' => $base58address, 'IsVerified' => 0])->first();
         if ($exist) {
             return $this->_jsonError('Oops! There is a pending tag verification for this address.', 400);
         }
@@ -755,16 +755,23 @@ class MainController extends AppController {
         if (!isset($base58address)) {
             return $this->_jsonError('Base58 address not specified.', 400);
         }
-
-        // TODO: Add unconfirmed_balance to response
-        $result = $this->Addresses->find()->select(['Balance'])->where(['Address' => $base58address])->first();
-        if (!$result) {
-            // Return 0 for address that does not exist?
-            $result = new \stdClass();
-            $result->Balance = 0;
+        
+        $address = $this->Addresses->find()->select(['id'])->where(['address' => $base58address])->first();
+        if (!$address) {
+            return $this->_jsonError('Could not find address.', 400);
         }
-
-        return $this->_jsonResponse(['success' => true, ['balance' => ['confirmed' => $result->Balance, 'unconfirmed' => 0]]]);
+        $conn = ConnectionManager::get('default');
+        $stmt = $conn->execute(sprintf(
+                'SELECT TA.debit_amount, TA.credit_amount, ' .
+                'FROM transaction_address TA' .
+                'WHERE TA.address_id = ?'), [$address->id]);
+        $transaction_addresses = $stmt->fetchAll(\PDO::FETCH_OBJ);
+        $balance = 0;
+        foreach($transaction_addresses as $ta) {
+            $balance += $ta->credit_amount;
+            $balance -= $ta->debit_amount;
+        } 
+        return $this->_jsonResponse(['success' => true, ['balance' => ['confirmed' => $balance, 'unconfirmed' => 0]]]);
     }
 
     public function apiaddrutxo($base58address = null) {
-- 
2.45.2


From 6c45f432de8eae1ec833d1d505df641e2d130e2b Mon Sep 17 00:00:00 2001
From: marcdeb1 <marcdebrouchev@laposte.net>
Date: Tue, 18 Dec 2018 23:02:09 +0100
Subject: [PATCH 17/43] Clam and publisher in one query

---
 src/Controller/MainController.php | 47 +++++++++++++------------------
 src/Template/Main/claims.ctp      |  2 +-
 2 files changed, 20 insertions(+), 29 deletions(-)

diff --git a/src/Controller/MainController.php b/src/Controller/MainController.php
index 91cc67d..69c77d2 100644
--- a/src/Controller/MainController.php
+++ b/src/Controller/MainController.php
@@ -147,13 +147,7 @@ class MainController extends AppController {
             }
 
             $offset = ($page - 1) * $pageLimit;
-            $claims = $this->Claims->find()->distinct(['claim_id'])->order(['created_at' => 'DESC'])->offset($offset)->limit($pageLimit)->toArray();
-            foreach($claims as $claim) {
-                if(isset($claim->publisher_id)) {
-                    $publisher = $this->Claims->find()->select(['name'])->where(['claim_id' => $claim->publisher_id])->first();
-                    $claim->publisher = $publisher;
-                }
-            }
+            $claims = $this->Claims->find()->distinct(['Claims.claim_id'])->select($this->Claims)->select(['publisher' => 'C.name'])->leftJoin(['C' => 'claim'], ['C.claim_id = Claims.publisher_id'])->order(['Claims.created_at' => 'DESC'])->offset($offset)->limit($pageLimit)->toArray();
             
             for ($i = 0; $i < count($claims); $i++) {
                 if ($canConvert && $claims[$i]->fee > 0 && $claims[$i]->fee_currency == 'USD') {
@@ -177,9 +171,7 @@ class MainController extends AppController {
             $this->set('currentPage', $page);
             $this->set('claims', $claims);
         } else {
-            $claim = $this->Claims->find()->where(['claim_id' => $id])->order(['created_at' => 'DESC'])->first();
-            $publisher = $this->Claims->find()->select(['name'])->where(['claim_id' => $claim->publisher_id])->first();
-            $claim->publisher = $publisher;
+            $claim = $this->Claims->find()->select($this->Claims)->select(['publisher' => 'C.name'])->leftJoin(['C' => 'claim'], ['C.claim_id = Claims.publisher_id'])->where(['Claims.claim_id' => $id])->order(['Claims.created_at' => 'DESC'])->first();
             
             if (!$claim) {
                 return $this->redirect('/');
@@ -202,8 +194,7 @@ class MainController extends AppController {
             $moreClaims = [];
             if (isset($claim->publisher) || $claim->claim_type == 1) {
                 // find more claims for the publisher
-                $moreClaims = $this->Claims->find()->where(['claim_type' => 2, 'id <>' => $claim->id, 'publisher_id' => isset($claim->publisher) ? $claim->publisher_id : $claim->claim_id])->
-                    limit(9)->order(['fee' => 'DESC', 'RAND()' => 'DESC'])->toArray();
+                $moreClaims = $this->Claims->find()->select($this->Claims)->select(['publisher' => 'C.name'])->leftJoin(['C' => 'claim'], ['C.claim_id = Claims.publisher_id'])->where(['Claims.claim_type' => 2, 'Claims.id <>' => $claim->id, 'Claims.publisher_id' => isset($claim->publisher) ? $claim->publisher_id : $claim->claim_id])->limit(9)->order(['Claims.fee' => 'DESC', 'RAND()' => 'DESC'])->toArray();
                 for ($i = 0; $i < count($moreClaims); $i++) {
                     if ($canConvert && $moreClaims[$i]->fee > 0 && $moreClaims[$i]->fee_currency == 'USD') {
                         $moreClaims[$i]->price = $moreClaims[$i]->fee / $priceInfo->price;
@@ -783,7 +774,7 @@ class MainController extends AppController {
         }
 
         $arr = explode(',', $base58address);
-        $addresses = $this->Addresses->find()->select(['Id'])->where(['Address IN' => $arr])->toArray();
+        $addresses = $this->Addresses->find()->select(['id'])->where(['address IN' => $arr])->toArray();
         if (count($addresses) == 0) {
             return $this->_jsonError('No base58 address matching the specified parameter was found.', 404);
         }
@@ -791,33 +782,33 @@ class MainController extends AppController {
         $addressIds = [];
         $params = [];
         foreach ($addresses as $address) {
-            $addressIds[] = $address->Id;
+            $addressIds[] = $address->id;
             $params[] = '?';
         }
 
         // Get the unspent outputs for the address
         $conn = ConnectionManager::get('default');
         $stmt = $conn->execute(sprintf(
-                               'SELECT T.Hash AS TransactionHash, O.Vout, O.Value, O.Addresses, O.ScriptPubKeyAsm, O.ScriptPubKeyHex, O.Type, O.RequiredSignatures, B.Confirmations ' .
-                               'FROM Transactions T ' .
-                               'JOIN Outputs O ON O.TransactionId = T.Id ' .
-                               'JOIN Blocks B ON B.Hash = T.BlockHash ' .
-                               'WHERE O.Id IN (SELECT OutputId FROM OutputsAddresses WHERE AddressId IN (%s)) AND O.IsSpent <> 1 ORDER BY T.TransactionTime ASC', implode(',', $params)), $addressIds);
+                               'SELECT T.hash AS transaction_hash, O.vout, O.value, O.address_list, O.script_pub_key_asm, O.script_pub_key_hex, O._type, O.required_signatures, B.confirmations ' .
+                               'FROM transaction T ' .
+                               'JOIN output O ON O.transaction_id = T.id ' .
+                               'JOIN block B ON B.hash = T.block_hash_id ' .
+                               'WHERE O.id IN (SELECT id FROM output O2 WHERE address_id IN (%s)) AND O.is_spent <> 1 ORDER BY T.transaction_time ASC', implode(',', $params)), $addressIds);
         $outputs = $stmt->fetchAll(\PDO::FETCH_OBJ);
 
         $utxo = [];
         foreach ($outputs as $out) {
             $utxo[] = [
-                'transaction_hash' => $out->TransactionHash,
-                'output_index' => $out->Vout,
-                'value' => (int) bcmul($out->Value, 100000000),
-                'addresses' => json_decode($out->Addresses),
-                'script' => $out->ScriptPubKeyAsm,
-                'script_hex' => $out->ScriptPubKeyHex,
-                'script_type' => $out->Type,
-                'required_signatures' => (int) $out->RequiredSignatures,
+                'transaction_hash' => $out->transaction_hash,
+                'output_index' => $out->vout,
+                'value' => (int) bcmul($out->value, 100000000),
+                'addresses' => json_decode($out->address_list),
+                'script' => $out->script_pub_key_asm,
+                'script_hex' => $out->script_pub_key_hex,
+                'script_type' => $out->type,
+                'required_signatures' => (int) $out->required_signatures,
                 'spent' => false,
-                'confirmations' => (int) $out->Confirmations
+                'confirmations' => (int) $out->confirmations
             ];
         }
 
diff --git a/src/Template/Main/claims.ctp b/src/Template/Main/claims.ctp
index c84602c..4a17312 100644
--- a/src/Template/Main/claims.ctp
+++ b/src/Template/Main/claims.ctp
@@ -79,7 +79,7 @@ if (strlen(trim($desc)) == 0) {
             <div class="label">Published By</div>
             <div class="value">
                 <?php if (isset($claim->publisher)): ?>
-                    <a href="lbry://<?php echo $claim->publisher->name ?>"><?php echo $claim->publisher->name ?></a>
+                    <a href="lbry://<?php echo $claim->publisher ?>"><?php echo $claim->publisher ?></a>
                 <?php else: ?>
                     <em>Anonymous</em>
                 <?php endif; ?>
-- 
2.45.2


From a09a0148c2354a3aca4fac132054f7c652c9defd Mon Sep 17 00:00:00 2001
From: marcdeb1 <marcdebrouchev@laposte.net>
Date: Wed, 19 Dec 2018 00:12:14 +0100
Subject: [PATCH 18/43] Fix claim page bugs

---
 src/Controller/MainController.php | 3 +--
 src/Template/Main/claims.ctp      | 8 +++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/Controller/MainController.php b/src/Controller/MainController.php
index 69c77d2..056c958 100644
--- a/src/Controller/MainController.php
+++ b/src/Controller/MainController.php
@@ -171,8 +171,7 @@ class MainController extends AppController {
             $this->set('currentPage', $page);
             $this->set('claims', $claims);
         } else {
-            $claim = $this->Claims->find()->select($this->Claims)->select(['publisher' => 'C.name'])->leftJoin(['C' => 'claim'], ['C.claim_id = Claims.publisher_id'])->where(['Claims.claim_id' => $id])->order(['Claims.created_at' => 'DESC'])->first();
-            
+            $claim = $this->Claims->find()->select($this->Claims)->select(['Claims__publisher' => 'C.name'])->leftJoin(['C' => 'claim'], ['C.claim_id = Claims.publisher_id'])->where(['Claims.claim_id' => $id])->order(['Claims.created_at' => 'DESC'])->first();
             if (!$claim) {
                 return $this->redirect('/');
             }
diff --git a/src/Template/Main/claims.ctp b/src/Template/Main/claims.ctp
index 4a17312..182112c 100644
--- a/src/Template/Main/claims.ctp
+++ b/src/Template/Main/claims.ctp
@@ -75,7 +75,7 @@ if (strlen(trim($desc)) == 0) {
         </div>
 
         <div class="content">
-            <?php if ($claim->claim_type == 2): ?>
+            <?php if ($claim->claim_type == 1): ?>
             <div class="label">Published By</div>
             <div class="value">
                 <?php if (isset($claim->publisher)): ?>
@@ -92,7 +92,7 @@ if (strlen(trim($desc)) == 0) {
             <div class="label">Transaction ID</div>
             <div class="value"><a href="/tx/<?php echo $claim->transaction_hash_id ?>#output-<?php echo $claim->vout ?>"><?php echo $claim->transaction_hash_id ?></a></div>
 
-            <?php if ($claim->claim_type == 2): ?>
+            <?php if ($claim->claim_type == 1): ?>
             <div class="label half-width">Cost</div>
             <div class="label half-width">Safe for Work</div>
 
@@ -120,8 +120,10 @@ if (strlen(trim($desc)) == 0) {
                 <div class="value half-width"><?php echo strlen(trim($claim->author)) > 0 ? $claim->author : '<em>Unspecified</em>' ?></div>
                 <div class="value half-width"><?php echo strlen(trim($claim->content_type)) > 0 ? $claim->content_type : '<em>Unspecified</em>' ?></div>
 
+                <!--
                 <div class="label half-width">License</div>
-                <div class="label half-width">Language</div>
+                -->
+                <div class="label">Language</div>
 
                 <!--
                 <div class="value half-width"<?php if(strlen(trim($claim->license)) > 0): ?> title="<?php echo $claim->license ?>"<?php endif; ?>>
-- 
2.45.2


From cbee21c07cd30c29c2190be32a414f09cab794a7 Mon Sep 17 00:00:00 2001
From: marcdeb1 <marcdebrouchev@laposte.net>
Date: Wed, 19 Dec 2018 00:37:01 +0100
Subject: [PATCH 19/43] Other claim page bugs

---
 src/Controller/MainController.php |  5 +--
 src/Template/Element/claimbox.ctp | 72 ++++++++++++++++++++++++++++++
 src/Template/Main/claims.ctp      | 74 +------------------------------
 3 files changed, 76 insertions(+), 75 deletions(-)
 create mode 100644 src/Template/Element/claimbox.ctp

diff --git a/src/Controller/MainController.php b/src/Controller/MainController.php
index 056c958..cbb5a14 100644
--- a/src/Controller/MainController.php
+++ b/src/Controller/MainController.php
@@ -171,7 +171,7 @@ class MainController extends AppController {
             $this->set('currentPage', $page);
             $this->set('claims', $claims);
         } else {
-            $claim = $this->Claims->find()->select($this->Claims)->select(['Claims__publisher' => 'C.name'])->leftJoin(['C' => 'claim'], ['C.claim_id = Claims.publisher_id'])->where(['Claims.claim_id' => $id])->order(['Claims.created_at' => 'DESC'])->first();
+            $claim = $this->Claims->find()->select($this->Claims)->select(['publisher' => 'C.name'])->leftJoin(['C' => 'claim'], ['C.claim_id = Claims.publisher_id'])->where(['Claims.claim_id' => $id])->order(['Claims.created_at' => 'DESC'])->first();
             if (!$claim) {
                 return $this->redirect('/');
             }
@@ -193,7 +193,7 @@ class MainController extends AppController {
             $moreClaims = [];
             if (isset($claim->publisher) || $claim->claim_type == 1) {
                 // find more claims for the publisher
-                $moreClaims = $this->Claims->find()->select($this->Claims)->select(['publisher' => 'C.name'])->leftJoin(['C' => 'claim'], ['C.claim_id = Claims.publisher_id'])->where(['Claims.claim_type' => 2, 'Claims.id <>' => $claim->id, 'Claims.publisher_id' => isset($claim->publisher) ? $claim->publisher_id : $claim->claim_id])->limit(9)->order(['Claims.fee' => 'DESC', 'RAND()' => 'DESC'])->toArray();
+                $moreClaims = $this->Claims->find()->select($this->Claims)->select(['publisher' => 'C.name'])->leftJoin(['C' => 'claim'], ['C.claim_id = Claims.publisher_id'])->where(['Claims.claim_type' => 1, 'Claims.id <>' => $claim->id, 'Claims.publisher_id' => isset($claim->publisher) ? $claim->publisher_id : $claim->claim_id])->limit(9)->order(['Claims.fee' => 'DESC', 'RAND()' => 'DESC'])->toArray();
                 for ($i = 0; $i < count($moreClaims); $i++) {
                     if ($canConvert && $moreClaims[$i]->fee > 0 && $moreClaims[$i]->fee_currency == 'USD') {
                         $moreClaims[$i]->price = $moreClaims[$i]->fee / $priceInfo->price;
@@ -210,7 +210,6 @@ class MainController extends AppController {
                     }
                 }
             }
-
             $this->set('claim', $claim);
             $this->set('moreClaims', $moreClaims);
         }
diff --git a/src/Template/Element/claimbox.ctp b/src/Template/Element/claimbox.ctp
new file mode 100644
index 0000000..5e4a677
--- /dev/null
+++ b/src/Template/Element/claimbox.ctp
@@ -0,0 +1,72 @@
+<?php
+$autoThumbText = $claim->getAutoThumbText();
+$cost = '';
+if (isset($claim->Price) && $claim->Price > 0) {
+    $cost = $this->Amount->formatCurrency($claim->Price) . ' LBC';
+} else if (isset($claim->fee) && strtolower($claim->fee_currency) === 'lbc') {
+    $cost = $this->Amount->formatCurrency($claim->fee) . ' LBC';
+}
+$a = ['purple', 'orange', 'blue', 'teal', 'green', 'yellow'];
+// content type
+$ctTag = $claim->getContentTag();
+?>
+<div data-id="<?php echo $claim->claim_id ?>" class="claim-grid-item<?php if ($idx % 3 == 0): ?> last-item<?php endif; ?><?php if ($last_row): ?> last-row<?php endif; ?>">
+    <?php if (strlen(trim($cost)) > 0): ?>
+    <div class="price-tag"><?php echo $cost ?></div>
+    <?php endif; ?>
+
+    <div class="tags">
+        <?php if ($ctTag): ?>
+        <div class="content-type"><?php echo strtoupper($ctTag) ?></div>
+        <?php endif; ?>
+        <?php if ($claim->is_nsfw): ?>
+        <div class="nsfw">NSFW</div>
+        <?php endif; ?>
+    </div>
+
+    <div data-autothumb="<?php echo $autoThumbText ?>" class="thumbnail <?php echo $a[mt_rand(0, count($a) - 1)] ?>">
+        <?php if (!$claim->is_nsfw && strlen(trim($claim->thumbnail_url)) > 0): ?>
+            <img src="<?php echo htmlspecialchars($claim->thumbnail_url) ?>" alt="" />
+        <?php else: ?>
+            <div class="autothumb"><?php echo $autoThumbText ?></div>
+        <?php endif; ?>
+    </div>
+
+    <div class="metadata">
+        <div class="title" title="<?php echo $claim->claim_type == 1 ? $claim->name : ((strlen(trim($claim->title)) > 0) ? $claim->title : '') ?>"><?php echo $claim->claim_type == 1 ? $claim->name : ((strlen(trim($claim->title)) > 0) ? $claim->title : '<em>No Title</em>') ?></div>
+        <div class="link" title="<?php echo $claim->getLbryLink() ?>"><a href="<?php echo $claim->getLbryLink() ?>" rel="nofollow"><?php echo $claim->getLbryLink() ?></a></div>
+
+        <div class="desc"><?php echo strlen(trim($claim->description)) > 0 ? $claim->description : '<em>No description available</em>' ?></div>
+
+        <div class="label half-width">Transaction</div>
+        <div class="label half-width">Created</div>
+
+        <div class="value half-width"><a href="/tx/<?php echo $claim->transaction_hash_id ?>#output-<?php echo $claim->vout ?>" title="<?php echo $claim->transaction_hash_id ?>"><?php echo $claim->transaction_hash_id ?></a></div>
+        <div class="value half-width" title="<?php echo $claim->created_at->format('j M Y H:i:s') ?> UTC">
+                <?php echo \Carbon\Carbon::createFromTimestamp($claim->created_at->format('U'))->diffForHumans(); ?>
+            </div>
+        <div class="clear spacer"></div>
+
+        <?php if ($claim->claim_type == 1): ?>
+        <div class="label half-width">Content Type</div>
+        <div class="label half-width">Language</div>
+
+        <div class="value half-width" title="<?php echo $claim->content_type ?>"><?php echo $claim->content_type ?></div>
+        <div class="value half-width" title="<?php echo $claim->language == 'en' ? 'English' : $claim->language ?>"><?php echo $claim->language == 'en' ? 'English' : $claim->language ?></div>
+
+        <div class="clear spacer"></div>
+
+        <div class="label half-width">Author</div>
+        <div class="label half-width">License</div>
+        
+        <!--
+        <div class="value half-width" title="<?php echo strlen(trim($claim->author)) > 0 ? $claim->author : '<em>Unspecified</em>' ?>"><?php echo strlen(trim($claim->author)) > 0 ? $claim->author : '<em>Unspecified</em>' ?></div>
+        <div class="value half-width" title="<?php echo strlen(trim($claim->license)) > 0 ? $claim->license : '' ?>">
+            <?php if (strlen(trim($claim->LicenseUrl)) > 0): ?><a href="<?php echo $claim->LicenseUrl ?>" rel="nofollow" target="_blank"><?php endif; ?>
+            <?php echo strlen(trim($claim->License)) > 0 ? $claim->License : '<em>Unspecified</em>' ?>
+            <?php if (strlen(trim($claim->LicenseUrl))): ?></a><?php endif; ?>
+        </div>
+        -->
+        <?php endif; ?>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/Template/Main/claims.ctp b/src/Template/Main/claims.ctp
index 182112c..4458105 100644
--- a/src/Template/Main/claims.ctp
+++ b/src/Template/Main/claims.ctp
@@ -154,7 +154,7 @@ if (strlen(trim($desc)) == 0) {
             if ($idx % 3 == 0) {
                 $row++;
             }
-            echo $this->element('claimbox', array('claim' => $claim));
+            echo $this->element('claimbox', array('claim' => $claim, 'idx' => $idx, 'last_row' => $last_row));
             $idx++; 
             endforeach; ?>
         <div class="clear"></div>
@@ -185,77 +185,7 @@ if (strlen(trim($desc)) == 0) {
         if ($idx % 3 == 0) {
             $row++;
         }
-$autoThumbText = $claim->getAutoThumbText();
-$cost = '';
-if (isset($claim->Price) && $claim->Price > 0) {
-    $cost = $this->Amount->formatCurrency($claim->Price) . ' LBC';
-} else if (isset($claim->fee) && strtolower($claim->fee_currency) === 'lbc') {
-    $cost = $this->Amount->formatCurrency($claim->fee) . ' LBC';
-}
-
-// content type
-$ctTag = $claim->getContentTag();
-?>
-<div data-id="<?php echo $claim->claim_id ?>" class="claim-grid-item<?php if ($idx % 3 == 0): ?> last-item<?php endif; ?><?php if ($last_row): ?> last-row<?php endif; ?>">
-    <?php if (strlen(trim($cost)) > 0): ?>
-    <div class="price-tag"><?php echo $cost ?></div>
-    <?php endif; ?>
-
-    <div class="tags">
-        <?php if ($ctTag): ?>
-        <div class="content-type"><?php echo strtoupper($ctTag) ?></div>
-        <?php endif; ?>
-        <?php if ($claim->is_nsfw): ?>
-        <div class="nsfw">NSFW</div>
-        <?php endif; ?>
-    </div>
-
-    <div data-autothumb="<?php echo $autoThumbText ?>" class="thumbnail <?php echo $a[mt_rand(0, count($a) - 1)] ?>">
-        <?php if (!$claim->is_nsfw && strlen(trim($claim->thumbnail_url)) > 0): ?>
-            <img src="<?php echo htmlspecialchars($claim->thumbnail_url) ?>" alt="" />
-        <?php else: ?>
-            <div class="autothumb"><?php echo $autoThumbText ?></div>
-        <?php endif; ?>
-    </div>
-
-    <div class="metadata">
-        <div class="title" title="<?php echo $claim->claim_type == 1 ? $claim->name : ((strlen(trim($claim->title)) > 0) ? $claim->title : '') ?>"><?php echo $claim->claim_type == 1 ? $claim->name : ((strlen(trim($claim->title)) > 0) ? $claim->title : '<em>No Title</em>') ?></div>
-        <div class="link" title="<?php echo $claim->getLbryLink() ?>"><a href="<?php echo $claim->getLbryLink() ?>" rel="nofollow"><?php echo $claim->getLbryLink() ?></a></div>
-
-        <div class="desc"><?php echo strlen(trim($claim->description)) > 0 ? $claim->description : '<em>No description available</em>' ?></div>
-
-        <div class="label half-width">Transaction</div>
-        <div class="label half-width">Created</div>
-
-        <div class="value half-width"><a href="/tx/<?php echo $claim->transaction_hash ?>#output-<?php echo $claim->vout ?>" title="<?php echo $claim->transaction_hash ?>"><?php echo $claim->transaction_hash ?></a></div>
-        <div class="value half-width" title="<?php echo $claim->created_at->format('j M Y H:i:s') ?> UTC">
-                <?php echo \Carbon\Carbon::createFromTimestamp($claim->created_at->format('U'))->diffForHumans(); ?>
-            </div>
-        <div class="clear spacer"></div>
-
-        <?php if ($claim->claim_type == 2): ?>
-        <div class="label half-width">Content Type</div>
-        <div class="label half-width">Language</div>
-
-        <div class="value half-width" title="<?php echo $claim->content_type ?>"><?php echo $claim->content_type ?></div>
-        <div class="value half-width" title="<?php echo $claim->language == 'en' ? 'English' : $claim->language ?>"><?php echo $claim->language == 'en' ? 'English' : $claim->language ?></div>
-
-        <div class="clear spacer"></div>
-
-        <div class="label half-width">Author</div>
-        <div class="label half-width">License</div>
-        
-        <!--
-        <div class="value half-width" title="<?php echo strlen(trim($claim->author)) > 0 ? $claim->author : '<em>Unspecified</em>' ?>"><?php echo strlen(trim($claim->author)) > 0 ? $claim->author : '<em>Unspecified</em>' ?></div>
-        <div class="value half-width" title="<?php echo strlen(trim($claim->license)) > 0 ? $claim->license : '' ?>">
-            <?php if (strlen(trim($claim->LicenseUrl)) > 0): ?><a href="<?php echo $claim->LicenseUrl ?>" rel="nofollow" target="_blank"><?php endif; ?>
-            <?php echo strlen(trim($claim->License)) > 0 ? $claim->License : '<em>Unspecified</em>' ?>
-            <?php if (strlen(trim($claim->LicenseUrl))): ?></a><?php endif; ?>
-        </div>
-        -->
-        <?php endif; ?>
-    </div>
-</div><?php
+        echo $this->element('claimbox', array('claim' => $claim, 'idx' => $idx, 'last_row' => $last_row));
         $idx++;
         endforeach; ?>
     <div class="clear"></div>
-- 
2.45.2


From dfd7af81f93a3ea85ebf618573f1104fb2905ebd Mon Sep 17 00:00:00 2001
From: marcdeb1 <marcdebrouchev@laposte.net>
Date: Wed, 19 Dec 2018 00:53:39 +0100
Subject: [PATCH 20/43] Realtme action improvements

---
 src/Controller/MainController.php | 8 ++------
 src/Template/Element/claimbox.ctp | 3 ++-
 src/Template/Main/realtime.ctp    | 6 +++---
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/Controller/MainController.php b/src/Controller/MainController.php
index cbb5a14..afa7757 100644
--- a/src/Controller/MainController.php
+++ b/src/Controller/MainController.php
@@ -220,19 +220,15 @@ class MainController extends AppController {
         $this->loadModel('Transactions');
 
         // load 10 blocks and transactions
-        $conn = ConnectionManager::get('default');
         $blocks = $this->Blocks->find()->select(['height', 'block_time', 'transaction_hashes'])->order(['height' => 'desc'])->limit(10)->toArray();
         for ($i = 0; $i < count($blocks); $i++) {
             $tx_hashes = preg_split('#,#', $blocks[$i]->transaction_hashes);
             $blocks[$i]->transaction_count = count($tx_hashes);
         }
 
-        $stmt = $conn->execute('SELECT T.id, T.hash, T.input_count, T.output_count, IFNULL(T.transaction_time, T.created_at) AS TxTime ' .
-                               'FROM  transaction T ORDER BY created_at DESC LIMIT 10');
-        $txs = $stmt->fetchAll(\PDO::FETCH_OBJ);
-
+        $transactions = $this->Transactions->find()->select(['id', 'hash', 'input_count', 'output_count', 'transaction_time', 'created_at'])->order(['created_at' => 'desc'])->limit(10)->toArray();
         $this->set('blocks', $blocks);
-        $this->set('txs', $txs);
+        $this->set('txs', $transactions);
     }
 
     public function find() {
diff --git a/src/Template/Element/claimbox.ctp b/src/Template/Element/claimbox.ctp
index 5e4a677..8013628 100644
--- a/src/Template/Element/claimbox.ctp
+++ b/src/Template/Element/claimbox.ctp
@@ -59,8 +59,9 @@ $ctTag = $claim->getContentTag();
         <div class="label half-width">Author</div>
         <div class="label half-width">License</div>
         
-        <!--
+        
         <div class="value half-width" title="<?php echo strlen(trim($claim->author)) > 0 ? $claim->author : '<em>Unspecified</em>' ?>"><?php echo strlen(trim($claim->author)) > 0 ? $claim->author : '<em>Unspecified</em>' ?></div>
+        <!--
         <div class="value half-width" title="<?php echo strlen(trim($claim->license)) > 0 ? $claim->license : '' ?>">
             <?php if (strlen(trim($claim->LicenseUrl)) > 0): ?><a href="<?php echo $claim->LicenseUrl ?>" rel="nofollow" target="_blank"><?php endif; ?>
             <?php echo strlen(trim($claim->License)) > 0 ? $claim->License : '<em>Unspecified</em>' ?>
diff --git a/src/Template/Main/realtime.ctp b/src/Template/Main/realtime.ctp
index 777855b..31dccd7 100644
--- a/src/Template/Main/realtime.ctp
+++ b/src/Template/Main/realtime.ctp
@@ -153,9 +153,9 @@
 
             <tbody>
                 <?php foreach ($txs as $tx): ?>
-                <tr data-hash="<?php echo $tx->Hash ?>" data-time="<?php echo $tx->TxTime ?>">
-                    <td class="w200"><div><a href="/tx/<?php echo $tx->Hash ?>" target="_blank"><?php echo $tx->Hash ?></a></div></td>
-                    <td><?php echo \Carbon\Carbon::createFromTimestamp($tx->TxTime)->diffForHumans(); ?></td>
+                <tr data-hash="<?php echo $tx->Hash ?>" data-time="<?php echo $tx->transaction_time ?>">
+                    <td class="w200"><div><a href="/tx/<?php echo $tx->hash ?>" target="_blank"><?php echo $tx->hash ?></a></div></td>
+                    <td><?php echo $tx->created_at->diffForHumans(); ?></td>
                     <td class="right"><?php echo $tx->input_count ?></td>
                     <td class="right"><?php echo $tx->output_count ?></td>
                     <td class="right"><?php echo number_format($tx->value(), 8, '.', '') ?> LBC</td>
-- 
2.45.2


From 90eee866fcd91b6dac7a9f98e9acb18425838c8f Mon Sep 17 00:00:00 2001
From: marcdeb1 <marcdebrouchev@laposte.net>
Date: Wed, 19 Dec 2018 00:57:43 +0100
Subject: [PATCH 21/43] Block list page

---
 src/Controller/MainController.php | 2 +-
 src/Template/Main/blocks.ctp      | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Controller/MainController.php b/src/Controller/MainController.php
index afa7757..aa52061 100644
--- a/src/Controller/MainController.php
+++ b/src/Controller/MainController.php
@@ -292,7 +292,7 @@ class MainController extends AppController {
             $page = intval($this->request->query('page'));
 
             $conn = ConnectionManager::get('default');
-            $stmt = $conn->execute('SELECT COUNT(id) AS Total FROM Blocks');
+            $stmt = $conn->execute('SELECT COUNT(id) AS Total FROM block');
             $count = $stmt->fetch(\PDO::FETCH_OBJ);
             $numBlocks = $count->Total;
 
diff --git a/src/Template/Main/blocks.ctp b/src/Template/Main/blocks.ctp
index 17ff11c..442b897 100644
--- a/src/Template/Main/blocks.ctp
+++ b/src/Template/Main/blocks.ctp
@@ -181,10 +181,10 @@
         <tbody>
             <?php foreach ($blocks as $block): ?>
             <tr>
-                <td class="right"><a href="/blocks/<?php echo $block->height ?>"><?php echo $block->Height ?></a></td>
-                <td class="pad-left"><?php echo number_format($block->d0ifficulty, 8, '.', '') ?></td>
+                <td class="right"><a href="/blocks/<?php echo $block->height ?>"><?php echo $block->height ?></a></td>
+                <td class="pad-left"><?php echo number_format($block->difficulty, 8, '.', '') ?></td>
                 <td class="right"><?php echo number_format((($currentBlock->height - $block->height) + 1), 0, '', ',') ?></td>
-                <td class="right"><?php echo count(json_decode($block->transaction_hashes)) ?></td>
+                <td class="right"><?php echo count(preg_split('#,#', $block->transaction_hashes)) ?></td>
                 <td class="right"><?php echo round($block->block_size / 1024, 2) . 'KB' ?></td>
                 <td class="right pad-left"><?php echo $block->nonce ?></td>
                 <td class="pad-left"><?php echo \DateTime::createFromFormat('U', $block->block_time)->format('d M Y H:i:s') ?> UTC</td>
-- 
2.45.2


From f7318d64fc4efd244e6df9474002de82f7bf3b77 Mon Sep 17 00:00:00 2001
From: marcdeb1 <marcdebrouchev@laposte.net>
Date: Fri, 21 Dec 2018 13:42:57 +0100
Subject: [PATCH 22/43] Improved block page queries

---
 src/Controller/MainController.php | 16 +++++++---------
 src/Template/Main/blocks.ctp      |  2 +-
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/Controller/MainController.php b/src/Controller/MainController.php
index aa52061..f8e812a 100644
--- a/src/Controller/MainController.php
+++ b/src/Controller/MainController.php
@@ -327,9 +327,7 @@ class MainController extends AppController {
             }
 
             // Get the basic block transaction info
-            $txs = $this->Transactions->find()->select(['id', 'input_count', 'output_count', 'hash', 'version'])->where(['block_hash_id' => $block->hash])->toArray();
-            
-
+            $txs = $this->Transactions->find()->select(['Transactions.id', 'Transactions.input_count', 'Transactions.output_count', 'Transactions.hash', 'Transactions.version'])->select(['value' => 'sum(O.value)'])->leftJoin(['O' => 'output'], ['O.transaction_id = Transactions.id'])->where(['Transactions.block_hash_id' => $block->hash])->toArray();
             $this->set('block', $block);
             $this->set('blockTxs', $txs);
         }
@@ -400,7 +398,7 @@ class MainController extends AppController {
         $this->loadModel('Addresses');
 
         // exclude bHW58d37s1hBjj3wPBkn5zpCX3F8ZW3uWf (genesis block)
-        $richList = $this->Addresses->find()->where(['Address <>' => 'bHW58d37s1hBjj3wPBkn5zpCX3F8ZW3uWf'])->order(['Balance' => 'DESC'])->limit(500)->toArray();
+        $richList = $this->Addresses->find()->where(['address <>' => 'bHW58d37s1hBjj3wPBkn5zpCX3F8ZW3uWf'])->order(['Balance' => 'DESC'])->limit(500)->toArray();
 
         $priceRate = 0;
         //$priceInfo = json_decode($this->redis->get(self::lbcPriceKey));
@@ -456,11 +454,11 @@ class MainController extends AppController {
 
         $tagRequestAmount = 0;
         // Check for pending tag request
-        $this->loadModel('TagAddressRequests');
-        $pending = $this->TagAddressRequests->find()->where(['Address' => $addr, 'IsVerified <>' => 1])->first();
-        if (!$pending) {
-            $tagRequestAmount = '25.' . rand(11111111, 99999999);
-        }
+        //$this->loadModel('TagAddressRequests');
+        //$pending = $this->TagAddressRequests->find()->where(['Address' => $addr, 'IsVerified <>' => 1])->first();
+        //if (!$pending) {
+        //    $tagRequestAmount = '25.' . rand(11111111, 99999999);
+        //}
 
         $address = $this->Addresses->find()->where(['address' => $addr])->first();
         if (!$address) {
diff --git a/src/Template/Main/blocks.ctp b/src/Template/Main/blocks.ctp
index 442b897..45429a0 100644
--- a/src/Template/Main/blocks.ctp
+++ b/src/Template/Main/blocks.ctp
@@ -112,7 +112,7 @@
                             <td class="w300"><div><a href="/tx/<?php echo $tx->hash ?>"><?php echo $tx->hash ?></a></div></td>
                             <td class="right"><?php echo $tx->input_count ?></td>
                             <td class="right"><?php echo $tx->output_count ?></td>
-                            <td class="right"><div title="<?php echo $tx->value() ?> LBC"><?php echo $this->Amount->formatCurrency($tx->value()) ?> LBC</div></td>
+                            <td class="right"><div title="<?php echo $tx->value ?> LBC"><?php echo $this->Amount->formatCurrency($tx->value()) ?> LBC</div></td>
                         </tr>
                         <?php endforeach; ?>
                     </tbody>
-- 
2.45.2


From 4e0eeab3d18e04bd935b3be8e9175da9ebefe1c3 Mon Sep 17 00:00:00 2001
From: marcdeb1 <marcdebrouchev@laposte.net>
Date: Fri, 21 Dec 2018 13:50:17 +0100
Subject: [PATCH 23/43] Improved queries

---
 src/Controller/MainController.php | 5 ++---
 src/Template/Main/realtime.ctp    | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/Controller/MainController.php b/src/Controller/MainController.php
index f8e812a..96a4564 100644
--- a/src/Controller/MainController.php
+++ b/src/Controller/MainController.php
@@ -226,7 +226,7 @@ class MainController extends AppController {
             $blocks[$i]->transaction_count = count($tx_hashes);
         }
 
-        $transactions = $this->Transactions->find()->select(['id', 'hash', 'input_count', 'output_count', 'transaction_time', 'created_at'])->order(['created_at' => 'desc'])->limit(10)->toArray();
+        $transactions = $this->Transactions->find()->select(['Transactions.id', 'Transactions.hash', 'Transactions.input_count', 'Transactions.output_count', 'Transactions.transaction_time', 'Transactions.created_at'])->select(['value' => 'sum(O.value)'])->leftJoin(['O' => 'output'], ['O.transaction_id = Transactions.id'])->order(['Transactions.created_at' => 'desc'])->limit(10)->toArray();
         $this->set('blocks', $blocks);
         $this->set('txs', $transactions);
     }
@@ -344,8 +344,7 @@ class MainController extends AppController {
         $sourceAddress = $this->request->query('address');
 
         $tx = $this->Transactions->find()->select(
-            ['id', 'block_hash_id', 'input_count', 'output_count', 'hash', 'transaction_time', 'transaction_size', 'created_at', 'version', 'lock_time', 'raw'])->where(['hash' => $hash])->first();
-        $tx->value = $tx->value();
+            ['Transactions.id', 'Transactions.block_hash_id', 'Transactions.input_count', 'Transactions.output_count', 'Transactions.hash', 'Transactions.transaction_time', 'Transactions.transaction_size', 'Transactions.created_at', 'Transactions.version', 'Transactions.lock_time', 'Transactions.raw'])->select(['value' => 'sum(O.value)'])->leftJoin(['O' => 'output'], ['O.transaction_id = Transactions.id'])->where(['Transactions.hash' => $hash])->first();
         if (!$tx) {
             return $this->redirect('/');
         }
diff --git a/src/Template/Main/realtime.ctp b/src/Template/Main/realtime.ctp
index 31dccd7..2724609 100644
--- a/src/Template/Main/realtime.ctp
+++ b/src/Template/Main/realtime.ctp
@@ -158,7 +158,7 @@
                     <td><?php echo $tx->created_at->diffForHumans(); ?></td>
                     <td class="right"><?php echo $tx->input_count ?></td>
                     <td class="right"><?php echo $tx->output_count ?></td>
-                    <td class="right"><?php echo number_format($tx->value(), 8, '.', '') ?> LBC</td>
+                    <td class="right"><?php echo number_format($tx->value, 8, '.', '') ?> LBC</td>
                 </tr>
                 <?php endforeach; ?>
             </tbody>
-- 
2.45.2


From 3569fdb4ff969b88aa8bc68eba228c1bae6abf4b Mon Sep 17 00:00:00 2001
From: marcdeb1 <marcdebrouchev@laposte.net>
Date: Fri, 21 Dec 2018 13:55:59 +0100
Subject: [PATCH 24/43] Improved index query

---
 src/Controller/MainController.php | 9 ++-------
 src/Template/Main/index.ctp       | 6 +++---
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/Controller/MainController.php b/src/Controller/MainController.php
index 96a4564..8766913 100644
--- a/src/Controller/MainController.php
+++ b/src/Controller/MainController.php
@@ -102,13 +102,7 @@ class MainController extends AppController {
         $hashRate = $this->_formatHashRate($this->_gethashrate());
 
         // recent claims
-        $claims = $this->Claims->find()->select(['transaction_hash_id', 'name', 'vout', 'claim_id', 'claim_type', 'author', 'title', 'description', 'content_type', 'is_nsfw', 'language', 'thumbnail_url', 'created_at', 'publisher_id'])->
-            distinct(['Claims.claim_id'])->order(['Claims.created_at' => 'DESC'])->limit(5)->toArray();
-
-        foreach($claims as $claim) {
-            $publisher = $this->Claims->find()->select(['name'])->where(['claim_id' => $claim->publisher_id])->first();
-            $claim->publisher = $publisher;
-        }
+        $claims = $this->Claims->find()->distinct(['Claims.claim_id'])->select($this->Claims)->select(['publisher' => 'C.name'])->leftJoin(['C' => 'claim'], ['C.claim_id = Claims.publisher_id'])->order(['Claims.created_at' => 'DESC'])->limit(5)->toArray();
 
         $this->set('recentBlocks', $blocks);
         $this->set('recentClaims', $claims);
@@ -227,6 +221,7 @@ class MainController extends AppController {
         }
 
         $transactions = $this->Transactions->find()->select(['Transactions.id', 'Transactions.hash', 'Transactions.input_count', 'Transactions.output_count', 'Transactions.transaction_time', 'Transactions.created_at'])->select(['value' => 'sum(O.value)'])->leftJoin(['O' => 'output'], ['O.transaction_id = Transactions.id'])->order(['Transactions.created_at' => 'desc'])->limit(10)->toArray();
+        
         $this->set('blocks', $blocks);
         $this->set('txs', $transactions);
     }
diff --git a/src/Template/Main/index.ctp b/src/Template/Main/index.ctp
index 8bd3aed..fedcf93 100644
--- a/src/Template/Main/index.ctp
+++ b/src/Template/Main/index.ctp
@@ -189,9 +189,9 @@
                 $autoThumbText = $claim->getAutoThumbText();
                 $link = $claim->name;
                 $rawLink = $claim->name;
-                if (isset($claim->publisher->name)) {
-                    $link = urlencode($claim->publisher->name) . '/' . $link;
-                    $rawLink = $claim->publisher->name . '/' . $link;
+                if (isset($claim->publisher)) {
+                    $link = urlencode($claim->publisher) . '/' . $link;
+                    $rawLink = $claim->publisher . '/' . $link;
                 }
                 $link = 'lbry://' . $link;
                 $rawLink = 'lbry://' . $rawLink;
-- 
2.45.2


From 9d88e2eaec5721b43390249b7a2c66d2633bcfd1 Mon Sep 17 00:00:00 2001
From: marcdeb1 <marcdebrouchev@laposte.net>
Date: Fri, 21 Dec 2018 14:18:39 +0100
Subject: [PATCH 25/43] Queries and bugs

---
 src/Controller/MainController.php | 10 +++++++++-
 src/Model/Entity/Claim.php        |  7 ++-----
 src/Template/Main/realtime.ctp    |  2 +-
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/Controller/MainController.php b/src/Controller/MainController.php
index 8766913..86e2c5f 100644
--- a/src/Controller/MainController.php
+++ b/src/Controller/MainController.php
@@ -220,7 +220,15 @@ class MainController extends AppController {
             $blocks[$i]->transaction_count = count($tx_hashes);
         }
 
-        $transactions = $this->Transactions->find()->select(['Transactions.id', 'Transactions.hash', 'Transactions.input_count', 'Transactions.output_count', 'Transactions.transaction_time', 'Transactions.created_at'])->select(['value' => 'sum(O.value)'])->leftJoin(['O' => 'output'], ['O.transaction_id = Transactions.id'])->order(['Transactions.created_at' => 'desc'])->limit(10)->toArray();
+        $transactions = $this->Transactions->find()->select(['Transactions.id', 'Transactions.hash', 'Transactions.input_count', 'Transactions.output_count', 'Transactions.transaction_time', 'Transactions.created_at'])->order(['Transactions.created_at' => 'desc'])->limit(10)->toArray();
+        foreach($transactions as $tx) {
+            $value = 0;
+            $outputs = $this->Outputs->find()->where(['transaction_id' => $tx->id])->toArray();
+            foreach($outputs as $output) {
+                $value += $output->value;
+            }
+            $tx->value = $value;
+        }
         
         $this->set('blocks', $blocks);
         $this->set('txs', $transactions);
diff --git a/src/Model/Entity/Claim.php b/src/Model/Entity/Claim.php
index eab2204..90bbcd5 100644
--- a/src/Model/Entity/Claim.php
+++ b/src/Model/Entity/Claim.php
@@ -8,11 +8,8 @@ use Cake\ORM\TableRegistry;
 class Claim extends Entity {
     function getLbryLink() {
         $link = $this->name;
-        $ClaimModel = TableRegistry::get('Claims');
-        $publisher = $ClaimModel->find()->select(['name'])->where(['claim_id' => $this->publisher_id])->first();
-        
-        if (isset($publisher->name)) {
-            $link = $publisher->name . '/' . $link;
+        if (isset($this->publisher)) {
+            $link = $this->publisher . '/' . $link;
         }
         $link = 'lbry://' . $link;
         return $link;
diff --git a/src/Template/Main/realtime.ctp b/src/Template/Main/realtime.ctp
index 2724609..45750c0 100644
--- a/src/Template/Main/realtime.ctp
+++ b/src/Template/Main/realtime.ctp
@@ -153,7 +153,7 @@
 
             <tbody>
                 <?php foreach ($txs as $tx): ?>
-                <tr data-hash="<?php echo $tx->Hash ?>" data-time="<?php echo $tx->transaction_time ?>">
+                <tr data-hash="<?php echo $tx->hash ?>" data-time="<?php echo $tx->transaction_time ?>">
                     <td class="w200"><div><a href="/tx/<?php echo $tx->hash ?>" target="_blank"><?php echo $tx->hash ?></a></div></td>
                     <td><?php echo $tx->created_at->diffForHumans(); ?></td>
                     <td class="right"><?php echo $tx->input_count ?></td>
-- 
2.45.2


From 8bef4e5cecdcd57c60d20963dd3d5da78092017e Mon Sep 17 00:00:00 2001
From: marcdeb1 <marcdebrouchev@laposte.net>
Date: Fri, 21 Dec 2018 15:48:33 +0100
Subject: [PATCH 26/43] Address page

---
 src/Controller/MainController.php | 53 ++++++++++++++-----------------
 src/Model/Entity/Claim.php        |  1 -
 src/Template/Main/address.ctp     |  2 +-
 src/Template/Main/tx.ctp          |  2 +-
 4 files changed, 26 insertions(+), 32 deletions(-)

diff --git a/src/Controller/MainController.php b/src/Controller/MainController.php
index 86e2c5f..055dc98 100644
--- a/src/Controller/MainController.php
+++ b/src/Controller/MainController.php
@@ -212,6 +212,7 @@ class MainController extends AppController {
     public function realtime() {
         $this->loadModel('Blocks');
         $this->loadModel('Transactions');
+        $this->loadModel('Outputs');
 
         // load 10 blocks and transactions
         $blocks = $this->Blocks->find()->select(['height', 'block_time', 'transaction_hashes'])->order(['height' => 'desc'])->limit(10)->toArray();
@@ -360,12 +361,11 @@ class MainController extends AppController {
             $input->input_addresses = $inputAddresses;
         }
         
-        $outputs = $this->Outputs->find()->where(['transaction_id' => $tx->id])->order(['vout' => 'asc'])->toArray();
+        $outputs = $this->Outputs->find()->select($this->Outputs)->select(['spend_input_hash' => 'I.transaction_hash', 'spend_input_id' => 'I.id'])->where(['Outputs.transaction_id' => $tx->id])->leftJoin(['I' => 'input'], ['I.id = Outputs.spent_by_input_id'])->order(['Outputs.vout' => 'asc'])->toArray();
         for ($i = 0; $i < count($outputs); $i++) {
-            $spend_input = $this->Inputs->find()->select(['transaction_hash', 'id'])->where(['id' => $outputs[$i]->spent_by_input_id])->first();
-            $outputs[$i]->spend_input = $spend_input;
-            
+            debug($outputs[$i]);
             $output_address = trim($outputs[$i]->address_list, '[""]');
+            debug($output_address);
             $address = $this->Addresses->find()->select(['address'])->where(['address' => $output_address])->first();
             $outputs[$i]->output_addresses = [$address];
             
@@ -438,6 +438,7 @@ class MainController extends AppController {
         $this->loadModel('Transactions');
         $this->loadModel('Inputs');
         $this->loadModel('Outputs');
+        $this->loadModel('TransactionAddress');
 
         if (!$addr) {
             return $this->redirect('/');
@@ -474,11 +475,9 @@ class MainController extends AppController {
             $conn = ConnectionManager::get('default');
 
             $canTag = true;
-            $addressId = $address->id;
-            
-            $stmt = $conn->execute('SELECT * FROM transaction_address WHERE address_id = ?', [$addressId]);
-            $transactionAddresses = $stmt->fetch(\PDO::FETCH_OBJ);
+            $transactionAddresses = $this->TransactionAddress->find()->where(['address_id' => $address->id])->toArray();
             $numTransactions = count($transactionAddresses);
+            
             $all = $this->request->query('all');
             if ($all === 'true') {
                 $offset = 0;
@@ -496,31 +495,28 @@ class MainController extends AppController {
 
                 $offset = ($page - 1) * $pageLimit;
             }
-
-            $currentBlock = $this->Blocks->find()->select(['height'])->order(['height' => 'desc'])->first();
-            $currentHeight = $currentBlock ? intval($currentBlock->height) : 0;
-
+            
             $stmt = $conn->execute(sprintf(
-                'SELECT T.id, T.hash, T.input_count, T.output_count' .
+                'SELECT T.id, T.hash, T.input_count, T.output_count, T.block_hash_id, ' .
                 '    TA.debit_amount, TA.credit_amount, ' .
                 '    B.height, B.confirmations, ' .
                 '    IFNULL(T.transaction_time, T.created_at) AS transaction_time ' .
                 'FROM transaction T ' .
                 'LEFT JOIN block B ON T.block_hash_id = B.hash ' .
                 'RIGHT JOIN (SELECT transaction_id, debit_amount, credit_amount FROM transaction_address ' .
-                '            WHERE address_id = ? ORDER BY transaction_time DESC LIMIT %d, %d) TA ON TA.transaction_id = T.id', $offset, $pageLimit), [$addressId]);
+                '            WHERE address_id = ?) TA ON TA.transaction_id = T.id ' .
+                'ORDER BY transaction_time DESC LIMIT %d, %d', $offset, $pageLimit), [$address->id]);
             $recentTxs = $stmt->fetchAll(\PDO::FETCH_OBJ);
 
             foreach($transactionAddresses as $ta) {
                 $totalRecvAmount += $ta->credit_amount + 0;
                 $totalSentAmount += $ta->debit_amount + 0;
             }
-            $balanceAmount = $totalSentAmount - $totalRecvAmount;
+            $balanceAmount = $totalRecvAmount - $totalSentAmount;
         }
 
         $this->set('offset', $offset);
         $this->set('canTag', $canTag);
-        $this->set('pending', $pending);
         $this->set('tagRequestAmount', $tagRequestAmount);
         $this->set('address', $address);
         $this->set('totalReceived', $totalRecvAmount);
@@ -580,6 +576,18 @@ class MainController extends AppController {
 
         $resultSet = [];
 
+        // get avg prices
+        $conn_local = ConnectionManager::get('localdb');
+        $stmt = $conn_local->execute("SELECT AVG(USD) AS AvgUSD, DATE_FORMAT(Created, '$sqlDateFormat') AS TimePeriod " .
+                               "FROM PriceHistory WHERE DATE_FORMAT(Created, '$sqlDateFormat') >= ? GROUP BY TimePeriod ORDER BY TimePeriod ASC", [$start->format($dateFormat)]);
+        $avgPrices = $stmt->fetchAll(\PDO::FETCH_OBJ);
+        foreach ($avgPrices as $price) {
+            if (!isset($resultSet[$price->TimePeriod])) {
+                $resultSet[$price->TimePeriod] = [];
+            }
+            $resultSet[$price->TimePeriod]['AvgUSD'] = (float) $price->AvgUSD;
+        }
+        
         $conn = ConnectionManager::get('default');
         // get avg block sizes for the time period
         $stmt = $conn->execute("SELECT AVG(block_size) AS AvgBlockSize, DATE_FORMAT(FROM_UNIXTIME(block_time), '$sqlDateFormat') AS TimePeriod " .
@@ -592,19 +600,6 @@ class MainController extends AppController {
             $resultSet[$size->TimePeriod]['AvgBlockSize'] = (float) $size->AvgBlockSize;
         }
 
-        // get avg prices
-        
-        $conn_local = ConnectionManager::get('localdb');
-        $stmt = $conn_local->execute("SELECT AVG(USD) AS AvgUSD, DATE_FORMAT(Created, '$sqlDateFormat') AS TimePeriod " .
-                               "FROM PriceHistory WHERE DATE_FORMAT(Created, '$sqlDateFormat') >= ? GROUP BY TimePeriod ORDER BY TimePeriod ASC", [$start->format($dateFormat)]);
-        $avgPrices = $stmt->fetchAll(\PDO::FETCH_OBJ);
-        foreach ($avgPrices as $price) {
-            if (!isset($resultSet[$price->TimePeriod])) {
-                $resultSet[$price->TimePeriod] = [];
-            }
-            $resultSet[$price->TimePeriod]['AvgUSD'] = (float) $price->AvgUSD;
-        }
-
         return $this->_jsonResponse(['success' => true, 'data' => $resultSet]);
     }
     
diff --git a/src/Model/Entity/Claim.php b/src/Model/Entity/Claim.php
index 90bbcd5..a7651e7 100644
--- a/src/Model/Entity/Claim.php
+++ b/src/Model/Entity/Claim.php
@@ -3,7 +3,6 @@
 namespace App\Model\Entity;
 
 use Cake\ORM\Entity;
-use Cake\ORM\TableRegistry;
 
 class Claim extends Entity {
     function getLbryLink() {
diff --git a/src/Template/Main/address.ctp b/src/Template/Main/address.ctp
index 748bdf3..1357301 100644
--- a/src/Template/Main/address.ctp
+++ b/src/Template/Main/address.ctp
@@ -153,7 +153,7 @@
             <?php foreach ($recentTxs as $tx): ?>
             <tr>
                 <td class="w125"><?php if ($tx->height === null): ?><em>Unconfirmed</em><?php else: ?><a href="/blocks/<?php echo $tx->height ?>"><?php echo $tx->height ?></a><?php endif; ?></td>
-                <td class="w250"><div><a href="/tx/<?php echo $tx->Hash ?>?address=<?php echo $address->address ?>#<?php echo $address->address ?>"><?php echo $tx->Hash ?></a></div></td>
+                <td class="w250"><div><a href="/tx/<?php echo $tx->hash ?>?address=<?php echo $address->address ?>#<?php echo $address->address ?>"><?php echo $tx->hash ?></a></div></td>
                 <td><?php echo \DateTime::createFromFormat('U', $tx->transaction_time)->format('d M Y H:i:s') . ' UTC'; ?></td>
                 <td class="right"><?php echo number_format($tx->confirmations, 0, '', ',') ?></td>
                 <td class="right"><?php echo $tx->input_count ?></td>
diff --git a/src/Template/Main/tx.ctp b/src/Template/Main/tx.ctp
index 56a15f3..bd2bf29 100644
--- a/src/Template/Main/tx.ctp
+++ b/src/Template/Main/tx.ctp
@@ -155,7 +155,7 @@
                 <div><span class="value"><?php echo $this->Amount->format($out->value) ?> LBC</span> to</div>
                 <div class="address"><a href="/address/<?php echo $addr->address ?>"><?php echo $addr->address ?></a>
 
-                <?php if ($out->is_spent): ?>(<a href="/tx/<?php if(isset($out->spend_input)) { echo $out->spend_input->transaction_hash; } ?>#input-<?php if(isset($out->spend_input)) {echo $out->spend_input->id; } ?>">spent</a>)<?php else: ?>(unspent)<?php endif; ?>
+                <?php if ($out->is_spent): ?>(<a href="/tx/<?php if(isset($out->spend_input_id)) { echo $out->spend_input_hash; } ?>#input-<?php if(isset($out->spend_input_id)) {echo $out->spend_input_id; } ?>">spent</a>)<?php else: ?>(unspent)<?php endif; ?>
 
                 <?php if (isset($addr->Tag) && strlen(trim($addr->Tag)) > 0): ?>
                 <div class="tag">
-- 
2.45.2


From 1edc128b61e439a0bcdeb9b285b4db8e4f84fe6b Mon Sep 17 00:00:00 2001
From: marcdeb1 <marcdebrouchev@laposte.net>
Date: Fri, 21 Dec 2018 15:51:36 +0100
Subject: [PATCH 27/43] Address balance API

---
 src/Controller/MainController.php | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/Controller/MainController.php b/src/Controller/MainController.php
index 055dc98..148537d 100644
--- a/src/Controller/MainController.php
+++ b/src/Controller/MainController.php
@@ -731,6 +731,7 @@ class MainController extends AppController {
     public function apiaddrbalance($base58address = null) {
         $this->autoRender = false;
         $this->loadModel('Addresses');
+        $this->loadModel('TransactionAddress');
 
         if (!isset($base58address)) {
             return $this->_jsonError('Base58 address not specified.', 400);
@@ -740,12 +741,8 @@ class MainController extends AppController {
         if (!$address) {
             return $this->_jsonError('Could not find address.', 400);
         }
-        $conn = ConnectionManager::get('default');
-        $stmt = $conn->execute(sprintf(
-                'SELECT TA.debit_amount, TA.credit_amount, ' .
-                'FROM transaction_address TA' .
-                'WHERE TA.address_id = ?'), [$address->id]);
-        $transaction_addresses = $stmt->fetchAll(\PDO::FETCH_OBJ);
+        
+        $transaction_addresses = $this->TransactionAddress->find()->where(['address_id' => $address->id])->toArray();
         $balance = 0;
         foreach($transaction_addresses as $ta) {
             $balance += $ta->credit_amount;
-- 
2.45.2


From 80e55f53e255f08e74782398a40e50667754c709 Mon Sep 17 00:00:00 2001
From: marcdeb1 <marcdebrouchev@laposte.net>
Date: Fri, 21 Dec 2018 16:21:28 +0100
Subject: [PATCH 28/43] Circulating supply API

---
 src/Controller/MainController.php | 37 +++++++++----------------------
 1 file changed, 11 insertions(+), 26 deletions(-)

diff --git a/src/Controller/MainController.php b/src/Controller/MainController.php
index 148537d..b484c32 100644
--- a/src/Controller/MainController.php
+++ b/src/Controller/MainController.php
@@ -775,11 +775,11 @@ class MainController extends AppController {
         // Get the unspent outputs for the address
         $conn = ConnectionManager::get('default');
         $stmt = $conn->execute(sprintf(
-                               'SELECT T.hash AS transaction_hash, O.vout, O.value, O.address_list, O.script_pub_key_asm, O.script_pub_key_hex, O._type, O.required_signatures, B.confirmations ' .
+                               'SELECT T.hash AS transaction_hash, O.vout, O.value, O.address_list, O.script_pub_key_asm, O.script_pub_key_hex, O.type, O.required_signatures, B.confirmations ' .
                                'FROM transaction T ' .
                                'JOIN output O ON O.transaction_id = T.id ' .
                                'JOIN block B ON B.hash = T.block_hash_id ' .
-                               'WHERE O.id IN (SELECT id FROM output O2 WHERE address_id IN (%s)) AND O.is_spent <> 1 ORDER BY T.transaction_time ASC', implode(',', $params)), $addressIds);
+                               'WHERE O.id IN (SELECT O2.id FROM output O2 WHERE address_id IN (%s)) AND O.is_spent <> 1 ORDER BY T.transaction_time ASC', implode(',', $params)), $addressIds);
         $outputs = $stmt->fetchAll(\PDO::FETCH_OBJ);
 
         $utxo = [];
@@ -806,32 +806,17 @@ class MainController extends AppController {
         $this->loadModel('Addresses');
 
         $circulating = 0;
-        $reservedcommunity = 0;
-        $reservedoperational = 0;
-        $reservedinstitutional = 0;
-        $reservedtotal = 0;
-        $circulating = 0;
-
         $txoutsetinfo = $this->_gettxoutsetinfo();
-        $reservedcommunity = $this->Addresses->find()->select(['Balance'])->where(['Address =' => 'rFLUohPG4tP3gZHYoyhvADCtrDMiaYb7Qd'])->first();
-        $reservedoperational = $this->Addresses->find()->select(['Balance'])->where(['Address =' => 'r9PGXsejVJb9ZfMf3QVdDEJCzxkd9JLxzL'])->first();
-        $reservedinstitutional = $this->Addresses->find()->select(['Balance'])->where(['Address =' => 'r9srwX7DEN7Mex3a8oR1mKSqQmLBizoJvi'])->first();
-        //aux is the address of hot wallets and where some of the LBRY operational fund are, but not sold on market.
-        $reservedaux = $this->Addresses->find()->select(['Balance'])->where(['Address =' => 'bRo4FEeqqxY7nWFANsZsuKEWByEgkvz8Qt'])->first() +
-                       $this->Addresses->find()->select(['Balance'])->where(['Address =' => 'bU2XUzckfpdEuQNemKvhPT1gexQ3GG3SC2'])->first() +
-                       $this->Addresses->find()->select(['Balance'])->where(['Address =' => 'bay3VA6YTQBL4WLobbG7CthmoGeUKXuXkD'])->first() +
-                       $this->Addresses->find()->select(['Balance'])->where(['Address =' => 'bLPbiXBp6Vr3NSnsHzDsLNzoy5o36re9Cz'])->first() +
-                       $this->Addresses->find()->select(['Balance'])->where(['Address =' => 'bMvUBo1h5WS46ThHtmfmXftz3z33VHL7wc'])->first() +
-                       $this->Addresses->find()->select(['Balance'])->where(['Address =' => 'bVUrbCK8hcZ5XWti7b9eNxKEBxzc1rr393'])->first() +
-                       $this->Addresses->find()->select(['Balance'])->where(['Address =' => 'bZja2VyhAC84a9hMwT8dwTU6rDRXowrjxH'])->first() +
-                       $this->Addresses->find()->select(['Balance'])->where(['Address =' => 'bMvUBo1h5WS46ThHtmfmXftz3z33VHL7wc'])->first() +
-                       $this->Addresses->find()->select(['Balance'])->where(['Address =' => 'bCrboXVztuSbZzVToCWSsu1pEr2oxKHu9v'])->first() +
-                       $this->Addresses->find()->select(['Balance'])->where(['Address =' => 'bMgqQqYfwzWWYBk5o5dBMXtCndVAoeqy6h'])->first();
+        
+        $reservedcommunity = ['rFLUohPG4tP3gZHYoyhvADCtrDMiaYb7Qd'];
+        $reservedoperational = ['r9PGXsejVJb9ZfMf3QVdDEJCzxkd9JLxzL'];
+        $reservedinstitutional = ['r9srwX7DEN7Mex3a8oR1mKSqQmLBizoJvi'];
+        $reservedaux = ['bRo4FEeqqxY7nWFANsZsuKEWByEgkvz8Qt', 'bU2XUzckfpdEuQNemKvhPT1gexQ3GG3SC2', 'bay3VA6YTQBL4WLobbG7CthmoGeUKXuXkD', 'bLPbiXBp6Vr3NSnsHzDsLNzoy5o36re9Cz', 'bMvUBo1h5WS46ThHtmfmXftz3z33VHL7wc', 'bVUrbCK8hcZ5XWti7b9eNxKEBxzc1rr393', 'bZja2VyhAC84a9hMwT8dwTU6rDRXowrjxH', 'bCrboXVztuSbZzVToCWSsu1pEr2oxKHu9v', 'bMgqQqYfwzWWYBk5o5dBMXtCndVAoeqy6h'];
+        $allAddresses = array_merge($reservedcommunity, $reservedoperational, $reservedinstitutional, $reservedaux);
+        
+        $reservedtotal = $this->Addresses->find()->select(['id'])->select(['credit_amount' => 'sum(TA.credit_amount)', 'debit_amount' => 'sum(TA.debit_amount)'])->leftJoin(['TA' => 'transaction_address'], ['TA.address_id = Addresses.id'])->where(['Addresses.address IN' => $allAddresses])->first();
 
-        $reservedtotal = $reservedcommunity->Balance + $reservedoperational->Balance + $reservedinstitutional->Balance + $reservedaux->Balance;
-
-
-         $circulating = $txoutsetinfo->total_amount - $reservedtotal;
+        $circulating = $txoutsetinfo->total_amount - ($reservedtotal->credit_amount - $reservedtotal->debit_amount);
 
         return $this->_jsonResponse(['success' => true, 'utxosupply' => ['total' => $txoutsetinfo->total_amount, 'circulating' => $circulating]]);
     }
-- 
2.45.2


From 0d49e4d0c857d32f32ce0d202e20d020dadde354 Mon Sep 17 00:00:00 2001
From: marcdeb1 <marcdebrouchev@laposte.net>
Date: Fri, 21 Dec 2018 16:53:55 +0100
Subject: [PATCH 29/43] Claim address in tx page

---
 src/Controller/MainController.php | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/Controller/MainController.php b/src/Controller/MainController.php
index b484c32..0d405da 100644
--- a/src/Controller/MainController.php
+++ b/src/Controller/MainController.php
@@ -362,18 +362,19 @@ class MainController extends AppController {
         }
         
         $outputs = $this->Outputs->find()->select($this->Outputs)->select(['spend_input_hash' => 'I.transaction_hash', 'spend_input_id' => 'I.id'])->where(['Outputs.transaction_id' => $tx->id])->leftJoin(['I' => 'input'], ['I.id = Outputs.spent_by_input_id'])->order(['Outputs.vout' => 'asc'])->toArray();
-        for ($i = 0; $i < count($outputs); $i++) {
-            debug($outputs[$i]);
-            $output_address = trim($outputs[$i]->address_list, '[""]');
-            debug($output_address);
-            $address = $this->Addresses->find()->select(['address'])->where(['address' => $output_address])->first();
-            $outputs[$i]->output_addresses = [$address];
-            
+        for ($i = 0; $i < count($outputs); $i++) {            
             $outputs[$i]->IsClaim = (strpos($outputs[$i]->script_pub_key_asm, 'CLAIM') > -1);
             $outputs[$i]->IsSupportClaim = (strpos($outputs[$i]->script_pub_key_asm, 'SUPPORT_CLAIM') > -1);
             $outputs[$i]->IsUpdateClaim = (strpos($outputs[$i]->script_pub_key_asm, 'UPDATE_CLAIM') > -1);
-            $claim = $this->Claims->find()->select(['id', 'claim_id', 'vout', 'transaction_hash_id'])->where(['transaction_hash_id' => $tx->hash, 'vout' => $outputs[$i]->vout])->first();
+            $claim = $this->Claims->find()->select(['id', 'claim_id', 'claim_address', 'vout', 'transaction_hash_id'])->where(['transaction_hash_id' => $tx->hash, 'vout' => $outputs[$i]->vout])->first();
             $outputs[$i]->Claim = $claim;
+            
+            $output_address = trim($outputs[$i]->address_list, '[""]');
+             if(!$output_address && $claim) {
+                $output_address = $claim->claim_address;
+            }
+            $address = $this->Addresses->find()->select(['address'])->where(['address' => $output_address])->first();
+            $outputs[$i]->output_addresses = [$address];
         }
 
         $totalIn = 0;
-- 
2.45.2


From d61d9ff015301943481deafef0c85761679153e2 Mon Sep 17 00:00:00 2001
From: marcdeb1 <marcdebrouchev@laposte.net>
Date: Fri, 21 Dec 2018 17:12:00 +0100
Subject: [PATCH 30/43] DB comments

---
 config/app.default.php            | 4 ++--
 src/Controller/MainController.php | 4 ++--
 src/Model/Entity/PriceHistory.php | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/config/app.default.php b/config/app.default.php
index 6a00e95..4ebb149 100644
--- a/config/app.default.php
+++ b/config/app.default.php
@@ -218,7 +218,7 @@ return [
      * See vendor\cakephp\cakephp\src\Database\Driver for complete list
      */
     'Datasources' => [
-        'default' => [
+        'default' => [ // Chainquery database connection
             'className' => 'Cake\Database\Connection',
             'driver' => 'Cake\Database\Driver\Mysql',
             'persistent' => false,
@@ -260,7 +260,7 @@ return [
             'url' => env('DATABASE_URL', 'chainquery.lbry.io:3600'),
         ],
         
-        'localdb' => [
+        'localdb' => [ // Local db for price history
             'className' => 'Cake\Database\Connection',
             'driver' => 'Cake\Database\Driver\Mysql',
             'persistent' => false,
diff --git a/src/Controller/MainController.php b/src/Controller/MainController.php
index 0d405da..be8ad60 100644
--- a/src/Controller/MainController.php
+++ b/src/Controller/MainController.php
@@ -579,9 +579,9 @@ class MainController extends AppController {
 
         // get avg prices
         $conn_local = ConnectionManager::get('localdb');
-        $stmt = $conn_local->execute("SELECT AVG(USD) AS AvgUSD, DATE_FORMAT(Created, '$sqlDateFormat') AS TimePeriod " .
+        $stmt_price = $conn_local->execute("SELECT AVG(USD) AS AvgUSD, DATE_FORMAT(Created, '$sqlDateFormat') AS TimePeriod " .
                                "FROM PriceHistory WHERE DATE_FORMAT(Created, '$sqlDateFormat') >= ? GROUP BY TimePeriod ORDER BY TimePeriod ASC", [$start->format($dateFormat)]);
-        $avgPrices = $stmt->fetchAll(\PDO::FETCH_OBJ);
+        $avgPrices = $stmt_price->fetchAll(\PDO::FETCH_OBJ);
         foreach ($avgPrices as $price) {
             if (!isset($resultSet[$price->TimePeriod])) {
                 $resultSet[$price->TimePeriod] = [];
diff --git a/src/Model/Entity/PriceHistory.php b/src/Model/Entity/PriceHistory.php
index 2d0f333..038ccc6 100644
--- a/src/Model/Entity/PriceHistory.php
+++ b/src/Model/Entity/PriceHistory.php
@@ -5,7 +5,7 @@ namespace App\Model\Entity;
 use Cake\ORM\Entity;
 
 class PriceHistory extends Entity {
-
+    public $useDbConfig = 'localdb';
 }
 
 ?>
\ No newline at end of file
-- 
2.45.2


From b99285cfa53bf9b79c52e8f406f18190efb3a039 Mon Sep 17 00:00:00 2001
From: marcdeb1 <marcdebrouchev@laposte.net>
Date: Fri, 21 Dec 2018 17:15:02 +0100
Subject: [PATCH 31/43] Minor bugs

---
 src/Template/Element/claimbox.ctp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Template/Element/claimbox.ctp b/src/Template/Element/claimbox.ctp
index 8013628..628188c 100644
--- a/src/Template/Element/claimbox.ctp
+++ b/src/Template/Element/claimbox.ctp
@@ -1,8 +1,8 @@
 <?php
 $autoThumbText = $claim->getAutoThumbText();
 $cost = '';
-if (isset($claim->Price) && $claim->Price > 0) {
-    $cost = $this->Amount->formatCurrency($claim->Price) . ' LBC';
+if (isset($claim->price) && $claim->price > 0) {
+    $cost = $this->Amount->formatCurrency($claim->price) . ' LBC';
 } else if (isset($claim->fee) && strtolower($claim->fee_currency) === 'lbc') {
     $cost = $this->Amount->formatCurrency($claim->fee) . ' LBC';
 }
-- 
2.45.2


From 5064b86fc6e43906150bcaae8170579473fc0e5b Mon Sep 17 00:00:00 2001
From: marcdeb1 <marcdebrouchev@laposte.net>
Date: Fri, 21 Dec 2018 17:15:36 +0100
Subject: [PATCH 32/43] Transaction address table

---
 src/Model/Entity/TransactionAddress.php  | 10 ++++++++++
 src/Model/Table/TransactionAddresses.php | 17 +++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 src/Model/Entity/TransactionAddress.php
 create mode 100644 src/Model/Table/TransactionAddresses.php

diff --git a/src/Model/Entity/TransactionAddress.php b/src/Model/Entity/TransactionAddress.php
new file mode 100644
index 0000000..4be5a33
--- /dev/null
+++ b/src/Model/Entity/TransactionAddress.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Model\Entity;
+
+use Cake\ORM\Entity;
+
+class TransactionAddress extends Entity {
+}
+
+?>
\ No newline at end of file
diff --git a/src/Model/Table/TransactionAddresses.php b/src/Model/Table/TransactionAddresses.php
new file mode 100644
index 0000000..3de545c
--- /dev/null
+++ b/src/Model/Table/TransactionAddresses.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Model\Table;
+
+use Cake\ORM\Table;
+
+class TransactionAddressesTable extends Table {
+    public function initialize(array $config) {
+        parent::initialize($config);
+
+        $this->table('transaction_address');
+
+        $this->addBehavior('SimpleAudit');
+    }
+}
+
+?>
\ No newline at end of file
-- 
2.45.2


From 17b0ef58a9d1e94e161c9f1000f110c5833ecc88 Mon Sep 17 00:00:00 2001
From: marcdeb1 <marcdebrouchev@laposte.net>
Date: Fri, 21 Dec 2018 17:19:55 +0100
Subject: [PATCH 33/43] Find page bug

---
 src/Template/Main/find.ctp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Template/Main/find.ctp b/src/Template/Main/find.ctp
index e1051bc..2c806c8 100644
--- a/src/Template/Main/find.ctp
+++ b/src/Template/Main/find.ctp
@@ -54,7 +54,7 @@
         if ($idx % 3 == 0) {
             $row++;
         }
-        echo $this->element('claimbox', array('claim' => $claim));
+        echo $this->element('claimbox', array('claim' => $claim, 'idx' => $idx, 'last_row' => $last_row));
         $idx++; 
         endforeach; ?>
     <?php else: ?>
-- 
2.45.2


From 262e90a2e10dda94aa51329074b0e32d6c3f4b8e Mon Sep 17 00:00:00 2001
From: Mark Beamer Jr <markbeamerjr@gmail.com>
Date: Fri, 21 Dec 2018 23:41:30 -0500
Subject: [PATCH 34/43] Fixed some deprecation warnings. Fixed a few claim
 queries that were using a distinct causing a group by to be performed with
 full table scan. Added `dev.sh` file to quickly startup the explorer.

---
 config/bootstrap.php              | 13 +++++++++----
 dev.sh                            | 23 +++++++++++++++++++++++
 src/Controller/MainController.php |  8 +++++---
 3 files changed, 37 insertions(+), 7 deletions(-)
 create mode 100755 dev.sh

diff --git a/config/bootstrap.php b/config/bootstrap.php
index 938d3c2..fbfa9d0 100644
--- a/config/bootstrap.php
+++ b/config/bootstrap.php
@@ -49,6 +49,7 @@ require __DIR__ . '/paths.php';
  */
 require CORE_PATH . 'config' . DS . 'bootstrap.php';
 
+use App\Application;
 use Cake\Cache\Cache;
 use Cake\Console\ConsoleErrorHandler;
 use Cake\Core\App;
@@ -60,6 +61,7 @@ use Cake\Datasource\ConnectionManager;
 use Cake\Error\ErrorHandler;
 use Cake\Log\Log;
 use Cake\Mailer\Email;
+use Cake\Mailer\TransportFactory;
 use Cake\Network\Request;
 use Cake\Utility\Inflector;
 use Cake\Utility\Security;
@@ -150,10 +152,12 @@ if (!Configure::read('App.fullBaseUrl')) {
 
 Cache::setConfig(Configure::consume('Cache'));
 ConnectionManager::setConfig(Configure::consume('Datasources'));
-Email::setConfigTransport(Configure::consume('EmailTransport'));
+//Email::setConfigTransport(Configure::consume('EmailTransport'));
+TransportFactory::setConfig(Configure::consume('EmailTransport'));
 Email::setConfig(Configure::consume('Email'));
 Log::setConfig(Configure::consume('Log'));
-Security::salt(Configure::consume('Security.salt'));
+//Security::salt(Configure::consume('Security.salt'));
+Security::setSalt(Configure::consume('Security.salt'));
 
 /*
  * The default crypto extension in 3.0 is OpenSSL.
@@ -218,8 +222,9 @@ Type::build('timestamp')
  * Debug Kit should not be installed on a production system
  */
 if (Configure::read('debug')) {
-    Plugin::load('DebugKit', ['bootstrap' => true]);
+    //Plugin::load('DebugKit', ['bootstrap' => true]);
+    Application::addPlugin('DebugKit', ['bootstrap' => true]);
 }
 
-Configure::load('lbry');
+Configure::load('lbry','lbry.default');
 
diff --git a/dev.sh b/dev.sh
new file mode 100755
index 0000000..d617fd1
--- /dev/null
+++ b/dev.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+set -e
+
+PHPBIN=php7.2
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+
+if [ ! -e "config/app.php" ]; then
+ cp "$DIR/config/app.default.php" "$DIR/config/app.php"
+fi
+
+if ! which $PHPBIN 2>/dev/null; then
+   PHPBIN=php
+fi
+
+#Composer update
+composer update
+
+#$PHPBIN composer.phar install
+
+$PHPBIN --server localhost:8000 --docroot "$DIR/webroot" "$DIR/webroot/index.php"
\ No newline at end of file
diff --git a/src/Controller/MainController.php b/src/Controller/MainController.php
index be8ad60..eae6609 100644
--- a/src/Controller/MainController.php
+++ b/src/Controller/MainController.php
@@ -102,7 +102,8 @@ class MainController extends AppController {
         $hashRate = $this->_formatHashRate($this->_gethashrate());
 
         // recent claims
-        $claims = $this->Claims->find()->distinct(['Claims.claim_id'])->select($this->Claims)->select(['publisher' => 'C.name'])->leftJoin(['C' => 'claim'], ['C.claim_id = Claims.publisher_id'])->order(['Claims.created_at' => 'DESC'])->limit(5)->toArray();
+        //$claims = $this->Claims->find()->distinct(['Claims.claim_id'])->select($this->Claims)->select(['publisher' => 'C.name'])->leftJoin(['C' => 'claim'], ['C.claim_id = Claims.publisher_id'])->order(['Claims.created_at' => 'DESC'])->limit(5)->toArray();
+        $claims = $this->Claims->find()->select($this->Claims)->select(['publisher' => 'C.name'])->leftJoin(['C' => 'claim'], ['C.claim_id = Claims.publisher_id'])->order(['Claims.created_at' => 'DESC'])->limit(5)->toArray();
 
         $this->set('recentBlocks', $blocks);
         $this->set('recentClaims', $claims);
@@ -141,8 +142,9 @@ class MainController extends AppController {
             }
 
             $offset = ($page - 1) * $pageLimit;
-            $claims = $this->Claims->find()->distinct(['Claims.claim_id'])->select($this->Claims)->select(['publisher' => 'C.name'])->leftJoin(['C' => 'claim'], ['C.claim_id = Claims.publisher_id'])->order(['Claims.created_at' => 'DESC'])->offset($offset)->limit($pageLimit)->toArray();
-            
+            //$claims = $this->Claims->find()->distinct(['Claims.claim_id'])->select($this->Claims)->select(['publisher' => 'C.name'])->leftJoin(['C' => 'claim'], ['C.claim_id = Claims.publisher_id'])->order(['Claims.created_at' => 'DESC'])->offset($offset)->limit($pageLimit)->toArray();
+            $claims = $this->Claims->find()->select($this->Claims)->select(['publisher' => 'C.name'])->leftJoin(['C' => 'claim'], ['C.claim_id = Claims.publisher_id'])->order(['Claims.created_at' => 'DESC'])->offset($offset)->limit($pageLimit)->toArray();
+
             for ($i = 0; $i < count($claims); $i++) {
                 if ($canConvert && $claims[$i]->fee > 0 && $claims[$i]->fee_currency == 'USD') {
                     $claims[$i]->price = $claims[$i]->fee / $priceInfo->price;
-- 
2.45.2


From a428ebdd73f6655c368df9c02ee810ac51ae37ff Mon Sep 17 00:00:00 2001
From: marcdeb1 <marcdebrouchev@laposte.net>
Date: Tue, 1 Jan 2019 15:40:45 +0100
Subject: [PATCH 35/43] Chainquery update, transaction value and address
 balance

---
 composer.lock                     | 291 +++++++++++++++++-------------
 config/bootstrap.php              |   6 +-
 src/Controller/MainController.php |  55 ++----
 src/Model/Entity/Transaction.php  |  10 -
 src/Template/Main/blocks.ctp      |   2 +-
 src/Template/Main/stats.ctp       |  12 +-
 src/Template/Main/tx.ctp          |   2 +-
 src/View/AjaxView.php             |   2 +-
 8 files changed, 200 insertions(+), 180 deletions(-)

diff --git a/composer.lock b/composer.lock
index 639cfca..5ed47a4 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1,10 +1,9 @@
 {
     "_readme": [
         "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "hash": "654f4b2fd4cf16d217bd2c8d6431357c",
     "content-hash": "d6441e245d73b6c3db3a627313143bff",
     "packages": [
         {
@@ -51,7 +50,7 @@
                 "l10n",
                 "localization"
             ],
-            "time": "2017-01-20 05:00:11"
+            "time": "2017-01-20T05:00:11+00:00"
         },
         {
             "name": "bacon/bacon-qr-code",
@@ -97,20 +96,20 @@
             ],
             "description": "BaconQrCode is a QR code generator for PHP.",
             "homepage": "https://github.com/Bacon/BaconQrCode",
-            "time": "2017-10-17 09:59:25"
+            "time": "2017-10-17T09:59:25+00:00"
         },
         {
             "name": "cakephp/cakephp",
-            "version": "3.6.13",
+            "version": "3.7.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/cakephp/cakephp.git",
-                "reference": "6a0b9c74710a56c5974d1c8229c7a91dac780402"
+                "reference": "1f6fd21ca27ffc88fa88506a400b94a809e29254"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/cakephp/cakephp/zipball/6a0b9c74710a56c5974d1c8229c7a91dac780402",
-                "reference": "6a0b9c74710a56c5974d1c8229c7a91dac780402",
+                "url": "https://api.github.com/repos/cakephp/cakephp/zipball/1f6fd21ca27ffc88fa88506a400b94a809e29254",
+                "reference": "1f6fd21ca27ffc88fa88506a400b94a809e29254",
                 "shasum": ""
             },
             "require": {
@@ -120,6 +119,7 @@
                 "ext-mbstring": "*",
                 "php": ">=5.6.0",
                 "psr/log": "^1.0.0",
+                "psr/simple-cache": "^1.0.0",
                 "zendframework/zend-diactoros": "^1.4.0"
             },
             "conflict": {
@@ -145,6 +145,7 @@
                 "phpunit/phpunit": "^5.7.14|^6.0"
             },
             "suggest": {
+                "ext-curl": "To enable more efficient network calls in Http\\Client.",
                 "ext-openssl": "To use Security::encrypt() or have secure CSRF token generation.",
                 "lib-ICU": "The intl PHP library, to use Text::transliterate() or Text::slug()"
             },
@@ -183,7 +184,7 @@
                 "rapid-development",
                 "validation"
             ],
-            "time": "2018-11-04 20:29:27"
+            "time": "2018-12-18T02:39:37+00:00"
         },
         {
             "name": "cakephp/chronos",
@@ -240,7 +241,7 @@
                 "datetime",
                 "time"
             ],
-            "time": "2018-10-18 22:02:21"
+            "time": "2018-10-18T22:02:21+00:00"
         },
         {
             "name": "cakephp/migrations",
@@ -293,7 +294,7 @@
                 "cakephp",
                 "migrations"
             ],
-            "time": "2018-04-16 01:35:59"
+            "time": "2018-04-16T01:35:59+00:00"
         },
         {
             "name": "cakephp/plugin-installer",
@@ -334,7 +335,7 @@
                 }
             ],
             "description": "A composer installer for CakePHP 3.0+ plugins.",
-            "time": "2017-12-24 21:09:29"
+            "time": "2017-12-24T21:09:29+00:00"
         },
         {
             "name": "endroid/qrcode",
@@ -404,7 +405,7 @@
                 "symfony"
             ],
             "abandoned": "endroid/qr-code",
-            "time": "2018-05-09 20:26:30"
+            "time": "2018-05-09T20:26:30+00:00"
         },
         {
             "name": "fgrosse/phpasn1",
@@ -473,7 +474,7 @@
                 "x509",
                 "x690"
             ],
-            "time": "2018-12-02 01:34:34"
+            "time": "2018-12-02T01:34:34+00:00"
         },
         {
             "name": "khanamiryan/qrcode-detector-decoder",
@@ -523,20 +524,20 @@
                 "qr",
                 "zxing"
             ],
-            "time": "2017-01-13 09:11:46"
+            "time": "2017-01-13T09:11:46+00:00"
         },
         {
             "name": "mdanter/ecc",
-            "version": "v0.5.1",
+            "version": "v0.5.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpecc/phpecc.git",
-                "reference": "9a3aca17c6dfc04bdaad2e7ddab3b8df656ffc5b"
+                "reference": "b95f25cc1bacc83a9f0ccd375900b7cfd343029e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpecc/phpecc/zipball/9a3aca17c6dfc04bdaad2e7ddab3b8df656ffc5b",
-                "reference": "9a3aca17c6dfc04bdaad2e7ddab3b8df656ffc5b",
+                "url": "https://api.github.com/repos/phpecc/phpecc/zipball/b95f25cc1bacc83a9f0ccd375900b7cfd343029e",
+                "reference": "b95f25cc1bacc83a9f0ccd375900b7cfd343029e",
                 "shasum": ""
             },
             "require": {
@@ -595,7 +596,7 @@
                 "secp256k1",
                 "secp256r1"
             ],
-            "time": "2018-12-01 23:35:23"
+            "time": "2018-12-03T18:17:01+00:00"
         },
         {
             "name": "mobiledetect/mobiledetectlib",
@@ -647,7 +648,7 @@
                 "mobile detector",
                 "php mobile detect"
             ],
-            "time": "2018-09-01 15:05:15"
+            "time": "2018-09-01T15:05:15+00:00"
         },
         {
             "name": "myclabs/php-enum",
@@ -691,20 +692,20 @@
             "keywords": [
                 "enum"
             ],
-            "time": "2018-10-30 14:36:18"
+            "time": "2018-10-30T14:36:18+00:00"
         },
         {
             "name": "nesbot/carbon",
-            "version": "1.36.1",
+            "version": "1.36.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/briannesbitt/Carbon.git",
-                "reference": "63da8cdf89d7a5efe43aabc794365f6e7b7b8983"
+                "reference": "cd324b98bc30290f233dd0e75e6ce49f7ab2a6c9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/63da8cdf89d7a5efe43aabc794365f6e7b7b8983",
-                "reference": "63da8cdf89d7a5efe43aabc794365f6e7b7b8983",
+                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/cd324b98bc30290f233dd0e75e6ce49f7ab2a6c9",
+                "reference": "cd324b98bc30290f233dd0e75e6ce49f7ab2a6c9",
                 "shasum": ""
             },
             "require": {
@@ -749,7 +750,7 @@
                 "datetime",
                 "time"
             ],
-            "time": "2018-11-22 18:23:02"
+            "time": "2018-12-28T10:07:33+00:00"
         },
         {
             "name": "predis/predis",
@@ -799,7 +800,7 @@
                 "predis",
                 "redis"
             ],
-            "time": "2016-06-16 16:22:20"
+            "time": "2016-06-16T16:22:20+00:00"
         },
         {
             "name": "psr/http-message",
@@ -849,7 +850,7 @@
                 "request",
                 "response"
             ],
-            "time": "2016-08-06 14:39:51"
+            "time": "2016-08-06T14:39:51+00:00"
         },
         {
             "name": "psr/log",
@@ -896,7 +897,55 @@
                 "psr",
                 "psr-3"
             ],
-            "time": "2018-11-20 15:27:04"
+            "time": "2018-11-20T15:27:04+00:00"
+        },
+        {
+            "name": "psr/simple-cache",
+            "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/simple-cache.git",
+                "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/408d5eafb83c57f6365a3ca330ff23aa4a5fa39b",
+                "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\SimpleCache\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interfaces for simple caching",
+            "keywords": [
+                "cache",
+                "caching",
+                "psr",
+                "psr-16",
+                "simple-cache"
+            ],
+            "time": "2017-10-23T01:57:42+00:00"
         },
         {
             "name": "robmorgan/phinx",
@@ -962,11 +1011,11 @@
                 "migrations",
                 "phinx"
             ],
-            "time": "2017-06-05 13:30:19"
+            "time": "2017-06-05T13:30:19+00:00"
         },
         {
             "name": "symfony/config",
-            "version": "v3.4.19",
+            "version": "v3.4.20",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/config.git",
@@ -1026,11 +1075,11 @@
             ],
             "description": "Symfony Config Component",
             "homepage": "https://symfony.com",
-            "time": "2018-11-26 10:17:44"
+            "time": "2018-11-26T10:17:44+00:00"
         },
         {
             "name": "symfony/console",
-            "version": "v3.4.19",
+            "version": "v3.4.20",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
@@ -1095,20 +1144,20 @@
             ],
             "description": "Symfony Console Component",
             "homepage": "https://symfony.com",
-            "time": "2018-11-26 12:48:07"
+            "time": "2018-11-26T12:48:07+00:00"
         },
         {
             "name": "symfony/contracts",
-            "version": "v1.0.1",
+            "version": "v1.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/contracts.git",
-                "reference": "3edf0ab943d1985a356721952cba36ff31bd6e5f"
+                "reference": "1aa7ab2429c3d594dd70689604b5cf7421254cdf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/contracts/zipball/3edf0ab943d1985a356721952cba36ff31bd6e5f",
-                "reference": "3edf0ab943d1985a356721952cba36ff31bd6e5f",
+                "url": "https://api.github.com/repos/symfony/contracts/zipball/1aa7ab2429c3d594dd70689604b5cf7421254cdf",
+                "reference": "1aa7ab2429c3d594dd70689604b5cf7421254cdf",
                 "shasum": ""
             },
             "require": {
@@ -1163,11 +1212,11 @@
                 "interoperability",
                 "standards"
             ],
-            "time": "2018-11-24 09:35:08"
+            "time": "2018-12-05T08:06:11+00:00"
         },
         {
             "name": "symfony/debug",
-            "version": "v4.2.0",
+            "version": "v4.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/debug.git",
@@ -1219,11 +1268,11 @@
             ],
             "description": "Symfony Debug Component",
             "homepage": "https://symfony.com",
-            "time": "2018-11-28 18:24:18"
+            "time": "2018-11-28T18:24:18+00:00"
         },
         {
             "name": "symfony/filesystem",
-            "version": "v4.2.0",
+            "version": "v4.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
@@ -1269,11 +1318,11 @@
             ],
             "description": "Symfony Filesystem Component",
             "homepage": "https://symfony.com",
-            "time": "2018-11-11 19:52:12"
+            "time": "2018-11-11T19:52:12+00:00"
         },
         {
             "name": "symfony/options-resolver",
-            "version": "v2.8.48",
+            "version": "v2.8.49",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/options-resolver.git",
@@ -1323,7 +1372,7 @@
                 "configuration",
                 "options"
             ],
-            "time": "2018-11-11 11:18:13"
+            "time": "2018-11-11T11:18:13+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
@@ -1381,7 +1430,7 @@
                 "polyfill",
                 "portable"
             ],
-            "time": "2018-08-06 14:22:27"
+            "time": "2018-08-06T14:22:27+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
@@ -1440,11 +1489,11 @@
                 "portable",
                 "shim"
             ],
-            "time": "2018-09-21 13:07:52"
+            "time": "2018-09-21T13:07:52+00:00"
         },
         {
             "name": "symfony/property-access",
-            "version": "v2.8.48",
+            "version": "v2.8.49",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/property-access.git",
@@ -1501,25 +1550,25 @@
                 "property path",
                 "reflection"
             ],
-            "time": "2018-11-11 11:18:13"
+            "time": "2018-11-11T11:18:13+00:00"
         },
         {
             "name": "symfony/translation",
-            "version": "v4.2.0",
+            "version": "v4.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation.git",
-                "reference": "ff9a878c9b8f8bcd4d9138e2d32f508c942773d9"
+                "reference": "c0e2191e9bed845946ab3d99767513b56ca7dcd6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/ff9a878c9b8f8bcd4d9138e2d32f508c942773d9",
-                "reference": "ff9a878c9b8f8bcd4d9138e2d32f508c942773d9",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/c0e2191e9bed845946ab3d99767513b56ca7dcd6",
+                "reference": "c0e2191e9bed845946ab3d99767513b56ca7dcd6",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.1.3",
-                "symfony/contracts": "^1.0",
+                "symfony/contracts": "^1.0.2",
                 "symfony/polyfill-mbstring": "~1.0"
             },
             "conflict": {
@@ -1574,11 +1623,11 @@
             ],
             "description": "Symfony Translation Component",
             "homepage": "https://symfony.com",
-            "time": "2018-11-27 07:20:32"
+            "time": "2018-12-06T10:45:32+00:00"
         },
         {
             "name": "symfony/yaml",
-            "version": "v3.4.19",
+            "version": "v3.4.20",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
@@ -1633,7 +1682,7 @@
             ],
             "description": "Symfony Yaml Component",
             "homepage": "https://symfony.com",
-            "time": "2018-11-11 19:48:54"
+            "time": "2018-11-11T19:48:54+00:00"
         },
         {
             "name": "zendframework/zend-diactoros",
@@ -1697,22 +1746,22 @@
                 "psr",
                 "psr-7"
             ],
-            "time": "2018-09-05 19:29:37"
+            "time": "2018-09-05T19:29:37+00:00"
         }
     ],
     "packages-dev": [
         {
             "name": "ajgl/breakpoint-twig-extension",
-            "version": "0.3.1",
+            "version": "0.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ajgarlag/AjglBreakpointTwigExtension.git",
-                "reference": "360ec6351ad7e1968ee78abb31430046c2e04fc5"
+                "reference": "bb419d13775d8fb5cd03b31012eaf496b31b444f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ajgarlag/AjglBreakpointTwigExtension/zipball/360ec6351ad7e1968ee78abb31430046c2e04fc5",
-                "reference": "360ec6351ad7e1968ee78abb31430046c2e04fc5",
+                "url": "https://api.github.com/repos/ajgarlag/AjglBreakpointTwigExtension/zipball/bb419d13775d8fb5cd03b31012eaf496b31b444f",
+                "reference": "bb419d13775d8fb5cd03b31012eaf496b31b444f",
                 "shasum": ""
             },
             "require": {
@@ -1720,9 +1769,9 @@
                 "twig/twig": "^1.14|^2.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^5",
-                "symfony/framework-bundle": "^2.7|^3.2",
-                "symfony/twig-bundle": "^2.7|^3.2"
+                "symfony/framework-bundle": "^2.7|^3.2|^4.1",
+                "symfony/phpunit-bridge": "^3.4|^4.1",
+                "symfony/twig-bundle": "^2.7|^3.2|^4.1"
             },
             "suggest": {
                 "ext-xdebug": "The Xdebug extension is required for the breakpoint to work",
@@ -1759,7 +1808,7 @@
                 "breakpoint",
                 "twig"
             ],
-            "time": "2017-11-20 13:04:11"
+            "time": "2018-12-10T08:22:36+00:00"
         },
         {
             "name": "aptoma/twig-markdown",
@@ -1816,7 +1865,7 @@
                 "markdown",
                 "twig"
             ],
-            "time": "2015-10-23 20:27:08"
+            "time": "2015-10-23T20:27:08+00:00"
         },
         {
             "name": "asm89/twig-cache-extension",
@@ -1870,24 +1919,24 @@
                 "extension",
                 "twig"
             ],
-            "time": "2017-01-10 22:04:15"
+            "time": "2017-01-10T22:04:15+00:00"
         },
         {
             "name": "cakephp/bake",
-            "version": "1.8.6",
+            "version": "1.9.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/cakephp/bake.git",
-                "reference": "bfa552a92a01cb1c878b3a3a67899fcd21569818"
+                "reference": "7ff3b8df337b16d67d9834e6b438d06d9d4974ca"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/cakephp/bake/zipball/bfa552a92a01cb1c878b3a3a67899fcd21569818",
-                "reference": "bfa552a92a01cb1c878b3a3a67899fcd21569818",
+                "url": "https://api.github.com/repos/cakephp/bake/zipball/7ff3b8df337b16d67d9834e6b438d06d9d4974ca",
+                "reference": "7ff3b8df337b16d67d9834e6b438d06d9d4974ca",
                 "shasum": ""
             },
             "require": {
-                "cakephp/cakephp": "^3.6.12",
+                "cakephp/cakephp": "^3.7.0",
                 "cakephp/plugin-installer": "^1.0",
                 "php": ">=5.6.0",
                 "wyrihaximus/twig-view": "^4.3.4"
@@ -1918,24 +1967,24 @@
                 "bake",
                 "cakephp"
             ],
-            "time": "2018-11-17 03:34:24"
+            "time": "2018-12-12T07:48:52+00:00"
         },
         {
             "name": "cakephp/debug_kit",
-            "version": "3.16.6",
+            "version": "3.17.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/cakephp/debug_kit.git",
-                "reference": "b6a75d47b2b1be6f6db31fbdf60ed5e062f310db"
+                "reference": "6a9023ecc4ac0983c184cedf8e6142ab8ea4a3ff"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/cakephp/debug_kit/zipball/b6a75d47b2b1be6f6db31fbdf60ed5e062f310db",
-                "reference": "b6a75d47b2b1be6f6db31fbdf60ed5e062f310db",
+                "url": "https://api.github.com/repos/cakephp/debug_kit/zipball/6a9023ecc4ac0983c184cedf8e6142ab8ea4a3ff",
+                "reference": "6a9023ecc4ac0983c184cedf8e6142ab8ea4a3ff",
                 "shasum": ""
             },
             "require": {
-                "cakephp/cakephp": "^3.6.0",
+                "cakephp/cakephp": "^3.7.0",
                 "cakephp/chronos": "^1.0.0",
                 "cakephp/plugin-installer": "^1.0.0",
                 "composer/composer": "^1.3.0",
@@ -1978,7 +2027,7 @@
                 "debug",
                 "kit"
             ],
-            "time": "2018-11-22 15:19:18"
+            "time": "2018-12-02T03:27:26+00:00"
         },
         {
             "name": "composer/ca-bundle",
@@ -2034,7 +2083,7 @@
                 "ssl",
                 "tls"
             ],
-            "time": "2018-10-18 06:09:13"
+            "time": "2018-10-18T06:09:13+00:00"
         },
         {
             "name": "composer/composer",
@@ -2114,7 +2163,7 @@
                 "dependency",
                 "package"
             ],
-            "time": "2018-12-03 09:31:16"
+            "time": "2018-12-03T09:31:16+00:00"
         },
         {
             "name": "composer/semver",
@@ -2176,7 +2225,7 @@
                 "validation",
                 "versioning"
             ],
-            "time": "2016-08-30 16:08:34"
+            "time": "2016-08-30T16:08:34+00:00"
         },
         {
             "name": "composer/spdx-licenses",
@@ -2237,7 +2286,7 @@
                 "spdx",
                 "validator"
             ],
-            "time": "2018-11-01 09:45:54"
+            "time": "2018-11-01T09:45:54+00:00"
         },
         {
             "name": "composer/xdebug-handler",
@@ -2281,7 +2330,7 @@
                 "Xdebug",
                 "performance"
             ],
-            "time": "2018-11-29 10:59:02"
+            "time": "2018-11-29T10:59:02+00:00"
         },
         {
             "name": "dnoegel/php-xdg-base-dir",
@@ -2314,7 +2363,7 @@
                 "MIT"
             ],
             "description": "implementation of xdg base directory specification for php",
-            "time": "2014-10-24 07:27:01"
+            "time": "2014-10-24T07:27:01+00:00"
         },
         {
             "name": "jakub-onderka/php-console-color",
@@ -2356,7 +2405,7 @@
                     "email": "jakub.onderka@gmail.com"
                 }
             ],
-            "time": "2018-09-29 17:23:10"
+            "time": "2018-09-29T17:23:10+00:00"
         },
         {
             "name": "jakub-onderka/php-console-highlighter",
@@ -2402,7 +2451,7 @@
                 }
             ],
             "description": "Highlight PHP code in terminal",
-            "time": "2018-09-29 18:48:56"
+            "time": "2018-09-29T18:48:56+00:00"
         },
         {
             "name": "jasny/twig-extensions",
@@ -2462,7 +2511,7 @@
                 "text",
                 "time"
             ],
-            "time": "2017-09-13 07:38:01"
+            "time": "2017-09-13T07:38:01+00:00"
         },
         {
             "name": "jdorn/sql-formatter",
@@ -2512,7 +2561,7 @@
                 "highlight",
                 "sql"
             ],
-            "time": "2014-01-12 16:20:24"
+            "time": "2014-01-12T16:20:24+00:00"
         },
         {
             "name": "justinrainbow/json-schema",
@@ -2578,20 +2627,20 @@
                 "json",
                 "schema"
             ],
-            "time": "2018-02-14 22:26:30"
+            "time": "2018-02-14T22:26:30+00:00"
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.1.0",
+            "version": "v4.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "d0230c5c77a7e3cfa69446febf340978540958c0"
+                "reference": "8aae5b59b83bb4d0dbf07b0a835f2680a658f610"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/d0230c5c77a7e3cfa69446febf340978540958c0",
-                "reference": "d0230c5c77a7e3cfa69446febf340978540958c0",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/8aae5b59b83bb4d0dbf07b0a835f2680a658f610",
+                "reference": "8aae5b59b83bb4d0dbf07b0a835f2680a658f610",
                 "shasum": ""
             },
             "require": {
@@ -2629,7 +2678,7 @@
                 "parser",
                 "php"
             ],
-            "time": "2018-10-10 09:24:14"
+            "time": "2018-12-26T11:32:39+00:00"
         },
         {
             "name": "psy/psysh",
@@ -2703,7 +2752,7 @@
                 "interactive",
                 "shell"
             ],
-            "time": "2018-10-13 15:16:03"
+            "time": "2018-10-13T15:16:03+00:00"
         },
         {
             "name": "seld/jsonlint",
@@ -2752,7 +2801,7 @@
                 "parser",
                 "validator"
             ],
-            "time": "2018-01-24 12:46:19"
+            "time": "2018-01-24T12:46:19+00:00"
         },
         {
             "name": "seld/phar-utils",
@@ -2796,11 +2845,11 @@
             "keywords": [
                 "phra"
             ],
-            "time": "2015-10-13 18:44:15"
+            "time": "2015-10-13T18:44:15+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v4.2.0",
+            "version": "v4.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
@@ -2845,7 +2894,7 @@
             ],
             "description": "Symfony Finder Component",
             "homepage": "https://symfony.com",
-            "time": "2018-11-11 19:52:12"
+            "time": "2018-11-11T19:52:12+00:00"
         },
         {
             "name": "symfony/polyfill-php72",
@@ -2900,11 +2949,11 @@
                 "portable",
                 "shim"
             ],
-            "time": "2018-09-21 13:07:52"
+            "time": "2018-09-21T13:07:52+00:00"
         },
         {
             "name": "symfony/process",
-            "version": "v4.2.0",
+            "version": "v4.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
@@ -2949,11 +2998,11 @@
             ],
             "description": "Symfony Process Component",
             "homepage": "https://symfony.com",
-            "time": "2018-11-20 16:22:05"
+            "time": "2018-11-20T16:22:05+00:00"
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v4.2.0",
+            "version": "v4.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
@@ -3024,20 +3073,20 @@
                 "debug",
                 "dump"
             ],
-            "time": "2018-11-25 12:50:42"
+            "time": "2018-11-25T12:50:42+00:00"
         },
         {
             "name": "twig/twig",
-            "version": "v1.35.4",
+            "version": "v1.36.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/twigphp/Twig.git",
-                "reference": "7e081e98378a1e78c29cc9eba4aefa5d78a05d2a"
+                "reference": "730c9c4471b5152d23061feb02b03382264c8a15"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/7e081e98378a1e78c29cc9eba4aefa5d78a05d2a",
-                "reference": "7e081e98378a1e78c29cc9eba4aefa5d78a05d2a",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/730c9c4471b5152d23061feb02b03382264c8a15",
+                "reference": "730c9c4471b5152d23061feb02b03382264c8a15",
                 "shasum": ""
             },
             "require": {
@@ -3047,12 +3096,12 @@
             "require-dev": {
                 "psr/container": "^1.0",
                 "symfony/debug": "^2.7",
-                "symfony/phpunit-bridge": "^3.3"
+                "symfony/phpunit-bridge": "^3.4.19|^4.1.8"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.35-dev"
+                    "dev-master": "1.36-dev"
                 }
             },
             "autoload": {
@@ -3090,7 +3139,7 @@
             "keywords": [
                 "templating"
             ],
-            "time": "2018-07-13 07:12:17"
+            "time": "2018-12-16T10:34:11+00:00"
         },
         {
             "name": "umpirsky/twig-php-function",
@@ -3131,27 +3180,27 @@
                 }
             ],
             "description": "Call (almost) any PHP function from your Twig templates.",
-            "time": "2016-03-12 16:36:32"
+            "time": "2016-03-12T16:36:32+00:00"
         },
         {
             "name": "wyrihaximus/twig-view",
-            "version": "4.3.5",
+            "version": "4.3.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/WyriHaximus/TwigView.git",
-                "reference": "ec2771e6a1fe799f9b16eff19da424cd04d593b7"
+                "reference": "a5ec66690aa045d6eda17ab1c8a5baf0efdcfa45"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/WyriHaximus/TwigView/zipball/ec2771e6a1fe799f9b16eff19da424cd04d593b7",
-                "reference": "ec2771e6a1fe799f9b16eff19da424cd04d593b7",
+                "url": "https://api.github.com/repos/WyriHaximus/TwigView/zipball/a5ec66690aa045d6eda17ab1c8a5baf0efdcfa45",
+                "reference": "a5ec66690aa045d6eda17ab1c8a5baf0efdcfa45",
                 "shasum": ""
             },
             "require": {
                 "ajgl/breakpoint-twig-extension": "^0.3.0",
                 "aptoma/twig-markdown": "^2.0",
                 "asm89/twig-cache-extension": "^1.0",
-                "cakephp/cakephp": "^3.5",
+                "cakephp/cakephp": "^3.6",
                 "jasny/twig-extensions": "^1.0",
                 "php": "^5.6 || ^7.0",
                 "twig/twig": "^1.27",
@@ -3189,7 +3238,7 @@
                 "twig",
                 "view"
             ],
-            "time": "2018-07-03 15:46:29"
+            "time": "2018-12-17T21:08:25+00:00"
         }
     ],
     "aliases": [],
diff --git a/config/bootstrap.php b/config/bootstrap.php
index fbfa9d0..756de4d 100644
--- a/config/bootstrap.php
+++ b/config/bootstrap.php
@@ -62,7 +62,7 @@ use Cake\Error\ErrorHandler;
 use Cake\Log\Log;
 use Cake\Mailer\Email;
 use Cake\Mailer\TransportFactory;
-use Cake\Network\Request;
+use Cake\Http\ServerRequest;
 use Cake\Utility\Inflector;
 use Cake\Utility\Security;
 
@@ -169,12 +169,12 @@ Security::setSalt(Configure::consume('Security.salt'));
 /*
  * Setup detectors for mobile and tablet.
  */
-Request::addDetector('mobile', function ($request) {
+ServerRequest::addDetector('mobile', function ($request) {
     $detector = new \Detection\MobileDetect();
 
     return $detector->isMobile();
 });
-Request::addDetector('tablet', function ($request) {
+ServerRequest::addDetector('tablet', function ($request) {
     $detector = new \Detection\MobileDetect();
 
     return $detector->isTablet();
diff --git a/src/Controller/MainController.php b/src/Controller/MainController.php
index eae6609..a2b7f58 100644
--- a/src/Controller/MainController.php
+++ b/src/Controller/MainController.php
@@ -223,15 +223,7 @@ class MainController extends AppController {
             $blocks[$i]->transaction_count = count($tx_hashes);
         }
 
-        $transactions = $this->Transactions->find()->select(['Transactions.id', 'Transactions.hash', 'Transactions.input_count', 'Transactions.output_count', 'Transactions.transaction_time', 'Transactions.created_at'])->order(['Transactions.created_at' => 'desc'])->limit(10)->toArray();
-        foreach($transactions as $tx) {
-            $value = 0;
-            $outputs = $this->Outputs->find()->where(['transaction_id' => $tx->id])->toArray();
-            foreach($outputs as $output) {
-                $value += $output->value;
-            }
-            $tx->value = $value;
-        }
+        $transactions = $this->Transactions->find()->select(['Transactions.id', 'Transactions.hash', 'Transactions.value', 'Transactions.input_count', 'Transactions.output_count', 'Transactions.transaction_time', 'Transactions.created_at'])->order(['Transactions.created_at' => 'desc'])->limit(10)->toArray();
         
         $this->set('blocks', $blocks);
         $this->set('txs', $transactions);
@@ -333,7 +325,7 @@ class MainController extends AppController {
             }
 
             // Get the basic block transaction info
-            $txs = $this->Transactions->find()->select(['Transactions.id', 'Transactions.input_count', 'Transactions.output_count', 'Transactions.hash', 'Transactions.version'])->select(['value' => 'sum(O.value)'])->leftJoin(['O' => 'output'], ['O.transaction_id = Transactions.id'])->where(['Transactions.block_hash_id' => $block->hash])->toArray();
+            $txs = $this->Transactions->find()->select(['Transactions.id', 'Transactions.value', 'Transactions.input_count', 'Transactions.output_count', 'Transactions.hash', 'Transactions.version'])->where(['Transactions.block_hash_id' => $block->hash])->toArray();
             $this->set('block', $block);
             $this->set('blockTxs', $txs);
         }
@@ -349,8 +341,7 @@ class MainController extends AppController {
         
         $sourceAddress = $this->request->query('address');
 
-        $tx = $this->Transactions->find()->select(
-            ['Transactions.id', 'Transactions.block_hash_id', 'Transactions.input_count', 'Transactions.output_count', 'Transactions.hash', 'Transactions.transaction_time', 'Transactions.transaction_size', 'Transactions.created_at', 'Transactions.version', 'Transactions.lock_time', 'Transactions.raw'])->select(['value' => 'sum(O.value)'])->leftJoin(['O' => 'output'], ['O.transaction_id = Transactions.id'])->where(['Transactions.hash' => $hash])->first();
+        $tx = $this->Transactions->find()->where(['Transactions.hash' => $hash])->first();
         if (!$tx) {
             return $this->redirect('/');
         }
@@ -403,13 +394,14 @@ class MainController extends AppController {
         $this->loadModel('Addresses');
 
         // exclude bHW58d37s1hBjj3wPBkn5zpCX3F8ZW3uWf (genesis block)
-        $richList = $this->Addresses->find()->where(['address <>' => 'bHW58d37s1hBjj3wPBkn5zpCX3F8ZW3uWf'])->order(['Balance' => 'DESC'])->limit(500)->toArray();
+        $richList = $this->Addresses->find()->where(['address <>' => 'bHW58d37s1hBjj3wPBkn5zpCX3F8ZW3uWf'])->order(['balance' => 'DESC'])->limit(500)->toArray();
 
         $priceRate = 0;
-        //$priceInfo = json_decode($this->redis->get(self::lbcPriceKey));
-        $priceInfo->price = 0.05;
-        if (isset($priceInfo->price)) {
-            $priceRate = $priceInfo->price;
+        if(isset($this->redis)) {
+            $priceInfo = json_decode($this->redis->get(self::lbcPriceKey));
+            if (isset($priceInfo->price)) {
+                $priceRate = $priceInfo->price;
+            }
         }
         
         $lbryAddresses = ['rFLUohPG4tP3gZHYoyhvADCtrDMiaYb7Qd', 'r9PGXsejVJb9ZfMf3QVdDEJCzxkd9JLxzL', 'r9srwX7DEN7Mex3a8oR1mKSqQmLBizoJvi', 'bRo4FEeqqxY7nWFANsZsuKEWByEgkvz8Qt', 'bU2XUzckfpdEuQNemKvhPT1gexQ3GG3SC2', 'bay3VA6YTQBL4WLobbG7CthmoGeUKXuXkD', 'bLPbiXBp6Vr3NSnsHzDsLNzoy5o36re9Cz', 'bMvUBo1h5WS46ThHtmfmXftz3z33VHL7wc', 'bVUrbCK8hcZ5XWti7b9eNxKEBxzc1rr393', 'bZja2VyhAC84a9hMwT8dwTU6rDRXowrjxH', 'bMvUBo1h5WS46ThHtmfmXftz3z33VHL7wc', 'bMgqQqYfwzWWYBk5o5dBMXtCndVAoeqy6h', 'bMvUBo1h5WS46ThHtmfmXftz3z33VHL7wc'];
@@ -417,15 +409,15 @@ class MainController extends AppController {
         $maxBalance = 0;
         $minBalance = 0;
         foreach ($richList as $item) {
-            $totalBalance = bcadd($totalBalance, $item->Balance, 8);
-            $minBalance = $minBalance == 0 ? $item->Balance : min($minBalance, $item->Balance);
-            $maxBalance = max($maxBalance, $item->Balance);
+            $totalBalance = bcadd($totalBalance, $item->balance, 8);
+            $minBalance = $minBalance == 0 ? $item->balance : min($minBalance, $item->balance);
+            $maxBalance = max($maxBalance, $item->balance);
         }
         for ($i = 0; $i < count($richList); $i++) {
             $item = $richList[$i];
-            $percentage = bcdiv($item->Balance, $totalBalance, 8) * 100;
+            $percentage = bcdiv($item->balance, $totalBalance, 8) * 100;
             $richList[$i]->Top500Percent = $percentage;
-            $richList[$i]->MinMaxPercent = bcdiv($item->Balance, $maxBalance, 8) * 100;
+            $richList[$i]->MinMaxPercent = bcdiv($item->balance, $maxBalance, 8) * 100;
         }
 
         $this->set('richList', $richList);
@@ -624,10 +616,7 @@ class MainController extends AppController {
         // Load 10 transactions
         $this->autoRender = false;
         $this->loadModel('Transactions');
-        $txs = $this->Transactions->find()->select(['id', 'Hash' => 'hash', 'InputCount' => 'input_count', 'OutputCount' => 'output_count', 'TxTime' => 'transaction_time'])->order(['TxTime' => 'desc'])->limit(10);
-        foreach($txs as $tx) {
-            $tx->Value = $tx->value();
-        }
+        $txs = $this->Transactions->find()->select(['id', 'Value' => 'value', 'Hash' => 'hash', 'InputCount' => 'input_count', 'OutputCount' => 'output_count', 'TxTime' => 'transaction_time'])->order(['TxTime' => 'desc'])->limit(10);
 
         $this->_jsonResponse(['success' => true, 'txs' => $txs]);
     }
@@ -740,18 +729,12 @@ class MainController extends AppController {
             return $this->_jsonError('Base58 address not specified.', 400);
         }
         
-        $address = $this->Addresses->find()->select(['id'])->where(['address' => $base58address])->first();
+        $address = $this->Addresses->find()->select(['id', 'balance'])->where(['address' => $base58address])->first();
         if (!$address) {
             return $this->_jsonError('Could not find address.', 400);
         }
         
-        $transaction_addresses = $this->TransactionAddress->find()->where(['address_id' => $address->id])->toArray();
-        $balance = 0;
-        foreach($transaction_addresses as $ta) {
-            $balance += $ta->credit_amount;
-            $balance -= $ta->debit_amount;
-        } 
-        return $this->_jsonResponse(['success' => true, ['balance' => ['confirmed' => $balance, 'unconfirmed' => 0]]]);
+        return $this->_jsonResponse(['success' => true, ['balance' => ['confirmed' => $address->balance, 'unconfirmed' => 0]]]);
     }
 
     public function apiaddrutxo($base58address = null) {
@@ -817,9 +800,9 @@ class MainController extends AppController {
         $reservedaux = ['bRo4FEeqqxY7nWFANsZsuKEWByEgkvz8Qt', 'bU2XUzckfpdEuQNemKvhPT1gexQ3GG3SC2', 'bay3VA6YTQBL4WLobbG7CthmoGeUKXuXkD', 'bLPbiXBp6Vr3NSnsHzDsLNzoy5o36re9Cz', 'bMvUBo1h5WS46ThHtmfmXftz3z33VHL7wc', 'bVUrbCK8hcZ5XWti7b9eNxKEBxzc1rr393', 'bZja2VyhAC84a9hMwT8dwTU6rDRXowrjxH', 'bCrboXVztuSbZzVToCWSsu1pEr2oxKHu9v', 'bMgqQqYfwzWWYBk5o5dBMXtCndVAoeqy6h'];
         $allAddresses = array_merge($reservedcommunity, $reservedoperational, $reservedinstitutional, $reservedaux);
         
-        $reservedtotal = $this->Addresses->find()->select(['id'])->select(['credit_amount' => 'sum(TA.credit_amount)', 'debit_amount' => 'sum(TA.debit_amount)'])->leftJoin(['TA' => 'transaction_address'], ['TA.address_id = Addresses.id'])->where(['Addresses.address IN' => $allAddresses])->first();
+        $reservedtotal = $this->Addresses->find()->select(['id', 'balance' => 'SUM(balance)'])->where(['Addresses.address IN' => $allAddresses])->first();
 
-        $circulating = $txoutsetinfo->total_amount - ($reservedtotal->credit_amount - $reservedtotal->debit_amount);
+        $circulating = $txoutsetinfo->total_amount - ($reservedtotal->balance);
 
         return $this->_jsonResponse(['success' => true, 'utxosupply' => ['total' => $txoutsetinfo->total_amount, 'circulating' => $circulating]]);
     }
diff --git a/src/Model/Entity/Transaction.php b/src/Model/Entity/Transaction.php
index aa0ed81..60fccfc 100644
--- a/src/Model/Entity/Transaction.php
+++ b/src/Model/Entity/Transaction.php
@@ -6,16 +6,6 @@ use Cake\ORM\Entity;
 use Cake\ORM\TableRegistry;
 
 class Transaction extends Entity {
-    public function value() {
-        $OutputModel = TableRegistry::get('Outputs');
-        $outputs = $OutputModel->find()->select(['value'])->where(['transaction_id' => $this->id])->toArray();
-        $value = 0;
-        foreach($outputs as $o) {
-            $value += $o->value;
-        }
-        return $value;
-    }
-
 }
 
 ?>
\ No newline at end of file
diff --git a/src/Template/Main/blocks.ctp b/src/Template/Main/blocks.ctp
index 45429a0..45c3b8d 100644
--- a/src/Template/Main/blocks.ctp
+++ b/src/Template/Main/blocks.ctp
@@ -112,7 +112,7 @@
                             <td class="w300"><div><a href="/tx/<?php echo $tx->hash ?>"><?php echo $tx->hash ?></a></div></td>
                             <td class="right"><?php echo $tx->input_count ?></td>
                             <td class="right"><?php echo $tx->output_count ?></td>
-                            <td class="right"><div title="<?php echo $tx->value ?> LBC"><?php echo $this->Amount->formatCurrency($tx->value()) ?> LBC</div></td>
+                            <td class="right"><div title="<?php echo $tx->value ?> LBC"><?php echo $this->Amount->formatCurrency($tx->value) ?> LBC</div></td>
                         </tr>
                         <?php endforeach; ?>
                     </tbody>
diff --git a/src/Template/Main/stats.ctp b/src/Template/Main/stats.ctp
index 84609c2..974b2c9 100644
--- a/src/Template/Main/stats.ctp
+++ b/src/Template/Main/stats.ctp
@@ -47,8 +47,8 @@
                 <?php $rank = 0; foreach ($richList as $item): $rank++; ?>
                 <tr>
                     <td class="right topvalign"><?php echo $rank ?></td>
-                    <td class="topvalign"><a href="/address/<?php echo $item->Address ?>" target="_blank"><?php echo $item->Address ?></a>
-                    <?php if(in_array($item->Address, $lbryAddresses)): ?>
+                    <td class="topvalign"><a href="/address/<?php echo $item->address ?>" target="_blank"><?php echo $item->address ?></a>
+                    <?php if(in_array($item->address, $lbryAddresses)): ?>
                     <span class="lbry-address">
                         <img src="/img/lbry.png" height="18px" width="18px" title="Address owned by LBRY Inc."/>
                     </span>
@@ -58,16 +58,14 @@
                         <?php if (strlen(trim($item->TagUrl)) > 0): ?><a href="<?php echo $item->TagUrl ?>" target="_blank" rel="nofollow"><?php echo $tiem->Tag ?></a><?php else: echo $item->Tag; endif; ?>
                     </div>
                     <?php endif; ?></td>
-                    <td class="right topvalign"><?php echo number_format($item->Balance, 8, '.', ',') ?></td>
-                    <td class="right topvalign">$<?php echo number_format(bcmul($item->Balance, $rate, 8), 2, '.', ',') ?></td>
-                    <td class="med-pad-left topvalign"><?php echo $item->FirstSeen->format('d M Y H:i:s') . ' UTC'; ?></td>
+                    <td class="right topvalign"><?php echo number_format($item->balance, 8, '.', ',') ?></td>
+                    <td class="right topvalign">$<?php echo number_format(bcmul($item->balance, $rate, 8), 2, '.', ',') ?></td>
+                    <td class="med-pad-left topvalign"><?php echo $item->first_seen->format('d M Y H:i:s') . ' UTC'; ?></td>
                     <td class="w150 center top500-percent-cell"><div class="top500-percent" style="width: <?php echo $item->MinMaxPercent ?>%"></div><div class="text"><?php echo number_format($item->Top500Percent, 5, '.', '') ?>%</div></td>
                 </tr>
                 <?php endforeach; ?>
             </tbody>
         </table>
     </div>
-
     <div class="clear"></div>
-
 </div>
diff --git a/src/Template/Main/tx.ctp b/src/Template/Main/tx.ctp
index bd2bf29..0a7e8aa 100644
--- a/src/Template/Main/tx.ctp
+++ b/src/Template/Main/tx.ctp
@@ -47,7 +47,7 @@
 <div class="tx-summary">
     <div class="box p25">
         <div class="title">Amount (LBC)</div>
-        <div class="value"><?php echo $this->Amount->format($tx->value()) ?></div>
+        <div class="value"><?php echo $this->Amount->format($tx->value) ?></div>
     </div>
 
     <div class="box p15">
diff --git a/src/View/AjaxView.php b/src/View/AjaxView.php
index 594e2d8..6c20b5e 100644
--- a/src/View/AjaxView.php
+++ b/src/View/AjaxView.php
@@ -15,7 +15,7 @@
 namespace App\View;
 
 use Cake\Event\EventManager;
-use Cake\Network\Request;
+use Cake\Http\ServerRequest;
 use Cake\Network\Response;
 
 /**
-- 
2.45.2


From 1ba751acb3f50362ca2867164b6b77e5c5087477 Mon Sep 17 00:00:00 2001
From: marcdeb1 <marcdebrouchev@laposte.net>
Date: Sat, 5 Jan 2019 21:44:37 +0100
Subject: [PATCH 36/43] Thumbnail text and content tag fix

---
 src/Controller/MainController.php | 2 ++
 src/Model/Entity/Claim.php        | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/Controller/MainController.php b/src/Controller/MainController.php
index a2b7f58..e3e1257 100644
--- a/src/Controller/MainController.php
+++ b/src/Controller/MainController.php
@@ -572,6 +572,7 @@ class MainController extends AppController {
         $resultSet = [];
 
         // get avg prices
+        /*
         $conn_local = ConnectionManager::get('localdb');
         $stmt_price = $conn_local->execute("SELECT AVG(USD) AS AvgUSD, DATE_FORMAT(Created, '$sqlDateFormat') AS TimePeriod " .
                                "FROM PriceHistory WHERE DATE_FORMAT(Created, '$sqlDateFormat') >= ? GROUP BY TimePeriod ORDER BY TimePeriod ASC", [$start->format($dateFormat)]);
@@ -582,6 +583,7 @@ class MainController extends AppController {
             }
             $resultSet[$price->TimePeriod]['AvgUSD'] = (float) $price->AvgUSD;
         }
+        */
         
         $conn = ConnectionManager::get('default');
         // get avg block sizes for the time period
diff --git a/src/Model/Entity/Claim.php b/src/Model/Entity/Claim.php
index a7651e7..cfd183d 100644
--- a/src/Model/Entity/Claim.php
+++ b/src/Model/Entity/Claim.php
@@ -29,7 +29,7 @@ class Claim extends Entity {
             $ctTag = 'image';
         }
     
-        if (!$ctTag && $this->claim_type == 1) {
+        if (!$ctTag && $this->claim_type == 2) {
             $ctTag = 'identity';
         }
         return $ctTag;
@@ -37,11 +37,11 @@ class Claim extends Entity {
     
     function getAutoThumbText() {
         $autoThumbText = '';
-        if ($this->claim_type == 1) { 
-            $autoThumbText = strtoupper(substr($this->name, 1, min( strlen($this->name), 3 ))); 
+        if ($this->claim_type == 2) {
+            $autoThumbText = strtoupper(substr($this->name, 1, min(strlen($this->name), 10)));
         } else {
             $str = (strlen(trim($this->title)) > 0) ? $this->title : $this->name;
-            $autoThumbText = strtoupper(substr($str, 0, min (strlen($str), 2 )));
+            $autoThumbText = strtoupper(substr($str, 0, min(strlen($str), 5)));
         }
         return $autoThumbText;
     }
-- 
2.45.2


From 19b35b06855c59e6da55483c692874c57fdb8e6b Mon Sep 17 00:00:00 2001
From: marcdeb1 <marcdebrouchev@laposte.net>
Date: Sat, 5 Jan 2019 22:34:08 +0100
Subject: [PATCH 37/43] Controlling tag and sorting by bid state in claim
 search

---
 src/Controller/MainController.php |  2 +-
 src/Template/Element/claimbox.ctp | 11 +++++++----
 webroot/css/main.css              |  1 +
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/Controller/MainController.php b/src/Controller/MainController.php
index e3e1257..2974c1a 100644
--- a/src/Controller/MainController.php
+++ b/src/Controller/MainController.php
@@ -268,7 +268,7 @@ class MainController extends AppController {
             }
         } else {
             // finally, try exact claim name match
-            $claims = $this->Claims->find()->distinct(['claim_id'])->where(['name' => $criteria])->order(['created_at' => 'DESC'])->limit(10)->toArray();
+            $claims = $this->Claims->find()->distinct(['claim_id'])->where(['name' => $criteria])->order(["FIELD(bid_state, 'Controlling') DESC"])->limit(10)->toArray();
             if (count($claims) == 1) {
                 return $this->redirect('/claims/' . $claims[0]->claim_id);
             }
diff --git a/src/Template/Element/claimbox.ctp b/src/Template/Element/claimbox.ctp
index 628188c..76bc25e 100644
--- a/src/Template/Element/claimbox.ctp
+++ b/src/Template/Element/claimbox.ctp
@@ -16,6 +16,9 @@ $ctTag = $claim->getContentTag();
     <?php endif; ?>
 
     <div class="tags">
+        <?php if ($claim->bid_state == 'Controlling'): ?>
+        <div class="bid-state">Controlling</div>
+        <?php endif; ?>
         <?php if ($ctTag): ?>
         <div class="content-type"><?php echo strtoupper($ctTag) ?></div>
         <?php endif; ?>
@@ -56,12 +59,12 @@ $ctTag = $claim->getContentTag();
 
         <div class="clear spacer"></div>
 
-        <div class="label half-width">Author</div>
-        <div class="label half-width">License</div>
+        <!--<div class="label half-width">Author</div>
+        <div class="label half-width">License</div>-->
         
         
-        <div class="value half-width" title="<?php echo strlen(trim($claim->author)) > 0 ? $claim->author : '<em>Unspecified</em>' ?>"><?php echo strlen(trim($claim->author)) > 0 ? $claim->author : '<em>Unspecified</em>' ?></div>
-        <!--
+        <!--<div class="value half-width" title="<?php echo strlen(trim($claim->author)) > 0 ? $claim->author : '<em>Unspecified</em>' ?>"><?php echo strlen(trim($claim->author)) > 0 ? $claim->author : '<em>Unspecified</em>' ?></div>
+        
         <div class="value half-width" title="<?php echo strlen(trim($claim->license)) > 0 ? $claim->license : '' ?>">
             <?php if (strlen(trim($claim->LicenseUrl)) > 0): ?><a href="<?php echo $claim->LicenseUrl ?>" rel="nofollow" target="_blank"><?php endif; ?>
             <?php echo strlen(trim($claim->License)) > 0 ? $claim->License : '<em>Unspecified</em>' ?>
diff --git a/webroot/css/main.css b/webroot/css/main.css
index b9f9376..2f1a828 100644
--- a/webroot/css/main.css
+++ b/webroot/css/main.css
@@ -81,6 +81,7 @@ border-radius: 0 8px 8px 0 }
 .claims-grid .claim-grid-item .thumbnail .autothumb { display: block; margin: 73px auto 0 auto; text-align: center; font-size: 240%; color: #fff; line-height: 54px }
 .claims-grid .claim-grid-item .tags > div { display: inline-block; padding: 4px 12px; margin-left: 2px }
 .claims-grid .claim-grid-item .tags .nsfw { background: #e53935; text-align: center; color: #fff; position: relative; left: 1px }
+.claims-grid .claim-grid-item .tags .bid-state { background: #551CA1; text-align: center; color: #fff; }
 .claims-grid .claim-grid-item .tags .content-type { background: #880e4f; text-align: center; color: #fff; }
 .claims-grid .claim-grid-item .metadata { padding: 24px; font-size: 90% }
 .claims-grid .claim-grid-item .title { font-size: 120%; height: 25px; line-height: 25px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap }
-- 
2.45.2


From 2941698c2b791397432c879fd0d2b87c5d0ac02e Mon Sep 17 00:00:00 2001
From: marcdeb1 <marcdebrouchev@laposte.net>
Date: Sat, 26 Jan 2019 20:37:30 +0100
Subject: [PATCH 38/43] Updated CakePHP

---
 composer.json                     |   2 +-
 composer.lock                     | 480 ++++++++++++++++++++++++++++--
 src/Controller/MainController.php |  28 +-
 3 files changed, 476 insertions(+), 34 deletions(-)

diff --git a/composer.json b/composer.json
index 5fd7b2d..5126290 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
     "license": "MIT",
     "require": {
         "php": ">=5.6",
-        "cakephp/cakephp": "3.4.*",
+        "cakephp/cakephp": "3.7.1",
         "mobiledetect/mobiledetectlib": "2.*",
         "cakephp/migrations": "~1.0",
         "cakephp/plugin-installer": "~1.0",
diff --git a/composer.lock b/composer.lock
index 911fd35..218b102 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "e64d13561bc0e6896ed8629290b55669",
+    "content-hash": "f951a6637387b0718e7749c8fbda8202",
     "packages": [
         {
             "name": "aura/intl",
@@ -99,7 +99,7 @@
             ],
             "description": "BaconQrCode is a QR code generator for PHP.",
             "homepage": "https://github.com/Bacon/BaconQrCode",
-            "time": "2017-10-17T09:59:25+00:00"
+            "time": "2018-04-25T17:53:56+00:00"
         },
         {
             "name": "cakephp/cakephp",
@@ -117,7 +117,7 @@
             },
             "require": {
                 "aura/intl": "^3.0.0",
-                "cakephp/chronos": "^1.0.0",
+                "cakephp/chronos": "^1.0.1",
                 "ext-intl": "*",
                 "ext-mbstring": "*",
                 "php": ">=5.6.0",
@@ -145,7 +145,7 @@
             },
             "require-dev": {
                 "cakephp/cakephp-codesniffer": "^3.0",
-                "phpunit/phpunit": "^5.7|^6.0"
+                "phpunit/phpunit": "^5.7.14|^6.0"
             },
             "suggest": {
                 "ext-curl": "To enable more efficient network calls in Http\\Client.",
@@ -155,7 +155,7 @@
             "type": "library",
             "autoload": {
                 "psr-4": {
-                    "Cake\\": "src"
+                    "Cake\\": "src/"
                 },
                 "files": [
                     "src/Core/functions.php",
@@ -187,7 +187,7 @@
                 "rapid-development",
                 "validation"
             ],
-            "time": "2018-05-21T01:19:34+00:00"
+            "time": "2018-12-18T02:39:37+00:00"
         },
         {
             "name": "cakephp/chronos",
@@ -429,16 +429,16 @@
         },
         {
             "name": "endroid/qr-code",
-            "version": "3.5.0",
+            "version": "3.5.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/endroid/qr-code.git",
-                "reference": "0095706c3bf2389f15f6c097bab4a00a48fc5ff7"
+                "reference": "d95143907cf178f9073523af4b37feb25bd6cdd0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/endroid/qr-code/zipball/0095706c3bf2389f15f6c097bab4a00a48fc5ff7",
-                "reference": "0095706c3bf2389f15f6c097bab4a00a48fc5ff7",
+                "url": "https://api.github.com/repos/endroid/qr-code/zipball/d95143907cf178f9073523af4b37feb25bd6cdd0",
+                "reference": "d95143907cf178f9073523af4b37feb25bd6cdd0",
                 "shasum": ""
             },
             "require": {
@@ -485,7 +485,7 @@
                 "qr",
                 "qrcode"
             ],
-            "time": "2018-12-01T12:34:40+00:00"
+            "time": "2018-12-16T12:37:37+00:00"
         },
         {
             "name": "fgrosse/phpasn1",
@@ -830,7 +830,7 @@
                 "datetime",
                 "time"
             ],
-            "time": "2018-11-22T18:23:02+00:00"
+            "time": "2018-12-28T10:07:33+00:00"
         },
         {
             "name": "predis/predis",
@@ -979,6 +979,54 @@
             ],
             "time": "2018-11-20T15:27:04+00:00"
         },
+        {
+            "name": "psr/simple-cache",
+            "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/simple-cache.git",
+                "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/408d5eafb83c57f6365a3ca330ff23aa4a5fa39b",
+                "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\SimpleCache\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interfaces for simple caching",
+            "keywords": [
+                "cache",
+                "caching",
+                "psr",
+                "psr-16",
+                "simple-cache"
+            ],
+            "time": "2017-10-23T01:57:42+00:00"
+        },
         {
             "name": "robmorgan/phinx",
             "version": "v0.8.1",
@@ -1244,7 +1292,7 @@
                 "interoperability",
                 "standards"
             ],
-            "time": "2018-11-24T09:35:08+00:00"
+            "time": "2018-12-05T08:06:11+00:00"
         },
         {
             "name": "symfony/debug",
@@ -1719,7 +1767,7 @@
             ],
             "description": "Symfony Translation Component",
             "homepage": "https://symfony.com",
-            "time": "2018-11-27T07:20:32+00:00"
+            "time": "2018-12-06T10:45:32+00:00"
         },
         {
             "name": "symfony/yaml",
@@ -1846,6 +1894,177 @@
         }
     ],
     "packages-dev": [
+        {
+            "name": "ajgl/breakpoint-twig-extension",
+            "version": "0.3.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/ajgarlag/AjglBreakpointTwigExtension.git",
+                "reference": "bb419d13775d8fb5cd03b31012eaf496b31b444f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/ajgarlag/AjglBreakpointTwigExtension/zipball/bb419d13775d8fb5cd03b31012eaf496b31b444f",
+                "reference": "bb419d13775d8fb5cd03b31012eaf496b31b444f",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6",
+                "twig/twig": "^1.14|^2.0"
+            },
+            "require-dev": {
+                "symfony/framework-bundle": "^2.7|^3.2|^4.1",
+                "symfony/phpunit-bridge": "^3.4|^4.1",
+                "symfony/twig-bundle": "^2.7|^3.2|^4.1"
+            },
+            "suggest": {
+                "ext-xdebug": "The Xdebug extension is required for the breakpoint to work",
+                "symfony/framework-bundle": "The framework bundle to integrate the extension into Symfony",
+                "symfony/twig-bundle": "The twig bundle to integrate the extension into Symfony"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "0.3.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Ajgl\\Twig\\Extension\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Antonio J. García Lagar",
+                    "email": "aj@garcialagar.es",
+                    "homepage": "http://aj.garcialagar.es",
+                    "role": "developer"
+                }
+            ],
+            "description": "Twig extension to set breakpoints",
+            "homepage": "https://github.com/ajgarlag/AjglBreakpointTwigExtension",
+            "keywords": [
+                "Xdebug",
+                "breakpoint",
+                "twig"
+            ],
+            "time": "2018-12-10T08:22:36+00:00"
+        },
+        {
+            "name": "aptoma/twig-markdown",
+            "version": "2.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/aptoma/twig-markdown.git",
+                "reference": "64a9c5c7418c08faf91c4410b34bdb65fb25c23d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/aptoma/twig-markdown/zipball/64a9c5c7418c08faf91c4410b34bdb65fb25c23d",
+                "reference": "64a9c5c7418c08faf91c4410b34bdb65fb25c23d",
+                "shasum": ""
+            },
+            "require": {
+                "twig/twig": "~1.12"
+            },
+            "require-dev": {
+                "codeclimate/php-test-reporter": "dev-master",
+                "erusev/parsedown": "^1.6",
+                "knplabs/github-api": "~1.2",
+                "league/commonmark": "~0.5",
+                "michelf/php-markdown": "~1",
+                "phpunit/phpunit": "~4.0",
+                "satooshi/php-coveralls": "~0.6"
+            },
+            "suggest": {
+                "knplabs/github-api": "Needed for using GitHub's Markdown engine provided through their API.",
+                "michelf/php-markdown": "Original Markdown engine with MarkdownExtra."
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "Aptoma": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Joris Berthelot",
+                    "email": "joris@berthelot.tel"
+                },
+                {
+                    "name": "Gunnar Lium",
+                    "email": "gunnar@aptoma.com"
+                }
+            ],
+            "description": "Twig extension to work with Markdown content",
+            "keywords": [
+                "markdown",
+                "twig"
+            ],
+            "time": "2015-10-23T20:27:08+00:00"
+        },
+        {
+            "name": "asm89/twig-cache-extension",
+            "version": "1.3.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/asm89/twig-cache-extension.git",
+                "reference": "630ea7abdc3fc62ba6786c02590a1560e449cf55"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/asm89/twig-cache-extension/zipball/630ea7abdc3fc62ba6786c02590a1560e449cf55",
+                "reference": "630ea7abdc3fc62ba6786c02590a1560e449cf55",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.2",
+                "twig/twig": "^1.0|^2.0"
+            },
+            "require-dev": {
+                "doctrine/cache": "~1.0"
+            },
+            "suggest": {
+                "psr/cache-implementation": "To make use of PSR-6 cache implementation via PsrCacheAdapter."
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.3-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "": "lib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Alexander",
+                    "email": "iam.asm89@gmail.com"
+                }
+            ],
+            "description": "Cache fragments of templates directly within Twig.",
+            "homepage": "https://github.com/asm89/twig-cache-extension",
+            "keywords": [
+                "cache",
+                "extension",
+                "twig"
+            ],
+            "time": "2017-01-10T22:04:15+00:00"
+        },
         {
             "name": "cakephp/bake",
             "version": "1.9.1",
@@ -1868,7 +2087,7 @@
             },
             "require-dev": {
                 "cakephp/cakephp-codesniffer": "^3.0",
-                "phpunit/phpunit": "~5.7 | ~6.0"
+                "phpunit/phpunit": "^5.7.14|^6.0"
             },
             "type": "cakephp-plugin",
             "autoload": {
@@ -1886,7 +2105,7 @@
                     "homepage": "https://github.com/cakephp/bake/graphs/contributors"
                 }
             ],
-            "description": "Bake plugin for CakePHP 3.0",
+            "description": "Bake plugin for CakePHP 3",
             "homepage": "https://github.com/cakephp/bake",
             "keywords": [
                 "bake",
@@ -1918,10 +2137,10 @@
             },
             "require-dev": {
                 "cakephp/cakephp-codesniffer": "^3.0",
-                "phpunit/phpunit": "^5.7|^6.0"
+                "phpunit/phpunit": "^5.7.14|^6.0"
             },
             "suggest": {
-                "ext-sqlite": "DebugKit needs to store panel data in a database. SQLite is simple and easy to use."
+                "ext-pdo_sqlite": "DebugKit needs to store panel data in a database. SQLite is simple and easy to use."
             },
             "type": "cakephp-plugin",
             "autoload": {
@@ -2378,6 +2597,66 @@
             "description": "Highlight PHP code in terminal",
             "time": "2018-09-29T18:48:56+00:00"
         },
+        {
+            "name": "jasny/twig-extensions",
+            "version": "v1.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/jasny/twig-extensions.git",
+                "reference": "30bdf3a3903c021544f36332c9d5d4d563527da4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/jasny/twig-extensions/zipball/30bdf3a3903c021544f36332c9d5d4d563527da4",
+                "reference": "30bdf3a3903c021544f36332c9d5d4d563527da4",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.0.0 | >=5.6.0",
+                "twig/twig": "^2.0 | ^1.12"
+            },
+            "require-dev": {
+                "ext-intl": "*",
+                "ext-pcre": "*",
+                "jasny/php-code-quality": "^2.1",
+                "phpunit/phpunit": "^5.0"
+            },
+            "suggest": {
+                "ext-intl": "Required for the use of the LocalDate Twig extension",
+                "ext-pcre": "Required for the use of the PCRE Twig extension"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Jasny\\Twig\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Arnold Daniels",
+                    "email": "arnold@jasny.net",
+                    "homepage": "http://www.jasny.net"
+                }
+            ],
+            "description": "A set of useful Twig filters",
+            "homepage": "http://github.com/jasny/twig-extensions#README",
+            "keywords": [
+                "PCRE",
+                "array",
+                "date",
+                "datetime",
+                "preg",
+                "regex",
+                "templating",
+                "text",
+                "time"
+            ],
+            "time": "2017-09-13T07:38:01+00:00"
+        },
         {
             "name": "jdorn/sql-formatter",
             "version": "v1.2.17",
@@ -2939,6 +3218,171 @@
                 "dump"
             ],
             "time": "2018-11-25T12:50:42+00:00"
+        },
+        {
+            "name": "twig/twig",
+            "version": "v1.37.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/twigphp/Twig.git",
+                "reference": "66be9366c76cbf23e82e7171d47cbfa54a057a62"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/66be9366c76cbf23e82e7171d47cbfa54a057a62",
+                "reference": "66be9366c76cbf23e82e7171d47cbfa54a057a62",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.4.0",
+                "symfony/polyfill-ctype": "^1.8"
+            },
+            "require-dev": {
+                "psr/container": "^1.0",
+                "symfony/debug": "^2.7",
+                "symfony/phpunit-bridge": "^3.4.19|^4.1.8"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.37-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Twig_": "lib/"
+                },
+                "psr-4": {
+                    "Twig\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com",
+                    "homepage": "http://fabien.potencier.org",
+                    "role": "Lead Developer"
+                },
+                {
+                    "name": "Armin Ronacher",
+                    "email": "armin.ronacher@active-4.com",
+                    "role": "Project Founder"
+                },
+                {
+                    "name": "Twig Team",
+                    "homepage": "https://twig.symfony.com/contributors",
+                    "role": "Contributors"
+                }
+            ],
+            "description": "Twig, the flexible, fast, and secure template language for PHP",
+            "homepage": "https://twig.symfony.com",
+            "keywords": [
+                "templating"
+            ],
+            "time": "2019-01-14T14:59:29+00:00"
+        },
+        {
+            "name": "umpirsky/twig-php-function",
+            "version": "v0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/umpirsky/twig-php-function.git",
+                "reference": "53b4b1eb0c5eacbd7d66c504b7d809c79b4bedbc"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/umpirsky/twig-php-function/zipball/53b4b1eb0c5eacbd7d66c504b7d809c79b4bedbc",
+                "reference": "53b4b1eb0c5eacbd7d66c504b7d809c79b4bedbc",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "twig/twig": "~1.12"
+            },
+            "require-dev": {
+                "phpspec/phpspec": "~2.0",
+                "phpunit/phpunit": "~4.4"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "Umpirsky\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Saša Stamenković",
+                    "email": "umpirsky@gmail.com"
+                }
+            ],
+            "description": "Call (almost) any PHP function from your Twig templates.",
+            "time": "2016-03-12T16:36:32+00:00"
+        },
+        {
+            "name": "wyrihaximus/twig-view",
+            "version": "4.3.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/WyriHaximus/TwigView.git",
+                "reference": "a5ec66690aa045d6eda17ab1c8a5baf0efdcfa45"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/WyriHaximus/TwigView/zipball/a5ec66690aa045d6eda17ab1c8a5baf0efdcfa45",
+                "reference": "a5ec66690aa045d6eda17ab1c8a5baf0efdcfa45",
+                "shasum": ""
+            },
+            "require": {
+                "ajgl/breakpoint-twig-extension": "^0.3.0",
+                "aptoma/twig-markdown": "^2.0",
+                "asm89/twig-cache-extension": "^1.0",
+                "cakephp/cakephp": "^3.6",
+                "jasny/twig-extensions": "^1.0",
+                "php": "^5.6 || ^7.0",
+                "twig/twig": "^1.27",
+                "umpirsky/twig-php-function": "0.1"
+            },
+            "require-dev": {
+                "cakephp/bake": "^1.5",
+                "cakephp/debug_kit": "^3.0",
+                "phake/phake": "^1.0.4",
+                "phpunit/phpunit": "^5.7.14",
+                "squizlabs/php_codesniffer": "^1.5.6",
+                "wyrihaximus/phpunit-class-reflection-helpers": "dev-master"
+            },
+            "type": "cakephp-plugin",
+            "autoload": {
+                "psr-4": {
+                    "WyriHaximus\\TwigView\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Cees-Jan Kiewiet",
+                    "email": "ceesjank@gmail.com",
+                    "homepage": "http://wyrihaximus.net/"
+                }
+            ],
+            "description": "Twig powered View for CakePHP3",
+            "keywords": [
+                "cakephp",
+                "cakephp3",
+                "twig",
+                "view"
+            ],
+            "time": "2018-12-17T21:08:25+00:00"
         }
     ],
     "aliases": [],
diff --git a/src/Controller/MainController.php b/src/Controller/MainController.php
index 4fb6b9f..5f5a92e 100644
--- a/src/Controller/MainController.php
+++ b/src/Controller/MainController.php
@@ -145,7 +145,6 @@ class MainController extends AppController {
             }
 
             $offset = ($page - 1) * $pageLimit;
-            //$claims = $this->Claims->find()->distinct(['Claims.claim_id'])->select($this->Claims)->select(['publisher' => 'C.name'])->leftJoin(['C' => 'claim'], ['C.claim_id = Claims.publisher_id'])->order(['Claims.created_at' => 'DESC'])->offset($offset)->limit($pageLimit)->toArray();
             $claims = $this->Claims->find()->select($this->Claims)->select(['publisher' => 'C.name'])->leftJoin(['C' => 'claim'], ['C.claim_id = Claims.publisher_id'])->order(['Claims.created_at' => 'DESC'])->offset($offset)->limit($pageLimit)->toArray();
 
             for ($i = 0; $i < count($claims); $i++) {
@@ -533,13 +532,12 @@ class MainController extends AppController {
         $qrCode->setWriterByName('png');
         $qrCode->setMargin(10);
         $qrCode->setEncoding('UTF-8');
-        $qrCode->setErrorCorrectionLevel(new ErrorCorrectionLevel(ErrorCorrectionLevel::LOW));
+        $qrCode->setErrorCorrectionLevel(new ErrorCorrectionLevel(ErrorCorrectionLevel::HIGH));
         $qrCode->setForegroundColor(['r' => 0, 'g' => 0, 'b' => 0, 'a' => 0]);
         $qrCode->setBackgroundColor(['r' => 255, 'g' => 255, 'b' => 255, 'a' => 0]);
         $qrCode->setLogoWidth(150);
         $qrCode->setValidateResult(false);
 
-
         header('Content-Type: '.$qrCode->getContentType());
         echo $qrCode->writeString();
         exit(0);
@@ -903,18 +901,18 @@ class MainController extends AppController {
         }
     }
 
-    private function _gettxoutsetinfo() {
-        $req = ['method' => 'gettxoutsetinfo', 'params' => []];
-        try {
-            $res = json_decode(self::curl_json_post(self::$rpcurl, json_encode($req)));
-            if (!isset($res->result)) {
-                return 0;
-            }
-            return $res->result;
-        } catch (\Exception $e) {
-            return 'N/A';
-        }
-    }
+    // private function _gettxoutsetinfo() {
+        // $req = ['method' => 'gettxoutsetinfo', 'params' => []];
+        // try {
+            // $res = json_decode(self::curl_json_post(self::$rpcurl, json_encode($req)));
+            // if (!isset($res->result)) {
+                // return 0;
+            // }
+            // return $res->result;
+        // } catch (\Exception $e) {
+            // return 'N/A';
+        // }
+    // }
 
     private static function curl_json_post($url, $data, $headers = []) {
         $ch = curl_init();
-- 
2.45.2


From f3564d780935c5933d6798e2d2c1e896317e9957 Mon Sep 17 00:00:00 2001
From: marcdeb1 <marcdebrouchev@laposte.net>
Date: Sat, 26 Jan 2019 20:54:30 +0100
Subject: [PATCH 39/43] TransactionAddress loading fix

---
 src/Controller/MainController.php        |  5 ++---
 src/Model/Entity/Block.php               |  3 ---
 src/Model/Table/ClaimsTable.php          |  1 -
 src/Model/Table/TransactionAddresses.php | 17 -----------------
 4 files changed, 2 insertions(+), 24 deletions(-)
 delete mode 100644 src/Model/Table/TransactionAddresses.php

diff --git a/src/Controller/MainController.php b/src/Controller/MainController.php
index 5f5a92e..7419653 100644
--- a/src/Controller/MainController.php
+++ b/src/Controller/MainController.php
@@ -435,7 +435,7 @@ class MainController extends AppController {
         $this->loadModel('Transactions');
         $this->loadModel('Inputs');
         $this->loadModel('Outputs');
-        $this->loadModel('TransactionAddress');
+        $this->loadModel('TransactionAddresses');
 
         if (!$addr) {
             return $this->redirect('/');
@@ -465,7 +465,7 @@ class MainController extends AppController {
             $conn = ConnectionManager::get('default');
 
             $canTag = true;
-            $transactionAddresses = $this->TransactionAddress->find()->where(['address_id' => $address->id])->toArray();
+            $transactionAddresses = $this->TransactionAddresses->find()->where(['address_id' => $address->id])->toArray();
             $numTransactions = count($transactionAddresses);
             
             $all = $this->request->query('all');
@@ -761,7 +761,6 @@ class MainController extends AppController {
     public function apiaddrbalance($base58address = null) {
         $this->autoRender = false;
         $this->loadModel('Addresses');
-        $this->loadModel('TransactionAddress');
 
         if (!isset($base58address)) {
             return $this->_jsonError('Base58 address not specified.', 400);
diff --git a/src/Model/Entity/Block.php b/src/Model/Entity/Block.php
index 8f66eac..7858813 100644
--- a/src/Model/Entity/Block.php
+++ b/src/Model/Entity/Block.php
@@ -5,9 +5,6 @@ namespace App\Model\Entity;
 use Cake\ORM\Entity;
 
 class Block extends Entity {
-    public function target() {
-        
-    }
 
 }
 
diff --git a/src/Model/Table/ClaimsTable.php b/src/Model/Table/ClaimsTable.php
index 9f826da..c3a6296 100644
--- a/src/Model/Table/ClaimsTable.php
+++ b/src/Model/Table/ClaimsTable.php
@@ -24,5 +24,4 @@ class ClaimsTable extends Table {
         ]);
     }
 }
-
 ?>
\ No newline at end of file
diff --git a/src/Model/Table/TransactionAddresses.php b/src/Model/Table/TransactionAddresses.php
deleted file mode 100644
index 3de545c..0000000
--- a/src/Model/Table/TransactionAddresses.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-namespace App\Model\Table;
-
-use Cake\ORM\Table;
-
-class TransactionAddressesTable extends Table {
-    public function initialize(array $config) {
-        parent::initialize($config);
-
-        $this->table('transaction_address');
-
-        $this->addBehavior('SimpleAudit');
-    }
-}
-
-?>
\ No newline at end of file
-- 
2.45.2


From b96d40241d4f8b678e11a6f5f31e02ea25a9ab11 Mon Sep 17 00:00:00 2001
From: marcdeb1 <marcdebrouchev@laposte.net>
Date: Sat, 26 Jan 2019 21:04:46 +0100
Subject: [PATCH 40/43] Name Transaction Address table file

---
 src/Model/Table/TransactionAddressesTable.php | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 src/Model/Table/TransactionAddressesTable.php

diff --git a/src/Model/Table/TransactionAddressesTable.php b/src/Model/Table/TransactionAddressesTable.php
new file mode 100644
index 0000000..2ec8057
--- /dev/null
+++ b/src/Model/Table/TransactionAddressesTable.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Model\Table;
+
+use Cake\ORM\Table;
+
+class TransactionAddressesTable extends Table {
+    public function initialize(array $config) {
+        parent::initialize($config);
+
+        $this->table('transaction_address');
+        
+        $this->addBehavior('SimpleAudit');
+    }
+}
+
+?>
\ No newline at end of file
-- 
2.45.2


From 70069a29ec1506bb71f9c9c75edc81b8aadb4ac7 Mon Sep 17 00:00:00 2001
From: marcdeb1 <marcdebrouchev@laposte.net>
Date: Sat, 26 Jan 2019 21:56:01 +0100
Subject: [PATCH 41/43] Test Travis

---
 .travis.yml   | 1 -
 composer.json | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index befdb98..d426a58 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,6 @@ dist: trusty
 sudo: false
 
 php:
-  - 5.6
   - 7.0
   - 7.1
 
diff --git a/composer.json b/composer.json
index 5126290..1cece7b 100644
--- a/composer.json
+++ b/composer.json
@@ -9,6 +9,7 @@
         "cakephp/cakephp": "3.7.1",
         "mobiledetect/mobiledetectlib": "2.*",
         "cakephp/migrations": "~1.0",
+        "psr/simple-cache": "^1.0.0",
         "cakephp/plugin-installer": "~1.0",
         "mdanter/ecc": "^0.5.0",
         "nesbot/carbon": "~1.18",
-- 
2.45.2


From fd8a6953f3df2e10abaccd357675c2e5d3d71c22 Mon Sep 17 00:00:00 2001
From: marcdeb1 <marcdebrouchev@laposte.net>
Date: Sat, 26 Jan 2019 22:21:50 +0100
Subject: [PATCH 42/43] Deprecation warnings

---
 src/Model/Table/AddressesTable.php            | 4 ++--
 src/Model/Table/BlocksTable.php               | 4 ++--
 src/Model/Table/ClaimsTable.php               | 4 ++--
 src/Model/Table/InputsTable.php               | 4 ++--
 src/Model/Table/OutputsTable.php              | 4 ++--
 src/Model/Table/PriceHistoryTable.php         | 4 ++--
 src/Model/Table/TagAddressRequestsTable.php   | 4 ++--
 src/Model/Table/TransactionAddressesTable.php | 3 +--
 src/Model/Table/TransactionsTable.php         | 4 ++--
 9 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/src/Model/Table/AddressesTable.php b/src/Model/Table/AddressesTable.php
index daa47f2..b710896 100644
--- a/src/Model/Table/AddressesTable.php
+++ b/src/Model/Table/AddressesTable.php
@@ -8,8 +8,8 @@ class AddressesTable extends Table {
     public function initialize(array $config) {
         parent::initialize($config);
 
-        $this->primaryKey('id');
-        $this->table('address');
+        $this->setPrimaryKey('id');
+        $this->setTable('address');
 
         $this->addBehavior('SimpleAudit');
     }
diff --git a/src/Model/Table/BlocksTable.php b/src/Model/Table/BlocksTable.php
index bc58288..4ef0f17 100644
--- a/src/Model/Table/BlocksTable.php
+++ b/src/Model/Table/BlocksTable.php
@@ -8,8 +8,8 @@ class BlocksTable extends Table {
     public function initialize(array $config) {
         parent::initialize($config);
 
-        $this->primaryKey('id');
-        $this->table('block');
+        $this->setPrimaryKey('id');
+        $this->setTable('block');
 
         $this->addBehavior('SimpleAudit');
     }
diff --git a/src/Model/Table/ClaimsTable.php b/src/Model/Table/ClaimsTable.php
index c3a6296..c7fb547 100644
--- a/src/Model/Table/ClaimsTable.php
+++ b/src/Model/Table/ClaimsTable.php
@@ -8,8 +8,8 @@ class ClaimsTable extends Table {
     public function initialize(array $config) {
         parent::initialize($config);
 
-        $this->primaryKey('id');
-        $this->table('claim');
+        $this->setPrimaryKey('id');
+        $this->setTable('claim');
 
         //$this->addBehavior('SimpleAudit');
         $this->addAssociations([
diff --git a/src/Model/Table/InputsTable.php b/src/Model/Table/InputsTable.php
index 58776b6..5ef080d 100644
--- a/src/Model/Table/InputsTable.php
+++ b/src/Model/Table/InputsTable.php
@@ -8,8 +8,8 @@ class InputsTable extends Table {
     public function initialize(array $config) {
         parent::initialize($config);
 
-        $this->primaryKey('id');
-        $this->table('input');
+        $this->setPrimaryKey('id');
+        $this->setTable('input');
 
         $this->addBehavior('SimpleAudit');
 
diff --git a/src/Model/Table/OutputsTable.php b/src/Model/Table/OutputsTable.php
index dbb58fc..5967478 100644
--- a/src/Model/Table/OutputsTable.php
+++ b/src/Model/Table/OutputsTable.php
@@ -8,8 +8,8 @@ class OutputsTable extends Table {
     public function initialize(array $config) {
         parent::initialize($config);
 
-        $this->primaryKey('id');
-        $this->table('output');
+        $this->setPrimaryKey('id');
+        $this->setTable('output');
 
         $this->addBehavior('SimpleAudit');
 
diff --git a/src/Model/Table/PriceHistoryTable.php b/src/Model/Table/PriceHistoryTable.php
index 1b9fe02..74c2a09 100644
--- a/src/Model/Table/PriceHistoryTable.php
+++ b/src/Model/Table/PriceHistoryTable.php
@@ -8,8 +8,8 @@ class PriceHistoryTable extends Table {
     public function initialize(array $config) {
         parent::initialize($config);
 
-        $this->primaryKey('Id');
-        $this->table('PriceHistory');
+        $this->setPrimaryKey('Id');
+        $this->setTable('PriceHistory');
     }
 }
 
diff --git a/src/Model/Table/TagAddressRequestsTable.php b/src/Model/Table/TagAddressRequestsTable.php
index 51af76e..d106ca9 100644
--- a/src/Model/Table/TagAddressRequestsTable.php
+++ b/src/Model/Table/TagAddressRequestsTable.php
@@ -8,8 +8,8 @@ class TagAddressRequestsTable extends Table {
     public function initialize(array $config) {
         parent::initialize($config);
 
-        $this->primaryKey('Id');
-        $this->table('TagAddressRequests');
+        $this->setPrimaryKey('Id');
+        $this->setTable('TagAddressRequests');
 
         $this->addBehavior('SimpleAudit');
     }
diff --git a/src/Model/Table/TransactionAddressesTable.php b/src/Model/Table/TransactionAddressesTable.php
index 2ec8057..29d090a 100644
--- a/src/Model/Table/TransactionAddressesTable.php
+++ b/src/Model/Table/TransactionAddressesTable.php
@@ -8,8 +8,7 @@ class TransactionAddressesTable extends Table {
     public function initialize(array $config) {
         parent::initialize($config);
 
-        $this->table('transaction_address');
-        
+        $this->setTable('transaction_address');
         $this->addBehavior('SimpleAudit');
     }
 }
diff --git a/src/Model/Table/TransactionsTable.php b/src/Model/Table/TransactionsTable.php
index 7d1a180..28c010d 100644
--- a/src/Model/Table/TransactionsTable.php
+++ b/src/Model/Table/TransactionsTable.php
@@ -8,8 +8,8 @@ class TransactionsTable extends Table {
     public function initialize(array $config) {
         parent::initialize($config);
 
-        $this->primaryKey('id');
-        $this->table('transaction');
+        $this->setPrimaryKey('id');
+        $this->setTable('transaction');
 
         $this->addBehavior('SimpleAudit');
     }
-- 
2.45.2


From 55a373623385b56c04df401d9d3817a2ca7f4f47 Mon Sep 17 00:00:00 2001
From: marcdeb1 <marcdebrouchev@laposte.net>
Date: Sat, 26 Jan 2019 22:57:30 +0100
Subject: [PATCH 43/43] Deprecation warnings

---
 composer.lock     | 181 +++++++++++++++++++++++-----------------------
 config/routes.php |   6 --
 2 files changed, 91 insertions(+), 96 deletions(-)

diff --git a/composer.lock b/composer.lock
index 218b102..c34149a 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "f951a6637387b0718e7749c8fbda8202",
+    "content-hash": "bfdd477b9edc64f5c9f04b61d9bb6ae2",
     "packages": [
         {
             "name": "aura/intl",
@@ -248,29 +248,29 @@
         },
         {
             "name": "cakephp/migrations",
-            "version": "1.7.2",
+            "version": "1.8.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/cakephp/migrations.git",
-                "reference": "a5612adfd2efa8c90d29cb3b0c969de872a99eda"
+                "reference": "cd65daa9fae933bc0ccc69d5b5d92460375da9e2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/cakephp/migrations/zipball/a5612adfd2efa8c90d29cb3b0c969de872a99eda",
-                "reference": "a5612adfd2efa8c90d29cb3b0c969de872a99eda",
+                "url": "https://api.github.com/repos/cakephp/migrations/zipball/cd65daa9fae933bc0ccc69d5b5d92460375da9e2",
+                "reference": "cd65daa9fae933bc0ccc69d5b5d92460375da9e2",
                 "shasum": ""
             },
             "require": {
-                "cakephp/cache": "~3.2",
-                "cakephp/orm": "~3.2",
-                "php": ">=5.5.9",
+                "cakephp/cache": "^3.6.0",
+                "cakephp/orm": "^3.6.0",
+                "php": ">=5.6.0",
                 "robmorgan/phinx": "0.8.1"
             },
             "require-dev": {
-                "cakephp/bake": "@stable",
-                "cakephp/cakephp": "~3.2",
+                "cakephp/bake": "^1.7.0",
+                "cakephp/cakephp": "^3.6.0",
                 "cakephp/cakephp-codesniffer": "^3.0",
-                "phpunit/phpunit": "~4.1"
+                "phpunit/phpunit": "^5.7.14"
             },
             "suggest": {
                 "cakephp/bake": "Required if you want to generate migrations."
@@ -297,7 +297,7 @@
                 "cakephp",
                 "migrations"
             ],
-            "time": "2017-12-12T21:01:38+00:00"
+            "time": "2018-04-16T01:35:59+00:00"
         },
         {
             "name": "cakephp/plugin-installer",
@@ -1095,16 +1095,16 @@
         },
         {
             "name": "symfony/config",
-            "version": "v3.4.20",
+            "version": "v3.4.21",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/config.git",
-                "reference": "8a660daeb65dedbe0b099529f65e61866c055081"
+                "reference": "17c5d8941eb75a03d19bc76a43757738632d87b3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/config/zipball/8a660daeb65dedbe0b099529f65e61866c055081",
-                "reference": "8a660daeb65dedbe0b099529f65e61866c055081",
+                "url": "https://api.github.com/repos/symfony/config/zipball/17c5d8941eb75a03d19bc76a43757738632d87b3",
+                "reference": "17c5d8941eb75a03d19bc76a43757738632d87b3",
                 "shasum": ""
             },
             "require": {
@@ -1155,20 +1155,20 @@
             ],
             "description": "Symfony Config Component",
             "homepage": "https://symfony.com",
-            "time": "2018-11-26T10:17:44+00:00"
+            "time": "2019-01-01T13:45:19+00:00"
         },
         {
             "name": "symfony/console",
-            "version": "v3.4.20",
+            "version": "v3.4.21",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "8f80fc39bbc3b7c47ee54ba7aa2653521ace94bb"
+                "reference": "a700b874d3692bc8342199adfb6d3b99f62cc61a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/8f80fc39bbc3b7c47ee54ba7aa2653521ace94bb",
-                "reference": "8f80fc39bbc3b7c47ee54ba7aa2653521ace94bb",
+                "url": "https://api.github.com/repos/symfony/console/zipball/a700b874d3692bc8342199adfb6d3b99f62cc61a",
+                "reference": "a700b874d3692bc8342199adfb6d3b99f62cc61a",
                 "shasum": ""
             },
             "require": {
@@ -1224,7 +1224,7 @@
             ],
             "description": "Symfony Console Component",
             "homepage": "https://symfony.com",
-            "time": "2018-11-26T12:48:07+00:00"
+            "time": "2019-01-04T04:42:43+00:00"
         },
         {
             "name": "symfony/contracts",
@@ -1296,16 +1296,16 @@
         },
         {
             "name": "symfony/debug",
-            "version": "v4.2.1",
+            "version": "v4.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/debug.git",
-                "reference": "e0a2b92ee0b5b934f973d90c2f58e18af109d276"
+                "reference": "64cb33c81e37d19b7715d4a6a4d49c1c382066dd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/debug/zipball/e0a2b92ee0b5b934f973d90c2f58e18af109d276",
-                "reference": "e0a2b92ee0b5b934f973d90c2f58e18af109d276",
+                "url": "https://api.github.com/repos/symfony/debug/zipball/64cb33c81e37d19b7715d4a6a4d49c1c382066dd",
+                "reference": "64cb33c81e37d19b7715d4a6a4d49c1c382066dd",
                 "shasum": ""
             },
             "require": {
@@ -1348,20 +1348,20 @@
             ],
             "description": "Symfony Debug Component",
             "homepage": "https://symfony.com",
-            "time": "2018-11-28T18:24:18+00:00"
+            "time": "2019-01-03T09:07:35+00:00"
         },
         {
             "name": "symfony/filesystem",
-            "version": "v4.2.1",
+            "version": "v4.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "2f4c8b999b3b7cadb2a69390b01af70886753710"
+                "reference": "c2ffd9a93f2d6c5be2f68a0aa7953cc229f871f8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/2f4c8b999b3b7cadb2a69390b01af70886753710",
-                "reference": "2f4c8b999b3b7cadb2a69390b01af70886753710",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/c2ffd9a93f2d6c5be2f68a0aa7953cc229f871f8",
+                "reference": "c2ffd9a93f2d6c5be2f68a0aa7953cc229f871f8",
                 "shasum": ""
             },
             "require": {
@@ -1398,20 +1398,20 @@
             ],
             "description": "Symfony Filesystem Component",
             "homepage": "https://symfony.com",
-            "time": "2018-11-11T19:52:12+00:00"
+            "time": "2019-01-03T09:07:35+00:00"
         },
         {
             "name": "symfony/inflector",
-            "version": "v4.2.0",
+            "version": "v4.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/inflector.git",
-                "reference": "f9a637c0359f74404d44cf0da0a3ce53bae0787e"
+                "reference": "9f64271222922ef1a10e43f77d88baf72bf22b0e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/inflector/zipball/f9a637c0359f74404d44cf0da0a3ce53bae0787e",
-                "reference": "f9a637c0359f74404d44cf0da0a3ce53bae0787e",
+                "url": "https://api.github.com/repos/symfony/inflector/zipball/9f64271222922ef1a10e43f77d88baf72bf22b0e",
+                "reference": "9f64271222922ef1a10e43f77d88baf72bf22b0e",
                 "shasum": ""
             },
             "require": {
@@ -1456,20 +1456,20 @@
                 "symfony",
                 "words"
             ],
-            "time": "2018-11-11T19:52:12+00:00"
+            "time": "2019-01-03T09:07:35+00:00"
         },
         {
             "name": "symfony/options-resolver",
-            "version": "v4.2.0",
+            "version": "v4.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/options-resolver.git",
-                "reference": "a9c38e8a3da2c03b3e71fdffa6efb0bda51390ba"
+                "reference": "fbcb106aeee72f3450298bf73324d2cc00d083d1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/a9c38e8a3da2c03b3e71fdffa6efb0bda51390ba",
-                "reference": "a9c38e8a3da2c03b3e71fdffa6efb0bda51390ba",
+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/fbcb106aeee72f3450298bf73324d2cc00d083d1",
+                "reference": "fbcb106aeee72f3450298bf73324d2cc00d083d1",
                 "shasum": ""
             },
             "require": {
@@ -1510,7 +1510,7 @@
                 "configuration",
                 "options"
             ],
-            "time": "2018-11-11T19:52:12+00:00"
+            "time": "2019-01-03T09:07:35+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
@@ -1631,16 +1631,16 @@
         },
         {
             "name": "symfony/property-access",
-            "version": "v4.2.0",
+            "version": "v4.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/property-access.git",
-                "reference": "b6df4e1849f389468edb36e2e59877d4a8170723"
+                "reference": "a21d40670000f61a1a4b90a607d54696aad914cd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/property-access/zipball/b6df4e1849f389468edb36e2e59877d4a8170723",
-                "reference": "b6df4e1849f389468edb36e2e59877d4a8170723",
+                "url": "https://api.github.com/repos/symfony/property-access/zipball/a21d40670000f61a1a4b90a607d54696aad914cd",
+                "reference": "a21d40670000f61a1a4b90a607d54696aad914cd",
                 "shasum": ""
             },
             "require": {
@@ -1694,20 +1694,20 @@
                 "property path",
                 "reflection"
             ],
-            "time": "2018-11-29T14:48:32+00:00"
+            "time": "2019-01-05T16:37:49+00:00"
         },
         {
             "name": "symfony/translation",
-            "version": "v4.2.1",
+            "version": "v4.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation.git",
-                "reference": "c0e2191e9bed845946ab3d99767513b56ca7dcd6"
+                "reference": "939fb792d73f2ce80e6ae9019d205fc480f1c9a0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/c0e2191e9bed845946ab3d99767513b56ca7dcd6",
-                "reference": "c0e2191e9bed845946ab3d99767513b56ca7dcd6",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/939fb792d73f2ce80e6ae9019d205fc480f1c9a0",
+                "reference": "939fb792d73f2ce80e6ae9019d205fc480f1c9a0",
                 "shasum": ""
             },
             "require": {
@@ -1767,20 +1767,20 @@
             ],
             "description": "Symfony Translation Component",
             "homepage": "https://symfony.com",
-            "time": "2018-12-06T10:45:32+00:00"
+            "time": "2019-01-03T09:07:35+00:00"
         },
         {
             "name": "symfony/yaml",
-            "version": "v3.4.20",
+            "version": "v3.4.21",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "291e13d808bec481eab83f301f7bff3e699ef603"
+                "reference": "554a59a1ccbaac238a89b19c8e551a556fd0e2ea"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/291e13d808bec481eab83f301f7bff3e699ef603",
-                "reference": "291e13d808bec481eab83f301f7bff3e699ef603",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/554a59a1ccbaac238a89b19c8e551a556fd0e2ea",
+                "reference": "554a59a1ccbaac238a89b19c8e551a556fd0e2ea",
                 "shasum": ""
             },
             "require": {
@@ -1826,7 +1826,7 @@
             ],
             "description": "Symfony Yaml Component",
             "homepage": "https://symfony.com",
-            "time": "2018-11-11T19:48:54+00:00"
+            "time": "2019-01-01T13:45:19+00:00"
         },
         {
             "name": "zendframework/zend-diactoros",
@@ -2067,23 +2067,23 @@
         },
         {
             "name": "cakephp/bake",
-            "version": "1.9.1",
+            "version": "1.9.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/cakephp/bake.git",
-                "reference": "7ff3b8df337b16d67d9834e6b438d06d9d4974ca"
+                "reference": "9949a6a867a17cf30996dfc9daceab1c63a7a9c1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/cakephp/bake/zipball/7ff3b8df337b16d67d9834e6b438d06d9d4974ca",
-                "reference": "7ff3b8df337b16d67d9834e6b438d06d9d4974ca",
+                "url": "https://api.github.com/repos/cakephp/bake/zipball/9949a6a867a17cf30996dfc9daceab1c63a7a9c1",
+                "reference": "9949a6a867a17cf30996dfc9daceab1c63a7a9c1",
                 "shasum": ""
             },
             "require": {
                 "cakephp/cakephp": "^3.7.0",
                 "cakephp/plugin-installer": "^1.0",
                 "php": ">=5.6.0",
-                "wyrihaximus/twig-view": "^4.3.4"
+                "wyrihaximus/twig-view": "^4.3.7"
             },
             "require-dev": {
                 "cakephp/cakephp-codesniffer": "^3.0",
@@ -2111,7 +2111,7 @@
                 "bake",
                 "cakephp"
             ],
-            "time": "2018-12-12T07:48:52+00:00"
+            "time": "2019-01-02T12:59:40+00:00"
         },
         {
             "name": "cakephp/debug_kit",
@@ -2709,23 +2709,23 @@
         },
         {
             "name": "justinrainbow/json-schema",
-            "version": "5.2.7",
+            "version": "5.2.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/justinrainbow/json-schema.git",
-                "reference": "8560d4314577199ba51bf2032f02cd1315587c23"
+                "reference": "dcb6e1006bb5fd1e392b4daa68932880f37550d4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/8560d4314577199ba51bf2032f02cd1315587c23",
-                "reference": "8560d4314577199ba51bf2032f02cd1315587c23",
+                "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/dcb6e1006bb5fd1e392b4daa68932880f37550d4",
+                "reference": "dcb6e1006bb5fd1e392b4daa68932880f37550d4",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.3"
             },
             "require-dev": {
-                "friendsofphp/php-cs-fixer": "^2.1",
+                "friendsofphp/php-cs-fixer": "~2.2.20",
                 "json-schema/json-schema-test-suite": "1.2.0",
                 "phpunit/phpunit": "^4.8.35"
             },
@@ -2771,20 +2771,20 @@
                 "json",
                 "schema"
             ],
-            "time": "2018-02-14T22:26:30+00:00"
+            "time": "2019-01-14T23:55:14+00:00"
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.1.1",
+            "version": "v4.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "8aae5b59b83bb4d0dbf07b0a835f2680a658f610"
+                "reference": "594bcae1fc0bccd3993d2f0d61a018e26ac2865a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/8aae5b59b83bb4d0dbf07b0a835f2680a658f610",
-                "reference": "8aae5b59b83bb4d0dbf07b0a835f2680a658f610",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/594bcae1fc0bccd3993d2f0d61a018e26ac2865a",
+                "reference": "594bcae1fc0bccd3993d2f0d61a018e26ac2865a",
                 "shasum": ""
             },
             "require": {
@@ -2800,7 +2800,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.1-dev"
+                    "dev-master": "4.2-dev"
                 }
             },
             "autoload": {
@@ -2822,7 +2822,7 @@
                 "parser",
                 "php"
             ],
-            "time": "2018-12-26T11:32:39+00:00"
+            "time": "2019-01-12T16:31:37+00:00"
         },
         {
             "name": "psy/psysh",
@@ -2993,16 +2993,16 @@
         },
         {
             "name": "symfony/finder",
-            "version": "v4.2.1",
+            "version": "v4.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "e53d477d7b5c4982d0e1bfd2298dbee63d01441d"
+                "reference": "9094d69e8c6ee3fe186a0ec5a4f1401e506071ce"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/e53d477d7b5c4982d0e1bfd2298dbee63d01441d",
-                "reference": "e53d477d7b5c4982d0e1bfd2298dbee63d01441d",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/9094d69e8c6ee3fe186a0ec5a4f1401e506071ce",
+                "reference": "9094d69e8c6ee3fe186a0ec5a4f1401e506071ce",
                 "shasum": ""
             },
             "require": {
@@ -3038,7 +3038,7 @@
             ],
             "description": "Symfony Finder Component",
             "homepage": "https://symfony.com",
-            "time": "2018-11-11T19:52:12+00:00"
+            "time": "2019-01-03T09:07:35+00:00"
         },
         {
             "name": "symfony/polyfill-php72",
@@ -3097,16 +3097,16 @@
         },
         {
             "name": "symfony/process",
-            "version": "v4.2.1",
+            "version": "v4.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "2b341009ccec76837a7f46f59641b431e4d4c2b0"
+                "reference": "ea043ab5d8ed13b467a9087d81cb876aee7f689a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/2b341009ccec76837a7f46f59641b431e4d4c2b0",
-                "reference": "2b341009ccec76837a7f46f59641b431e4d4c2b0",
+                "url": "https://api.github.com/repos/symfony/process/zipball/ea043ab5d8ed13b467a9087d81cb876aee7f689a",
+                "reference": "ea043ab5d8ed13b467a9087d81cb876aee7f689a",
                 "shasum": ""
             },
             "require": {
@@ -3142,20 +3142,20 @@
             ],
             "description": "Symfony Process Component",
             "homepage": "https://symfony.com",
-            "time": "2018-11-20T16:22:05+00:00"
+            "time": "2019-01-03T14:48:52+00:00"
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v4.2.1",
+            "version": "v4.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "db61258540350725f4beb6b84006e32398acd120"
+                "reference": "85bde661b178173d85c6f11ea9d03b61d1212bb2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/db61258540350725f4beb6b84006e32398acd120",
-                "reference": "db61258540350725f4beb6b84006e32398acd120",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/85bde661b178173d85c6f11ea9d03b61d1212bb2",
+                "reference": "85bde661b178173d85c6f11ea9d03b61d1212bb2",
                 "shasum": ""
             },
             "require": {
@@ -3169,6 +3169,7 @@
             },
             "require-dev": {
                 "ext-iconv": "*",
+                "symfony/console": "~3.4|~4.0",
                 "symfony/process": "~3.4|~4.0",
                 "twig/twig": "~1.34|~2.4"
             },
@@ -3217,7 +3218,7 @@
                 "debug",
                 "dump"
             ],
-            "time": "2018-11-25T12:50:42+00:00"
+            "time": "2019-01-03T09:07:35+00:00"
         },
         {
             "name": "twig/twig",
diff --git a/config/routes.php b/config/routes.php
index abb4474..08e8237 100644
--- a/config/routes.php
+++ b/config/routes.php
@@ -72,9 +72,3 @@ Router::scope('/', function (RouteBuilder $routes) {
 
     //$routes->fallbacks(DashedRoute::class);
 });
-
-/**
- * Load all plugin routes. See the Plugin documentation on
- * how to customize the loading of plugin routes.
- */
-Plugin::routes();
-- 
2.45.2