From a57eb9aeb9d0c5eb21db42e6a6a4b5b3782feffe Mon Sep 17 00:00:00 2001 From: Ricardo Guilherme Schmidt <3esmit@gmail.com> Date: Tue, 20 Jun 2017 22:48:46 -0300 Subject: [PATCH] universal epoch --- contracts/management/EpochLocker.sol | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/contracts/management/EpochLocker.sol b/contracts/management/EpochLocker.sol index 864a254..79aa0af 100644 --- a/contracts/management/EpochLocker.sol +++ b/contracts/management/EpochLocker.sol @@ -9,18 +9,17 @@ pragma solidity ^0.4.11; contract EpochLocker is Lockable { - uint256 public creationTime = now; uint256 public unlockedTime = 25 days; uint256 public lockedTime = 5 days; uint256 public constant EPOCH_LENGTH = 30 days; function currentEpoch() public constant returns(uint256){ - return (now - creationTime) / EPOCH_LENGTH + 1; + return now / EPOCH_LENGTH + 1; } function nextLock() public constant returns (uint256){ uint256 epoch = currentEpoch(); - return (creationTime + epoch * unlockedTime) + (epoch - 1) * lockedTime; + return (epoch * unlockedTime) + (epoch - 1) * lockedTime; } function EpochLocker(uint256 _unlockedTime, uint256 _lockedTime){