fixed merge conflicts

bin/blockstack-server

@@ -0,0 +1,36 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+"""
+    Blockstore
+    ~~~~~
+    copyright: (c) 2014-2015 by Halfmoon Labs, Inc.
+    copyright: (c) 2016 by Blockstack.org
+
+    This file is part of Blockstore
+
+    Blockstore is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Blockstore is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+    You should have received a copy of the GNU General Public License
+    along with Blockstore.  If not, see <http://www.gnu.org/licenses/>.
+"""
+
+import sys
+import os
+
+# Hack around absolute paths
+current_dir = os.path.abspath(os.path.dirname(__file__))
+parent_dir = os.path.abspath(current_dir + "/../")
+
+sys.path.insert(0, parent_dir)
+
+from blockstore.blockstored import run_blockstored
+
+if __name__ == '__main__':
+    run_blockstored()

blockstack/lib/config.py

@@ -39,7 +39,7 @@ except:
 DEBUG = True
 TESTNET = False
 
-VERSION = "0.0.10.1"
+VERSION = "0.0.10.6"
 
 # namespace version
 BLOCKSTORE_VERSION = 1

blockstack/lib/nameset/namedb.py

@@ -573,8 +573,8 @@ class BlockstackDB( virtualchain.StateEngine ):
          names = sorted(self.name_records.keys())[offset:min(offset+count, len(self.name_records.keys()))]
          names.sort()
 
-      return dict( zip( names, [self.name_records[name] for name in names] ) )
-
+      #return dict( zip( names, [self.name_records[name] for name in names] ) )
+      return names
 
    def get_names_in_namespace( self, namespace_id, offset=None, count=None ):
       """

requirements.txt

@@ -2,7 +2,7 @@ base58==0.2.2
 basicrpc==0.0.2
 bitcoin==1.1.42
 bitmerchant==0.1.8
-blockstack==0.0.10.1
+blockstack-client==0.0.12.5
 boto==2.38.0
 cachetools==1.1.5
 commontools==0.1.0

setup.py

@@ -24,24 +24,24 @@
 from setuptools import setup, find_packages
 
 setup(
-    name='blockstack',
-    version='0.0.10.1',
-    url='https://github.com/blockstack/blockstack',
+    name='blockstack-server',
+    version='0.0.10.6',
+    url='https://github.com/blockstack/blockack-server',
     license='GPLv3',
     author='Blockstack.org',
     author_email='support@blockstack.org',
     description='Name registrations on the Bitcoin blockchain with external storage',
     keywords='blockchain bitcoin btc cryptocurrency name key value store data',
     packages=find_packages(),
-    scripts=['bin/blockstackd'],
-    download_url='https://github.com/blockstack/blockstack/archive/master.zip',
+    scripts=['bin/blockstackd', 'bin/blockstack-server'],
+    download_url='https://github.com/blockstack/blockstore/archive/master.zip',
     zip_safe=False,
     include_package_data=True,
     install_requires=[
         'virtualchain==0.0.6',
         'kademlia==0.5',
         'keychain==0.1.4',
-        'blockstack==0.0.10.1'
+        'blockstack-client==0.0.12.5'
     ],
     classifiers=[
         'Intended Audience :: Developers',