Merge remote-tracking branch 'upstream/master'

Author: Tom Galloway

.github/ISSUE_TEMPLATE

@@ -0,0 +1,21 @@
+Brief Description: 
+
+Operating System (OS and version): 
+OpenBazaar version: 
+Hardware: 
+
+Reproducible (Always / Almost Always / Sometimes / Rarely / Couldn't Reproduce): 
+
+
+Steps to reproduce:
+1. 
+2. 
+3. 
+
+Observed Behavior:
+
+
+Expected Behavior:
+
+
+Additional info (links, images, etc go here):

api/restapi.py

@@ -125,8 +125,8 @@ def _setContentDispositionAndSend(file_path, extension, content_type):
             request.finish()
 
         if "hash" in request.args and len(request.args["hash"][0]) == 40:
-            if self.db.HashMap().get_file(request.args["hash"][0]) is not None:
-                image_path = self.db.HashMap().get_file(request.args["hash"][0])
+            if self.db.filemap.get_file(request.args["hash"][0]) is not None:
+                image_path = self.db.filemap.get_file(request.args["hash"][0])
             else:
                 image_path = DATA_FOLDER + "cache/" + request.args["hash"][0]
             if not os.path.exists(image_path) and "guid" in request.args:
@@ -208,7 +208,7 @@ def get_node(node):
                 request.write(json.dumps({}))
                 request.finish()
             else:
-                temp_handle = self.db.ProfileStore().get_temp_handle()
+                temp_handle = self.db.profile.get_temp_handle()
                 parse_profile(p, None if temp_handle == "" else temp_handle)
         return server.NOT_DONE_YET
 
@@ -249,7 +249,7 @@ def get_node(node):
                     request.finish()
             self.kserver.resolve(unhexlify(request.args["guid"][0])).addCallback(get_node)
         else:
-            ser = self.db.ListingsStore().get_proto()
+            ser = self.db.listings.get_proto()
             if ser is not None:
                 l = objects.Listings()
                 l.ParseFromString(ser)
@@ -289,7 +289,7 @@ def get_node(node):
                     request.finish()
             self.kserver.resolve(unhexlify(request.args["guid"][0])).addCallback(get_node)
         else:
-            ser = self.db.FollowData().get_followers()
+            ser = self.db.follow.get_followers()
             if ser is not None:
                 f = objects.Followers()
                 f.ParseFromString(ser)
@@ -330,7 +330,7 @@ def get_node(node):
                     request.finish()
             self.kserver.resolve(unhexlify(request.args["guid"][0])).addCallback(get_node)
         else:
-            ser = self.db.FollowData().get_following()
+            ser = self.db.follow.get_following()
             if ser is not None:
                 f = objects.Following()
                 f.ParseFromString(ser)
@@ -396,10 +396,10 @@ def update_profile(self, request):
             if "handle" in request.args:
                 if blockchainid.validate(request.args["handle"][0], self.keychain.guid.encode("hex")):
                     u.handle = request.args["handle"][0]
-                    p.db.set_temp_handle("")
+                    self.db.profile.set_temp_handle("")
                 else:
                     u.handle = ""
-                    p.db.set_temp_handle(request.args["handle"][0])
+                    self.db.profile.set_temp_handle(request.args["handle"][0])
             if "about" in request.args:
                 u.about = request.args["about"][0]
             if "short_description" in request.args:
@@ -503,7 +503,7 @@ def get_node(node):
                 self.kserver.resolve(unhexlify(request.args["guid"][0])).addCallback(get_node)
             else:
                 try:
-                    with open(self.db.HashMap().get_file(request.args["id"][0]), "r") as filename:
+                    with open(self.db.filemap.get_file(request.args["id"][0]), "r") as filename:
                         contract = json.loads(filename.read(), object_pairs_hook=OrderedDict)
                     parse_contract(contract)
                 except Exception:
@@ -573,13 +573,15 @@ def set_contract(self, request):
     def delete_contract(self, request):
         try:
             if "id" in request.args:
-                file_path = self.db.HashMap().get_file(request.args["id"][0])
+                file_path = self.db.filemap.get_file(request.args["id"][0])
                 with open(file_path, 'r') as filename:
                     contract = json.load(filename, object_pairs_hook=OrderedDict)
                 c = Contract(self.db, contract=contract)
                 if "keywords" in c.contract["vendor_offer"]["listing"]["item"]:
                     for keyword in c.contract["vendor_offer"]["listing"]["item"]["keywords"]:
                         if keyword != "":
+                            if isinstance(keyword, unicode):
+                                keyword = keyword.encode('utf8')
                             self.kserver.delete(keyword.lower(), unhexlify(c.get_contract_id()),
                                                 self.keychain.signing_key.sign(
                                                     unhexlify(c.get_contract_id()))[:64])
@@ -606,9 +608,8 @@ def shutdown(self, request):
             request.finish()
             return server.NOT_DONE_YET
         else:
-            vendor_store = self.db.VendorStore()
             for vendor in self.protocol.vendors.values():
-                vendor_store.save_vendor(vendor.id.encode("hex"), vendor.getProto().SerializeToString())
+                self.db.vendors.save_vendor(vendor.id.encode("hex"), vendor.getProto().SerializeToString())
             PortMapper().clean_my_mappings(self.kserver.node.port)
             self.protocol.shutdown()
             reactor.stop()
@@ -732,21 +733,21 @@ def upload_image(self, request):
                     hash_value = digest(img).encode("hex")
                     with open(DATA_FOLDER + "store/media/" + hash_value, 'wb') as outfile:
                         outfile.write(img)
-                    self.db.HashMap().insert(hash_value, DATA_FOLDER + "store/media/" + hash_value)
+                    self.db.filemap.insert(hash_value, DATA_FOLDER + "store/media/" + hash_value)
                     ret.append(hash_value)
             elif "avatar" in request.args:
                 avi = request.args["avatar"][0].decode("base64")
                 hash_value = digest(avi).encode("hex")
                 with open(DATA_FOLDER + "store/avatar", 'wb') as outfile:
                     outfile.write(avi)
-                self.db.HashMap().insert(hash_value, DATA_FOLDER + "store/avatar")
+                self.db.filemap.insert(hash_value, DATA_FOLDER + "store/avatar")
                 ret.append(hash_value)
             elif "header" in request.args:
                 hdr = request.args["header"][0].decode("base64")
                 hash_value = digest(hdr).encode("hex")
                 with open(DATA_FOLDER + "store/header", 'wb') as outfile:
                     outfile.write(hdr)
-                self.db.HashMap().insert(hash_value, DATA_FOLDER + "store/header")
+                self.db.filemap.insert(hash_value, DATA_FOLDER + "store/header")
                 ret.append(hash_value)
             request.write(json.dumps({"success": True, "image_hashes": ret}, indent=4))
             request.finish()
@@ -788,7 +789,7 @@ def respond(success):
     @authenticated
     def set_settings(self, request):
         try:
-            settings = self.db.Settings()
+            settings = self.db.settings
             resolver = RESOLVER if "resolver" not in request.args or request.args["resolver"][0] == "" \
                 else request.args["resolver"][0]
             if self.protocol.testnet:
@@ -829,7 +830,7 @@ def set_settings(self, request):
     @GET('^/api/v1/settings')
     @authenticated
     def get_settings(self, request):
-        settings = self.db.Settings().get()
+        settings = self.db.settings.get()
         if settings is None:
             request.write(json.dumps({}, indent=4))
             request.finish()
@@ -859,10 +860,9 @@ def get_settings(self, request):
                 "network_connection": nat_type
             }
             mods = []
-            mods_db = self.db.ModeratorStore()
             try:
                 for guid in json.loads(settings[11]):
-                    info = mods_db.get_moderator(guid)
+                    info = self.db.moderators.get_moderator(guid)
                     if info is not None:
                         m = {
                             "guid": guid,
@@ -911,7 +911,7 @@ def get_routing_table(self, request):
     @GET('^/api/v1/get_notifications')
     @authenticated
     def get_notifications(self, request):
-        notifications = self.db.NotificationStore().get_notifications()
+        notifications = self.db.notifications.get_notifications()
         limit = int(request.args["limit"][0]) if "limit" in request.args else len(notifications)
         notification_list = []
         for n in notifications[len(notifications) - limit:]:
@@ -937,7 +937,7 @@ def get_notifications(self, request):
     def mark_notification_as_read(self, request):
         try:
             for notif_id in request.args["id"]:
-                self.db.NotificationStore().mark_as_read(notif_id)
+                self.db.notifications.mark_as_read(notif_id)
             request.write(json.dumps({"success": True}, indent=4))
             request.finish()
             return server.NOT_DONE_YET
@@ -963,7 +963,7 @@ def get_response(num):
     @GET('^/api/v1/get_chat_messages')
     @authenticated
     def get_chat_messages(self, request):
-        messages = self.db.MessageStore().get_messages(request.args["guid"][0], "CHAT")
+        messages = self.db.messages.get_messages(request.args["guid"][0], "CHAT")
         limit = int(request.args["limit"][0]) if "limit" in request.args else len(messages)
         start = int(request.args["start"][0]) if "start" in request.args else 0
         message_list = []
@@ -986,7 +986,7 @@ def get_chat_messages(self, request):
     @GET('^/api/v1/get_chat_conversations')
     @authenticated
     def get_chat_conversations(self, request):
-        messages = self.db.MessageStore().get_conversations()
+        messages = self.db.messages.get_conversations()
         request.setHeader('content-type', "application/json")
         request.write(str(bleach.clean(json.dumps(messages, indent=4), tags=ALLOWED_TAGS)))
         request.finish()
@@ -996,7 +996,7 @@ def get_chat_conversations(self, request):
     @authenticated
     def mark_chat_message_as_read(self, request):
         try:
-            self.db.MessageStore().mark_as_read(request.args["guid"][0])
+            self.db.messages.mark_as_read(request.args["guid"][0])
             request.write(json.dumps({"success": True}, indent=4))
             request.finish()
             return server.NOT_DONE_YET
@@ -1008,7 +1008,7 @@ def mark_chat_message_as_read(self, request):
     @GET('^/api/v1/get_sales')
     @authenticated
     def get_sales(self, request):
-        sales = self.db.Sales().get_all()
+        sales = self.db.sales.get_all()
         sales_list = []
         for sale in sales:
             sale_json = {
@@ -1031,7 +1031,7 @@ def get_sales(self, request):
     @GET('^/api/v1/get_purchases')
     @authenticated
     def get_purchases(self, request):
-        purchases = self.db.Purchases().get_all()
+        purchases = self.db.purchases.get_all()
         purchases_list = []
         for purchase in purchases:
             purchase_json = {
@@ -1210,7 +1210,7 @@ def release_funds(self, request):
     @GET('^/api/v1/get_cases')
     @authenticated
     def get_cases(self, request):
-        cases = self.db.Cases().get_all()
+        cases = self.db.cases.get_all()
         cases_list = []
         for case in cases:
             purchase_json = {
@@ -1235,7 +1235,7 @@ def get_cases(self, request):
     @authenticated
     def order_messages(self, request):
         message_list = []
-        messages = self.db.MessageStore().get_order_messages(request.args["order_id"][0])
+        messages = self.db.messages.get_order_messages(request.args["order_id"][0])
         for m in messages:
             if m[0] is not None:
                 message_json = {
@@ -1279,10 +1279,10 @@ def get_node(node):
         else:
             ratings = []
             if "contract_id" in request.args and request.args["contract_id"][0] != "":
-                for rating in self.db.Ratings().get_listing_ratings(request.args["contract_id"][0]):
+                for rating in self.db.ratings.get_listing_ratings(request.args["contract_id"][0]):
                     ratings.append(json.loads(rating[0]))
             else:
-                for rating in self.db.Ratings().get_all_ratings():
+                for rating in self.db.ratings.get_all_ratings():
                     ratings.append(json.loads(rating[0]))
             request.setHeader('content-type', "application/json")
             request.write(str(bleach.clean(json.dumps(ratings, indent=4), tags=ALLOWED_TAGS)))

api/ws.py

@@ -78,18 +78,19 @@ def handle_response(metadata, node):
             self.factory.mserver.get_user_metadata(node).addCallback(handle_response, node)
 
     def get_moderators(self, message_id):
-        m = self.factory.db.ModeratorStore()
 
         def parse_response(moderators):
             if moderators is not None:
-                m.clear_all()
+                self.factory.db.moderators.clear_all()
 
                 def parse_profile(profile, node):
                     if profile is not None:
                         # TODO: should check signatures here before entering in database
-                        m.save_moderator(node.id.encode("hex"), node.pubkey, profile.bitcoin_key.public_key,
-                                         profile.bitcoin_key.signature, profile.name, profile.avatar_hash,
-                                         profile.moderation_fee, profile.handle, profile.short_description)
+                        self.factory.db.moderators.save_moderator(node.id.encode("hex"), node.pubkey,
+                                                                  profile.bitcoin_key.public_key,
+                                                                  profile.bitcoin_key.signature, profile.name,
+                                                                  profile.avatar_hash, profile.moderation_fee,
+                                                                  profile.handle, profile.short_description)
                         moderator = {
                             "id": message_id,
                             "moderator":
@@ -105,7 +106,7 @@ def parse_profile(profile, node):
                         }
                         self.transport.write(str(bleach.clean(json.dumps(moderator, indent=4), tags=ALLOWED_TAGS)))
                     else:
-                        m.delete_moderator(node.id)
+                        self.factory.db.moderators.delete_moderator(node.id)
                 for mod in moderators:
                     try:
                         val = objects.Value()
@@ -184,9 +185,9 @@ def send_message(self, message_id, guid, handle, message, subject, message_type,
 
         enc_key = nacl.signing.VerifyKey(unhexlify(recipient_key)).to_curve25519_public_key().encode()
 
-        self.factory.db.MessageStore().save_message(guid, handle, unhexlify(recipient_key), subject,
-                                                    message_type.upper(), message, time.time(), "", "", True,
-                                                    message_id)
+        self.factory.db.messages.save_message(guid, handle, unhexlify(recipient_key), subject,
+                                              message_type.upper(), message, time.time(), "", "", True,
+                                              message_id)
 
         def send(node_to_send):
             n = node_to_send if node_to_send is not None else Node(unhexlify(guid))
@@ -234,7 +235,7 @@ def parse_results(values):
                                            (n.relayAddress.ip, n.relayAddress.port),
                                            n.natType, n.vendor)
                         if n.guid == KeyChain(self.factory.db).guid:
-                            proto = self.factory.db.ListingsStore().get_proto()
+                            proto = self.factory.db.listings.get_proto()
                             l = Listings()
                             l.ParseFromString(proto)
                             for listing in l.listing:

config.py

@@ -12,7 +12,7 @@
 from ConfigParser import ConfigParser
 from urlparse import urlparse
 
-PROTOCOL_VERSION = 13
+PROTOCOL_VERSION = 14
 CONFIG_FILE = join(os.getcwd(), 'ob.cfg')
 
 # FIXME probably a better way to do this. This curretly checks two levels deep