From b7f108e15a6e62fc001d43f663f5fdd5301cef52 Mon Sep 17 00:00:00 2001 From: Jay Graber Date: Thu, 3 Aug 2017 09:04:51 -0700 Subject: [PATCH] Rm hardcoded username pw --- xcat/bitcoinRPC.py | 3 ++- xcat/cli.py | 1 + xcat/zcashRPC.py | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/xcat/bitcoinRPC.py b/xcat/bitcoinRPC.py index 0b6f7d6..42f54d3 100644 --- a/xcat/bitcoinRPC.py +++ b/xcat/bitcoinRPC.py @@ -20,7 +20,8 @@ from xcat.zcashRPC import parse_script # SelectParams('testnet') SelectParams('regtest') # TODO: Accurately read user and pw info -bitcoind = bitcoin.rpc.Proxy(service_url="http://user:password@127.0.0.1:18332") +# bitcoind = bitcoin.rpc.Proxy(service_url="http://user:password@127.0.0.1:18332") +bitcoind = bitcoin.rpc.Proxy() FEE = 0.001*COIN def validateaddress(addr): diff --git a/xcat/cli.py b/xcat/cli.py index 8555f10..3b9def3 100644 --- a/xcat/cli.py +++ b/xcat/cli.py @@ -139,6 +139,7 @@ def checktrade(tradeid): trade = db.get(tradeid) if find_role(trade.sell) == 'test': input("Is this a test? Both buyer and seller addresses are yours, press 'enter' to test.") + checkSellStatus(tradeid) checkBuyStatus(tradeid) checkSellStatus(tradeid) checkBuyStatus(tradeid) diff --git a/xcat/zcashRPC.py b/xcat/zcashRPC.py index 162ae92..a6bc159 100644 --- a/xcat/zcashRPC.py +++ b/xcat/zcashRPC.py @@ -21,7 +21,8 @@ from xcat.utils import * # SelectParams('testnet') SelectParams('regtest') # TODO: accurately read user and pw info -zcashd = zcash.rpc.Proxy(service_url="http://user:password@127.0.0.1:18232") +# zcashd = zcash.rpc.Proxy(service_url="http://user:password@127.0.0.1:18232") +zcashd = zcash.rpc.Proxy() FEE = 0.001*COIN def x2s(hexstring):