Merge pull request #312 from windingtree/update-repo

Fix wrong purchases amount bug

Author: AugustoL

.gitignore

@@ -6,3 +6,4 @@ coverage
 coverage.json
 allFiredEvents
 scTopics
+package-lock.json

contracts/LifCrowdsale.sol

@@ -229,7 +229,7 @@ contract LifCrowdsale is Ownable, Pausable {
 
     // store wei amount in case of TGE min cap not reached
     weiRaised = weiRaised.add(weiAmount);
-    purchases[beneficiary] = weiAmount;
+    purchases[beneficiary] = purchases[beneficiary].add(weiAmount);
     tokensSold = tokensSold.add(tokens);
 
     token.mint(beneficiary, tokens);
@@ -273,8 +273,11 @@ contract LifCrowdsale is Ownable, Pausable {
     // calculate the max amount of wei for the foundation
     uint256 foundationBalanceCapWei = maxFoundationCapUSD.mul(weiPerUSDinTGE);
 
-    // if the minimiun cap for the MVM is not reached transfer all funds to foundation
-    // else if the min cap for the MVM is reached, create it and send the remaining funds
+    // If the minimiun cap for the MVM is not reached transfer all funds to foundation
+    // else if the min cap for the MVM is reached, create it and send the remaining funds.
+    // We use weiRaised to compare becuase that is the total amount of wei raised in all TGE
+    // but we have to distribute the balance using `this.balance` because thats the amount
+    // raised by the crowdsale
     if (weiRaised <= foundationBalanceCapWei) {
 
       foundationWallet.transfer(this.balance);
@@ -398,6 +401,12 @@ contract LifCrowdsale is Ownable, Pausable {
     uint256 toReturn = purchases[contributor];
     assert(toReturn > 0);
 
+    uint256 tokenBalance = token.balanceOf(contributor);
+
+    // Substract weiRaised and tokens sold
+    weiRaised = weiRaised.sub(toReturn);
+    tokensSold = tokensSold.sub(tokenBalance);
+    token.burn(contributor, tokenBalance);
     purchases[contributor] = 0;
 
     contributor.transfer(toReturn);
@@ -409,7 +418,7 @@ contract LifCrowdsale is Ownable, Pausable {
      Mechanism in case the soft cap was exceeded. It also unpauses the token to
      enable transfers. It can be called only once, after `end2Timestamp`
    */
-  function finalize() public whenNotPaused hasEnded {
+  function finalize() public onlyOwner hasEnded {
     require(!isFinalized);
 
     // foward founds and unpause token only if minCap is reached

contracts/LifToken.sol

@@ -3,7 +3,6 @@ pragma solidity ^0.4.18;
 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";
 
 /**
@@ -12,9 +11,9 @@ import "zeppelin-solidity/contracts/token/ERC20/PausableToken.sol";
    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.
+   Uses OpenZeppelin StandardToken, ERC827Token, MintableToken and PausableToken.
  */
-contract LifToken is StandardToken, ERC827Token, BurnableToken, MintableToken, PausableToken {
+contract LifToken is StandardToken, ERC827Token, MintableToken, PausableToken {
   // Token Name
   string public constant NAME = "Líf";
 
@@ -30,11 +29,34 @@ contract LifToken is StandardToken, ERC827Token, BurnableToken, MintableToken, P
    * @param _value The amount of tokens to be burned.
    */
   function burn(uint256 _value) public whenNotPaused {
-    super.burn(_value);
+
+    require(_value <= balances[msg.sender]);
+
+    balances[msg.sender] = balances[msg.sender].sub(_value);
+    totalSupply_ = totalSupply_.sub(_value);
 
     // a Transfer event to 0x0 can be useful for observers to keep track of
     // all the Lif by just looking at those events
     Transfer(msg.sender, address(0), _value);
   }
 
+  /**
+   * @dev Burns a specific amount of tokens of an address
+   * This function can be called only by the owner in the minting process
+   *
+   * @param _value The amount of tokens to be burned.
+   */
+  function burn(address burner, uint256 _value) public onlyOwner {
+
+    require(!mintingFinished);
+
+    require(_value <= balances[burner]);
+
+    balances[burner] = balances[burner].sub(_value);
+    totalSupply_ = totalSupply_.sub(_value);
+
+    // a Transfer event to 0x0 can be useful for observers to keep track of
+    // all the Lif by just looking at those events
+    Transfer(burner, address(0), _value);
+  }
 }