Chainquery integration #49

Merged
marcdeb1 merged 44 commits from chainquery into master 2019-02-13 19:01:13 +01:00
2 changed files with 3 additions and 4 deletions
Showing only changes of commit 4e0eeab3d1 - Show all commits

View file

@ -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('/');
}

View file

@ -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>