merge rc-0.14.1 resolve.py

This commit is contained in:
Jude Nelson
2017-01-17 11:23:04 -05:00
parent 60c003f377
commit c3a7bdf4a5

View File

@@ -536,6 +536,11 @@ def blockstack_data_url(field_dict):
field_dict['blockchain_id'], field_dict['data_id'], field_dict['fields']['data_hash']
)
if field_dict['fields'].has_key('user_id') and field_dict['fields'].has_key('datastore_id'):
return blockstack_datastore_url(
field_dict['blockchain_id'], field_dict['fields']['user_id'], field_dict['fields']['datastore_id'], field_dict['data_id'], field_dict['fields']['version']
)
return blockstack_mutable_data_url(
field_dict['blockchain_id'], field_dict['data_id'], field_dict['fields']['version']
)