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

[TokenVesting] Allow instantiation of already started vesting contracts. Improve comments' wording.

Browse Source
This commit is contained in:
Martín Triay
2017-10-02 17:30:35 -03:00
parent 562fb6945f
commit 9e0e80e820
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
contracts/token/TokenVesting.sol
View File

@ -39,8 +39,7 @@ contract TokenVesting is Ownable {
*/
function TokenVesting(address _beneficiary, uint256 _start, uint256 _cliff, uint256 _duration, bool _revocable) {
require(_beneficiary != 0x0);
require(_cliff < _duration);
require(_start >= now);
require(_cliff <= _duration);
beneficiary = _beneficiary;
revocable = _revocable;
@ -82,7 +81,7 @@ contract TokenVesting is Ownable {
}
/**
* @dev Calculates the amount that has already vested but not released.
* @dev Calculates the amount that has already vested but hasn't been released yet.
* @param token ERC20 token which is being vested
*/
function vestedAmount(ERC20Basic token) constant returns (uint256) {
@ -97,7 +96,7 @@ contract TokenVesting is Ownable {
uint256 vested = totalBalance.mul(now - start).div(duration);
uint256 unreleased = vested.sub(released[token]);
// currentBalance can be 0 in case of a revoke
// currentBalance can be 0 in case of vesting being revoked earlier.
return Math.min256(currentBalance, unreleased);
}
}