zcash-hackworks
/
zbxcat
mirror of https://github.com/zcash-hackworks/zbxcat.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Changes to newtrade

This commit is contained in:
Jay Graber 2017-07-31 14:01:20 -07:00
parent f4d68606e1
commit 9cc52454c8
4 changed files with 17 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
xcat/bitcoinRPC.py
View File

@ -24,7 +24,8 @@ from xcat.zcashRPC import parse_script
# SelectParams('testnet') # SelectParams('testnet')
SelectParams('regtest') SelectParams('regtest')
bitcoind = bitcoin.rpc.Proxy() # TODO: Accurately read user and pw info
bitcoind = bitcoin.rpc.Proxy(service_url="http://user:password@127.0.0.1:18332")
FEE = 0.001*COIN FEE = 0.001*COIN

5
xcat/cli.py
View File

@ -139,7 +139,10 @@ def main():
# Save it to leveldb # Save it to leveldb
save_state(trade) save_state(trade)
elif command == "step2": elif command == "step2":
trade = get_trade() # trade = get_trade()
tradeid = args.argument[0]
trade = db.get(tradeid)
print(trade)
checkBuyStatus(trade) checkBuyStatus(trade)
elif command == "step3": elif command == "step3":
trade = get_trade() trade = get_trade()

31
xcat/utils.py
View File

@ -1,4 +1,4 @@
import hashlib, json, random, binascii, ast import hashlib, json, random, binascii
import xcat.trades as trades import xcat.trades as trades
############################################ ############################################
@ -26,6 +26,8 @@ def s2x(string):
def hex2dict(hexstr): def hex2dict(hexstr):
jsonstr = x2s(hexstr) jsonstr = x2s(hexstr)
print(hexstr['fund_tx'])
print(jsonstr)
return json.loads(jsonstr) return json.loads(jsonstr)
def jsonformat(trade): def jsonformat(trade):
@ -82,33 +84,18 @@ def save_secret(secret):
######### xcat.json temp file ############# ######### xcat.json temp file #############
############################################# #############################################
def instantiate(tradedata):
if type(tradedata) == dict:
string = str(tradedata)
tradedata = json.loads(ast.literal_eval(tradedata))
elif type(tradedata) == hex:
hexstr = x2s(tradedata)
tradedata = ast.literal_eval(hexstr)
elif type(tradedata) == str:
tradedata = json.loads(tradedata)
sell = trades.Contract(tradedata['sell'])
buy = trades.Contract(tradedata['buy'])
trade = trades.Trade(sell, buy, commitment=tradedata['commitment'])
return trade
def save_trade(trade): def save_trade(trade):
print("Trade in save_trade", trade) print("Trade in save_trade", trade)
with open('xcat.json', 'w+') as outfile: with open('xcat.json', 'w+') as outfile:
json.dump(trade, outfile) json.dump(trade, outfile)
def get_trade(): def get_trade():
try: with open('xcat.json') as data_file:
with open('xcat.json') as data_file: xcatdb = json.load(data_file)
xcatdb = json.load(data_file) sell = trades.Contract(xcatdb['sell'])
trade = instantiate(tradedata) buy = trades.Contract(xcatdb['buy'])
return trade trade = trades.Trade(sell, buy, commitment=xcatdb['commitment'])
except: return trade
return None
def erase_trade(): def erase_trade():
with open('xcat.json', 'w') as outfile: with open('xcat.json', 'w') as outfile:

3
xcat/zcashRPC.py
View File

@ -20,7 +20,8 @@ from xcat.utils import *
# SelectParams('testnet') # SelectParams('testnet')
SelectParams('regtest') SelectParams('regtest')
zcashd = zcash.rpc.Proxy() # TODO: accurately read user and pw info
zcashd = zcash.rpc.Proxy(service_url="http://user:password@127.0.0.1:18232")
FEE = 0.001*COIN FEE = 0.001*COIN
def validateaddress(addr): def validateaddress(addr):