Merge branch 'develop'

Author: wanderingstan

packages/contracts/.gitignore

@@ -7,3 +7,5 @@
 
 # dependencies
 /node_modules
+
+secret/

packages/contracts/README.md

@@ -39,8 +39,8 @@ If you get the following error:
 Error: Attempting to run transaction which calls a contract function, but recipient address 0x8cdaf0cd259887258bc23a92c0a6da92698644c0 is not a contract address
 ```
 
-Resolve this by deleting the previously built contracts:
+Resolve this by running all migrations again:
 
 ```sh
-rm build/contracts/*.json
+migrate --reset
 ```

packages/contracts/contracts/Listing.sol

@@ -3,13 +3,15 @@ pragma solidity ^0.4.11;
 /// @title Listing
 /// @dev An indiviual Origin Listing representing an offer for booking/purchase
 
+import "./Purchase.sol";
+
 contract Listing {
 
   /*
    * Events
    */
 
-  event ListingPurchased(uint _unitsToBuy, uint _value);
+  event ListingPurchased(Purchase _purchaseContract);
 
     /*
     * Storage
@@ -23,6 +25,7 @@ contract Listing {
     bytes32 public ipfsHash;
     uint public price;
     uint public unitsAvailable;
+    Purchase[] public purchases;
 
 
     function Listing (
@@ -40,27 +43,70 @@ contract Listing {
       unitsAvailable = _unitsAvailable;
     }
 
+  /*
+    * Modifiers
+    */
+
+  modifier isSeller() {
+    require (msg.sender == owner);
+    _;
+  }
+
+  /*
+    * Public functions
+    */
+
 
   /// @dev buyListing(): Buy a listing
   /// @param _unitsToBuy Number of units to buy
   function buyListing(uint _unitsToBuy)
     public
     payable
   {
-    // Insure there is money to pay
-    require (msg.value >= (price * _unitsToBuy));
-
+    // Ensure that this is not trying to purchase more than is available.
     require (_unitsToBuy <= unitsAvailable);
 
+    // Create purchase contract
+    Purchase purchaseContract = new Purchase(this, msg.sender);
+
     // Count units as sold
     unitsAvailable -= _unitsToBuy;
 
-    // Send funds to lister
-    // TODO: In future there will likely be some sort of escrow
-    owner.transfer(msg.value);
+    purchases.push(purchaseContract);
+
+    // TODO STAN: How to call function *AND* transfer value??
+    purchaseContract.pay.value(msg.value)();
 
-    // TODO: this needs to call logging back on the registry
-    ListingPurchased(_unitsToBuy, msg.value);
+    ListingPurchased(purchaseContract);
+  }
+
+  /// @dev close(): Allows a seller to close the listing from further purchases
+  function close()
+    public
+    isSeller
+  {
+    unitsAvailable = 0;
+  }
+
+  /// @dev purchasesLength(): Return number of listings
+  function purchasesLength()
+    public
+    constant
+    returns (uint)
+  {
+      return purchases.length;
+  }
+
+  /// @dev getPurchase(): Return listing info for given listing
+  /// @param _index the index of the listing we want info about
+  function getPurchase(uint _index)
+    public
+    constant
+    returns (Purchase)
+  {
+    return (
+      purchases[_index]
+    );
   }
 
 }

packages/contracts/contracts/ListingsRegistry.sol

@@ -19,7 +19,7 @@ contract ListingsRegistry {
    */
 
   // Contract owner
-  address public owner_address;
+  address public owner;
 
   // Array of all listings
   Listing[] public listings;
@@ -35,7 +35,7 @@ contract ListingsRegistry {
 
 
   modifier isOwner() {
-    require (msg.sender == owner_address);
+    require (msg.sender == owner);
     _;
   }
 
@@ -48,10 +48,11 @@ contract ListingsRegistry {
     public
   {
     // Defines origin admin address - may be removed for public deployment
-    owner_address = msg.sender;
+    owner = msg.sender;
 
     // Sample Listings - May be removed for public deployment
-    testingAddSampleListings();
+    // 2018-04-04 - Temp commented out to get under gas limit.
+    // testingAddSampleListings();
   }
 
   function testingAddSampleListings()

packages/contracts/contracts/Purchase.sol

@@ -21,9 +21,9 @@ contract Purchase {
 
   Stages public stage = Stages.AWAITING_PAYMENT;
 
-  Listing listingContract; // listing that is being purchased
+  Listing public listingContract; // listing that is being purchased
   address public buyer; // User who is buying. Seller is derived from listing
-  uint created;
+  uint public created;
 
   /*
   * Modifiers
@@ -49,36 +49,39 @@ contract Purchase {
   */
 
   function Purchase(
-    address _listingContractAddress
+    address _listingContractAddress,
+    address _buyer
   )
   public
   {
-    buyer = msg.sender;
+    buyer = _buyer;
     listingContract = Listing(_listingContractAddress);
     created = now;
   }
 
-
-  function buyerPay()
+  // Pay for listing
+  // We used to limit this to buyer, but that prevents Listing contract from
+  // paying
+  function pay()
   public
   payable
-  isBuyer
   atStage(Stages.AWAITING_PAYMENT)
   {
     if (this.balance >= listingContract.price()) {
-
-      // Buyer has paid enough to cover purchase
+      // Buyer (or their proxy) has paid enough to cover purchase
       stage = Stages.BUYER_PENDING;
 
       // Mark item as no longer available for sale in Listing
-      // TODO: presumable we call function on Listing(), proving that we have the funds to cover purchase.
+      // TODO: presumably we call function on Listing(), proving that we have
+      // the funds to cover purchase.
     }
+    // Possible that nothing happens, and contract just accumulates sent value
   }
 
 
   function buyerConfirmReceipt()
-  isBuyer
   public
+  isBuyer
   atStage(Stages.BUYER_PENDING)
   {
       stage = Stages.SELLER_PENDING;
@@ -90,14 +93,16 @@ contract Purchase {
   isSeller
   atStage(Stages.SELLER_PENDING)
   {
+    stage = Stages.COMPLETE;
+
     // Send contract funds to seller (ie owner of Listing)
+    // Transfering money always needs to be the last thing we do, do avoid
+    // rentrancy bugs. (Though here the seller would just be getting their own money)
     listingContract.owner().transfer(this.balance);
-
-      stage = Stages.COMPLETE;
   }
 
 
-  function openDisute()
+  function openDispute()
   public
   {
     // Must be buyer or seller

packages/contracts/contracts/UserRegistry.sol

@@ -16,25 +16,7 @@ contract UserRegistry {
     */
 
     // Mapping of all users
-    mapping(address => userStruct) public users;
-
-    /*
-    * Structs
-    */
-
-    struct userStruct {
-        bytes32 ipfsHash;
-        bool isSet;
-    }
-
-    /*
-    * Modifiers
-    */
-
-    modifier isValidUserAddress() {
-        require (users[msg.sender].isSet);
-        _;
-    }
+    mapping(address => bytes32) public users;
 
     /*
     * Public functions
@@ -47,20 +29,34 @@ contract UserRegistry {
     )
         public
     {
-        users[msg.sender] = userStruct(_ipfsHash, true);
+        users[msg.sender] = _ipfsHash;
         NewUser(msg.sender);
     }
 
-    /// @dev create_another(): Create a new user and associates attenstion or proof with user
+    /// @dev createAnother(): Create a new user and associates attenstion or proof with user
     // @param wallet id
     // Attestation or proof to associate to the user
-    function create_another(string _id, string payload) public returns (string){
+    // TODO: (Brad David) replace with real function
+    function createAnother(
+        string _id,
+        string payload)
+        public
+        pure
+        returns (string)
+    {
+        _id; // Dummy "operation" to silence copiler warnigns
         return payload;
     }
 
     /// @dev get(): returns and existing user associated with wallet id
     // @param wallet id
-    function get(string _id) public returns (string){
+    function get(
+        string _id
+    )
+        public
+        pure
+        returns (string)
+    {
         return _id;
     }
 }