diff --git a/contract.json b/contract.json deleted file mode 100644 index d5ecca0..0000000 --- a/contract.json +++ /dev/null @@ -1 +0,0 @@ -{"2NCHkDvv3uBBd5ahUegtsXR9mgYHyz2VT4t": {"redeemScript": "63a8207d4f530f652f20614a1b3eacd661926ae548b41fddbc1bce02944090e1d0941b8876a9147788b4511a25fba1092e67b307a6dcdb6da125d967029200b17576a914c7043e62a7391596116f54f6a64c8548e97d3fd96888ac", "funder": "myfFr5twPYNwgeXyjCmGcrzXtCmfmWXKYp", "redeemblocknum": 146, "p2sh": "2NCHkDvv3uBBd5ahUegtsXR9mgYHyz2VT4t", "redeemer": "mrQzUGU1dwsWRx5gsKKSDPNtrsP65vCA3Z"}, "t2SKpnnDmsLWfn9hoo8ZU5tE5A4qJucY5uJ": {"redeemScript": "63a8207d4f530f652f20614a1b3eacd661926ae548b41fddbc1bce02944090e1d0941b8876a9143ea29256c9d2888ca23de42a8b8e69ca2ec235b16702b600b17576a914c5acca6ef39c843c7a9c3ad01b2da95fe2edf5ba6888ac", "funder": "tmTjZSg4pX2Us6V5HttiwFZwj464fD2ZgpY", "redeemblocknum": 182, "p2sh": "t2SKpnnDmsLWfn9hoo8ZU5tE5A4qJucY5uJ", "redeemer": "tmFRXyju7ANM7A9mg75ZjyhFW1UJEhUPwfQ"}} \ No newline at end of file diff --git a/utils.py b/utils.py index 7770258..03d0eec 100644 --- a/utils.py +++ b/utils.py @@ -51,13 +51,3 @@ def save(trade): 'buy': trade.buyContract.__dict__ } save_trade(trade) - - -def get_contract(): - with open('contract.json') as data_file: - contractdb = json.load(data_file) - return contractdb - -def save_contract(contracts): - with open('contract.json', 'w') as outfile: - json.dump(contracts, outfile) diff --git a/xcat.py b/xcat.py index cc115f8..45688d6 100644 --- a/xcat.py +++ b/xcat.py @@ -67,11 +67,6 @@ def create_p2sh(htlcTrade): # CREATE SELL CONTRACT contract = create_htlc(currency, htlcTrade.sellContract.initiator, htlcTrade.sellContract.fulfiller, secret, locktime) - contracts = {} - sell_p2sh = contract['p2sh'] - contracts[contract['p2sh']] = contract - save_contract(contracts) - print("sell contract", contract) setattr(htlcTrade.sellContract, 'p2sh', contract['p2sh']) setattr(htlcTrade.sellContract, 'redeemScript', contract['redeemScript']) @@ -103,9 +98,6 @@ def create_p2sh(htlcTrade): buy_contract = create_htlc(buy_currency, buy_fulfiller, buy_initiator, secret, locktime) print("Buy contract", buy_contract) - contracts[buy_contract['p2sh']] = buy_contract - save_contract(contracts) - setattr(htlcTrade.buyContract, 'p2sh', buy_contract['p2sh']) setattr(htlcTrade.buyContract, 'redeemScript', buy_contract['redeemScript']) setattr(htlcTrade.buyContract, 'redeemblocknum', buy_contract['redeemblocknum'])