fix: define startTime param

Author: PavelNaydanov

src/tokenDistribution/MetaTokenDistributor.sol

@@ -18,28 +18,24 @@ contract MetaTokenDistributor is IMetaTokenDistributor {
     IERC20 private _META;
 
     IVestingParams private _vestingParams;
-    uint64 private _vestingStartTime;
 
     mapping(VestingType vestingType => address vesting) private _vestingAddresses;
 
     modifier validateTime(VestingType vestingType) {
-        if (block.timestamp < _vestingStartTime) {
+        uint64 startTime = _vestingParams.getStartTime();
+
+        if (block.timestamp < startTime) {
             revert VestingStartTimeHasNotArrived();
         }
 
         _;
     }
 
-    constructor(address vestingParams, uint64 vestingStartTime) {
-        if (vestingStartTime < block.timestamp) {
-            revert InvalidVestingStartTime();
-        }
-
+    constructor(address vestingParams) {
         if (address(vestingParams) == address(0)) {
             revert ZeroAddress();
         }
 
-        _vestingStartTime = vestingStartTime;
         _vestingParams = IVestingParams(vestingParams);
 
         _vestingImpl = address(new Vesting());
@@ -82,8 +78,4 @@ contract MetaTokenDistributor is IMetaTokenDistributor {
     function getVestingParamsAddress() external view returns (address) {
         return address(_vestingParams);
     }
-
-    function getVestingStartTime() external view returns (uint64) {
-        return _vestingStartTime;
-    }
 }

src/tokenDistribution/interfaces/IMetaTokenDistributor.sol

@@ -7,7 +7,6 @@ interface IMetaTokenDistributor {
     event VestingStarted(address vesting);
     event MetaTokenDeployed(address META);
 
-    error InvalidVestingStartTime();
     error VestingStartTimeHasNotArrived();
     error ZeroAddress();
     error VestingHasAlreadyStarted();
@@ -16,5 +15,4 @@ interface IMetaTokenDistributor {
     function getMETAAddress() external view returns (address);
     function getVestingAddress(VestingType vestingType) external view returns (address);
     function getVestingParamsAddress() external view returns (address);
-    function getVestingStartTime() external view returns (uint64);
 }

src/tokenDistribution/vesting/VestingParams.sol

@@ -21,12 +21,20 @@ contract VestingParams is IVestingParams {
     uint256 public constant LIQUIDITY_CLIFF_PERIOD = 4 * MONTH; // 4 month
     uint256 public constant LIQUIDITY_VESTING_PORTION = 400; // 4%
 
+    uint64 private _startTime;
     mapping(VestingType vestingType => Beneficiary[] beneficiaries) private _beneficiaries;
 
     constructor(
+        uint64 startTime,
         Beneficiary[] memory teamBeneficiaries,
         Beneficiary[] memory liquidityBeneficiaries
     ) {
+        if (startTime < block.timestamp) {
+            revert InvalidStartTime();
+        }
+
+        _startTime = startTime;
+
         _validateAndStoreBeneficiaries(VestingType.TEAM, teamBeneficiaries, TEAM_TOTAL_AMOUNT);
         _validateAndStoreBeneficiaries(VestingType.LIQUIDITY, liquidityBeneficiaries, LIQUIDITY_TOTAL_AMOUNT);
     }
@@ -44,20 +52,19 @@ contract VestingParams is IVestingParams {
         Period[] memory periods = new Period[](numberOfPeriods);
 
         // TGE
-        periods[0] = Period({endTime: block.timestamp, portion: tgePortion});
+        periods[0] = Period({endTime: _startTime, portion: tgePortion});
 
         // Cliff period
-        periods[1] = Period({endTime: block.timestamp + cliffPeriod, portion: 0});
+        periods[1] = Period({endTime: _startTime + cliffPeriod, portion: 0});
 
         // Vesting period
-        uint256 vestingStartTime = block.timestamp + cliffPeriod;
+        uint256 vestingStartTime = _startTime + cliffPeriod;
         for (uint256 i = 2; i < numberOfPeriods; i++) {
             periods[i] = Period({endTime: vestingStartTime + (i - 1) * MONTH, portion: vestingPortion});
         }
 
         schedule = Schedule({
-            // TODO: подумать на тем, как упростить время
-            startTime: block.timestamp, // Start time is vesting creation time
+            startTime: _startTime,
             periods: periods
         });
     }
@@ -116,6 +123,10 @@ contract VestingParams is IVestingParams {
         );
     }
 
+    function getStartTime() external view returns (uint64) {
+        return _startTime;
+    }
+
     function _validateAndStoreBeneficiaries(
         VestingType vestingType,
         Beneficiary[] memory beneficiaries,

src/tokenDistribution/vesting/interfaces/IVestingParams.sol

@@ -4,6 +4,7 @@ pragma solidity 0.8.28;
 import {VestingType, Beneficiary, Schedule} from "../../utils/Common.sol";
 
 interface IVestingParams {
+    error InvalidStartTime();
     error ZeroBeneficiaries();
     error ZeroAddress();
     error ZeroAmount();
@@ -29,4 +30,5 @@ interface IVestingParams {
             Beneficiary[] memory beneficiaries,
             uint256 totalAmount
         );
+    function getStartTime() external view returns (uint64);
 }

test/tokenDistribution/MetaTokenDistributor.t.sol

@@ -24,42 +24,45 @@ contract MetaTokenDistributorTest is Test {
         (Beneficiary[] memory teamBeneficiaries, Beneficiary[] memory liquidityBeneficiaries)
             = _generateBeneficiaries();
 
-        vestingParams = new VestingParams(teamBeneficiaries, liquidityBeneficiaries);
-        distributor = new MetaTokenDistributor(address(vestingParams), vestingStartTime);
+        vestingParams = new VestingParams(vestingStartTime, teamBeneficiaries, liquidityBeneficiaries);
+        distributor = new MetaTokenDistributor(address(vestingParams));
     }
 
     // region - Deploy -
 
     function test_deploy() external view {
         assertEq(distributor.getVestingParamsAddress(), address(vestingParams));
-        assertEq(distributor.getVestingStartTime(), vestingStartTime);
-
         assertNotEq(distributor.getMETAAddress(), address(0));
     }
 
-    function test_deploy_revertIfInvalidVestingStartTime(uint64 invalidVestingStartTime) external {
-        // simulate timestamp
-        vm.warp(1000);
+    function test_deploy_emitMetaTokenDeployed() external {
+        vm.expectEmit(true, true, true, false); // data is not checking
+        emit IMetaTokenDistributor.MetaTokenDeployed(address(0));
 
-        vm.assume(invalidVestingStartTime < block.timestamp);
+        distributor = new MetaTokenDistributor(address(vestingParams));
+    }
 
-        vm.expectRevert(IMetaTokenDistributor.InvalidVestingStartTime.selector);
+    function test_deploy_startTimeEqualBlockTimestamp() external {
+        vestingStartTime = uint64(block.timestamp);
+        (Beneficiary[] memory teamBeneficiaries, Beneficiary[] memory liquidityBeneficiaries)
+            = _generateBeneficiaries();
 
-        distributor = new MetaTokenDistributor(address(vestingParams), invalidVestingStartTime);
-    }
+        vestingParams = new VestingParams(vestingStartTime, teamBeneficiaries, liquidityBeneficiaries);
+        distributor = new MetaTokenDistributor(address(vestingParams));
 
-    function test_deploy_revertIfZeroAddress() external {
+        address teamVesting = distributor.startVesting(VestingType.TEAM);
 
-        vm.expectRevert(IMetaTokenDistributor.ZeroAddress.selector);
+        assertNotEq(teamVesting, address(0));
 
-        distributor = new MetaTokenDistributor(address(0), vestingStartTime);
+        IERC20 META = IERC20(distributor.getMETAAddress());
+        assertEq(META.balanceOf(teamVesting), vestingParams.TEAM_TOTAL_AMOUNT());
     }
 
-    function test_deploy_emitMetaTokenDeployed() external {
-        vm.expectEmit(true, true, true, false); // data is not checking
-        emit IMetaTokenDistributor.MetaTokenDeployed(address(0));
+    function test_deploy_revertIfZeroAddress() external {
+
+        vm.expectRevert(IMetaTokenDistributor.ZeroAddress.selector);
 
-        distributor = new MetaTokenDistributor(address(vestingParams), vestingStartTime);
+        distributor = new MetaTokenDistributor(address(0));
     }
 
     // endregion