Compare commits
30
Commits
Mooore
..
imgsrc-fix
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5d23294dba | ||
|
|
a0cbc324b7 | ||
|
|
f66101a9de | ||
|
|
537dd85473 | ||
|
|
0adcf92cbb | ||
|
|
ade487848d | ||
|
|
7706338460 | ||
|
|
c60b3946ce | ||
|
|
6bf194c448 | ||
|
|
7cd3e5322c | ||
|
|
c82fd1a982 | ||
|
|
efcce65004 | ||
|
|
df6264f388 | ||
|
|
a99606ecbf | ||
|
|
f2bf172997 | ||
|
|
5db80ac0d4 | ||
|
|
fe14cd88f0 | ||
|
|
a855ee3d94 | ||
|
|
58620a6298 | ||
|
|
409a0a7da7 | ||
|
|
6e6dcd0613 | ||
|
|
ba995ed51f | ||
|
|
e7e444f84a | ||
|
|
1d9dbb802b | ||
|
|
85926e316f | ||
|
|
7f701f87d5 | ||
|
|
06a495d396 | ||
|
|
a19e3abd07 | ||
|
|
66940ac02a | ||
|
|
5acd8f6039 |
No files matched your search
@@ -0,0 +1,10 @@
|
||||
The MIT License (MIT)
|
||||
|
||||
Copyright (c) 2017-2018 LBRY Inc
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish,distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
||||
@@ -1,4 +1,7 @@
|
||||
#!/bin/sh
|
||||
cd /var/www/lbry.block.ng
|
||||
bin/cake block parsenewblocks
|
||||
rm tmp/lock/parsenewblocks
|
||||
bin/cake block parsetxs
|
||||
rm tmp/lock/parsetxs
|
||||
|
||||
@@ -233,7 +233,3 @@ CREATE TABLE `PriceHistory`
|
||||
PRIMARY KEY `PK_PriceHistory` (`Id`),
|
||||
UNIQUE KEY `Idx_PriceHistoryCreated` (`Created`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=4;
|
||||
|
||||
ALTER TABLE Claims ADD UNIQUE KEY `Idx_ClaimUnique` (`TransactionHash`, `Vout`, `ClaimId`);
|
||||
ALTER TABLE Addresses ADD COLUMN `Balance` DECIMAL(18,8) AS (`TotalReceived` - `TotalSent`) PERSISTENT AFTER `TotalSent`;
|
||||
ALTER TABLE Addresses ADD INDEX `Idx_AddressBalance` (`Balance`);
|
||||
@@ -882,7 +882,10 @@ class MainController extends AppController {
|
||||
$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 =' => '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 =' => 'bMgqQqYfwzWWYBk5o5dBMXtCndVAoeqy6h'])->first();
|
||||
|
||||
$reservedtotal = $reservedcommunity->Balance + $reservedoperational->Balance + $reservedinstitutional->Balance + $reservedaux->Balance;
|
||||
|
||||
|
||||
@@ -35,11 +35,6 @@ class BlockShell extends Shell {
|
||||
$this->out('No arguments specified');
|
||||
}
|
||||
|
||||
public function testtx() {
|
||||
$raw = '0100000001e4801fa8c9621753410e6c576c73168cc551624e08e4cc56e9a9189e8ebabcc3010000006b483045022100dcc5ae5564353e05cd8415936cdb534a26049a80a9866dbcab5dbb6ab16abbc702203af681fb5fbba5c78af887778aa32f27bc653312322b44c2a78e883e322921790121031c38def6b103b58481818d7d8aba39f9f51798f686ec3332bac23726a23366adffffffff0200e1f50500000000fd3a01b512626c6f636b6578706c6f7265722d686f6d654d0801080110011aa3010801125c080410011a1c4c42525920426c6f636b204578706c6f72657220486f6d6570616765222c574950204c42525920426c6f636b204578706c6f72657220686f6d6520706167652073637265656e73686f742a00320038004a0052005a001a41080110011a3038c6bf4a310d5b172aaae03cffb93e5a27c47f3946f58af0a4b9f99d7be42998f7dcec9b0fb0c124a6477bdb4c5311db2209696d6167652f706e672a5c080110031a401eb69f65768ba2cc347067dfb1317131137f7d685a5e804a4aeedd2385332c70f3ec7632fcebfbc073e37a58dbfbf4e6641853bbfc188b0d8bf27435b540801d22146b2a1d378efcdb7db7a03baa7dfedb86b976bc4a6d7576a914b7182b0f7c896ab240d233f81cb891e3f25e739988ac8085e811000000001976a9146fde27b4dac0b79a9ea06756562a52b019da7a8e88ac00000000';
|
||||
$decoded = self::decode_tx($raw);
|
||||
}
|
||||
|
||||
public function fixscripthashtx() {
|
||||
$conn = ConnectionManager::get('default');
|
||||
$otxs = $this->Outputs->find()->select(['TransactionId'])->distinct(['TransactionId'])->where(['Type' => 'scripthash'])->toArray();
|
||||
@@ -1298,7 +1293,16 @@ class BlockShell extends Shell {
|
||||
}
|
||||
}
|
||||
} catch (\Exception $e) {
|
||||
echo "Error occurred processing mempool: " . $e->getMessage() . "\n";
|
||||
echo "Mempool database error. Attempting to reconnect.\n";
|
||||
|
||||
// Final fix for MySQL server has gone away (hopefully)
|
||||
try {
|
||||
$conn->disconnect();
|
||||
} catch (\Exception $e) {
|
||||
// ignore possible disconnect errors
|
||||
}
|
||||
|
||||
$conn->connect();
|
||||
}
|
||||
|
||||
echo "*******************\n";
|
||||
|
||||
@@ -9,6 +9,6 @@
|
||||
<button class="btn btn-inline-search">Search</button>
|
||||
</div>
|
||||
</form>
|
||||
</div
|
||||
</div>
|
||||
<div class="clear"></div>
|
||||
</div>
|
||||
@@ -16,22 +16,16 @@
|
||||
<script src="https://use.typekit.net/yst3vhs.js"></script>
|
||||
<script>try{Typekit.load({ async: true });}catch(e){}</script>
|
||||
|
||||
<?php if ($_SERVER['HTTP_HOST'] !== 'local.lbry.block.ng' && $_SERVER['HTTP_HOST'] !== 'explorer.lbry.io'): ?>
|
||||
<!-- Analytics -->
|
||||
<script type="text/javascript">
|
||||
var _paq = _paq || [];
|
||||
/* tracker methods like "setCustomDimension" should be called before "trackPageView" */
|
||||
_paq.push(['trackPageView']);
|
||||
_paq.push(['enableLinkTracking']);
|
||||
(function() {
|
||||
var u="//analytics.aureolin.co/";
|
||||
_paq.push(['setTrackerUrl', u+'piwik.php']);
|
||||
_paq.push(['setSiteId', '1']);
|
||||
var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
|
||||
g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
|
||||
})();
|
||||
<?php if ($_SERVER['HTTP_HOST'] === 'explorer.lbry.io'): ?>
|
||||
<!-- Global site tag (gtag.js) - Google Analytics -->
|
||||
<script async src="//www.googletagmanager.com/gtag/js?id=UA-60403362-1"></script>
|
||||
<script>
|
||||
window.dataLayer = window.dataLayer || [];
|
||||
function gtag(){dataLayer.push(arguments);}
|
||||
gtag('js', new Date());
|
||||
gtag('config', 'UA-60403362-4');
|
||||
</script>
|
||||
<!-- End Analytics Code -->
|
||||
<?php endif; ?>
|
||||
|
||||
<script type="text/javascript">
|
||||
|
||||
@@ -89,7 +89,7 @@ if (strlen(trim($desc)) == 0) {
|
||||
|
||||
<div class="content">
|
||||
<?php if ($claim->ClaimType == 2): ?>
|
||||
<div class="label">Published by</div>
|
||||
<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>
|
||||
@@ -99,15 +99,15 @@ if (strlen(trim($desc)) == 0) {
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
|
||||
<div class="label">Created</div>
|
||||
<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="label">Transaction</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>
|
||||
|
||||
<?php if ($claim->ClaimType == 2): ?>
|
||||
<div class="label half-width">Cost</div>
|
||||
<div class="label half-width">Safe for work</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>
|
||||
@@ -392,4 +392,4 @@ if (strlen(trim($desc)) == 0) {
|
||||
|
||||
<?php echo $this->element('pagination') ?>
|
||||
|
||||
<?php endif ?>
|
||||
<?php endif ?>
|
||||
@@ -113,10 +113,16 @@
|
||||
<div class="home-container">
|
||||
<div class="home-container-cell">
|
||||
<div class="main">
|
||||
<div class="title">LBRY Block Explorer</div>
|
||||
<div class="title">LBRY Block Explorer</div><br>
|
||||
<form method="get" action="/find">
|
||||
<input class="search-input" name="q" type="text" placeholder="Enter a block height or hash, claim id or name, transaction hash or address" />
|
||||
<div class="ctls"><button class="btn btn-search">Search</button> <div class="links"><a href="/realtime">Realtime</a> • <a href="/stats" class="last">Stats</a></div></div>
|
||||
<div class="ctls">
|
||||
<div class="left-links"><a href="https://lbry.io/get">Download the LBRY App</a></div>
|
||||
<button class="btn btn-search">Search</button>
|
||||
<div class="right-links">
|
||||
<a href="/realtime">Realtime</a> • <a href="/stats" class="last">Stats</a>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
@@ -220,7 +226,7 @@
|
||||
|
||||
<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 $claim->ThumbnailUrl ?>" alt="" />
|
||||
<img src="<?php echo strip_tags($claim->ThumbnailUrl) ?>" alt="" />
|
||||
<?php else: ?>
|
||||
<div class="autothumb"><?php echo $autoThumbText ?></div>
|
||||
<?php endif; ?>
|
||||
@@ -244,4 +250,4 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
+13
-12
@@ -6,14 +6,14 @@
|
||||
a:link, a:visited { color: #1e88e5; text-decoration: none }
|
||||
a:hover { text-decoration: underline; color: #1976d2 }
|
||||
|
||||
.header { width: 1200px; margin: 0 auto 24px auto; padding: 12px 0 64px 0; border-bottom: 1px solid #ddd }
|
||||
.header { width: 1200px; margin: 0 auto 24px auto; padding: 12px 0 50px 0; border-bottom: 1px solid #ddd }
|
||||
.header a:link, .header a:visited { color: #333; text-decoration: none }
|
||||
.header .title { font-family: 'adelle-sans', sans-serif; font-weight: bold; font-size: 140%; float: left; position: relative; top: 4px }
|
||||
.header .search { float: right }
|
||||
.header .search .input-group { border: 2px solid #1e88e5; position: relative; width: 525px; height: 36px; border-radius: 8px }
|
||||
.header .search .input-group input { border: none; border-radius: 8px; padding: 8px 133px 8px 8px; width: 100%; height: 32px; width: 521px }
|
||||
.header .search .input-group .btn-inline-search { border: none; cursor: pointer; position: absolute; right: -4px; top: 0; height: 100%; background: #1e88e5; color: #fff; width: 125px;
|
||||
border-radius: 0 6px 8px 0 }
|
||||
border-radius: 0 8px 8px 0 }
|
||||
.header .search .input-group .btn-inline-search:hover { background: #1976d2 }
|
||||
|
||||
.home-container-cell > .main > .title { font-family: 'adelle-sans', sans-serif; font-weight: bold; font-size: 280%; margin: 24px auto 24px auto; width: 600px; text-align: center; color: #333; cursor: default }
|
||||
@@ -21,7 +21,8 @@ border-radius: 0 6px 8px 0 }
|
||||
.home-container-cell .ctls { width: 720px; text-align: center; margin: 24px auto; position: relative }
|
||||
.home-container-cell .ctls .btn-search { font-size: 115%; display: inline-block; padding: 12px 48px; background: #1e88e5; color: #fff; border-radius: 8px; border: none; font-weight: 300; cursor: pointer }
|
||||
.home-container-cell .ctls .btn-search:hover { background: #1976d2 }
|
||||
.home-container-cell .ctls .links { display: inline-block; font-weight: 300; position: absolute; right: 0; padding-top: 12px; }
|
||||
.home-container-cell .ctls .left-links { display: inline-block; font-weight: 300; position: absolute; left: 0; padding-top: 12px; }
|
||||
.home-container-cell .ctls .right-links { display: inline-block; font-weight: 300; position: absolute; right: 0; padding-top: 12px; }
|
||||
.home-container-cell .ctls a { font-size: 115%; display: inline-block; margin-right: 12px }
|
||||
.home-container-cell .ctls a.last { margin-left: 12px; margin-right: 0 }
|
||||
.home-container-cell .ctls a:hover { text-decoration: none; color: #1976d2 }
|
||||
@@ -59,7 +60,7 @@ border-radius: 0 6px 8px 0 }
|
||||
.claims-head h2 { font-weight: 300; margin-bottom: 0; font-size: 220% }
|
||||
.claims-head { width: 1200px; margin: 0 auto 24px auto; cursor: default }
|
||||
.claims-head h3, h4 { font-weight: 300; margin: 0 }
|
||||
.claims-head h3 { font-size: 200%; margin-bottom: 3px }
|
||||
.claims-head h3 { font-size: 170%; margin-bottom: 3px }
|
||||
.claims-head h4 { font-size: 125% }
|
||||
|
||||
.claims-grid { width: 1200px; margin: 0 auto 0 auto; cursor: default }
|
||||
@@ -92,11 +93,11 @@ border-radius: 0 6px 8px 0 }
|
||||
.claims-grid .claim-grid-item .spacer { height: 16px }
|
||||
|
||||
.claims-body { width: 1200px; margin: 0 auto 0 auto; cursor: default }
|
||||
.claims-body .claim-info { width: 400px; float: left; box-shadow: 0 2px 4px rgba(0,0,0,.175); border: 1px solid rgba(0,0,0,.15); cursor: default }
|
||||
.claims-body .claim-info { width: 400px; float: left; /*box-shadow: 0 2px 4px rgba(0,0,0,.175);*/ border: 1px solid rgba(0,0,0,.15); cursor: default }
|
||||
.claims-body .claim-info .thumbnail { width: 100%; height: 220px; background: #f0f0f0; display: block; position: relative; overflow: hidden }
|
||||
.claims-body .claim-info .thumbnail img { width: 100% }
|
||||
.claims-body .claim-info .content { padding: 24px }
|
||||
.claims-body .claim-info .content .label { font-size: 90%; color: #1e88e5 }
|
||||
.claims-body .claim-info .content .label { font-size: inherit; text-decoration: underline; color: #666666 }
|
||||
.claims-body .claim-info .content .value { font-weight: 300; margin-bottom: 24px; word-break: break-word; word-wrap: break-word }
|
||||
.claims-body .claim-info .content .value:last-child { margin-bottom: 0 }
|
||||
.claims-body .claim-info .content .half-width { width: 50%; float: left }
|
||||
@@ -108,12 +109,12 @@ border-radius: 0 6px 8px 0 }
|
||||
.claims-body .claim-info .thumbnail.yellow { background: #fdd835 }
|
||||
.claims-body .claim-info .thumbnail .autothumb { display: block; margin: 93px auto 0 auto; text-align: center; font-size: 240%; color: #fff; line-height: 54px }
|
||||
|
||||
.claims-body .claim-metadata { width: 750px; margin-left: 50px; float: left; box-shadow: 0 2px 4px rgba(0,0,0,.175); border: 1px solid rgba(0,0,0,.15); padding: 24px 36px 88px 36px; cursor: default; position: relative }
|
||||
.claims-body .claim-metadata .title { font-weight: 300; font-size: 170%; margin-bottom: 16px; color: #1e88e5; padding: 0 8px }
|
||||
.claims-body .claim-metadata .desc { font-weight: 300; font-size: 130%; line-height: 36px; padding: 0 12px; word-break: break-word; word-wrap: break-word }
|
||||
.claims-body .claim-metadata { width: 770px; margin-left: 30px; float: left; /*box-shadow: 0 2px 4px rgba(0,0,0,.175);*/ border: 1px solid rgba(0,0,0,.15); padding: 24px 36px 88px 36px; cursor: default; position: relative }
|
||||
.claims-body .claim-metadata .title { font-weight: bold; font-size: 120%; margin-bottom: 16px; color: #666666; padding: 0 8px }
|
||||
.claims-body .claim-metadata .desc { font-weight: 300; font-size: inherit; line-height: 1.8em; padding: 0 12px; word-break: break-word; word-wrap: break-word }
|
||||
.claims-body .claim-metadata .details { margin-top: 36px; border-top: 1px solid #ddd; padding: 36px 16px 0 16px }
|
||||
.claims-body .claim-metadata .details .label { font-size: 90%; color: #1e88e5 }
|
||||
.claims-body .claim-metadata .details .value { font-size: 110%; font-weight: 300; margin-bottom: 24px }
|
||||
.claims-body .claim-metadata .details .label { font-size: inherit; color: #666666; text-decoration: underline }
|
||||
.claims-body .claim-metadata .details .value { font-size: inherit; font-weight: 300; margin-bottom: 24px }
|
||||
.claims-body .claim-metadata .details .half-width { width: 50%; padding-right: 36px; float: left; height: 25px; line-height: 25px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis }
|
||||
.claims-body .claim-metadata .open-lbry-link { position: absolute; right: 36px; bottom: 36px; padding: 10px 24px; color: #fff; font-weight: 300; font-size: 90%; background: #1e88e5 }
|
||||
.claims-body .claim-metadata .open-lbry-link:hover { text-decoration: none; background: #1976d2 }
|
||||
@@ -307,4 +308,4 @@ footer .content .page-time { position: absolute; right: 12px; bottom: 0px; paddi
|
||||
@keyframes indeterminate {
|
||||
from { left: -25%; }
|
||||
to { left: 100% }
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user