From c3a7bdf4a587e60d4d4ee9727c2fce00c45d4b76 Mon Sep 17 00:00:00 2001 From: Jude Nelson Date: Tue, 17 Jan 2017 11:23:04 -0500 Subject: [PATCH] merge rc-0.14.1 resolve.py --- blockstack_client/resolve.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/blockstack_client/resolve.py b/blockstack_client/resolve.py index af50e428e..eb40ef302 100644 --- a/blockstack_client/resolve.py +++ b/blockstack_client/resolve.py @@ -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'] )