diff --git a/Apps.json b/Apps.json new file mode 100644 index 0000000..96f3270 --- /dev/null +++ b/Apps.json @@ -0,0 +1 @@ +{"FT9qkvuWXWBDRhHd42tDr5nMYFSx7bEhV7": {"Dapps": [], "lastTx": 3}, "FBcRbCxwChjTdgVewGMPBDDEFXzPcc7GAH": {"Dapps": [], "lastTx": 0}, "FC6CRkRCeJEKEGF2r1SFppPD5DXfVe1zWq": {"Dapps": [], "lastTx": 0}} \ No newline at end of file diff --git a/FLO_appStore b/FLO_appStore index 56214eb..a7b307a 100755 Binary files a/FLO_appStore and b/FLO_appStore differ diff --git a/generateAppData.py b/generateAppData.py index f469acd..5d9f8e7 100644 --- a/generateAppData.py +++ b/generateAppData.py @@ -10,10 +10,10 @@ def searchDict(dicArr,key,val): return -1 def readUnitFromBlockchain(txid): - rawtx = subprocess.check_output(["flo-cli","--testnet", "getrawtransaction", str(txid)]) + rawtx = subprocess.check_output(["flo-cli", "getrawtransaction", str(txid)]) rawtx = str(rawtx) rawtx = rawtx[2:-3] - tx = subprocess.check_output(["flo-cli","--testnet", "decoderawtransaction", str(rawtx)]) + tx = subprocess.check_output(["flo-cli", "decoderawtransaction", str(rawtx)]) content = json.loads(tx) text = content['floData'] return str(text) @@ -27,7 +27,7 @@ def Dappend(Dapps,app): return Dapps def getJsonData(JsonAddress): - r = requests.get("https://testnet.florincoin.info/ext/getaddress/"+JsonAddress) + r = requests.get("https://www.florincoin.info/ext/getaddress/"+JsonAddress) data = json.loads(r.content) #print(data) Dapps = [] @@ -73,11 +73,10 @@ else: appData['location'] = 'apps/'+input('Enter Repository name \t: ') +'/' appData['exec'] = input('Enter execution cmd (eg. ./binary) \t: ') -print(appData) apps = Dappend(apps ,appData) #print(apps) apphash = findHash(str(apps)) floData = json.dumps({'Dapp':appData ,'hash':apphash}) -print('\nfloData = '+floData) +print('\nfloData :\n'+floData) diff --git a/main.py b/main.py index e0a487c..fa53d0b 100755 --- a/main.py +++ b/main.py @@ -11,7 +11,7 @@ import socket import requests import hashlib -JsonAddresses = ["oXa7t72t3CgnR11ycxVfdupz55eucHufHj","oYcLBQZkgj9taQ5Zj6ziu8eqMREhyAPCcT","oYtGSrrfLvurYLKouZw3E7AyNuM8ZushbC"] +JsonAddresses = ["FT9qkvuWXWBDRhHd42tDr5nMYFSx7bEhV7","FBcRbCxwChjTdgVewGMPBDDEFXzPcc7GAH","FC6CRkRCeJEKEGF2r1SFppPD5DXfVe1zWq"] def searchDict(dicArr,key,val): for i in range(len(dicArr)): @@ -32,10 +32,10 @@ def isConnected(): return False def readUnitFromBlockchain(txid): - rawtx = subprocess.check_output(["flo-cli","--testnet", "getrawtransaction", str(txid)]) + rawtx = subprocess.check_output(["flo-cli", "getrawtransaction", str(txid)]) rawtx = str(rawtx) rawtx = rawtx[2:-3] - tx = subprocess.check_output(["flo-cli","--testnet", "decoderawtransaction", str(rawtx)]) + tx = subprocess.check_output(["flo-cli", "decoderawtransaction", str(rawtx)]) content = json.loads(tx) text = content['floData'] return str(text) @@ -64,7 +64,7 @@ def verifyHash(localHash,txid): def getJsonData(Dapps, lastTx,JsonAddress): try: - r = requests.get("https://testnet.florincoin.info/ext/getaddress/"+JsonAddress) + r = requests.get("https://www.florincoin.info/ext/getaddress/"+JsonAddress) data = json.loads(r.content) except: isConnected()