From ee49e7727926a6cb769385ddb879d8a6555e1969 Mon Sep 17 00:00:00 2001
From: Jay Graber <jay@z.cash>
Date: Wed, 12 Jul 2017 20:33:56 -0700
Subject: [PATCH] Export xcat.json to hex string on cli

---
 cli.py      | 32 +++++++++++++++++++++-----------
 database.py |  4 ----
 utils.py    |  4 ++++
 3 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/cli.py b/cli.py
index fe0d4ff..7abcc76 100644
--- a/cli.py
+++ b/cli.py
@@ -4,6 +4,7 @@ import database as db
 import bXcat, zXcat
 from trades import *
 from xcat import *
+import ast
 
 def find_role(contract):
     # Obviously when regtest created both addrs on same machine, role is both.
@@ -35,6 +36,9 @@ def checkBuyActions(trade):
         buyer_redeem(trade)
         print("XCAT trade complete!")
 
+def instantiateTrade(trade):
+    return Trade(buyContract=Contract(trade['buy']), sellContract=Contract(trade['sell']))
+
 if __name__ == '__main__':
     parser = argparse.ArgumentParser(formatter_class=argparse.RawTextHelpFormatter,
         description=textwrap.dedent('''\
@@ -42,10 +46,11 @@ if __name__ == '__main__':
                 newtrade - create a new trade
                 checktrades - check for actions to be taken on existing trades
                 importcontract "hexstr" - import an existing trade from a hex string
-                exportcontract - (not implemented) export the data of an existing xcat trade as a hex string
+                exportcontract - export the data of an existing xcat trade as a hex string
 
                 '''))
     parser.add_argument("command", action="store", help="list commands")
+    parser.add_argument("argument", action="store", nargs="*", help="add an argument")
     # parser.add_argument("-importcontract", type=str, action="store", help="import an existing trade from a hex string.")
     # parser.add_argument("-newtrade", action="store", help="create a new trade.")
     # parser.add_argument("-checktrades", action="store", help="check status of existing trades")
@@ -54,21 +59,26 @@ if __name__ == '__main__':
     # how to hold state of role
     command = args.command
     if command == 'importcontract':
-        erase_trade()
-        role = 'seller'
-        htlcTrade = Trade()
-        print("Creating new XCAT transaction...")
+        hexstr = args.argument[0]
+        trade = x2s(hexstr)
+        trade = instantiateTrade(ast.literal_eval(trade))
+        print(trade)
+    elif command == 'exportcontract':
+        trade = get_trade()
+        hexstr = s2x(str(trade))
+        print(trade)
+        print(hexstr)
     elif command == 'checktrades':
         trade = get_trade()
-        buyContract = Contract(trade['buy'])
-        sellContract = Contract(trade['sell'])
-        trade = Trade(buyContract=buyContract, sellContract=sellContract)
-        if find_role(sellContract) == 'initiator':
+        trade = instantiateTrade(trade)
+        if find_role(trade.sellContract) == 'initiator':
             role = 'seller'
             checkSellActions(trade)
         else:
             role = 'buyer'
             checkBuyActions(trade)
     elif command == 'newtrade':
-        hexstr = args.importcontract
-        db.create(hexstr)
+        erase_trade()
+        role = 'seller'
+        htlcTrade = Trade()
+        print("Creating new XCAT transaction...")
diff --git a/database.py b/database.py
index c228e30..a452fa6 100644
--- a/database.py
+++ b/database.py
@@ -9,10 +9,6 @@ trade = get_trade()
 ## txid we retrieve by
 txid = trade['sell']['fund_tx']
 
-def hex2dict(hexstr):
-    jsonstr = x2s(hexstr)
-    return json.loads(jsonstr)
-
 def create(hexstr):
     trade = hex2dict(hexstr)
     txid = trade['sell']['fund_tx']
diff --git a/utils.py b/utils.py
index d923776..59bf8da 100644
--- a/utils.py
+++ b/utils.py
@@ -23,6 +23,10 @@ def s2x(string):
     """Convert a utf-8 string to hex"""
     return b2x(b(string))
 
+def hex2dict(hexstr):
+    jsonstr = x2s(hexstr)
+    print(jsonstr)
+    return json.loads(jsonstr)
 
 ######################