kylefang/stacks-puppet-node
1
0
Fork 0
mirror of https://github.com/alexgo-io/stacks-puppet-node.git synced 2026-03-29 16:48:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

return the raw tx, if given

Browse Source
This commit is contained in:
Jude Nelson
2017-02-27 16:42:53 -05:00
parent 426b7b2f2d
commit 2a10ccfbcd
1 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
blockstack_client/backend/registrar.py
View File

@@ -571,6 +571,17 @@ class RegistrarWorker(threading.Thread):
return {'error': 'Failed to contact atlas peer'}
servers = list(set([str(hp) for hp in servers]))
# if this is empty or contains only `localhost`, then include `node.blockstack.org` for safety
if len(servers) == 0:
servers.append('node.blockstack.org:6264')
elif len(servers) == 1:
h, p = url_to_host_port(servers[0])
if h in ['localhost', socket.gethostname(), '127.0.0.1', '::1']:
log.warning("Also including node.blockstack.org for Atlas zone file dissimination")
servers.append("node.blockstack.org:6264")
log.debug("Servers: {}".format(servers))
return [url_to_host_port(hp) for hp in servers]
@@ -1098,6 +1109,9 @@ def preorder(fqu, cost_satoshis, zonefile_data, profile, transfer_address, min_p
data['message'] = "Couldn't broadcast transaction. You can try again."
data['error'] = resp['error']
if 'tx' in resp:
data['tx'] = resp['tx']
return data
@@ -1172,6 +1186,9 @@ def update( fqu, zonefile_txt, profile, zonefile_hash, transfer_address, tx_fee,
if replication_error is not None:
data['warning'] = "Failed to replicate the zonefile ('%s')" % replication_error
if 'tx' in resp:
data['tx'] = resp['tx']
return data
@@ -1218,7 +1235,11 @@ def transfer(fqu, transfer_address, tx_fee, config_path=CONFIG_PATH, proxy=None
data['transaction_hash'] = resp['transaction_hash']
else:
data['success'] = False
data['error'] = "Couldn't broadcast transaction. You can try again."
data['error'] = resp['error']
if 'tx' in resp:
data['tx'] = resp['tx']
return data
@@ -1268,6 +1289,8 @@ def renew( fqu, renewal_fee, tx_fee, config_path=CONFIG_PATH, proxy=None ):
data['message'] = "Couldn't broadcast transaction. You can try again."
data['error'] = resp['error']
if 'tx' in resp:
data['tx'] = resp['tx']
return data
@@ -1318,6 +1341,8 @@ def revoke( fqu, tx_fee, config_path=CONFIG_PATH, proxy=None ):
data['message'] = "Couldn't broadcast transaction. You can try again."
data['error'] = resp['error']
if 'tx' in resp:
data['tx'] = resp['tx']
return data