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

Add safeDiv and min/max functions to SafeMath

Browse Source
This commit is contained in:
Jorge Izquierdo
2017-02-10 16:17:02 +01:00
parent abc646a95c
commit 917b129517
2 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
contracts/token/GrantableToken.sol
View File

@ -67,12 +67,12 @@ contract GrantableToken is StandardToken {
if (time < cliff) return 0;
if (time > vesting) return tokens;
uint256 cliffTokens = safeMul(tokens, (cliff - start) / (vesting - start));
uint256 cliffTokens = safeMul(tokens, safeDiv(safeSub(cliff, start), safeSub(vesting, start)));
vestedTokens = cliffTokens;
uint256 vestingTokens = safeSub(tokens, cliffTokens);
vestedTokens = safeAdd(vestedTokens, vestingTokens * (time - cliff) / (vesting - start));
vestedTokens = safeAdd(vestedTokens, safeMul(vestingTokens, safeDiv(safeSub(time, cliff), safeSub(vesting, start))));
}
function nonVestedTokens(TokenGrant grant, uint64 time) private constant returns (uint256) {
@ -102,12 +102,4 @@ contract GrantableToken is StandardToken {
return super.transfer(_to, _value);
}
function max64(uint64 a, uint64 b) private constant returns (uint64) {
return a >= b ? a : b;
}
function min256(uint256 a, uint256 b) private constant returns (uint256) {
return a < b ? a : b;
}
}