Merge pull request #1 from SetProtocol/justin_chen-update-contracts

Update Contracts

Author: justinkchen

contracts/Migrations.sol

@@ -1,23 +1,24 @@
-pragma solidity ^0.4.11;
+pragma solidity 0.4.18;
+
 
 contract Migrations {
   address public owner;
-  uint public last_completed_migration;
+  uint public lastCompletedMigration;
 
   modifier restricted() {
     if (msg.sender == owner) _;
   }
 
-  function Migrations() {
+  function Migrations() public {
     owner = msg.sender;
   }
 
-  function setCompleted(uint completed) restricted {
-    last_completed_migration = completed;
+  function setCompleted(uint completed) public restricted {
+    lastCompletedMigration = completed;
   }
 
-  function upgrade(address new_address) restricted {
-    Migrations upgraded = Migrations(new_address);
-    upgraded.setCompleted(last_completed_migration);
+  function upgrade(address newAddress) public restricted {
+    Migrations upgraded = Migrations(newAddress);
+    upgraded.setCompleted(lastCompletedMigration);
   }
 }

contracts/SetToken.sol

@@ -1,34 +1,49 @@
-pragma solidity ^0.4.11;
+pragma solidity 0.4.18;
+
+
+import "zeppelin-solidity/contracts/token/ERC20/StandardToken.sol";
+import "zeppelin-solidity/contracts/token/ERC20/ERC20.sol";
+import "zeppelin-solidity/contracts/token/ERC20/DetailedERC20.sol";
+import "zeppelin-solidity/contracts/math/SafeMath.sol";
+import "./lib/Set.sol";
 
-import './lib/StandardToken.sol';
-import './lib/ERC20.sol';
-import './lib/SafeMath.sol';
-import './lib/Set.sol';
 
 /**
  * @title {Set}
  * @author Felix Feng
  * @dev Implementation of the basic {Set} token.
  */
-contract SetToken is Set, StandardToken {
+contract SetToken is StandardToken, DetailedERC20("", "", 18), Set {
+  uint256 public totalSupply;
+
   address[] public tokens;
   uint[] public units;
 
   /**
    * @dev Constructor Function for the issuance of an {Set} token
    * @param _tokens address[] A list of token address which you want to include
    * @param _units uint[] A list of quantities of each token (corresponds to the {Set} of _tokens)
-   */  
-  function SetToken(address[] _tokens, uint[] _units) {
+   */
+  function SetToken(address[] _tokens, uint[] _units, string _name, string _symbol) public {
     // There must be tokens present
     require(_tokens.length > 0);
-    
+
     // There must be an array of units
     require(_units.length > 0);
-    
+
     // The number of tokens must equal the number of units
     require(_tokens.length == _units.length);
 
+    for (uint i = 0; i < _units.length; i++) {
+      // Check that all units are non-zero. Negative numbers will underflow
+      uint currentUnits = _units[i];
+      require(currentUnits > 0);
+
+      // Check that all addresses are non-zero
+      address currentToken = _tokens[i];
+      require(currentToken != address(0));
+    }
+
     // As looping operations are expensive, checking for duplicates will be
     // on the onus of the application developer
 
@@ -37,25 +52,26 @@ contract SetToken is Set, StandardToken {
 
     tokens = _tokens;
     units = _units;
+    name = _name;
+    symbol = _symbol;
   }
 
-
   /**
    * @dev Function to convert tokens into {Set} Tokens
    *
-   * Please note that the user's ERC20 tokens must be approved by 
+   * Please note that the user's ERC20 tokens must be approved by
    * their ERC20 contract to transfer their tokens to this contract.
    *
    * @param quantity uint The quantity of tokens desired to convert
-   */  
+   */
   function issue(uint quantity) public returns (bool success) {
     // Transfers the sender's tokens to the contract
     for (uint i = 0; i < tokens.length; i++) {
       address currentToken = tokens[i];
       uint currentUnits = units[i];
 
       // The transaction will fail if any of the tokens fail to transfer
-      assert(ERC20(currentToken).transferFrom(msg.sender, this, currentUnits * quantity));      
+      assert(ERC20(currentToken).transferFrom(msg.sender, this, currentUnits * quantity));
     }
 
     // If successful, increment the balance of the user’s {Set} token
@@ -75,27 +91,39 @@ contract SetToken is Set, StandardToken {
    * The ERC20 tokens do not need to be approved to call this function
    *
    * @param quantity uint The quantity of tokens desired to redeem
-   */  
+   */
   function redeem(uint quantity) public returns (bool success) {
     // Check that the sender has sufficient tokens
     require(balances[msg.sender] >= quantity);
 
+   // If successful, decrement the balance of the user’s {Set} token
+    balances[msg.sender] = SafeMath.sub(balances[msg.sender], quantity);
+
+    // Decrement the total token supply
+    totalSupply = SafeMath.sub(totalSupply, quantity);
+
     for (uint i = 0; i < tokens.length; i++) {
       address currentToken = tokens[i];
       uint currentUnits = units[i];
-      
+
       // The transaction will fail if any of the tokens fail to transfer
       assert(ERC20(currentToken).transfer(msg.sender, currentUnits * quantity));
     }
 
-    // If successful, decrement the balance of the user’s {Set} token
-    balances[msg.sender] = SafeMath.sub(balances[msg.sender], quantity);
-
-    // Decrement the total token supply
-    totalSupply = SafeMath.sub(totalSupply, quantity);
-
     LogRedemption(msg.sender, quantity);
 
     return true;
   }
+
+  function tokenCount() public view returns(uint tokensLength) {
+    return tokens.length;
+  }
+
+  function getTokens() public view returns(address[]) {
+    return tokens;
+  }
+
+  function getUnits() public view returns(uint[]) {
+    return units;
+  }
 }

contracts/lib/BasicToken.sol

@@ -1,14 +1,20 @@
-pragma solidity ^0.4.11;
+pragma solidity 0.4.18;
+
 
 /**
  * @title Set interface
  */
 contract Set {
-
   function issue(uint quantity) public returns (bool success);
   function redeem(uint quantity) public returns (bool success);
 
-  event LogIssuance(address _sender, uint _quantity);
-  event LogRedemption(address _sender, uint _quantity);
+  event LogIssuance(
+    address indexed _sender,
+    uint indexed _quantity
+  );
 
-}
+  event LogRedemption(
+    address indexed _sender,
+    uint indexed _quantity
+  );
+}