From f9f1525291fcebc73ffefc0b12a46d935fa92c9b Mon Sep 17 00:00:00 2001 From: Vivek Teega Date: Mon, 22 Apr 2019 14:44:19 +0530 Subject: [PATCH] Fixing parsing of initTokens --- config.ini | 2 +- parsing.py | 3 +++ system.db | Bin 12288 -> 12288 bytes tracktokens-smartcontracts.py | 15 ++++++++------- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/config.ini b/config.ini index c2e54a8..96b9251 100644 --- a/config.ini +++ b/config.ini @@ -1,4 +1,4 @@ [DEFAULT] NET = mainnet FLO_CLI_PATH = /usr/local/bin/flo-cli -START_BLOCK = 3387900 \ No newline at end of file +START_BLOCK = 3387900 diff --git a/parsing.py b/parsing.py index 82cd7ac..f54f031 100644 --- a/parsing.py +++ b/parsing.py @@ -90,6 +90,9 @@ def extractInitTokens(text): if textList[idx + 1] in base_units: value = result * base_units[textList[idx + 1]] counter = counter + 1 + else: + value = result + counter = counter + 1 except: for unit in base_units: result = word.split(unit) diff --git a/system.db b/system.db index f36f9c54b88382b931332c958d5f73728e0954fe..590d20eeb5db1999e78f40b2a716eae7d04e6ba8 100644 GIT binary patch delta 25 fcmZojXh@hK#l)yMQN{^KZcLc1&uVFAWMK{fT{Z@i delta 25 fcmZojXh@hK#l%`VQN{^KZcLc1&uU?5WN8clX5$Az diff --git a/tracktokens-smartcontracts.py b/tracktokens-smartcontracts.py index 0955239..2b4bff6 100755 --- a/tracktokens-smartcontracts.py +++ b/tracktokens-smartcontracts.py @@ -198,6 +198,7 @@ def startWorking(transaction_data, parsed_data): continue if item[0] != temp: print('System has found more than one address as part of vin') + print('This transaction will be rejected') return inputlist = [vinlist[0][0], totalinputval] @@ -475,11 +476,11 @@ for blockindex in range( startblock, current_index ): print(parsed_data['type']) startWorking(transaction_data, parsed_data) - engine = create_engine('sqlite:///system.db') - SystemBase.metadata.create_all(bind=engine) - session = sessionmaker(bind=engine)() - entry = session.query(SystemData).filter(SystemData.attribute == 'lastblockscanned').all()[0] - entry.value = str(blockindex) - session.commit() - session.close() + engine = create_engine('sqlite:///system.db') + SystemBase.metadata.create_all(bind=engine) + session = sessionmaker(bind=engine)() + entry = session.query(SystemData).filter(SystemData.attribute == 'lastblockscanned').all()[0] + entry.value = str(blockindex) + session.commit() + session.close()