fix: adjust migrations

src/contracts/common/MigratableEntity.sol

@@ -79,7 +79,7 @@ abstract contract MigratableEntity is
 
     function _initialize(uint64, /* initialVersion */ address, /* owner */ bytes memory /* data */ ) internal virtual {}
 
-    function _migrate(uint64, /* oldVersion */ uint64, /* newVersion */ bytes calldata /* data */ ) internal virtual {}
+    function _migrate(uint64, /* oldVersion */ uint64, /* newVersion */ bytes memory /* data */ ) internal virtual {}
 
     uint256[10] private __gap;
 }

src/contracts/vault/Vault.sol

@@ -479,7 +479,7 @@ contract Vault is VaultStorage, MigratableEntity, AccessControlUpgradeable, IVau
         }
     }
 
-    function _migrate(uint64, /* oldVersion */ uint64, /* newVersion */ bytes calldata /* data */ ) internal override {
+    function _migrate(uint64, /* oldVersion */ uint64, /* newVersion */ bytes memory /* data */ ) internal override {
         revert();
     }
 }

src/contracts/vault/v1.1/Vault.sol

@@ -41,6 +41,33 @@ contract Vault is VaultStorage, MigratableEntity, AccessControlUpgradeable, Prox
         return IMPLEMENTATION;
     }
 
+    function _processMigrateParams(
+        IVault.MigrateParams memory params
+    ) internal {
+        if (params.epochDurationSetEpochsDelay < 3) {
+            revert IVault.InvalidEpochDurationSetEpochsDelay();
+        }
+
+        if (params.flashFeeReceiver == address(0) && params.flashFeeRate != 0) {
+            revert IVault.InvalidFlashParams();
+        }
+
+        epochDurationSetEpochsDelay = params.epochDurationSetEpochsDelay;
+
+        flashFeeRate = params.flashFeeRate;
+        flashFeeReceiver = params.flashFeeReceiver;
+
+        if (params.epochDurationSetRoleHolder != address(0)) {
+            _grantRole(EPOCH_DURATION_SET_ROLE, params.epochDurationSetRoleHolder);
+        }
+        if (params.flashFeeRateSetRoleHolder != address(0)) {
+            _grantRole(FLASH_FEE_RATE_SET_ROLE, params.flashFeeRateSetRoleHolder);
+        }
+        if (params.flashFeeReceiverSetRoleHolder != address(0)) {
+            _grantRole(FLASH_FEE_RECEIVER_SET_ROLE, params.flashFeeReceiverSetRoleHolder);
+        }
+    }
+
     function _initialize(uint64, address, bytes memory data) internal virtual override {
         (IVault.InitParams memory params) = abi.decode(data, (IVault.InitParams));
 
@@ -90,13 +117,6 @@ contract Vault is VaultStorage, MigratableEntity, AccessControlUpgradeable, Prox
             isDepositorWhitelisted[params.depositorsWhitelisted[i]] = true;
         }
 
-        if (params.epochDurationSetEpochsDelay < 3) {
-            revert IVault.InvalidEpochDurationSetEpochsDelay();
-        }
-
-        if (params.flashFeeReceiver == address(0) && params.flashFeeRate != 0) {
-            revert IVault.InvalidFlashParams();
-        }
         if (params.defaultAdminRoleHolder == address(0)) {
             if (params.flashFeeReceiver == address(0)) {
                 if (params.flashFeeRateSetRoleHolder == address(0)) {
@@ -111,22 +131,29 @@ contract Vault is VaultStorage, MigratableEntity, AccessControlUpgradeable, Prox
             }
         }
 
+        _processMigrateParams(
+            IVault.MigrateParams({
+                epochDurationSetEpochsDelay: params.epochDurationSetEpochsDelay,
+                flashFeeRate: params.flashFeeRate,
+                flashFeeReceiver: params.flashFeeReceiver,
+                epochDurationSetRoleHolder: params.epochDurationSetRoleHolder,
+                flashFeeRateSetRoleHolder: params.flashFeeRateSetRoleHolder,
+                flashFeeReceiverSetRoleHolder: params.flashFeeReceiverSetRoleHolder
+            })
+        );
+
         collateral = params.collateral;
 
         burner = params.burner;
 
         epochDurationInit = Time.timestamp();
         epochDuration = params.epochDuration;
-        epochDurationSetEpochsDelay = params.epochDurationSetEpochsDelay;
 
         depositWhitelist = params.depositWhitelist;
 
         isDepositLimit = params.isDepositLimit;
         depositLimit = params.depositLimit;
 
-        flashFeeRate = params.flashFeeRate;
-        flashFeeReceiver = params.flashFeeReceiver;
-
         if (params.defaultAdminRoleHolder != address(0)) {
             _grantRole(DEFAULT_ADMIN_ROLE, params.defaultAdminRoleHolder);
         }
@@ -142,22 +169,11 @@ contract Vault is VaultStorage, MigratableEntity, AccessControlUpgradeable, Prox
         if (params.depositLimitSetRoleHolder != address(0)) {
             _grantRole(DEPOSIT_LIMIT_SET_ROLE, params.depositLimitSetRoleHolder);
         }
-        if (params.epochDurationSetRoleHolder != address(0)) {
-            _grantRole(EPOCH_DURATION_SET_ROLE, params.epochDurationSetRoleHolder);
-        }
-        if (params.flashFeeRateSetRoleHolder != address(0)) {
-            _grantRole(FLASH_FEE_RATE_SET_ROLE, params.flashFeeRateSetRoleHolder);
-        }
-        if (params.flashFeeReceiverSetRoleHolder != address(0)) {
-            _grantRole(FLASH_FEE_RECEIVER_SET_ROLE, params.flashFeeReceiverSetRoleHolder);
-        }
     }
 
-    function _migrate(
-        uint64, /* oldVersion */
-        uint64, /* newVersion */
-        bytes calldata /* data */
-    ) internal virtual override {
-        revert();
+    function _migrate(uint64, /* oldVersion */ uint64, /* newVersion */ bytes memory data) internal virtual override {
+        (IVault.MigrateParams memory params) = abi.decode(data, (IVault.MigrateParams));
+
+        _processMigrateParams(params);
     }
 }

src/contracts/vault/v1.1/VaultTokenized.sol

@@ -4,6 +4,7 @@ pragma solidity 0.8.25;
 import {Vault} from "./Vault.sol";
 import {VaultTokenizedImplementation} from "./VaultTokenizedImplementation.sol";
 
+import {IVault} from "../../../interfaces/vault/v1.1/IVault.sol";
 import {IVaultTokenized} from "../../../interfaces/vault/v1.1/IVaultTokenized.sol";
 
 import {Address} from "@openzeppelin/contracts/utils/Address.sol";
@@ -21,25 +22,24 @@ contract VaultTokenized is Vault {
     function _initialize(uint64 initialVersion, address owner_, bytes memory data) internal virtual override {
         (IVaultTokenized.InitParamsTokenized memory params) = abi.decode(data, (IVaultTokenized.InitParamsTokenized));
 
-        super._initialize(initialVersion, owner_, abi.encode(params.baseParams));
+        super._initialize(initialVersion, owner_, params.baseParams);
 
         _implementation().functionDelegateCall(
             abi.encodeCall(VaultTokenizedImplementation._VaultTokenized_init, (params.name, params.symbol))
         );
     }
 
-    function _migrate(uint64 oldVersion, uint64, /* newVersion */ bytes calldata data) internal virtual override {
+    function _migrate(uint64 oldVersion, uint64 newVersion, bytes memory data) internal virtual override {
         if (oldVersion == 1) {
             (IVaultTokenized.MigrateParamsTokenized memory params) =
                 abi.decode(data, (IVaultTokenized.MigrateParamsTokenized));
+            super._migrate(oldVersion, newVersion, params.baseParams);
             _implementation().functionDelegateCall(
                 abi.encodeCall(VaultTokenizedImplementation._VaultTokenized_init, (params.name, params.symbol))
             );
         } else {
             // oldVersion == 2
-            if (data.length > 0) {
-                revert IVaultTokenized.InvalidData();
-            }
+            super._migrate(oldVersion, newVersion, data);
         }
     }
 }

src/contracts/vault/v1.1/VaultVotes.sol

@@ -24,13 +24,13 @@ contract VaultVotes is VaultTokenized {
         _implementation().functionDelegateCall(abi.encodeCall(VaultVotesImplementation._VaultVotes_init, ()));
     }
 
-    function _migrate(uint64 oldVersion, uint64, /* newVersion */ bytes calldata data) internal virtual override {
+    function _migrate(uint64 oldVersion, uint64, /* newVersion */ bytes memory data) internal virtual override {
         if (oldVersion != 3) {
             revert IVaultVotes.ImproperMigration();
         }
 
         if (data.length > 0) {
-            revert IVaultTokenized.InvalidData();
+            revert IVaultVotes.InvalidData();
         }
 
         _implementation().functionDelegateCall(abi.encodeCall(VaultVotesImplementation._VaultVotes_init, ()));

src/contracts/vault/v1.1/VaultVotesImplementation.sol

@@ -96,17 +96,15 @@ contract VaultVotesImplementation is VaultStorage, VotesUpgradeable, Proxy, IVau
     }
 
     function transfer(address to, uint256 value) external returns (bool result) {
-        result = abi.decode(
-            BASE_IMPLEMENTATION.functionDelegateCall(abi.encodeCall(IERC20.transfer, (to, value))), (bool)
-        );
+        result =
+            abi.decode(BASE_IMPLEMENTATION.functionDelegateCall(abi.encodeCall(IERC20.transfer, (to, value))), (bool));
 
         _transferVotingUnits(msg.sender, to, value);
     }
 
     function transferFrom(address from, address to, uint256 value) external returns (bool result) {
         result = abi.decode(
-            BASE_IMPLEMENTATION.functionDelegateCall(abi.encodeCall(IERC20.transferFrom, (from, to, value))),
-            (bool)
+            BASE_IMPLEMENTATION.functionDelegateCall(abi.encodeCall(IERC20.transferFrom, (from, to, value))), (bool)
         );
 
         _transferVotingUnits(from, to, value);

src/interfaces/vault/v1.1/IVault.sol

@@ -81,6 +81,15 @@ interface IVault is IVaultStorage, IAccessControl, IERC165, IERC3156FlashLender
         address flashFeeReceiverSetRoleHolder;
     }
 
+    struct MigrateParams {
+        uint256 epochDurationSetEpochsDelay;
+        uint256 flashFeeRate;
+        address flashFeeReceiver;
+        address epochDurationSetRoleHolder;
+        address flashFeeRateSetRoleHolder;
+        address flashFeeReceiverSetRoleHolder;
+    }
+
     /**
      * @notice Hints for an active balance.
      * @param activeSharesOfHint hint for the active shares of checkpoint

src/interfaces/vault/v1.1/IVaultTokenized.sol

@@ -8,16 +8,14 @@ import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IER
 import {IERC20Errors} from "@openzeppelin/contracts/interfaces/draft-IERC6093.sol";
 
 interface IVaultTokenized is IERC20, IERC20Metadata, IERC20Errors {
-    error InvalidData();
-
     /**
      * @notice Initial parameters needed for a tokenized vault deployment.
      * @param baseParams initial parameters needed for a vault deployment (InitParams)
      * @param name name for the ERC20 tokenized vault
      * @param symbol symbol for the ERC20 tokenized vault
      */
     struct InitParamsTokenized {
-        IVault.InitParams baseParams;
+        bytes baseParams;
         string name;
         string symbol;
     }
@@ -28,6 +26,7 @@ interface IVaultTokenized is IERC20, IERC20Metadata, IERC20Errors {
      * @param symbol symbol for the ERC20 tokenized vault
      */
     struct MigrateParamsTokenized {
+        bytes baseParams;
         string name;
         string symbol;
     }

src/interfaces/vault/v1.1/IVaultVotes.sol

@@ -6,4 +6,5 @@ import {IERC5805} from "@openzeppelin/contracts/interfaces/IERC5805.sol";
 interface IVaultVotes is IERC5805 {
     error SafeSupplyExceeded();
     error ImproperMigration();
+    error InvalidData();
 }

test/mocks/SimpleMigratableEntity.sol

@@ -16,7 +16,7 @@ contract SimpleMigratableEntity is MigratableEntity {
         a = _a;
     }
 
-    function _migrate(uint64, /* oldVersion */ uint64, /* newVersion */ bytes calldata /* data */ ) internal override {
+    function _migrate(uint64, /* oldVersion */ uint64, /* newVersion */ bytes memory /* data */ ) internal override {
         revert();
     }
 }

test/mocks/SimpleMigratableEntityV2.sol

@@ -23,7 +23,7 @@ contract SimpleMigratableEntityV2 is MigratableEntity {
         b = b_;
     }
 
-    function _migrate(uint64 oldVersion, uint64 newVersion, bytes calldata data) internal override {
+    function _migrate(uint64 oldVersion, uint64 newVersion, bytes memory data) internal override {
         if (newVersion - oldVersion > 1) {
             revert();
         }