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

for API calls that take an address, re-encode them if need be to match the running system's version byte (so we can use the test framework alongside portal)

Browse Source
This commit is contained in:
Jude Nelson
2017-03-29 01:03:38 -04:00
parent 2169c376fe
commit 8d5697e648
1 changed files with 34 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
blockstack_client/rpc.py
View File

@@ -431,7 +431,7 @@ class BlockstackAPIEndpointHandler(SimpleHTTPRequestHandler):
assert decoded_token.has_key('payload')
jsonschema.validate(decoded_token['payload'], APP_AUTHREQUEST_SCHEMA )
except ValidationError as ve:
if BLOCKSTACK_TEST:
if BLOCKSTACK_TEST or BLOCKSTACK_DEBUG:
log.exception(ve)
log.debug("Invalid token")
@@ -443,10 +443,8 @@ class BlockstackAPIEndpointHandler(SimpleHTTPRequestHandler):
app_public_key = str(decoded_token['payload']['app_public_key'])
blockchain_ids = decoded_token['payload'].get('blockchain_ids', None)
if blockchain_ids is not None:
blockchain_ids = ",".join(blockchain_ids)
# it needs to be at least self-signed
# it needs to be at least self-signed
# TODO: non-reusable public keys?
try:
verifier = jsontokens.TokenVerifier()
log.debug("Verify with {}".format(app_public_key))
@@ -476,6 +474,12 @@ class BlockstackAPIEndpointHandler(SimpleHTTPRequestHandler):
if blockchain != 'bitcoin':
return self._reply_json({'error': 'Invalid blockchain'}, status_code=401)
# make sure we have the right encoding
new_addr = virtualchain.address_reencode(str(address))
if new_addr != address:
log.debug("Re-encode {} to {}".format(new_addr, address))
address = new_addr
res = proxy.get_names_owned_by_address(address)
if json_is_error(res):
log.error("Failed to get names owned by address")
@@ -585,6 +589,13 @@ class BlockstackAPIEndpointHandler(SimpleHTTPRequestHandler):
log.error("Absurd tx fee {}".format(tx_fee))
return self._reply_json({'error': 'Absurd transaction fee'}, status_code=401)
# make sure we have the right encoding
if recipient_address:
new_addr = virtualchain.address_reencode(str(recipient_address))
if new_addr != recipient_address:
log.debug("Re-encode {} to {}".format(new_addr, recipient_address))
recipient_address = new_addr
# do we own this name already?
# i.e. do we need to renew?
res = proxy.get_names_owned_by_address( self.server.wallet_keys['owner_addresses'][0] )
@@ -777,6 +788,12 @@ class BlockstackAPIEndpointHandler(SimpleHTTPRequestHandler):
self._reply_json({"error": 'Invalid owner address'}, status_code=401)
return
# make sure we have the right encoding
new_addr = virtualchain.address_reencode(str(recipient_address))
if new_addr != recipient_address:
log.debug("Re-encode {} to {}".format(new_addr, recipient_address))
recipient_address = new_addr
tx_fee = request.get('tx_fee', None)
if tx_fee is not None:
if tx_fee > (5 * 1e5):
@@ -1958,6 +1975,12 @@ class BlockstackAPIEndpointHandler(SimpleHTTPRequestHandler):
if min_confs < 0:
min_confs = 0
# make sure we have the right encoding
new_addr = virtualchain.address_reencode(str(address))
if new_addr != address:
log.debug("Re-encode {} to {}".format(new_addr, address))
address = new_addr
internal = self.server.get_internal_proxy()
res = internal.cli_withdraw(address, amount, min_confs, tx_only, config_path=self.server.config_path, interactive=False, wallet_keys=self.server.wallet_keys)
if 'error' in res:
@@ -2252,6 +2275,12 @@ class BlockstackAPIEndpointHandler(SimpleHTTPRequestHandler):
# not supported
return self._reply_json({'error': 'Unsupported blockchain'}, status_code=401)
# make sure we have the right encoding
new_addr = virtualchain.address_reencode(str(address))
if new_addr != address:
log.debug("Re-encode {} to {}".format(new_addr, address))
address = new_addr
min_confirmations = path_info['qs_values'].get('min_confirmations', '{}'.format(TX_MIN_CONFIRMATIONS))
try:
min_confirmations = int(min_confirmations)