Merge pull request #486 from cpacia/master

1.0 upgrades

Author: cpacia

api/restapi.py

@@ -233,7 +233,9 @@ def parse_listings(listings):
                         "nsfw": l.nsfw,
                         "origin": str(CountryCode.Name(l.origin)),
                         "ships_to": [],
-                        "last_modified": l.last_modified
+                        "last_modified": l.last_modified,
+                        "pinned": l.pinned,
+                        "hidden": l.hidden
                     }
                     if l.contract_type != 0:
                         listing_json["contract_type"] = str(objects.Listings.ContractType.Name(l.contract_type))
@@ -549,6 +551,9 @@ def set_contract(self, request):
             else:
                 c = Contract(self.db, testnet=self.protocol.testnet)
             c.create(
+                str_to_bool(request.args["pinned"][0]) if "pinned" in request.args else False,
+                int(request.args["max_quantity"][0]) if "max_quantity" in request.args else 999999,
+                str_to_bool(request.args["hidden"][0]) if "hidden" in request.args else False,
                 str(request.args["expiration_date"][0]),
                 request.args["metadata_category"][0],
                 request.args["title"][0].decode("utf8"),
@@ -705,7 +710,9 @@ def handle_response(resp, contract):
                                   request.args["country"][0].decode("utf8")
                                   if "country" in request.args else None,
                                   request.args["moderator"][0] if "moderator" in request.args else None,
-                                  options)
+                                  options,
+                                  request.args["alternate_contact"][0].decode("utf8")
+                                  if "alternate_contact" in request.args else None)
 
             def get_node(node):
                 if node is not None:

market/contracts.py

@@ -94,6 +94,9 @@ def __init__(self, database, contract=None, hash_value=None, testnet=False):
         self.outpoints = []
 
     def create(self,
+               pinned,
+               max_quantity,
+               hidden,
                expiration_date,
                metadata_category,
                title,
@@ -150,7 +153,10 @@ def create(self,
                             "version": "1",
                             "category": metadata_category.lower(),
                             "category_sub": "fixed price",
-                            "last_modified": int(time.time())
+                            "last_modified": int(time.time()),
+                            "pinned": pinned,
+                            "max_quantity": max_quantity,
+                            "hidden": hidden
                         },
                         "id": {
                             "guid": self.keychain.guid.encode("hex"),
@@ -282,7 +288,8 @@ def add_purchase_info(self,
                           postal_code=None,
                           country=None,
                           moderator=None,
-                          options=None):
+                          options=None,
+                          alternate_contact=None):
         """
         Update the contract with the buyer's purchase information.
         """
@@ -297,6 +304,10 @@ def add_purchase_info(self,
         except AssertionError:
             raise Exception("Invalid Bitcoin address")
 
+        if "max_quantity" in self.contract["vendor_offer"]["listing"]["metadata"]:
+            if quantity > int(self.contract["vendor_offer"]["listing"]["metadata"]["max_quantity"]):
+                raise Exception("Quantity exceeds max quantity in listing")
+
         profile = Profile(self.db).get()
         order_json = {
             "buyer_order": {
@@ -312,7 +323,8 @@ def add_purchase_info(self,
                         }
                     },
                     "payment": {},
-                    "refund_address": refund_address
+                    "refund_address": refund_address,
+                    "alternate_contact": alternate_contact if alternate_contact is not None else ""
                 }
             }
         }
@@ -1065,6 +1077,8 @@ def save(self):
         elif self.contract["vendor_offer"]["listing"]["metadata"]["category"].lower() == "service":
             data.contract_type = listings.SERVICE
         data.last_modified = int(time.time())
+        data.pinned = self.contract["vendor_offer"]["listing"]["metadata"]["pinned"]
+        data.hidden = self.contract["vendor_offer"]["listing"]["metadata"]["hidden"]
 
         # save the mapping of the contract file path and contract hash in the database
         self.db.filemap.insert(data.contract_hash.encode("hex"), file_path[len(DATA_FOLDER):])
@@ -1179,8 +1193,13 @@ def verify(self, sender_key):
             if not valid:
                 raise Exception("Invalid Bitcoin signature")
 
-            # verify buyer included the correct bitcoin amount for payment
+            # verify the quantity does not exceed the max
             quantity = int(self.contract["buyer_order"]["order"]["quantity"])
+            if "max_quantity" in self.contract["vendor_offer"]["listing"]["metadata"]:
+                if quantity > int(self.contract["vendor_offer"]["listing"]["metadata"]["max_quantity"]):
+                    raise Exception("Buyer tried to purchase more than the max quantity")
+
+            # verify buyer included the correct bitcoin amount for payment
             price_json = self.contract["vendor_offer"]["listing"]["item"]["price_per_unit"]
             if "bitcoin" in price_json:
                 asking_price = float(price_json["bitcoin"]) * quantity

market/protocol.py

@@ -113,6 +113,9 @@ def rpc_get_listings(self, sender):
             l.ParseFromString(self.db.listings.get_proto())
             l.handle = p.handle
             l.avatar_hash = p.avatar_hash
+            for listing in l.listing:
+                if listing.hidden:
+                    l.listing.remove(listing)
             return [l.SerializeToString(), self.signing_key.sign(l.SerializeToString())[:64]]
         except Exception:
             self.log.warning("could not find any listings in the database")

net/dos.py

@@ -1,7 +1,7 @@
 __author__ = 'chris'
 
 from log import Logger
-from protos.message import Command, PING, STUN, STORE, INV, VALUES, GET_LISTINGS, FOLLOW, UNFOLLOW
+from protos.message import Command, FOLLOW, UNFOLLOW
 from twisted.internet import reactor, task
 
 RECONNECTIONS = 100

protos/objects.proto

@@ -123,6 +123,8 @@ message Listings {
         string handle                 = 11;
         ContractType contract_type    = 12;
         uint64 last_modified          = 13;
+        bool pinned                   = 14;
+        bool hidden                   = 15;
     }
 
     enum ContractType {