Fix bug updating moderators in contracts

Author: cpacia

api/restapi.py

@@ -819,17 +819,21 @@ def set_settings(self, request):
             settings = self.db.settings
             resolver = RESOLVER if "resolver" not in request.args or request.args["resolver"][0] == "" \
                 else request.args["resolver"][0]
-            if "libbitcoin_server" in request.args and request.args["libbitcoin_server"][0] != "":
+            if "libbitcoin_server" in request.args and \
+                            request.args["libbitcoin_server"][0] != "" and \
+                            request.args["libbitcoin_server"][0] != "null":
                 if self.protocol.testnet:
                     set_value("LIBBITCOIN_SERVERS_TESTNET", "testnet_server_custom",
                               request.args["libbitcoin_server"][0])
                 else:
                     set_value("LIBBITCOIN_SERVERS", "server_custom", request.args["libbitcoin_server"][0])
             else:
                 if self.protocol.testnet:
-                    delete_value("LIBBITCOIN_SERVERS_TESTNET", "testnet_server_custom")
+                    if get_value("LIBBITCOIN_SERVERS_TESTNET", "testnet_server_custom"):
+                        delete_value("LIBBITCOIN_SERVERS_TESTNET", "testnet_server_custom")
                 else:
-                    delete_value("LIBBITCOIN_SERVERS", "server_custom")
+                    if get_value("LIBBITCOIN_SERVERS", "server_custom"):
+                        delete_value("LIBBITCOIN_SERVERS", "server_custom")
             if resolver != get_value("CONSTANTS", "RESOLVER"):
                 set_value("CONSTANTS", "RESOLVER", resolver)
 

market/network.py

@@ -1130,24 +1130,25 @@ def update_moderators_on_listings(self, moderator_list):
             mods_to_add = list(set(moderator_list) - set(contract_moderators))
             for mod in mods_to_add:
                 mod_info = self.db.moderators.get_moderator(mod)
-                moderator_json = {
-                    "guid": mod,
-                    "name": mod_info[5],
-                    "avatar": mod_info[7].encode("hex"),
-                    "short_description": mod_info[6],
-                    "fee": str(mod_info[8]) + "%",
-                    "blockchain_id": mod_info[4],
-                    "pubkeys": {
-                        "guid": mod_info[1].encode("hex"),
-                        "bitcoin": {
-                            "key": mod_info[2].encode("hex"),
-                            "signature": base64.b64encode(mod_info[3])
+                if mod_info is not None:
+                    moderator_json = {
+                        "guid": mod,
+                        "name": mod_info[5],
+                        "avatar": mod_info[7].encode("hex"),
+                        "short_description": mod_info[6],
+                        "fee": str(mod_info[8]) + "%",
+                        "blockchain_id": mod_info[4],
+                        "pubkeys": {
+                            "guid": mod_info[1].encode("hex"),
+                            "bitcoin": {
+                                "key": mod_info[2].encode("hex"),
+                                "signature": base64.b64encode(mod_info[3])
+                            }
                         }
                     }
-                }
-                if "moderators" not in c.contract["vendor_offer"]["listing"]:
-                    c.contract["vendor_offer"]["listing"]["moderators"] = []
-                c.contract["vendor_offer"]["listing"]["moderators"].append(moderator_json)
+                    if "moderators" not in c.contract["vendor_offer"]["listing"]:
+                        c.contract["vendor_offer"]["listing"]["moderators"] = []
+                    c.contract["vendor_offer"]["listing"]["moderators"].append(moderator_json)
             for mod in mods_to_remove:
                 for rem in c.contract["vendor_offer"]["listing"]["moderators"]:
                     if rem["guid"] == mod:

ob.cfg

@@ -25,3 +25,4 @@ testnet_server2 = tcp://libbitcoin2.openbazaar.org:9091,<Z&{.=LJSPySefIKgCu99w.L
 
 [SEEDS]
 seed1 = seed.openbazaar.org:8080,5b44be5c18ced1bc9400fe5e79c8ab90204f06bebacc04dd9c70a95eaca6e117
+