Merge pull request #311 from windingtree/update-repo

Dependencies updated, replaced SmartToken for ERC827

Author: AugustoL

README.md

@@ -21,9 +21,8 @@ npm install
 
 ## Contracts
 
-- [SmartToken](blob/master/contracts/SmartToken.sol): Token based in the ERC20 standard with extra methods to transfer value and data and execute a call on transfer. Uses OpenZeppelin StandardToken.
-- [LifToken](blob/master/contracts/LifToken.sol): Smart token for the Winding Tree platform.
- Uses SmartToken and OpenZeppelin MintableToken and Pausable contracts.
+- [LifToken](blob/master/contracts/LifToken.sol): ERC827 token for the Winding Tree platform.
+ Uses OpenZeppelin ERC827Token, StandardToken, BurnableToken, MintableToken and PausableToken contracts.
  - [LifChannels](blob/master/contracts/LifChannels.sol): Implementation of simple state channels for Lif token holders.
 - [LifCrowdsale](blob/master/contracts/LifCrowdsale.sol): Implementation of the Lif Token Generation Event (TGE)
   Crowdsale: A 2 week fixed price, uncapped token sale, with a discounted rate for contributions during the private

contracts/LifChannels.sol

@@ -1,6 +1,6 @@
 pragma solidity ^0.4.18;
 
-import "zeppelin-solidity/contracts/token/ERC20.sol";
+import "zeppelin-solidity/contracts/token/ERC20/ERC20.sol";
 import "zeppelin-solidity/contracts/math/SafeMath.sol";
 import "zeppelin-solidity/contracts/ECRecovery.sol";
 

contracts/LifToken.sol

@@ -1,18 +1,20 @@
 pragma solidity ^0.4.18;
 
-import "./SmartToken.sol";
-import "zeppelin-solidity/contracts/token/MintableToken.sol";
-import "zeppelin-solidity/contracts/token/BurnableToken.sol";
-import "zeppelin-solidity/contracts/token/PausableToken.sol";
+import "zeppelin-solidity/contracts/token/ERC827/ERC827Token.sol";
+import "zeppelin-solidity/contracts/token/ERC20/StandardToken.sol";
+import "zeppelin-solidity/contracts/token/ERC20/MintableToken.sol";
+import "zeppelin-solidity/contracts/token/ERC20/BurnableToken.sol";
+import "zeppelin-solidity/contracts/token/ERC20/PausableToken.sol";
 
 /**
    @title Líf, the Winding Tree token
 
-   Implementation of Líf, the ERC20 token for Winding Tree, with extra methods
-   to transfer value and data to execute a call on transfer.
-   Uses OpenZeppelin MintableToken and Pausable.
+   Implementation of Líf, the ERC827 token for Winding Tree, an extension of the
+   ERC20 token with extra methods to transfer value and data to execute a call
+   on transfer.
+   Uses OpenZeppelin StandardToken, ERC827Token, BurnableToken, MintableToken and PausableToken.
  */
-contract LifToken is SmartToken, BurnableToken, MintableToken, PausableToken {
+contract LifToken is StandardToken, ERC827Token, BurnableToken, MintableToken, PausableToken {
   // Token Name
   string public constant NAME = "Líf";
 
@@ -22,22 +24,10 @@ contract LifToken is SmartToken, BurnableToken, MintableToken, PausableToken {
   // Token decimals
   uint public constant DECIMALS = 18;
 
-  function approveData(address spender, uint256 value, bytes data) public whenNotPaused returns (bool) {
-    return super.approveData(spender, value, data);
-  }
-
-  function transferData(address to, uint256 value, bytes data) public whenNotPaused returns (bool) {
-    return super.transferData(to, value, data);
-  }
-
-  function transferDataFrom(address from, address to, uint256 value, bytes data) public whenNotPaused returns (bool) {
-    return super.transferDataFrom(from, to, value, data);
-  }
-
   /**
-     @dev Burns a specific amount of tokens.
-
-     @param _value The amount of tokens to be burned.
+   * @dev Burns a specific amount of tokens.
+   *
+   * @param _value The amount of tokens to be burned.
    */
   function burn(uint256 _value) public whenNotPaused {
     super.burn(_value);

contracts/LifTokenTest.sol

@@ -1,19 +1,22 @@
 pragma solidity ^0.4.18;
 
-import "./SmartToken.sol";
-import "zeppelin-solidity/contracts/token/BurnableToken.sol";
-import "zeppelin-solidity/contracts/token/PausableToken.sol";
+import "zeppelin-solidity/contracts/token/ERC827/ERC827Token.sol";
+import "zeppelin-solidity/contracts/token/ERC20/StandardToken.sol";
+import "zeppelin-solidity/contracts/token/ERC20/MintableToken.sol";
+import "zeppelin-solidity/contracts/token/ERC20/BurnableToken.sol";
+import "zeppelin-solidity/contracts/token/ERC20/PausableToken.sol";
 
 /**
    @title Líf, the Winding Tree token
 
-   Implementation of Líf, the ERC20 token for Winding Tree, with extra methods
-   to transfer value and data to execute a call on transfer.
+   Implementation of Líf, the ERC827 token for Winding Tree, an extension of the
+   ERC20 token with extra methods to transfer value and data to execute a call
+   on transfer.
    This version of the token is used in test networks, it allows anyone to claim
    tokens.
-   Uses OpenZeppelin Pausable.
+   Uses OpenZeppelin StandardToken, ERC827Token, BurnableToken, MintableToken and PausableToken.
  */
-contract LifTokenTest is SmartToken, BurnableToken, PausableToken {
+contract LifTokenTest is StandardToken, ERC827Token, BurnableToken, MintableToken, PausableToken {
   // Token Name
   string public constant NAME = "Líf";
 
@@ -27,21 +30,31 @@ contract LifTokenTest is SmartToken, BurnableToken, PausableToken {
   uint256 public constant MAX_LIF_FAUCET = 50000000000000000000;
 
   function approveData(address spender, uint256 value, bytes data) public whenNotPaused returns (bool) {
-    return super.approveData(spender, value, data);
+    return super.approve(spender, value, data);
   }
 
   function transferData(address to, uint256 value, bytes data) public whenNotPaused returns (bool) {
-    return super.transferData(to, value, data);
+    return super.transfer(to, value, data);
   }
 
   function transferDataFrom(address from, address to, uint256 value, bytes data) public whenNotPaused returns (bool) {
-    return super.transferDataFrom(from, to, value, data);
+    return super.transferFrom(from, to, value, data);
   }
 
   /**
-     @dev Burns a specific amount of tokens.
+   * @dev Function to create tokens, it will issue tokens to the tx sender
+   */
+  function faucetLif() public {
+    uint256 amount = MAX_LIF_FAUCET.sub(balances[msg.sender]);
+    totalSupply_ = totalSupply_.add(amount);
+    balances[msg.sender] = balances[msg.sender].add(amount);
+    Transfer(0x0, msg.sender, amount);
+  }
 
-     @param _value The amount of tokens to be burned.
+  /**
+   * @dev Burns a specific amount of tokens.
+   *
+   * @param _value The amount of tokens to be burned.
    */
   function burn(uint256 _value) public whenNotPaused {
     super.burn(_value);
@@ -51,14 +64,4 @@ contract LifTokenTest is SmartToken, BurnableToken, PausableToken {
     Transfer(msg.sender, address(0), _value);
   }
 
-  /**
-   * @dev Function to create tokens, it will issue tokens to the tx sender
-   */
-  function faucetLif() public {
-    uint256 amount = MAX_LIF_FAUCET.sub(balances[msg.sender]);
-    totalSupply = totalSupply.add(amount);
-    balances[msg.sender] = balances[msg.sender].add(amount);
-    Transfer(0x0, msg.sender, amount);
-  }
-
 }

contracts/SmartToken.sol

@@ -27,22 +27,22 @@
     "jsverify": "^0.8.2",
     "lodash": "^4.17.4",
     "truffle-hdwallet-provider": "0.0.3",
-    "zeppelin-solidity": "1.3.0"
+    "zeppelin-solidity": "^1.6.0"
   },
   "devDependencies": {
     "chai-bignumber": "^2.0.1",
     "coveralls": "^2.13.1",
-    "eslint": "^4.11.0",
+    "eslint": "^4.16.0",
     "eslint-config-standard": "^10.2.1",
     "eslint-plugin-import": "^2.8.0",
     "eslint-plugin-node": "^5.2.1",
     "eslint-plugin-promise": "^3.6.0",
     "eslint-plugin-standard": "^3.0.1",
     "ethereumjs-testrpc": "^6.0.1",
-    "ethereumjs-util": "^5.1.2",
+    "ethereumjs-util": "^5.1.3",
     "mocha-lcov-reporter": "^1.3.0",
     "solidity-coverage": "^0.2.2",
-    "truffle": "^4.0.0",
+    "truffle": "^4.0.5",
     "truffle-hdwallet-provider": "0.0.3"
   }
 }