LBRYCommunity/block-explorer
1
0
Fork 0
Code Issues 31 Pull requests 4 Projects Releases Packages Wiki Activity

Chainquery integration #49

Merged
marcdeb1 merged 44 commits from chainquery into master 2019-02-13 19:01:13 +01:00
Conversation 25 Commits 44 Files changed 36 +20 -29
2 changed files with 20 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 6c45f432de - Show all commits

47
src/Controller/MainController.php
View file

@ -147,13 +147,7 @@ class MainController extends AppController {
} }
$offset = ($page - 1) * $pageLimit; $offset = ($page - 1) * $pageLimit;
$claims = $this->Claims->find()->distinct(['claim_id'])->order(['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();
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++) { 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') {
@ -177,9 +171,7 @@ class MainController extends AppController {
$this->set('currentPage', $page); $this->set('currentPage', $page);
$this->set('claims', $claims); $this->set('claims', $claims);
} else { } else {
$claim = $this->Claims->find()->where(['claim_id' => $id])->order(['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();
$publisher = $this->Claims->find()->select(['name'])->where(['claim_id' => $claim->publisher_id])->first();
$claim->publisher = $publisher;
if (!$claim) { if (!$claim) {
return $this->redirect('/'); return $this->redirect('/');
@ -202,8 +194,7 @@ class MainController extends AppController {
$moreClaims = []; $moreClaims = [];
if (isset($claim->publisher) || $claim->claim_type == 1) { if (isset($claim->publisher) || $claim->claim_type == 1) {
// find more claims for the publisher // 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])-> $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();
limit(9)->order(['fee' => 'DESC', 'RAND()' => 'DESC'])->toArray();
for ($i = 0; $i < count($moreClaims); $i++) { for ($i = 0; $i < count($moreClaims); $i++) {
if ($canConvert && $moreClaims[$i]->fee > 0 && $moreClaims[$i]->fee_currency == 'USD') { if ($canConvert && $moreClaims[$i]->fee > 0 && $moreClaims[$i]->fee_currency == 'USD') {
$moreClaims[$i]->price = $moreClaims[$i]->fee / $priceInfo->price; $moreClaims[$i]->price = $moreClaims[$i]->fee / $priceInfo->price;
@ -783,7 +774,7 @@ class MainController extends AppController {
} }
$arr = explode(',', $base58address); $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) { if (count($addresses) == 0) {
return $this->_jsonError('No base58 address matching the specified parameter was found.', 404); return $this->_jsonError('No base58 address matching the specified parameter was found.', 404);
} }
@ -791,33 +782,33 @@ class MainController extends AppController {
$addressIds = []; $addressIds = [];
$params = []; $params = [];
foreach ($addresses as $address) { foreach ($addresses as $address) {
$addressIds[] = $address->Id; $addressIds[] = $address->id;
$params[] = '?'; $params[] = '?';
} }
// Get the unspent outputs for the address // Get the unspent outputs for the address
$conn = ConnectionManager::get('default'); $conn = ConnectionManager::get('default');
$stmt = $conn->execute(sprintf( $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 ' . '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 Transactions T ' . 'FROM transaction T ' .
'JOIN Outputs O ON O.TransactionId = T.Id ' . 'JOIN output O ON O.transaction_id = T.id ' .
'JOIN Blocks B ON B.Hash = T.BlockHash ' . 'JOIN block B ON B.hash = T.block_hash_id ' .
'WHERE O.Id IN (SELECT OutputId FROM OutputsAddresses WHERE AddressId IN (%s)) AND O.IsSpent <> 1 ORDER BY T.TransactionTime ASC', implode(',', $params)), $addressIds); '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); $outputs = $stmt->fetchAll(\PDO::FETCH_OBJ);
$utxo = []; $utxo = [];
foreach ($outputs as $out) { foreach ($outputs as $out) {
$utxo[] = [ $utxo[] = [
'transaction_hash' => $out->TransactionHash, 'transaction_hash' => $out->transaction_hash,
'output_index' => $out->Vout, 'output_index' => $out->vout,
'value' => (int) bcmul($out->Value, 100000000), 'value' => (int) bcmul($out->value, 100000000),
'addresses' => json_decode($out->Addresses), 'addresses' => json_decode($out->address_list),
'script' => $out->ScriptPubKeyAsm, 'script' => $out->script_pub_key_asm,
'script_hex' => $out->ScriptPubKeyHex, 'script_hex' => $out->script_pub_key_hex,
'script_type' => $out->Type, 'script_type' => $out->type,
'required_signatures' => (int) $out->RequiredSignatures, 'required_signatures' => (int) $out->required_signatures,
'spent' => false, 'spent' => false,
'confirmations' => (int) $out->Confirmations 'confirmations' => (int) $out->confirmations
]; ];
} }

2
src/Template/Main/claims.ctp
View file

@ -79,7 +79,7 @@ if (strlen(trim($desc)) == 0) {
<div class="label">Published By</div> <div class="label">Published By</div>
<div class="value"> <div class="value">
<?php if (isset($claim->publisher)): ?> <?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: ?> <?php else: ?>
<em>Anonymous</em> <em>Anonymous</em>
<?php endif; ?> <?php endif; ?>