AaronFiore/electrum
1
0
Fork 0
Code Activity

fix #4071

Browse Source
This commit is contained in:
SomberNight
2018-04-22 04:00:57 +02:00
parent e00499f040
commit d0352379d7
2 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/trustedcoin/qt.py
View File

@@ -115,6 +115,9 @@ class Plugin(TrustedCoinPlugin):
if wallet.can_sign_without_server(): if wallet.can_sign_without_server():
return return
if wallet.billing_info is None: if wallet.billing_info is None:
self.start_request_thread(wallet)
window.show_error(_('Requesting account info from TrustedCoin server...') + '\n' +
_('Please try again.'))
return True return True
return False return False

26
plugins/trustedcoin/trustedcoin.py
View File

@@ -82,6 +82,11 @@ class TrustedCoinException(Exception):
Exception.__init__(self, message) Exception.__init__(self, message)
self.status_code = status_code self.status_code = status_code
class ErrorConnectingServer(Exception):
pass
class TrustedCoinCosignerClient(object): class TrustedCoinCosignerClient(object):
def __init__(self, user_agent=None, base_url='https://api.trustedcoin.com/2/'): def __init__(self, user_agent=None, base_url='https://api.trustedcoin.com/2/'):
self.base_url = base_url self.base_url = base_url
@@ -100,7 +105,10 @@ class TrustedCoinCosignerClient(object):
url = urljoin(self.base_url, relative_url) url = urljoin(self.base_url, relative_url)
if self.debug: if self.debug:
print('%s %s %s' % (method, url, data)) print('%s %s %s' % (method, url, data))
response = requests.request(method, url, **kwargs) try:
response = requests.request(method, url, **kwargs)
except Exception as e:
raise ErrorConnectingServer(e)
if self.debug: if self.debug:
print(response.text) print(response.text)
if response.status_code != 200: if response.status_code != 200:
@@ -336,17 +344,29 @@ class TrustedCoinPlugin(BasePlugin):
if _type == TYPE_ADDRESS and addr == address: if _type == TYPE_ADDRESS and addr == address:
return address, amount return address, amount
def finish_requesting(func):
def f(self, *args, **kwargs):
try:
return func(self, *args, **kwargs)
finally:
self.requesting = False
return f
@finish_requesting
def request_billing_info(self, wallet): def request_billing_info(self, wallet):
if wallet.can_sign_without_server(): if wallet.can_sign_without_server():
return return
self.print_error("request billing info") self.print_error("request billing info")
billing_info = server.get(wallet.get_user_id()[1]) try:
billing_info = server.get(wallet.get_user_id()[1])
except ErrorConnectingServer as e:
self.print_error('cannot connect to TrustedCoin server: {}'.format(e))
return
billing_address = make_billing_address(wallet, billing_info['billing_index']) billing_address = make_billing_address(wallet, billing_info['billing_index'])
assert billing_address == billing_info['billing_address'] assert billing_address == billing_info['billing_address']
wallet.billing_info = billing_info wallet.billing_info = billing_info
wallet.price_per_tx = dict(billing_info['price_per_tx']) wallet.price_per_tx = dict(billing_info['price_per_tx'])
wallet.price_per_tx.pop(1) wallet.price_per_tx.pop(1)
self.requesting = False
return True return True
def start_request_thread(self, wallet): def start_request_thread(self, wallet):