Changes to newtrade
This commit is contained in:
parent
f4d68606e1
commit
9cc52454c8
|
@ -24,7 +24,8 @@ from xcat.zcashRPC import parse_script
|
|||
|
||||
# SelectParams('testnet')
|
||||
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
|
||||
|
||||
|
||||
|
|
|
@ -139,7 +139,10 @@ def main():
|
|||
# Save it to leveldb
|
||||
save_state(trade)
|
||||
elif command == "step2":
|
||||
trade = get_trade()
|
||||
# trade = get_trade()
|
||||
tradeid = args.argument[0]
|
||||
trade = db.get(tradeid)
|
||||
print(trade)
|
||||
checkBuyStatus(trade)
|
||||
elif command == "step3":
|
||||
trade = get_trade()
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
import hashlib, json, random, binascii, ast
|
||||
import hashlib, json, random, binascii
|
||||
import xcat.trades as trades
|
||||
|
||||
############################################
|
||||
|
@ -26,6 +26,8 @@ def s2x(string):
|
|||
|
||||
def hex2dict(hexstr):
|
||||
jsonstr = x2s(hexstr)
|
||||
print(hexstr['fund_tx'])
|
||||
print(jsonstr)
|
||||
return json.loads(jsonstr)
|
||||
|
||||
def jsonformat(trade):
|
||||
|
@ -82,33 +84,18 @@ def save_secret(secret):
|
|||
######### 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):
|
||||
print("Trade in save_trade", trade)
|
||||
with open('xcat.json', 'w+') as outfile:
|
||||
json.dump(trade, outfile)
|
||||
|
||||
def get_trade():
|
||||
try:
|
||||
with open('xcat.json') as data_file:
|
||||
xcatdb = json.load(data_file)
|
||||
trade = instantiate(tradedata)
|
||||
return trade
|
||||
except:
|
||||
return None
|
||||
with open('xcat.json') as data_file:
|
||||
xcatdb = json.load(data_file)
|
||||
sell = trades.Contract(xcatdb['sell'])
|
||||
buy = trades.Contract(xcatdb['buy'])
|
||||
trade = trades.Trade(sell, buy, commitment=xcatdb['commitment'])
|
||||
return trade
|
||||
|
||||
def erase_trade():
|
||||
with open('xcat.json', 'w') as outfile:
|
||||
|
|
|
@ -20,7 +20,8 @@ from xcat.utils import *
|
|||
|
||||
# SelectParams('testnet')
|
||||
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
|
||||
|
||||
def validateaddress(addr):
|
||||
|
|
Loading…
Reference in New Issue