Fix vesting calculation logic

41d2fde9 · Jorge Izquierdo · 6139500e · 41d2fde9
Commit 41d2fde9 authored Apr 05, 2017 by Jorge Izquierdo
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

VestedToken.sol contracts/token/VestedToken.sol +2 -2

No files found.
--- a/contracts/token/VestedToken.sol
+++ b/contracts/token/VestedToken.sol
@@ -94,7 +94,7 @@ contract VestedToken is StandardToken, LimitedTransferToken {
    if (time < cliff) {
      return 0;
    }
-    if (time > vesting) {
+    if (time >= vesting) {
      return tokens;
    }

@@ -103,7 +103,7 @@ contract VestedToken is StandardToken, LimitedTransferToken {

    uint256 vestingTokens = safeSub(tokens, cliffTokens);

-    vestedTokens = safeAdd(vestedTokens, safeDiv(safeMul(vestingTokens, safeSub(time, cliff)), safeSub(vesting, start)));
+    vestedTokens = safeAdd(vestedTokens, safeDiv(safeMul(vestingTokens, safeSub(time, cliff)), safeSub(vesting, cliff)));
  }

  function nonVestedTokens(TokenGrant grant, uint64 time) private constant returns (uint256) {