Bytes params for vesting factory (#135)

* Bytes params for vesting factory

* remove `.only`

* add test and fix lint

* rename `initialization` -> `initArgs`

Author: arr00

contracts/finance/VestingWalletConfidentialFactory.sol

@@ -16,33 +16,19 @@ import {VestingWalletCliffConfidential} from "./VestingWalletCliffConfidential.s
  */
 abstract contract VestingWalletConfidentialFactory {
     struct VestingPlan {
-        address beneficiary;
         externalEuint64 encryptedAmount;
-        uint48 startTimestamp;
-        uint48 durationSeconds;
-        uint48 cliffSeconds;
+        bytes initArgs;
     }
 
     address private immutable _vestingImplementation;
 
     event VestingWalletConfidentialFunded(
         address indexed vestingWalletConfidential,
-        address indexed beneficiary,
         address indexed confidentialFungibleToken,
-        euint64 encryptedAmount,
-        uint48 startTimestamp,
-        uint48 durationSeconds,
-        uint48 cliffSeconds,
-        address executor
-    );
-    event VestingWalletConfidentialCreated(
-        address indexed vestingWalletConfidential,
-        address indexed beneficiary,
-        uint48 startTimestamp,
-        uint48 durationSeconds,
-        uint48 cliffSeconds,
-        address indexed executor
+        euint64 transferredAmount,
+        bytes initArgs
     );
+    event VestingWalletConfidentialCreated(address indexed vestingWalletConfidential, bytes initArgs);
 
     constructor() {
         _vestingImplementation = _deployVestingWalletImplementation();
@@ -59,50 +45,28 @@ abstract contract VestingWalletConfidentialFactory {
     function batchFundVestingWalletConfidential(
         address confidentialFungibleToken,
         VestingPlan[] calldata vestingPlans,
-        address executor,
         bytes calldata inputProof
     ) public virtual {
         uint256 vestingPlansLength = vestingPlans.length;
         for (uint256 i = 0; i < vestingPlansLength; i++) {
             VestingPlan memory vestingPlan = vestingPlans[i];
-            require(
-                vestingPlan.cliffSeconds <= vestingPlan.durationSeconds,
-                VestingWalletCliffConfidential.VestingWalletCliffConfidentialInvalidCliffDuration(
-                    vestingPlan.cliffSeconds,
-                    vestingPlan.durationSeconds
-                )
-            );
+            _validateVestingWalletInitArgs(vestingPlan.initArgs);
 
-            require(vestingPlan.beneficiary != address(0), OwnableUpgradeable.OwnableInvalidOwner(address(0)));
-            address vestingWalletAddress = predictVestingWalletConfidential(
-                vestingPlan.beneficiary,
-                vestingPlan.startTimestamp,
-                vestingPlan.durationSeconds,
-                vestingPlan.cliffSeconds,
-                executor
-            );
+            address vestingWalletAddress = predictVestingWalletConfidential(vestingPlan.initArgs);
 
-            euint64 transferredAmount;
-            {
-                // avoiding stack too deep with scope
-                euint64 encryptedAmount = FHE.fromExternal(vestingPlan.encryptedAmount, inputProof);
-                FHE.allowTransient(encryptedAmount, confidentialFungibleToken);
-                transferredAmount = IConfidentialFungibleToken(confidentialFungibleToken).confidentialTransferFrom(
-                    msg.sender,
-                    vestingWalletAddress,
-                    encryptedAmount
-                );
-            }
+            euint64 encryptedAmount = FHE.fromExternal(vestingPlan.encryptedAmount, inputProof);
+            FHE.allowTransient(encryptedAmount, confidentialFungibleToken);
+            euint64 transferredAmount = IConfidentialFungibleToken(confidentialFungibleToken).confidentialTransferFrom(
+                msg.sender,
+                vestingWalletAddress,
+                encryptedAmount
+            );
 
             emit VestingWalletConfidentialFunded(
                 vestingWalletAddress,
-                vestingPlan.beneficiary,
                 confidentialFungibleToken,
                 transferredAmount,
-                vestingPlan.startTimestamp,
-                vestingPlan.durationSeconds,
-                vestingPlan.cliffSeconds,
-                executor
+                vestingPlan.initArgs
             );
         }
     }
@@ -112,75 +76,33 @@ abstract contract VestingWalletConfidentialFactory {
      *
      * Emits a {VestingWalletConfidentialCreated}.
      */
-    function createVestingWalletConfidential(
-        address beneficiary,
-        uint48 startTimestamp,
-        uint48 durationSeconds,
-        uint48 cliffSeconds,
-        address executor
-    ) public virtual returns (address) {
+    function createVestingWalletConfidential(bytes calldata initArgs) public virtual returns (address) {
         // Will revert if clone already created
         address vestingWalletConfidentialAddress = Clones.cloneDeterministic(
             _vestingImplementation,
-            _getCreate2VestingWalletConfidentialSalt(
-                beneficiary,
-                startTimestamp,
-                durationSeconds,
-                cliffSeconds,
-                executor
-            )
-        );
-        _initializeVestingWallet(
-            vestingWalletConfidentialAddress,
-            beneficiary,
-            startTimestamp,
-            durationSeconds,
-            cliffSeconds,
-            executor
-        );
-        emit VestingWalletConfidentialCreated(
-            vestingWalletConfidentialAddress,
-            beneficiary,
-            startTimestamp,
-            durationSeconds,
-            cliffSeconds,
-            executor
+            _getCreate2VestingWalletConfidentialSalt(initArgs)
         );
+        _initializeVestingWallet(vestingWalletConfidentialAddress, initArgs);
+        emit VestingWalletConfidentialCreated(vestingWalletConfidentialAddress, initArgs);
         return vestingWalletConfidentialAddress;
     }
 
     /**
      * @dev Predicts the deterministic address for a confidential vesting wallet.
      */
-    function predictVestingWalletConfidential(
-        address beneficiary,
-        uint48 startTimestamp,
-        uint48 durationSeconds,
-        uint48 cliffSeconds,
-        address executor
-    ) public view virtual returns (address) {
+    function predictVestingWalletConfidential(bytes memory initArgs) public view virtual returns (address) {
         return
             Clones.predictDeterministicAddress(
                 _vestingImplementation,
-                _getCreate2VestingWalletConfidentialSalt(
-                    beneficiary,
-                    startTimestamp,
-                    durationSeconds,
-                    cliffSeconds,
-                    executor
-                )
+                _getCreate2VestingWalletConfidentialSalt(initArgs)
             );
     }
 
+    /// @dev Virtual function that must be implemented to validate the initArgs bytes.
+    function _validateVestingWalletInitArgs(bytes memory initArgs) internal virtual;
+
     /// @dev Virtual function that must be implemented to initialize the vesting wallet at `vestingWalletAddress`.
-    function _initializeVestingWallet(
-        address vestingWalletAddress,
-        address beneficiary,
-        uint48 startTimestamp,
-        uint48 durationSeconds,
-        uint48 cliffSeconds,
-        address executor
-    ) internal virtual;
+    function _initializeVestingWallet(address vestingWalletAddress, bytes calldata initArgs) internal virtual;
 
     /**
      * @dev Internal function that is called once to deploy the vesting wallet implementation.
@@ -192,13 +114,7 @@ abstract contract VestingWalletConfidentialFactory {
     /**
      * @dev Gets create2 salt for a confidential vesting wallet.
      */
-    function _getCreate2VestingWalletConfidentialSalt(
-        address beneficiary,
-        uint48 startTimestamp,
-        uint48 durationSeconds,
-        uint48 cliffSeconds,
-        address executor
-    ) internal pure virtual returns (bytes32) {
-        return keccak256(abi.encodePacked(beneficiary, startTimestamp, durationSeconds, cliffSeconds, executor));
+    function _getCreate2VestingWalletConfidentialSalt(bytes memory initArgs) internal pure virtual returns (bytes32) {
+        return keccak256(initArgs);
     }
 }

contracts/mocks/finance/VestingWalletConfidentialFactoryMock.sol

@@ -12,14 +12,29 @@ abstract contract VestingWalletConfidentialFactoryMock is VestingWalletConfident
         return address(new VestingWalletCliffExecutorConfidential());
     }
 
-    function _initializeVestingWallet(
-        address vestingWalletAddress,
-        address beneficiary,
-        uint48 startTimestamp,
-        uint48 durationSeconds,
-        uint48 cliffSeconds,
-        address executor
-    ) internal virtual override {
+    function _validateVestingWalletInitArgs(bytes memory initArgs) internal virtual override {
+        // solhint-disable no-unused-vars
+        (
+            address beneficiary,
+            uint48 startTimestamp,
+            uint48 durationSeconds,
+            uint48 cliffSeconds,
+            address executor
+        ) = abi.decode(initArgs, (address, uint48, uint48, uint48, address));
+
+        require(cliffSeconds <= durationSeconds);
+        require(beneficiary != address(0));
+    }
+
+    function _initializeVestingWallet(address vestingWalletAddress, bytes calldata initArgs) internal virtual override {
+        (
+            address beneficiary,
+            uint48 startTimestamp,
+            uint48 durationSeconds,
+            uint48 cliffSeconds,
+            address executor
+        ) = abi.decode(initArgs, (address, uint48, uint48, uint48, address));
+
         VestingWalletCliffExecutorConfidential(vestingWalletAddress).initialize(
             beneficiary,
             startTimestamp,