From 9cc52454c8abd7c6f9830f377a2621357fbf1965 Mon Sep 17 00:00:00 2001
From: Jay Graber <jay@z.cash>
Date: Mon, 31 Jul 2017 14:01:20 -0700
Subject: [PATCH] Changes to newtrade

---
 xcat/bitcoinRPC.py |  3 ++-
 xcat/cli.py        |  5 ++++-
 xcat/utils.py      | 31 +++++++++----------------------
 xcat/zcashRPC.py   |  3 ++-
 4 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/xcat/bitcoinRPC.py b/xcat/bitcoinRPC.py
index d5506d6..19309d3 100644
--- a/xcat/bitcoinRPC.py
+++ b/xcat/bitcoinRPC.py
@@ -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
 
 
diff --git a/xcat/cli.py b/xcat/cli.py
index 77af572..41878e6 100644
--- a/xcat/cli.py
+++ b/xcat/cli.py
@@ -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()
diff --git a/xcat/utils.py b/xcat/utils.py
index 96e3833..a20582f 100644
--- a/xcat/utils.py
+++ b/xcat/utils.py
@@ -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:
diff --git a/xcat/zcashRPC.py b/xcat/zcashRPC.py
index 711a71d..6ce5808 100644
--- a/xcat/zcashRPC.py
+++ b/xcat/zcashRPC.py
@@ -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):