From 7b540c019648b004e2a8ed752864c5d9a91ffae1 Mon Sep 17 00:00:00 2001
From: Akinwale Ariwodola <akinwale@gmail.com>
Date: Fri, 16 Jun 2017 09:10:47 +0100
Subject: [PATCH] more fixes

---
 src/Shell/BlockShell.php | 61 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 58 insertions(+), 3 deletions(-)

diff --git a/src/Shell/BlockShell.php b/src/Shell/BlockShell.php
index 1476f67..8afe2cb 100644
--- a/src/Shell/BlockShell.php
+++ b/src/Shell/BlockShell.php
@@ -330,7 +330,7 @@ class BlockShell extends Shell {
         /** 2017-06-12 21:38:07 **/
         //$last_fixed_txid = $redis->exists('fix.txid') ? $redis->get('fix.txid') : 0;
         try {
-            $stmt = $conn->execute('SELECT Id FROM Transactions WHERE Created >= ? AND Created <= ? LIMIT 1000000', ['2017-06-15 15:44:50', '2017-06-16 08:02:09']);
+            $stmt = $conn->execute('SELECT Id FROM Transactions WHERE Created >= ? AND Created <= ? LIMIT 1000000', ['2017-06-15 20:44:50', '2017-06-16 08:02:09']);
             $txids = $stmt->fetchAll(\PDO::FETCH_OBJ);
 
             $count = count($txids);
@@ -412,7 +412,34 @@ class BlockShell extends Shell {
                     $stmt = $conn->execute('SELECT Id FROM Outputs WHERE TransactionId = ? AND Vout = ?', [$txid, $vout]);
                     $exist_output = $stmt->fetch(\PDO::FETCH_OBJ);
 
-                    if ($exist_output) {
+                    if (!$exist_output) {
+                        $out['TransactionId'] = $txid;
+                        $out_entity = $this->Outputs->newEntity($out);
+
+                        //$stmt->execute('INSERT INTO Outputs')
+                        $conn->execute('INSERT INTO Outputs (TransactionId, Vout, Value, Type, ScriptPubKeyAsm, ScriptPubKeyHex, RequiredSignatures, Hash160, Addresses, Created, Modified) '.
+                                       'VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, UTC_TIMESTAMP(), UTC_TIMESTAMP())',
+                                       [$out['TransactionId'],
+                                        $out['Vout'],
+                                        $out['Value'],
+                                        $out['Type'],
+                                        $out['ScriptPubKeyAsm'],
+                                        $out['ScriptPubKeyHex'],
+                                        $out['RequiredSignatures'],
+                                        $out['Hash160'],
+                                        $out['Addresses']
+                                       ]);
+
+                        // get the last insert id
+                        $stmt = $conn->execute('SELECT LAST_INSERT_ID() AS outputId');
+                        $linsert = $stmt->fetch(\PDO::FETCH_OBJ);
+                        $out_entity->Id = $linsert->outputId;
+
+                        if ($out_entity->Id === 0) {
+                            $data_error = true;
+                            break;
+                        }
+
                         $json_addr = json_decode($out['Addresses']);
                         $address = $json_addr[0];
 
@@ -472,7 +499,7 @@ class BlockShell extends Shell {
                             $stmt = $conn->execute('SELECT Id FROM Inputs WHERE TransactionId = ? AND PrevoutHash = ? AND PrevoutN = ?', [$txid, $prevout_hash, $in_prevout]);
                             $exist_input = $stmt->fetch(\PDO::FETCH_OBJ);
 
-                            if ($exist_input) {
+                            if (!$exist_input) {
                                 $json_addr = json_decode($src_output->Addresses);
                                 $address = $json_addr[0];
 
@@ -488,6 +515,34 @@ class BlockShell extends Shell {
                                     }
                                 }
 
+                                $in_entity = $this->Inputs->newEntity($in);
+                                $in['TransactionId'] = $txid;
+                                if ($addr_id > -1) {
+                                    $in['AddressId'] = $addr_id;
+                                }
+                                $conn->execute('INSERT INTO Inputs (TransactionId, TransactionHash, AddressId, PrevoutHash, PrevoutN, Sequence, Value, ScriptSigAsm, ScriptSigHex, Created, Modified) ' .
+                                               'VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, UTC_TIMESTAMP(), UTC_TIMESTAMP())',
+                                               [$in['TransactionId'],
+                                                $in['TransactionHash'],
+                                                isset($in['AddressId']) ? $in['AddressId'] : null,
+                                                $in['PrevoutHash'],
+                                                $in['PrevoutN'],
+                                                $in['Sequence'],
+                                                isset($in['Value']) ? $in['Value'] : 0,
+                                                $in['ScriptSigAsm'],
+                                                $in['ScriptSigHex']
+                                                ]);
+
+                                // get last insert id
+                                $stmt = $conn->execute('SELECT LAST_INSERT_ID() AS inputId');
+                                $linsert = $stmt->fetch(\PDO::FETCH_OBJ);
+                                $in_entity->Id = $linsert->inputId;
+
+                                if ($in_entity->Id === 0) {
+                                    $data_error = true;
+                                    break;
+                                }
+
                                 if ($addr_id > -1) {
                                     $conn->execute('INSERT INTO InputsAddresses (InputId, AddressId) VALUES (?, ?) ON DUPLICATE KEY UPDATE InputId = InputId', [$exist_input->Id, $addr_id]);
                                     $conn->execute('INSERT INTO TransactionsAddresses (TransactionId, AddressId) VALUES (?, ?) ON DUPLICATE KEY UPDATE TransactionId = TransactionId', [$txid, $addr_id]);