From f7615524641af8de5f641cc30b857fac6b14f368 Mon Sep 17 00:00:00 2001
From: Vivek Teega <vivek.teega@gmail.com>
Date: Tue, 10 Sep 2019 07:30:28 +0530
Subject: [PATCH] Optimizing blockinfo passed to the function

---
 tracktokens-smartcontracts.py | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/tracktokens-smartcontracts.py b/tracktokens-smartcontracts.py
index 3e29e4c..0f41a4d 100755
--- a/tracktokens-smartcontracts.py
+++ b/tracktokens-smartcontracts.py
@@ -103,10 +103,10 @@ def processApiBlock(blockhash):
     checkLocaltriggerContracts(blockinfo)
 
 
-def updateLatestTransaction(transactionData, parsed_data, blockinfo):
+def updateLatestTransaction(transactionData, parsed_data, blockNumber):
     # connect to latest transaction db
     conn = sqlite3.connect('latestCache.db')
-    conn.execute("INSERT INTO latestTransactions(transactionHash, blockNumber, jsonData, transactionType, parsedFloData) VALUES (?,?,?,?,?)", (transactionData['hash'], blockinfo['height'], json.dumps(transactionData), parsed_data['type'], json.dumps(parsed_data)))
+    conn.execute("INSERT INTO latestTransactions(transactionHash, blockNumber, jsonData, transactionType, parsedFloData) VALUES (?,?,?,?,?)", (transactionData['hash'], blockNumber, json.dumps(transactionData), parsed_data['type'], json.dumps(parsed_data)))
     conn.commit()
     conn.close()
 
@@ -510,7 +510,7 @@ def startWorking(transaction_data, parsed_data, blockinfo):
                 pushData_SSEapi('Error | Something went wrong while doing the internal db transactions for {}'.format(transaction_data['txid']))
                 return 0
             else:
-                updateLatestTransaction(transaction_data, parsed_data, blockinfo)
+                updateLatestTransaction(transaction_data, parsed_data, blockinfo['height'])
 
             # If this is the first interaction of the outputlist's address with the given token name, add it to token mapping
             engine = create_engine('sqlite:///system.db', echo=True)
@@ -657,7 +657,7 @@ def startWorking(transaction_data, parsed_data, blockinfo):
                                                              contractName = parsed_data['contractName'], contractAddress = outputlist[0], transactionHash=transaction_data['txid']))
                             session.commit()
 
-                            updateLatestTransaction(transaction_data, parsed_data, blockinfo)
+                            updateLatestTransaction(transaction_data, parsed_data, blockinfo['height'])
                             return
 
                         else:
@@ -684,7 +684,7 @@ def startWorking(transaction_data, parsed_data, blockinfo):
                                                                    contractName=parsed_data['contractName'], contractAddress = outputlist[0], transactionHash=transaction_data['txid']))
                             session.commit()
                             session.close()
-                            updateLatestTransaction(transaction_data, parsed_data, blockinfo)
+                            updateLatestTransaction(transaction_data, parsed_data, blockinfo['height'])
                             return
 
                         else:
@@ -713,7 +713,7 @@ def startWorking(transaction_data, parsed_data, blockinfo):
                                                        contractAddress=outputlist[0], transactionHash=transaction_data['txid']))
                 session.commit()
 
-                updateLatestTransaction(transaction_data, parsed_data, blockinfo)
+                updateLatestTransaction(transaction_data, parsed_data, blockinfo['height'])
 
                 pushData_SSEapi('Participation | Succesfully participated in the contract {}-{} at transaction {}'.format(
                         parsed_data['contractName'], outputlist[0],
@@ -752,7 +752,7 @@ def startWorking(transaction_data, parsed_data, blockinfo):
 
             connection.close()
 
-            updateLatestTransaction(transaction_data, parsed_data, blockinfo)
+            updateLatestTransaction(transaction_data, parsed_data, blockinfo['height'])
 
             pushData_SSEapi('Token | Succesfully incorporated token {} at transaction {}'.format(
                     parsed_data['tokenIdentification'], transaction_data['txid']))
@@ -844,7 +844,7 @@ def startWorking(transaction_data, parsed_data, blockinfo):
                     session.commit()
                     session.close()
 
-                    updateLatestTransaction(transaction_data, parsed_data, blockinfo)
+                    updateLatestTransaction(transaction_data, parsed_data, blockinfo['height'])
 
                     pushData_SSEapi('Contract | Contract incorporated at transaction {} with name {}-{}'.format(
                             transaction_data['txid'], parsed_data['contractName'], parsed_data['contractAddress']))
@@ -928,7 +928,7 @@ def startWorking(transaction_data, parsed_data, blockinfo):
                             parsed_data['contractName'], outputlist[0]))
                     connection.close()
 
-                    updateLatestTransaction(transaction_data, parsed_data, blockinfo)
+                    updateLatestTransaction(transaction_data, parsed_data, blockinfo['height'])
 
                     pushData_SSEapi('Trigger | Contract triggered of the name {}-{} is active currentlyt at transaction {}'.format(parsed_data['contractName'], outputlist[0], transaction_data['txid']))
                     return
@@ -1032,7 +1032,7 @@ def startWorking(transaction_data, parsed_data, blockinfo):
                         parsed_data['contractName'], outputlist[0]))
                 connection.close()
 
-                updateLatestTransaction(transaction_data, parsed_data, blockinfo)
+                updateLatestTransaction(transaction_data, parsed_data, blockinfo['height'])
 
                 pushData_SSEapi('Trigger | Contract triggered of the name {}-{} is active currentlyt at transaction {}'.format(
                         parsed_data['contractName'], outputlist[0], transaction_data['txid']))
@@ -1151,4 +1151,4 @@ def on_connect():
 def on_block(data):
     print('New block received')
     print(str(data))
-    processApiBlock(data)
\ No newline at end of file
+    processApiBlock(data)