fix: move VestingImpl to constructor

Author: PavelNaydanov

script/DeployAll.s.sol

@@ -4,6 +4,7 @@ pragma solidity 0.8.28;
 import {Script, console} from "forge-std/Script.sol";
 
 import {MetaTokenDistributor} from "src/tokenDistribution/MetaTokenDistributor.sol";
+import {Vesting} from "src/tokenDistribution/vesting/Vesting.sol";
 import {VestingParams} from "src/tokenDistribution/vesting/VestingParams.sol";
 import {Beneficiary, VestingType} from "src/tokenDistribution/utils/Common.sol";
 
@@ -20,6 +21,7 @@ contract DeployAllScript is Script {
     uint256 constant LIQUIDITY_BENEFICIARY_AMOUNT = 287_500_000e18;
 
     VestingParams public vestingParams;
+    Vesting public vesting;
     MetaTokenDistributor public distributor;
 
     function run() public {
@@ -36,7 +38,8 @@ contract DeployAllScript is Script {
         vm.startBroadcast();
 
         vestingParams = new VestingParams(startTime, teamBeneficiaries, liquidityBeneficiaries);
-        distributor = new MetaTokenDistributor(address(vestingParams));
+        vesting = new Vesting();
+        distributor = new MetaTokenDistributor(address(vestingParams), address(vesting));
 
         vm.stopBroadcast();
 

src/tokenDistribution/MetaTokenDistributor.sol

@@ -44,14 +44,14 @@ contract MetaTokenDistributor is IMetaTokenDistributor {
         _;
     }
 
-    constructor(address vestingParams) {
+    constructor(address vestingParams, address vestingImpl) {
         if (address(vestingParams) == address(0)) {
             revert ZeroAddress();
         }
 
         _vestingParams = IVestingParams(vestingParams);
 
-        _vestingImpl = address(new Vesting());
+        _vestingImpl = vestingImpl;
         _META = IERC20(address(new MetaToken(address(this))));
 
         assert(_META.balanceOf(address(this)) == _META.totalSupply());
@@ -100,4 +100,9 @@ contract MetaTokenDistributor is IMetaTokenDistributor {
     function getVestingParamsAddress() external view returns (address) {
         return address(_vestingParams);
     }
+
+    /// @notice Returns address of VestingImpl contract
+    function getVestingImplAddress() external view returns (address) {
+        return _vestingImpl;
+    }
 }

src/tokenDistribution/interfaces/IMetaTokenDistributor.sol

@@ -23,4 +23,5 @@ interface IMetaTokenDistributor {
     function getMETAAddress() external view returns (address);
     function getVestingAddress(VestingType vestingType) external view returns (address);
     function getVestingParamsAddress() external view returns (address);
+    function getVestingImplAddress() external view returns (address);
 }

test/tokenDistribution/MetaTokenDistributor.t.sol

@@ -5,6 +5,7 @@ import {Test, console} from "forge-std/Test.sol";
 import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 
 import {MetaTokenDistributor, IMetaTokenDistributor} from "src/tokenDistribution/MetaTokenDistributor.sol";
+import {Vesting} from "src/tokenDistribution/vesting/Vesting.sol";
 import {VestingParams} from "src/tokenDistribution/vesting/VestingParams.sol";
 import {Beneficiary, VestingType, Schedule} from "src/tokenDistribution/utils/Common.sol";
 
@@ -13,6 +14,7 @@ contract MetaTokenDistributorTest is Test {
     uint64 public vestingStartTime;
 
     VestingParams vestingParams;
+    Vesting vestingImpl;
     MetaTokenDistributor distributor;
 
     address teamBeneficiary1;
@@ -24,29 +26,31 @@ contract MetaTokenDistributorTest is Test {
         (Beneficiary[] memory teamBeneficiaries, Beneficiary[] memory liquidityBeneficiaries) = _generateBeneficiaries();
 
         vestingParams = new VestingParams(vestingStartTime, teamBeneficiaries, liquidityBeneficiaries);
-        distributor = new MetaTokenDistributor(address(vestingParams));
+        vestingImpl = new Vesting();
+        distributor = new MetaTokenDistributor(address(vestingParams), address(vestingImpl));
     }
 
     // region - Deploy -
 
     function test_deploy() external view {
         assertEq(distributor.getVestingParamsAddress(), address(vestingParams));
         assertNotEq(distributor.getMETAAddress(), address(0));
+        assertNotEq(distributor.getVestingImplAddress(), address(0));
     }
 
     function test_deploy_emitMetaTokenDeployed() external {
         vm.expectEmit(true, true, true, false); // data is not checking
         emit IMetaTokenDistributor.MetaTokenDeployed(address(0));
 
-        distributor = new MetaTokenDistributor(address(vestingParams));
+        distributor = new MetaTokenDistributor(address(vestingParams), address(vestingImpl));
     }
 
     function test_deploy_startTimeEqualBlockTimestamp() external {
         vestingStartTime = uint64(block.timestamp);
         (Beneficiary[] memory teamBeneficiaries, Beneficiary[] memory liquidityBeneficiaries) = _generateBeneficiaries();
 
         vestingParams = new VestingParams(vestingStartTime, teamBeneficiaries, liquidityBeneficiaries);
-        distributor = new MetaTokenDistributor(address(vestingParams));
+        distributor = new MetaTokenDistributor(address(vestingParams), address(vestingImpl));
 
         address teamVesting = distributor.startVesting(VestingType.TEAM);
 
@@ -59,7 +63,7 @@ contract MetaTokenDistributorTest is Test {
     function test_deploy_revertIfZeroAddress() external {
         vm.expectRevert(IMetaTokenDistributor.ZeroAddress.selector);
 
-        distributor = new MetaTokenDistributor(address(0));
+        distributor = new MetaTokenDistributor(address(0), address(vestingImpl));
     }
 
     // endregion