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

Make vested stock calculation more testable

Browse Source
This commit is contained in:
Jorge Izquierdo
2017-02-10 15:28:20 +01:00
parent 93e7984c61
commit 1697518da8
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
contracts/SafeMath.sol
View File

@ -26,4 +26,3 @@ contract SafeMath {
if (!assertion) throw; if (!assertion) throw;
} }
} }

16
contracts/token/GrantableToken.sol
View File

@ -59,16 +59,20 @@ contract GrantableToken is StandardToken {
vested = vestedTokens(grant, uint64(now)); vested = vestedTokens(grant, uint64(now));
} }
function vestedTokens(TokenGrant grant, uint64 time) private constant returns (uint256 vestedTokens) { function vestedTokens(TokenGrant grant, uint64 time) private constant returns (uint256) {
if (time < grant.cliff) return 0; return calculateVestedTokens(grant.value, uint256(time), uint256(grant.start), uint256(grant.cliff), uint256(grant.vesting));
if (time > grant.vesting) return grant.value; }
uint256 cliffTokens = grant.value * uint256(grant.cliff - grant.start) / uint256(grant.vesting - grant.start); function calculateVestedTokens(uint256 tokens, uint256 time, uint256 start, uint256 cliff, uint256 vesting) constant returns (uint256 vestedTokens) {
if (time < cliff) return 0;
if (time > vesting) return tokens;
uint256 cliffTokens = safeMul(tokens, (cliff - start) / (vesting - start));
vestedTokens = cliffTokens; vestedTokens = cliffTokens;
uint256 vestingTokens = safeSub(grant.value, cliffTokens); uint256 vestingTokens = safeSub(tokens, cliffTokens);
vestedTokens = safeAdd(vestedTokens, vestingTokens * (time - uint256(grant.cliff)) / uint256(grant.vesting - grant.start)); vestedTokens = safeAdd(vestedTokens, vestingTokens * (time - cliff) / (vesting - start));
} }
function nonVestedTokens(TokenGrant grant, uint64 time) private constant returns (uint256) { function nonVestedTokens(TokenGrant grant, uint64 time) private constant returns (uint256) {