Feat/re enable options

.gitignore

@@ -5,4 +5,3 @@ out/
 test-command.txt
 broadcast/
 .DS_Store
-foundry.toml

README.md

@@ -206,5 +206,7 @@ forge script scripts/proposeAllGuardiansMetavestDeals.s.sol --rpc-url <your-targ
 
 To run tests:
 ```bash
-forge test --via-ir --fork-url <your-target-network-rpc> -vvv
+# Excluding acceptance tests because deployment may have not happened yet
+# Use Ethereum mainnet RPC for tests because YearnBorgCompensation integration tests depends on it
+forge test --via-ir --fork-url <eth-mainnet-rpc> -vvv --nmc YearnBorgCompensationAcceptanceTest
 ```

foundry.toml

@@ -0,0 +1,4 @@
+[fmt]
+sort_imports = true
+
+# See more config options https://github.com/foundry-rs/foundry/blob/master/crates/config/README.md#all-options

scripts/createAllTemplates.s.sol

@@ -9,7 +9,6 @@ import {CyberAgreementRegistry} from "cybercorps-contracts/src/CyberAgreementReg
 import {ERC1967Proxy} from "openzeppelin-contracts/proxy/ERC1967/ERC1967Proxy.sol";
 import {SafeTxHelper} from "./lib/SafeTxHelper.sol";
 import {Script} from "forge-std/Script.sol";
-import {VestingAllocationFactory} from "../src/VestingAllocationFactory.sol";
 import {console2} from "forge-std/console2.sol";
 import {metavestController} from "../src/MetaVesTController.sol";
 

scripts/createSafeTx.s.sol

@@ -11,7 +11,6 @@ import {ERC1967Proxy} from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.s
 import {IZkCappedMinterV2} from "../src/interfaces/zk-governance/IZkCappedMinterV2.sol";
 import {SafeTxHelper} from "./lib/SafeTxHelper.sol";
 import {Script} from "forge-std/Script.sol";
-import {VestingAllocationFactory} from "../src/VestingAllocationFactory.sol";
 import {console2} from "forge-std/console2.sol";
 import {metavestController} from "../src/MetaVesTController.sol";
 

scripts/deployYearnBorgCompensation.s.sol

@@ -10,7 +10,6 @@ import {ERC1967Proxy} from "openzeppelin-contracts/proxy/ERC1967/ERC1967Proxy.so
 import {ERC20} from "openzeppelin-contracts/token/ERC20/ERC20.sol";
 import {SafeTxHelper} from "./lib/SafeTxHelper.sol";
 import {Script} from "forge-std/Script.sol";
-import {VestingAllocationFactory} from "../src/VestingAllocationFactory.sol";
 import {console2} from "forge-std/console2.sol";
 import {metavestController} from "../src/MetaVesTController.sol";
 
@@ -47,23 +46,23 @@ contract DeployYearnBorgCompensationScript is SafeTxHelper, Script {
         console2.log("Salt string: ", saltStr);
         console2.log("Guardian Safe: ", address(config.borgSafe));
         console2.log("CyberAgreementRegistry: ", address(config.registry));
-        console2.log("VestingAllocationFactory: ", address(config.vestingAllocationFactory));
+        console2.log("MetavestControllerFactory: ", address(config.metavestControllerFactory));
         console2.log("");
 
         bytes32 salt = keccak256(bytes(saltStr));
 
         vm.startBroadcast(deployerPrivateKey);
 
         // Deploy MetaVesT Controller
-
+        // TODO fixme: next time use MetavestControllerFactory to deploy the controller
         metavestController controller = metavestController(address(new ERC1967Proxy{salt: salt}(
             address(new metavestController{salt: salt}()),
             abi.encodeWithSelector(
                 metavestController.initialize.selector,
                 address(config.borgSafe),
                 address(config.borgSafe),
                 address(config.registry),
-                address(config.vestingAllocationFactory)
+                address(config.metavestControllerFactory)
             )
         )));
 

scripts/deployYearnBorgCompensationPrerequisites.s.sol

@@ -9,7 +9,7 @@ import {CyberAgreementRegistry} from "cybercorps-contracts/src/CyberAgreementReg
 import {ERC1967Proxy} from "openzeppelin-contracts/proxy/ERC1967/ERC1967Proxy.sol";
 import {SafeTxHelper} from "./lib/SafeTxHelper.sol";
 import {Script} from "forge-std/Script.sol";
-import {VestingAllocationFactory} from "../src/VestingAllocationFactory.sol";
+import {MetaVesTControllerFactory} from "../src/MetaVesTControllerFactory.sol";
 import {console2} from "forge-std/console2.sol";
 import {metavestController} from "../src/MetaVesTController.sol";
 
@@ -37,14 +37,18 @@ contract DeployYearnBorgCompensationPrerequisitesScript is SafeTxHelper, Script
         string memory saltStr,
         YearnBorgCompensation2025_2026.Config memory config
     ) public virtual returns(
-        VestingAllocationFactory
+        MetaVesTControllerFactory
     ) {
         address deployer = vm.addr(deployerPrivateKey);
 
+        BorgAuth auth = config.registry.AUTH();
+
         console2.log("");
         console2.log("=== DeployYearnBorgCompensationPrerequisitesScript ===");
         console2.log("Deployer: ", deployer);
         console2.log("Salt string: ", saltStr);
+        console2.log("CyberAgreementRegistry: ", address(config.registry));
+        console2.log("Auth: ", address(auth));
         console2.log("");
 
         bytes32 salt = keccak256(bytes(saltStr));
@@ -53,16 +57,24 @@ contract DeployYearnBorgCompensationPrerequisitesScript is SafeTxHelper, Script
 
         // Deploy MetaVesT pre-requisites
 
-        VestingAllocationFactory vestingAllocationFactory = new VestingAllocationFactory{salt: salt}();
+        MetaVesTControllerFactory metavestControllerFactory = MetaVesTControllerFactory(address(new ERC1967Proxy{salt: salt}(
+            address(new MetaVesTControllerFactory{salt: salt}()),
+            abi.encodeWithSelector(
+                MetaVesTControllerFactory.initialize.selector,
+                address(auth),
+                address(config.registry),
+                new metavestController{salt: salt}()
+            )
+        )));
 
         vm.stopBroadcast();
 
         // Output logs
 
         console2.log("Deployed addresses:");
-        console2.log("  VestingAllocationFactory: ", address(vestingAllocationFactory));
+        console2.log("  MetaVesTControllerFactory: ", address(metavestControllerFactory));
         console2.log("");
 
-        return vestingAllocationFactory;
+        return metavestControllerFactory;
     }
 }

scripts/executeSafeTx.s.sol

@@ -11,7 +11,6 @@ import {ZkCappedMinterV2} from "zk-governance/l2-contracts/src/ZkCappedMinterV2.
 import {IZkCappedMinterV2Factory} from "../src/interfaces/zk-governance/IZkCappedMinterV2Factory.sol";
 import {SafeTxHelper} from "./lib/SafeTxHelper.sol";
 import {Script} from "forge-std/Script.sol";
-import {VestingAllocationFactory} from "../src/VestingAllocationFactory.sol";
 import {console2} from "forge-std/console2.sol";
 import {metavestController} from "../src/MetaVesTController.sol";
 

scripts/lib/YearnBorgCompensation2025_2026.sol

@@ -6,8 +6,8 @@ import {CommonBase} from "forge-std/Base.sol";
 import {CyberAgreementRegistry} from "cybercorps-contracts/src/CyberAgreementRegistry.sol";
 import {IGnosisSafe} from "../../test/lib/safe.sol";
 import {BaseAllocation} from "../../src/BaseAllocation.sol";
-import {VestingAllocationFactory} from "../../src/VestingAllocationFactory.sol";
 import {metavestController} from "../../src/MetaVesTController.sol";
+import {MetaVesTControllerFactory} from "../../src/MetaVesTControllerFactory.sol";
 
 library YearnBorgCompensation2025_2026 {
 
@@ -27,7 +27,7 @@ library YearnBorgCompensation2025_2026 {
 
         IGnosisSafe metalexSafe;
         CyberAgreementRegistry registry;
-        VestingAllocationFactory vestingAllocationFactory;
+        MetaVesTControllerFactory metavestControllerFactory;
         metavestController controller;
 
         // Yearn BORG Director Compensation Agreement (one template per director for now)
@@ -81,7 +81,7 @@ library YearnBorgCompensation2025_2026 {
 
             metalexSafe: metalexSafe,
             registry: CyberAgreementRegistry(0xa9E808B8eCBB60Bb19abF026B5b863215BC4c134),
-            vestingAllocationFactory: VestingAllocationFactory(0xDeaDbeefdEAdbeefdEadbEEFdeadbeEFdEaDbeeF), // TODO TBD
+            metavestControllerFactory: MetaVesTControllerFactory(0xDeaDbeefdEAdbeefdEadbEEFdeadbeEFdEaDbeeF), // TODO TBD
             controller: metavestController(0xDeaDbeefdEAdbeefdEadbEEFdeadbeEFdEaDbeeF), // TODO TBD
 
             // Yearn BORG Compensation Agreement

scripts/lib/YearnBorgCompensationSepolia2025_2026.sol

@@ -6,7 +6,7 @@ import {CommonBase} from "forge-std/Base.sol";
 import {CyberAgreementRegistry} from "cybercorps-contracts/src/CyberAgreementRegistry.sol";
 import {IGnosisSafe} from "../../test/lib/safe.sol";
 import {BaseAllocation} from "../../src/BaseAllocation.sol";
-import {VestingAllocationFactory} from "../../src/VestingAllocationFactory.sol";
+import {MetaVesTControllerFactory} from "../../src/MetaVesTControllerFactory.sol";
 import {metavestController} from "../../src/MetaVesTController.sol";
 import {YearnBorgCompensation2025_2026} from "./YearnBorgCompensation2025_2026.sol";
 
@@ -35,7 +35,7 @@ library YearnBorgCompensationSepolia2025_2026 {
 
             metalexSafe: metalexSafe,
             registry: CyberAgreementRegistry(0xa9E808B8eCBB60Bb19abF026B5b863215BC4c134),
-            vestingAllocationFactory: VestingAllocationFactory(0x87dC5e3FBFE8B5F2B74C64eE34da8bdc9fedCb0f),
+            metavestControllerFactory: MetaVesTControllerFactory(0xDeaDbeefdEAdbeefdEadbEEFdeadbeEFdEaDbeeF), // TODO TBD
             controller: metavestController(0xFa5Ab18bD5E02B1d6430e91C32C5CB5e7F43bB65),
 
             // Yearn BORG Compensation Agreement

scripts/proposeAllGuardiansMetavestDeals.s.sol

@@ -11,7 +11,6 @@ import {ISafeProxyFactory, IGnosisSafe} from "../test/lib/safe.sol";
 import {ProposeMetaVestDealScript} from "./proposeMetavestDeal.s.sol";
 import {SafeTxHelper} from "./lib/SafeTxHelper.sol";
 import {Script} from "forge-std/Script.sol";
-import {VestingAllocationFactory} from "../src/VestingAllocationFactory.sol";
 import {YearnBorgCompensation2025_2026} from "./lib/YearnBorgCompensation2025_2026.sol";
 import {YearnBorgCompensationSepolia2025_2026} from "./lib/YearnBorgCompensationSepolia2025_2026.sol";
 import {console2} from "forge-std/console2.sol";
@@ -49,7 +48,7 @@ contract ProposeAllGuardiansMetaVestDealScript is ProposeMetaVestDealScript {
         console2.log("=== ProposeAllGuardiansMetaVestDealScript ===");
         console2.log("Proposer: ", proposer);
         console2.log("CyberAgreementRegistry: ", address(config.registry));
-        console2.log("VestingAllocationFactory: ", address(config.vestingAllocationFactory));
+        console2.log("MetavestControllerFactory: ", address(config.metavestControllerFactory));
         console2.log("MetavesTController: ", address(config.controller));
         console2.log("");
 

scripts/proposeMetavestDeal.s.sol

@@ -10,11 +10,12 @@ import {ISafeProxyFactory, IGnosisSafe} from "../test/lib/safe.sol";
 import {CyberAgreementUtils} from "./lib/CyberAgreementUtils.sol";
 import {SafeTxHelper} from "./lib/SafeTxHelper.sol";
 import {Script} from "forge-std/Script.sol";
-import {VestingAllocationFactory} from "../src/VestingAllocationFactory.sol";
 import {console2} from "forge-std/console2.sol";
 import {metavestController} from "../src/MetaVesTController.sol";
+import {MetaVestDealLib, MetaVestDeal} from "../src/lib/MetaVestDealLib.sol";
 
 contract ProposeMetaVestDealScript is SafeTxHelper, Script {
+    using MetaVestDealLib for MetaVestDeal;
     using YearnBorgCompensation2025_2026 for YearnBorgCompensation2025_2026.Config;
 
     /// @dev For running from `forge script`. Provide the deployer private key through env var.
@@ -67,7 +68,7 @@ contract ProposeMetaVestDealScript is SafeTxHelper, Script {
         console2.log("Guardian Safe: ", address(config.borgSafe));
         console2.log("Payment token: ", address(config.paymentToken));
         console2.log("CyberAgreementRegistry: ", address(config.registry));
-        console2.log("VestingAllocationFactory: ", address(config.vestingAllocationFactory));
+        console2.log("MetavestControllerFactory: ", address(config.metavestControllerFactory));
         console2.log("MetavesTController: ", address(config.controller));
         console2.log("");
 
@@ -104,10 +105,11 @@ contract ProposeMetaVestDealScript is SafeTxHelper, Script {
             bytes32 contractId = config.controller.proposeAndSignDeal(
                 guardianInfo.compTemplate.id,
                 agreementSalt,
-                metavestController.metavestType.Vesting,
-                guardianInfo.partyInfo.evmAddress,
-                allocation,
-                config.milestones,
+                MetaVestDealLib.draft().setVesting(
+                    guardianInfo.partyInfo.evmAddress,
+                    allocation,
+                    config.milestones
+                ),
                 globalValues,
                 parties,
                 partyValues,

scripts/signDealAndCreateMetavest.s.sol

@@ -10,7 +10,6 @@ import {ERC1967Proxy} from "openzeppelin-contracts/proxy/ERC1967/ERC1967Proxy.so
 import {ISafeProxyFactory, IGnosisSafe} from "../test/lib/safe.sol";
 import {SafeTxHelper} from "./lib/SafeTxHelper.sol";
 import {Script} from "forge-std/Script.sol";
-import {VestingAllocationFactory} from "../src/VestingAllocationFactory.sol";
 import {console2} from "forge-std/console2.sol";
 import {metavestController} from "../src/MetaVesTController.sol";
 

scripts/voidAgreement.s.sol

@@ -12,7 +12,6 @@ import {IZkCappedMinterV2Factory} from "../src/interfaces/zk-governance/IZkCappe
 import {SafeTxHelper} from "./lib/SafeTxHelper.sol";
 import {CyberAgreementUtils} from "./lib/CyberAgreementUtils.sol";
 import {Script} from "forge-std/Script.sol";
-import {VestingAllocationFactory} from "../src/VestingAllocationFactory.sol";
 import {ZkCappedMinterV2} from "zk-governance/l2-contracts/src/ZkCappedMinterV2.sol";
 import {ZkTokenV2} from "zk-governance/l2-contracts/src/ZkTokenV2.sol";
 import {console2} from "forge-std/console2.sol";

src/BaseAllocation.sol

@@ -1,6 +1,8 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity 0.8.28;
 
+import {MetaVestType} from "./lib/MetaVestDealLib.sol";
+
 /// @notice interface to a MetaLeX condition contract
 /// @dev see https://github.com/MetaLex-Tech/BORG-CORE/tree/main/src/libs/conditions
 interface IConditionM {
@@ -190,7 +192,7 @@ abstract contract BaseAllocation is ReentrancyGuard, SafeTransferLib{
             govType = GovType.vested;
         }
 
-        function getVestingType() external view virtual returns (uint256);
+        function getVestingType() external view virtual returns (MetaVestType);
         function getGoverningPower() external virtual returns (uint256);  
         function updateStopTimes(uint48 _shortStopTime) external virtual;// onlyController;
         function terminate() external virtual;// onlyController;