diff --git a/config-example.ini b/config-example.ini new file mode 100644 index 0000000..bce0043 --- /dev/null +++ b/config-example.ini @@ -0,0 +1,13 @@ +[DEFAULT] +NET = testnet +FLO_CLI_PATH = /usr/local/bin/flo-cli +START_BLOCK = 740400 +FLOSIGHT_NETURL = https://flosight-testnet.ranchimall.net/ +TOKENAPI_SSE_URL = https://ranchimallflo-testnet.duckdns.org +MAINNET_FLOSIGHT_SERVER_LIST = https://flosight.ranchimall.net/ , https://flosight.duckdns.org/ +TESTNET_FLOSIGHT_SERVER_LIST = https://flosight-testnet.ranchimall.net/ , https://flosight-testnet.duckdns.org/ +IGNORE_BLOCK_LIST = 902446 +IGNORE_TRANSACTION_LIST = b4ac4ddb51188b28b39bcb3aa31357d5bfe562c21e8aaf8dde0ec560fc893174 +DATA_PATH = /home/production/Dev/flo-token-tracker +APP_ADMIN = oWooGLbBELNnwq8Z5YmjoVjw8GhBGH3qSP + diff --git a/config-example.py b/config-example.py deleted file mode 100644 index 6f19a0d..0000000 --- a/config-example.py +++ /dev/null @@ -1 +0,0 @@ -committeeAddressList = [] \ No newline at end of file diff --git a/old_parsing.py b/old_parsing.py deleted file mode 100644 index 33215b6..0000000 --- a/old_parsing.py +++ /dev/null @@ -1,590 +0,0 @@ -import re -import arrow -import pdb -import configparser - -config = configparser.ConfigParser() -config.read('config.ini') - -marker = None -operation = None -address = None -amount = None - -months = { - 'jan': 1, - 'feb': 2, - 'mar': 3, - 'apr': 4, - 'may': 5, - 'jun': 6, - 'jul': 7, - 'aug': 8, - 'sep': 9, - 'oct': 10, - 'nov': 11, - 'dec': 12 -} - - -def isTransfer(text): - wordlist = ['transfer', 'send', 'give'] # keep everything lowercase - textList = text.split(' ') - for word in wordlist: - if word in textList: - return True - return False - - -def isDeposit(text): - wordlist = ['submit', 'deposit'] # keep everything lowercase - textList = text.split(' ') - for word in wordlist: - if word in textList: - return True - return False - - -def isIncorp(text): - wordlist = ['incorporate', 'create', 'start'] # keep everything lowercase - textList = text.split(' ') - for word in wordlist: - if word in textList: - return True - return False - - -def isSmartContract(text): - textList = text.split(' ') - for word in textList: - if word == '': - continue - if word.endswith('@') and len(word) != 1: - return word - return False - - -def isSmartContractPay(text): - wordlist = text.split(' ') - if len(wordlist) != 2: - return False - smartContractTrigger = re.findall(r"smartContractTrigger:'.*'", text)[0].split('smartContractTrigger:')[1] - smartContractTrigger = smartContractTrigger[1:-1] - smartContractName = re.findall(r"smartContractName:.*@", text)[0].split('smartContractName:')[1] - smartContractName = smartContractName[:-1] - - if smartContractTrigger and smartContractName: - contractconditions = { - 'smartContractTrigger': smartContractTrigger, 'smartContractName': smartContractName} - return contractconditions - else: - return False - - -def extractAmount(text, marker): - count = 0 - returnval = None - splitText = text.split('userchoice')[0].split(' ') - - for word in splitText: - word = word.replace(marker, '') - try: - float(word) - count = count + 1 - returnval = float(word) - except ValueError: - pass - - if count > 1: - return 'Too many' - return returnval - - -def extractSubmitAmount(text, marker): - count = 0 - returnval = None - text = text.split('deposit-conditions')[0] - splitText = text.split(' ') - - for word in splitText: - word = word.replace(marker, '') - try: - float(word) - count = count + 1 - returnval = float(word) - except ValueError: - continue - - if count > 1: - return 'Too many' - return returnval - - -def extractMarker(text): - textList = text.split(' ') - for word in textList: - if word == '': - continue - if word.endswith('#') and len(word) != 1: - return word - return False - - -def extractInitTokens(text): - base_units = {'thousand': 10 ** 3, 'million': 10 ** 6, 'billion': 10 ** 9, 'trillion': 10 ** 12} - textList = text.split(' ') - counter = 0 - value = None - for idx, word in enumerate(textList): - try: - result = float(word) - 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) - if len(result) == 2 and result[1] == '' and result[0] != '': - try: - value = float(result[0]) * base_units[unit] - counter = counter + 1 - except: - continue - - if counter == 1: - return value - else: - return None - - -def extractAddress(text): - textList = text.split(' ') - for word in textList: - if word == '': - continue - if word[-1] == '$' and len(word) != 1: - return word - return None - - -def extractContractType(text): - # keep everything lowercase - operationList = ['one-time-event*', 'continuous-event*'] - count = 0 - returnval = None - for operation in operationList: - count = count + text.count(operation) - if count > 1: - return 'Too many' - if count == 1 and (returnval is None): - returnval = operation - return returnval - - -def extractUserchoice(text): - result = re.split('userchoice:\s*', text) - if len(result) != 1 and result[1] != '': - return result[1].strip().strip('"').strip("'") - else: - return None - - -def brackets_toNumber(item): - return float(item[1:-1]) - - -def extractContractConditions(text, contracttype, blocktime, marker=None): - rulestext = re.split('contract-conditions:\s*', text)[-1] - # rulelist = re.split('\d\.\s*', rulestext) - rulelist = [] - numberList = re.findall(r'\(\d\d*\)', rulestext) - - for idx, item in enumerate(numberList): - numberList[idx] = int(item[1:-1]) - - numberList = sorted(numberList) - for idx, item in enumerate(numberList): - if numberList[idx] + 1 != numberList[idx + 1]: - print('Contract condition numbers are not in order') - return None - if idx == len(numberList) - 2: - break - - for i in range(len(numberList)): - rule = rulestext.split('({})'.format( - i + 1))[1].split('({})'.format(i + 2))[0] - rulelist.append(rule.strip()) - - if contracttype == 'one-time-event*': - extractedRules = {} - for rule in rulelist: - if rule == '': - continue - elif rule[:10] == 'expirytime': - expirytime = re.split('expirytime[\s]*=[\s]*', rule)[1].strip() - - try: - expirytime_split = expirytime.split(' ') - parse_string = '{}/{}/{} {}'.format( - expirytime_split[3], months[expirytime_split[1]], expirytime_split[2], expirytime_split[4]) - expirytime_object = arrow.get( - parse_string, 'YYYY/M/D HH:mm:ss').replace(tzinfo=expirytime_split[5]) - blocktime_object = arrow.get(blocktime) - if expirytime_object < blocktime_object: - print( - 'Expirytime of the contract is earlier than the block it is incorporated in. This incorporation will be rejected ') - return None - extractedRules['expiryTime'] = expirytime - except: - print('Error parsing expiry time') - return None - - for rule in rulelist: - if rule == '': - continue - elif rule[:14] == 'contractamount': - pattern = re.compile('[^contractamount\s*=\s*].*') - searchResult = pattern.search(rule).group(0) - contractamount = searchResult.split(marker)[0] - try: - extractedRules['contractAmount'] = float(contractamount) - except: - print("Contract amount entered is not a decimal") - elif rule[:11] == 'userchoices': - pattern = re.compile('[^userchoices\s*=\s*].*') - conditions = pattern.search(rule).group(0) - conditionlist = conditions.split('|') - extractedRules['userchoices'] = {} - for idx, condition in enumerate(conditionlist): - extractedRules['userchoices'][idx] = condition.strip() - elif rule[:25] == 'minimumsubscriptionamount': - pattern = re.compile('[^minimumsubscriptionamount\s*=\s*].*') - searchResult = pattern.search(rule).group(0) - minimumsubscriptionamount = searchResult.split(marker)[0] - try: - extractedRules['minimumsubscriptionamount'] = float( - minimumsubscriptionamount) - except: - print("Minimum subscription amount entered is not a decimal") - elif rule[:25] == 'maximumsubscriptionamount': - pattern = re.compile('[^maximumsubscriptionamount\s*=\s*].*') - searchResult = pattern.search(rule).group(0) - maximumsubscriptionamount = searchResult.split(marker)[0] - try: - extractedRules['maximumsubscriptionamount'] = float( - maximumsubscriptionamount) - except: - print("Maximum subscription amount entered is not a decimal") - elif rule[:12] == 'payeeaddress': - pattern = re.compile('[^payeeAddress\s*=\s*].*') - searchResult = pattern.search(rule).group(0) - payeeAddress = searchResult.split(marker)[0] - extractedRules['payeeAddress'] = payeeAddress - - if len(extractedRules) > 1 and 'expiryTime' in extractedRules: - return extractedRules - else: - return None - - elif contracttype == 'continuous-event*': - extractedRules = {} - for rule in rulelist: - print(rule) - if rule == '': - continue - elif rule[:7] == 'subtype': - # todo : recheck the regular expression for subtype, find an elegant version which covers all permutations and combinations - '''pattern = re.compile('[^subtype\s*=].*') - searchResult = pattern.search(rule).group(0) - subtype = searchResult.split(marker)[0]''' - extractedRules['subtype'] = rule.split('=')[1].strip() - elif rule[:15] == 'accepting_token': - pattern = re.compile('[^accepting_token\s*=\s*].*') - searchResult = pattern.search(rule).group(0) - accepting_token = searchResult.split(marker)[0] - extractedRules['accepting_token'] = accepting_token - elif rule[:13] == 'selling_token': - pattern = re.compile('[^selling_token\s*=\s*].*') - searchResult = pattern.search(rule).group(0) - selling_token = searchResult.split(marker)[0] - extractedRules['selling_token'] = selling_token - elif rule[:9].lower() == 'pricetype': - pattern = re.compile('[^pricetype\s*=\s*].*') - searchResult = pattern.search(rule).group(0) - priceType = searchResult.split(marker)[0] - extractedRules['priceType'] = priceType - elif rule[:5] == 'price': - pattern = re.compile('[^price\s*=\s*].*') - searchResult = pattern.search(rule).group(0) - price = searchResult.split(marker)[0] - if price[0]=="'" or price[0]=='"': - price = price[1:] - if price[-1]=="'" or price[-1]=='"': - price = price[:-1] - extractedRules['price'] = float(price) - # else: - # pdb.set_trace() - if len(extractedRules) > 1: - return extractedRules - else: - return None - - return None - - -def extractDepositConditions(text, blocktime): - rulestext = re.split('deposit-conditions:\s*', text)[-1] - # rulelist = re.split('\d\.\s*', rulestext) - rulelist = [] - numberList = re.findall(r'\(\d\d*\)', rulestext) - for idx, item in enumerate(numberList): - numberList[idx] = int(item[1:-1]) - - numberList = sorted(numberList) - for idx, item in enumerate(numberList): - if len(numberList) > 1 and numberList[idx] + 1 != numberList[idx + 1]: - print('Deposit condition numbers are not in order') - return None - if idx == len(numberList) - 2: - break - - for i in range(len(numberList)): - rule = rulestext.split('({})'.format(i + 1))[1].split('({})'.format(i + 2))[0] - rulelist.append(rule.strip()) - - # elif contracttype == 'continuous-event*': - extractedRules = {} - for rule in rulelist: - if rule == '': - continue - elif rule[:10] == 'expirytime': - expirytime = re.split('expirytime[\s]*=[\s]*', rule)[1].strip() - - try: - expirytime_split = expirytime.split(' ') - parse_string = '{}/{}/{} {}'.format(expirytime_split[3], months[expirytime_split[1]], expirytime_split[2], expirytime_split[4]) - expirytime_object = arrow.get(parse_string, 'YYYY/M/D HH:mm:ss').replace(tzinfo=expirytime_split[5]) - blocktime_object = arrow.get(blocktime) - if expirytime_object < blocktime_object: - print('Expirytime of the contract is earlier than the block it is incorporated in. This incorporation will be rejected ') - return None - extractedRules['expiryTime'] = expirytime - except: - print('Error parsing expiry time') - return None - - """for rule in rulelist: - if rule == '': - continue - elif rule[:7] == 'subtype': - subtype=rule[8:] - #pattern = re.compile('[^subtype\s*=\s*].*') - #searchResult = pattern.search(rule).group(0) - #contractamount = searchResult.split(marker)[0] - extractedRules['subtype'] = subtype """ - - if len(extractedRules) > 0: - return extractedRules - else: - return None - - -def extractTriggerCondition(text): - searchResult = re.search('\".*\"', text) - if searchResult is None: - searchResult = re.search('\'.*\'', text) - return searchResult - return searchResult - - -# Combine test -def parse_flodata(string, blockinfo, netvariable): - - print("Break point at the first line of parsing function") - # todo Rule 20 - remove 'text:' from the start of flodata if it exists - if string[0:5] == 'text:': - string = string.split('text:')[1] - - # todo Rule 21 - Collapse multiple spaces into a single space in the whole of flodata - # todo Rule 22 - convert flodata to lowercase to make the system case insensitive - nospacestring = re.sub('\t', ' ', string) - nospacestring = re.sub('\n', ' ', nospacestring) - nospacestring = re.sub(' +', ' ', nospacestring) - cleanstring = nospacestring.lower() - #cleanstring_noconditions = cleanstring.split('contract-conditions:')[0] - cleanstring_split = re.compile("contract-conditions*[' ']:").split(cleanstring) - - # todo Rule 23 - Count number of words ending with @ and # - atList = [] - hashList = [] - starList = [] - - for word in cleanstring_split[0].split(' '): - if word.endswith('*') and len(word) != 1: - starList.append(word) - if word.endswith('@') and len(word) != 1: - atList.append(word) - - if len(starList) != 1 or starList[0] not in ['one-time-event*', 'continuous-event*']: - parsed_data = {'type': 'noise'} - else: - if starList == 'one-time-event*': - for word in cleanstring_split[0].split(' '): - if word.endswith('#') and len(word) != 1: - hashList.append(word) - elif starList == 'continuous-event*': - for word in cleanstring_split[1].split(' '): - if word.endswith('#') and len(word) != 1: - hashList.append(word) - - - '''for word in cleanstring_noconditions.split(' '): - if word.endswith('@') and len(word) != 1: - atList.append(word) - if word.endswith('#') and len(word) != 1: - hashList.append(word) - if word.endswith('*') and len(word) != 1: - starList.append(word) - ''' - - print('') - # todo Rule 24 - Reject the following conditions - a. number of # & number of @ is equal to 0 then reject - # todo Rule 25 - If number of # or number of @ is greater than 1, reject - # todo Rule 25.a - If a transaction is rejected, it means parsed_data type is noise - # Filter noise first - check if the words end with either @ or # - if (len(atList) == 0 and len(hashList) == 0) or len(atList) > 1 or len(hashList) > 2 or len(starList) > 1: - parsed_data = {'type': 'noise'} - - # todo Rule 26 - if number of # is 1 and numbner of @ is 0 and number of * is 0, then check if its token creation or token transfer transaction - elif len(hashList) == 1 and len(atList) == 0 and len(starList) == 0: - # Passing the above check means token creation or transfer - incorporation = isIncorp(cleanstring) - transfer = isTransfer(cleanstring) - - # todo Rule 27 - if (neither token incorporation a - if (not incorporation and not transfer) or (incorporation and transfer): - parsed_data = {'type': 'noise'} - - # todo Rule 28 - if token creation and not token transfer then it is confirmed that is it a token creation transaction - # todo Rule 29 - Extract total number of tokens issued, if its not mentioned then reject - elif incorporation and not transfer: - initTokens = extractInitTokens(cleanstring) - if initTokens is not None: - parsed_data = {'type': 'tokenIncorporation', 'flodata': string, 'tokenIdentification': hashList[0][:-1], 'tokenAmount': initTokens} - else: - parsed_data = {'type': 'noise'} - - # todo Rule 30 - if not token creation and is token transfer then then process it for token transfer rules - # todo Rule 31 - Extract number of tokens to be sent and the address to which to be sent, both data is mandatory - elif not incorporation and transfer: - amount = extractAmount(cleanstring, hashList[0][:-1]) - if None not in [amount]: - parsed_data = {'type': 'transfer', 'transferType': 'token', 'flodata': string, - 'tokenIdentification': hashList[0][:-1], - 'tokenAmount': amount} - else: - parsed_data = {'type': 'noise'} - - # todo Rule 32 - if number of @ is 1, then process for smart contract transfer or creation or trigger - elif len(atList) == 1: - # Passing the above check means Smart Contract creation or transfer - incorporation = isIncorp(cleanstring) - transfer = isTransfer(cleanstring) - deposit = isDeposit(cleanstring) - # todo Rule 33 - if a confusing smart contract command is given, like creating and sending at the same time, or no - if incorporation and transfer: - parsed_data = {'type': 'noise'} - - # todo Rule 34 - if incorporation and not transfer, then extract type of contract, address of the contract and conditions of the contract. Reject if any of those is not present - elif incorporation and not transfer: - contracttype = extractContractType(cleanstring) - contractaddress = extractAddress(nospacestring) - - if contracttype == 'one-time-event*' and len(hashList) == 1: - contractconditions = extractContractConditions(cleanstring, contracttype, blocktime=blockinfo['time'], marker=hashList[0][:-1]) - elif contracttype == 'continuous-event*': - contractconditions = extractContractConditions(cleanstring, contracttype, blocktime=blockinfo['time']) - else: - parsed_data = {'type': 'noise'} - return parsed_data - - if config['DEFAULT']['NET'] == 'mainnet' and blockinfo['height'] < 3454510: - if None not in [contracttype, contractconditions]: - parsed_data = {'type': 'smartContractIncorporation', 'contractType': contracttype[:-1], - 'tokenIdentification': hashList[0][:-1], 'contractName': atList[0][:-1], - 'contractAddress': contractaddress[:-1], 'flodata': string, - 'contractConditions': contractconditions} - else: - parsed_data = {'type': 'noise'} - else: - if None not in [contracttype, contractaddress, contractconditions] and contracttype[:-1] == 'one-time-event': - parsed_data = {'type': 'smartContractIncorporation', 'contractType': contracttype[:-1], - 'tokenIdentification': hashList[0][:-1], 'contractName': atList[0][:-1], - 'contractAddress': contractaddress[:-1], 'flodata': string, - 'contractConditions': contractconditions} - elif None not in [contracttype, contractaddress, contractconditions] and contracttype[:-1] == 'continuous-event': - if contractconditions['subtype'] == 'tokenswap' and ('priceType' not in contractconditions): - parsed_data = {'type': 'noise'} - return parsed_data - else: - parsed_data = {'type': 'smartContractIncorporation', 'contractType': contracttype[:-1], 'contractName': atList[0][:-1], - 'contractAddress': contractaddress[:-1], 'flodata': string, - 'contractConditions': contractconditions} - else: - parsed_data = {'type': 'noise'} - - # todo Rule 35 - if it is not incorporation and it is transfer, then extract smart contract amount to be locked and userPreference. If any of them is missing, then reject - elif not incorporation and transfer: - # todo - Temporary check for transaction 22196cc761043b96a06fcfe5e58af2dafb90c7d222dcb909b537f7ee6715f0bd on testnet , figure out an elegant way of doing this - if len(hashList) == 0: - parsed_data = {'type': 'noise'} - return parsed_data - - # We are at the send/transfer of smart contract - amount = extractAmount(cleanstring, hashList[0][:-1]) - userChoice = extractUserchoice(cleanstring) - contractaddress = extractAddress(nospacestring) - if None not in [amount, userChoice]: - parsed_data = {'type': 'transfer', 'transferType': 'smartContract', 'flodata': string, - 'tokenIdentification': hashList[0][:-1], - 'operation': 'transfer', 'tokenAmount': amount, 'contractName': atList[0][:-1], - 'userChoice': userChoice} - if contractaddress: - parsed_data['contractAddress'] = contractaddress[:-1] - else: - parsed_data = {'type': 'noise'} - - elif deposit: - # Figure out amount of token to be submitted - for word in cleanstring_split[0].split(' '): - if word.endswith('#') and len(word) != 1: - hashList.append(word) - depositAmount = extractSubmitAmount(cleanstring_split[0], hashList[0][:-1]) - # '' name of token = hashList[0] - # '' name of Smart Contract = atList[0] - # '' FLO address of the Smart Contract - # '' Submit conditions - deposit_conditions = extractDepositConditions(cleanstring, blocktime=blockinfo['time']) - if None not in [deposit_conditions]: - parsed_data = {'type': 'smartContractDeposit', - 'tokenIdentification': hashList[0][:-1], 'depositAmount': depositAmount, 'contractName': atList[0][:-1], 'flodata': string, - 'depositConditions': deposit_conditions} - else: - parsed_data = {'type': 'noise'} - - # If flodata doesn't indicate incorporation nor transfer, check if its a committee trigger - elif (not incorporation and not transfer): - # Passing the above check means Smart Contract pays | exitcondition triggered from the committee - # todo Rule 37 - Extract the trigger condition given by the committee. If its missing, reject - triggerCondition = extractTriggerCondition(cleanstring) - if triggerCondition is not None: - parsed_data = {'type': 'smartContractPays', 'contractName': atList[0][:-1], 'triggerCondition': triggerCondition.group().strip()[1:-1]} - else: - parsed_data = {'type': 'noise'} - else: - parsed_data = {'type': 'noise'} - - return parsed_data \ No newline at end of file diff --git a/test_parsing.py b/tests/test_parsing.py similarity index 99% rename from test_parsing.py rename to tests/test_parsing.py index 487b232..3bce405 100644 --- a/test_parsing.py +++ b/tests/test_parsing.py @@ -1,4 +1,6 @@ import unittest +import sys +sys.path.append("..") import parsing class TestParsing(unittest.TestCase): @@ -213,6 +215,5 @@ class TestParsing(unittest.TestCase): self.assertEqual(result, expected_result) - if __name__ == '__main__': unittest.main() \ No newline at end of file diff --git a/tracktokens_smartcontracts.py b/tracktokens_smartcontracts.py index cf23223..c001eb2 100755 --- a/tracktokens_smartcontracts.py +++ b/tracktokens_smartcontracts.py @@ -14,12 +14,10 @@ import time import arrow import parsing import re -from config import * from datetime import datetime from ast import literal_eval from models import SystemData, TokenBase, ActiveTable, ConsumedTable, TransferLogs, TransactionHistory, TokenContractAssociation, ContractBase, ContractStructure, ContractParticipants, ContractTransactionHistory, ContractDeposits, ConsumedInfo, ContractWinners, ContinuosContractBase, ContractStructure2, ContractParticipants2, ContractDeposits2, ContractTransactionHistory2, SystemBase, ActiveContracts, SystemData, ContractAddressMapping, TokenAddressMapping, DatabaseTypeMapping, TimeActions, RejectedContractTransactionHistory, RejectedTransactionHistory, LatestCacheBase, LatestTransactions, LatestBlocks from statef_processing import process_stateF -import pdb def newMultiRequest(apicall): diff --git a/test_db.py b/util_db_connect.py similarity index 90% rename from test_db.py rename to util_db_connect.py index fe89743..3d4e62d 100644 --- a/test_db.py +++ b/util_db_connect.py @@ -13,12 +13,11 @@ from sqlalchemy.orm import sessionmaker import time import arrow import parsing -from config import * from datetime import datetime from ast import literal_eval from models import SystemData, TokenBase, ActiveTable, ConsumedTable, TransferLogs, TransactionHistory, TokenContractAssociation, RejectedTransactionHistory, ContractBase, ContractStructure, ContractParticipants, ContractTransactionHistory, ContractDeposits, ConsumedInfo, ContractWinners, ContinuosContractBase, ContractStructure2, ContractParticipants2, ContractDeposits2, ContractTransactionHistory2, SystemBase, ActiveContracts, SystemData, ContractAddressMapping, TokenAddressMapping, DatabaseTypeMapping, TimeActions, RejectedContractTransactionHistory, RejectedTransactionHistory, LatestCacheBase, LatestTransactions, LatestBlocks from statef_processing import process_stateF -import pdb + # Configuration of required variables config = configparser.ConfigParser() @@ -79,13 +78,15 @@ def create_database_session_orm(type, parameters, base): # Connect to system.db with a session -session = create_database_session_orm('system_dbs', {'db_name':'system1'}, SystemBase) - - +'''session = create_database_session_orm('system_dbs', {'db_name':'system1'}, SystemBase) subquery_filter = session.query(TimeActions.id).group_by(TimeActions.transactionHash).having(func.count(TimeActions.transactionHash)==1).subquery() contract_deposits = session.query(TimeActions).filter(TimeActions.id.in_(subquery_filter), TimeActions.status=='active', TimeActions.activity=='contract-deposit').all() for contract in contract_deposits: - print(contract.transactionHash) + print(contract.transactionHash)''' -#SELECT * from (SELECT * FROM time_actions GROUP BY transactionHash HAVING COUNT(transactionHash)==1)time_action WHERE status='active' AND activity='contract-deposit'; +systemdb_session = create_database_session_orm('system_dbs', {'db_name':'system'}, SystemBase) +query = systemdb_session.query(TokenAddressMapping).filter(TokenAddressMapping.tokenAddress == 'contractAddress') +results = query.all() +pdb.set_trace() +print('Lets investigate this now') \ No newline at end of file diff --git a/test_rebuild.py b/util_rebuild.py similarity index 99% rename from test_rebuild.py rename to util_rebuild.py index 1a8b46a..7faf6bd 100644 --- a/test_rebuild.py +++ b/util_rebuild.py @@ -7,7 +7,6 @@ import os import logging import argparse import configparser -import pdb import shutil import sys diff --git a/test_rollback_new.py b/util_rollback.py similarity index 99% rename from test_rollback_new.py rename to util_rollback.py index d302e07..153018a 100644 --- a/test_rollback_new.py +++ b/util_rollback.py @@ -6,7 +6,6 @@ from ast import literal_eval import os import json import logging -import pdb import sys