NoBey/openzeppelin-contracts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change operations order for rounding. Make tests use blocktime as reference time rather than date.

Browse Source
This commit is contained in:
Jorge Izquierdo
2017-02-13 11:35:32 +01:00
parent 74dfd3511f
commit 0a5af4b8ac
2 changed files with 22 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
contracts/token/VestedToken.sol
View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.4;
pragma solidity ^0.4.8;
import "./StandardToken.sol";
@ -37,6 +37,7 @@ contract VestedToken is StandardToken {
balances[msg.sender] = safeAdd(balances[msg.sender], nonVested);
balances[_holder] = safeSub(balances[_holder], nonVested);
Transfer(_holder, msg.sender, nonVested);
}
function tokenGrantsCount(address _holder) constant returns (uint index) {
@ -63,12 +64,12 @@ contract VestedToken is StandardToken {
if (time < cliff) return 0;
if (time > vesting) return tokens;
uint256 cliffTokens = safeMul(tokens, safeDiv(safeSub(cliff, start), safeSub(vesting, start)));
uint256 cliffTokens = safeDiv(safeMul(tokens, safeSub(cliff, start)), safeSub(vesting, start));
vestedTokens = cliffTokens;
uint256 vestingTokens = safeSub(tokens, cliffTokens);
vestedTokens = safeAdd(vestedTokens, safeMul(vestingTokens, safeDiv(safeSub(time, cliff), safeSub(vesting, start))));
vestedTokens = safeAdd(vestedTokens, safeDiv(safeMul(vestingTokens, safeSub(time, cliff)), safeSub(vesting, start)));
}
function nonVestedTokens(TokenGrant grant, uint64 time) private constant returns (uint256) {