diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index 08b5886..0000000
--- a/LICENSE
+++ /dev/null
@@ -1,10 +0,0 @@
-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.
-
diff --git a/cron/blocks.sh b/cron/blocks.sh
index 2a2b7b5..dc5c788 100755
--- a/cron/blocks.sh
+++ b/cron/blocks.sh
@@ -1,7 +1,4 @@
#!/bin/sh
cd /var/www/lbry.block.ng
bin/cake block parsenewblocks
-rm tmp/lock/parsenewblocks
-bin/cake block parsetxs
-rm tmp/lock/parsetxs
diff --git a/sql/lbryexplorer.ddl.sql b/sql/lbryexplorer.ddl.sql
index 50e04d0..f624d4c 100644
--- a/sql/lbryexplorer.ddl.sql
+++ b/sql/lbryexplorer.ddl.sql
@@ -233,3 +233,7 @@ 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`);
\ No newline at end of file
diff --git a/src/Controller/MainController.php b/src/Controller/MainController.php
index d6d21b5..f68cd44 100644
--- a/src/Controller/MainController.php
+++ b/src/Controller/MainController.php
@@ -882,10 +882,7 @@ 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 =' => 'bZja2VyhAC84a9hMwT8dwTU6rDRXowrjxH'])->first() +
- $this->Addresses->find()->select(['Balance'])->where(['Address =' => 'bMvUBo1h5WS46ThHtmfmXftz3z33VHL7wc'])->first() +
- $this->Addresses->find()->select(['Balance'])->where(['Address =' => 'bMgqQqYfwzWWYBk5o5dBMXtCndVAoeqy6h'])->first();
+ $this->Addresses->find()->select(['Balance'])->where(['Address =' => 'bVUrbCK8hcZ5XWti7b9eNxKEBxzc1rr393'])->first();
$reservedtotal = $reservedcommunity->Balance + $reservedoperational->Balance + $reservedinstitutional->Balance + $reservedaux->Balance;
diff --git a/src/Shell/BlockShell.php b/src/Shell/BlockShell.php
index 79d91ce..2c933de 100644
--- a/src/Shell/BlockShell.php
+++ b/src/Shell/BlockShell.php
@@ -35,6 +35,11 @@ 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();
@@ -1293,16 +1298,7 @@ class BlockShell extends Shell {
}
}
} catch (\Exception $e) {
- 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 "Error occurred processing mempool: " . $e->getMessage() . "\n";
}
echo "*******************\n";
diff --git a/src/Template/Element/header.ctp b/src/Template/Element/header.ctp
index d248714..1a561f1 100644
--- a/src/Template/Element/header.ctp
+++ b/src/Template/Element/header.ctp
@@ -9,6 +9,6 @@
-
+
\ No newline at end of file
diff --git a/src/Template/Layout/default.ctp b/src/Template/Layout/default.ctp
index bcaeac9..9ee1ab7 100644
--- a/src/Template/Layout/default.ctp
+++ b/src/Template/Layout/default.ctp
@@ -16,16 +16,22 @@
+
-
-
-
-
+