Merge pull request #42 from symbioticfi/change-init

Change init process

script/deploy/Vault.s.sol

@@ -36,21 +36,21 @@ contract VaultScript is Script {
             IVaultConfigurator.InitParams({
                 version: IMigratablesFactory(IVaultConfigurator(vaultConfigurator).VAULT_FACTORY()).lastVersion(),
                 owner: owner,
-                vaultParams: IVault.InitParams({
-                    collateral: address(collateral),
-                    delegator: address(0),
-                    slasher: address(0),
-                    burner: address(0xdEaD),
-                    epochDuration: epochDuration,
-                    depositWhitelist: depositWhitelist,
-                    isDepositLimit: depositLimit != 0,
-                    depositLimit: depositLimit,
-                    defaultAdminRoleHolder: owner,
-                    depositWhitelistSetRoleHolder: owner,
-                    depositorWhitelistRoleHolder: owner,
-                    isDepositLimitSetRoleHolder: owner,
-                    depositLimitSetRoleHolder: owner
-                }),
+                vaultParams: abi.encode(
+                    IVault.InitParams({
+                        collateral: address(collateral),
+                        burner: address(0xdEaD),
+                        epochDuration: epochDuration,
+                        depositWhitelist: depositWhitelist,
+                        isDepositLimit: depositLimit != 0,
+                        depositLimit: depositLimit,
+                        defaultAdminRoleHolder: owner,
+                        depositWhitelistSetRoleHolder: owner,
+                        depositorWhitelistRoleHolder: owner,
+                        isDepositLimitSetRoleHolder: owner,
+                        depositLimitSetRoleHolder: owner
+                    })
+                ),
                 delegatorIndex: delegatorIndex,
                 delegatorParams: delegatorIndex == 0
                     ? abi.encode(

src/contracts/VaultConfigurator.sol

@@ -36,30 +36,18 @@ contract VaultConfigurator is IVaultConfigurator {
      */
     function create(
         InitParams memory params
-    ) public returns (address, address, address) {
-        if (params.vaultParams.delegator != address(0) || params.vaultParams.slasher != address(0)) {
-            revert DirtyInitParams();
-        }
-
-        address vault =
-            VaultFactory(VAULT_FACTORY).create(params.version, params.owner, false, abi.encode(params.vaultParams));
-
-        params.vaultParams.delegator = DelegatorFactory(DELEGATOR_FACTORY).create(
-            params.delegatorIndex, true, abi.encode(vault, params.delegatorParams)
-        );
-
-        bytes memory slasherData;
-        if (params.withSlasher) {
-            slasherData = abi.encode(vault, params.slasherParams);
-            params.vaultParams.slasher = SlasherFactory(SLASHER_FACTORY).create(params.slasherIndex, false, slasherData);
-        }
+    ) public returns (address vault, address delegator, address slasher) {
+        vault = VaultFactory(VAULT_FACTORY).create(params.version, params.owner, params.vaultParams);
 
-        Vault(vault).initialize(params.version, params.owner, abi.encode(params.vaultParams));
+        delegator =
+            DelegatorFactory(DELEGATOR_FACTORY).create(params.delegatorIndex, abi.encode(vault, params.delegatorParams));
 
         if (params.withSlasher) {
-            BaseSlasher(params.vaultParams.slasher).initialize(slasherData);
+            slasher =
+                SlasherFactory(SLASHER_FACTORY).create(params.slasherIndex, abi.encode(vault, params.slasherParams));
         }
 
-        return (vault, params.vaultParams.delegator, params.vaultParams.slasher);
+        Vault(vault).setDelegator(delegator);
+        Vault(vault).setSlasher(slasher);
     }
 }

src/contracts/common/Entity.sol

@@ -16,27 +16,13 @@ abstract contract Entity is Initializable, IEntity {
      */
     uint64 public immutable TYPE;
 
-    modifier initialized() {
-        if (!isInitialized()) {
-            revert NotInitialized();
-        }
-        _;
-    }
-
     constructor(address factory, uint64 type_) {
         _disableInitializers();
 
         FACTORY = factory;
         TYPE = type_;
     }
 
-    /**
-     * @inheritdoc IEntity
-     */
-    function isInitialized() public view returns (bool) {
-        return _getInitializedVersion() != 0;
-    }
-
     /**
      * @inheritdoc IEntity
      */

src/contracts/common/Factory.sol

@@ -84,13 +84,11 @@ contract Factory is Registry, Ownable, IFactory {
     /**
      * @inheritdoc IFactory
      */
-    function create(uint64 type_, bool withInitialize, bytes calldata data) external returns (address entity_) {
+    function create(uint64 type_, bytes calldata data) external returns (address entity_) {
         entity_ = implementation(type_).cloneDeterministic(keccak256(abi.encode(totalEntities(), type_, data)));
 
         _addEntity(entity_);
 
-        if (withInitialize) {
-            IEntity(entity_).initialize(data);
-        }
+        IEntity(entity_).initialize(data);
     }
 }

src/contracts/common/MigratableEntity.sol

@@ -19,17 +19,8 @@ abstract contract MigratableEntity is
      */
     address public immutable FACTORY;
 
-    address private immutable SELF;
-
-    modifier initialized() {
-        if (!isInitialized()) {
-            revert NotInitialized();
-        }
-        _;
-    }
-
     modifier notInitialized() {
-        if (isInitialized()) {
+        if (_getInitializedVersion() != 0) {
             revert AlreadyInitialized();
         }
 
@@ -42,14 +33,6 @@ abstract contract MigratableEntity is
         _disableInitializers();
 
         FACTORY = factory;
-        SELF = address(this);
-    }
-
-    /**
-     * @inheritdoc IMigratableEntity
-     */
-    function isInitialized() public view returns (bool) {
-        return _getInitializedVersion() != 0;
     }
 
     /**
@@ -67,10 +50,6 @@ abstract contract MigratableEntity is
         address owner_,
         bytes calldata data
     ) external notInitialized reinitializer(initialVersion) {
-        if (SELF != IMigratablesFactory(FACTORY).implementation(initialVersion)) {
-            revert InvalidInitialVersion();
-        }
-
         __ReentrancyGuard_init();
 
         if (owner_ != address(0)) {

src/contracts/common/MigratablesFactory.sol

@@ -86,18 +86,11 @@ contract MigratablesFactory is Registry, Ownable, IMigratablesFactory {
     /**
      * @inheritdoc IMigratablesFactory
      */
-    function create(
-        uint64 version,
-        address owner_,
-        bool withInitialize,
-        bytes calldata data
-    ) external returns (address entity_) {
+    function create(uint64 version, address owner_, bytes calldata data) external returns (address entity_) {
         entity_ = address(
             new MigratableEntityProxy{salt: keccak256(abi.encode(totalEntities(), version, owner_, data))}(
                 implementation(version),
-                withInitialize
-                    ? abi.encodeWithSelector(IMigratableEntity.initialize.selector, version, owner_, data)
-                    : new bytes(0)
+                abi.encodeWithSelector(IMigratableEntity.initialize.selector, version, owner_, data)
             )
         );
 

src/contracts/delegator/BaseDelegator.sol

@@ -141,7 +141,7 @@ contract BaseDelegator is
     /**
      * @inheritdoc IBaseDelegator
      */
-    function setMaxNetworkLimit(uint96 identifier, uint256 amount) external initialized nonReentrant {
+    function setMaxNetworkLimit(uint96 identifier, uint256 amount) external nonReentrant {
         if (!IRegistry(NETWORK_REGISTRY).isEntity(msg.sender)) {
             revert NotNetwork();
         }
@@ -163,7 +163,7 @@ contract BaseDelegator is
      */
     function setHook(
         address hook_
-    ) external initialized nonReentrant onlyRole(HOOK_SET_ROLE) {
+    ) external nonReentrant onlyRole(HOOK_SET_ROLE) {
         hook = hook_;
 
         emit SetHook(hook_);
@@ -178,7 +178,7 @@ contract BaseDelegator is
         uint256 slashedAmount,
         uint48 captureTimestamp,
         bytes memory data
-    ) external initialized nonReentrant {
+    ) external nonReentrant {
         if (IVault(vault).slasher() != msg.sender) {
             revert NotSlasher();
         }

src/contracts/delegator/FullRestakeDelegator.sol

@@ -87,10 +87,7 @@ contract FullRestakeDelegator is BaseDelegator, IFullRestakeDelegator {
     /**
      * @inheritdoc IFullRestakeDelegator
      */
-    function setNetworkLimit(
-        bytes32 subnetwork,
-        uint256 amount
-    ) external initialized onlyRole(NETWORK_LIMIT_SET_ROLE) {
+    function setNetworkLimit(bytes32 subnetwork, uint256 amount) external onlyRole(NETWORK_LIMIT_SET_ROLE) {
         if (amount > maxNetworkLimit[subnetwork]) {
             revert ExceedsMaxNetworkLimit();
         }
@@ -107,7 +104,7 @@ contract FullRestakeDelegator is BaseDelegator, IFullRestakeDelegator {
         bytes32 subnetwork,
         address operator,
         uint256 amount
-    ) external initialized onlyRole(OPERATOR_NETWORK_LIMIT_SET_ROLE) {
+    ) external onlyRole(OPERATOR_NETWORK_LIMIT_SET_ROLE) {
         _operatorNetworkLimit[subnetwork][operator].push(Time.timestamp(), amount);
 
         emit SetOperatorNetworkLimit(subnetwork, operator, amount);

src/contracts/delegator/NetworkRestakeDelegator.sol

@@ -109,10 +109,7 @@ contract NetworkRestakeDelegator is BaseDelegator, INetworkRestakeDelegator {
     /**
      * @inheritdoc INetworkRestakeDelegator
      */
-    function setNetworkLimit(
-        bytes32 subnetwork,
-        uint256 amount
-    ) external initialized onlyRole(NETWORK_LIMIT_SET_ROLE) {
+    function setNetworkLimit(bytes32 subnetwork, uint256 amount) external onlyRole(NETWORK_LIMIT_SET_ROLE) {
         if (amount > maxNetworkLimit[subnetwork]) {
             revert ExceedsMaxNetworkLimit();
         }
@@ -129,7 +126,7 @@ contract NetworkRestakeDelegator is BaseDelegator, INetworkRestakeDelegator {
         bytes32 subnetwork,
         address operator,
         uint256 shares
-    ) external initialized onlyRole(OPERATOR_NETWORK_SHARES_SET_ROLE) {
+    ) external onlyRole(OPERATOR_NETWORK_SHARES_SET_ROLE) {
         _totalOperatorNetworkShares[subnetwork].push(
             Time.timestamp(),
             totalOperatorNetworkShares(subnetwork) - operatorNetworkShares(subnetwork, operator) + shares

src/contracts/slasher/Slasher.sol

@@ -27,7 +27,7 @@ contract Slasher is BaseSlasher, ISlasher {
         uint256 amount,
         uint48 captureTimestamp,
         bytes calldata hints
-    ) external initialized nonReentrant onlyNetworkMiddleware(subnetwork) returns (uint256 slashedAmount) {
+    ) external nonReentrant onlyNetworkMiddleware(subnetwork) returns (uint256 slashedAmount) {
         SlashHints memory slashHints;
         if (hints.length > 0) {
             slashHints = abi.decode(hints, (SlashHints));

src/contracts/slasher/VetoSlasher.sol

@@ -83,7 +83,7 @@ contract VetoSlasher is BaseSlasher, IVetoSlasher {
         uint256 amount,
         uint48 captureTimestamp,
         bytes calldata hints
-    ) external initialized nonReentrant onlyNetworkMiddleware(subnetwork) returns (uint256 slashIndex) {
+    ) external nonReentrant onlyNetworkMiddleware(subnetwork) returns (uint256 slashIndex) {
         RequestSlashHints memory requestSlashHints;
         if (hints.length > 0) {
             requestSlashHints = abi.decode(hints, (RequestSlashHints));
@@ -126,7 +126,7 @@ contract VetoSlasher is BaseSlasher, IVetoSlasher {
     function executeSlash(
         uint256 slashIndex,
         bytes calldata hints
-    ) external initialized nonReentrant returns (uint256 slashedAmount) {
+    ) external nonReentrant returns (uint256 slashedAmount) {
         ExecuteSlashHints memory executeSlashHints;
         if (hints.length > 0) {
             executeSlashHints = abi.decode(hints, (ExecuteSlashHints));
@@ -189,7 +189,7 @@ contract VetoSlasher is BaseSlasher, IVetoSlasher {
     /**
      * @inheritdoc IVetoSlasher
      */
-    function vetoSlash(uint256 slashIndex, bytes calldata hints) external initialized nonReentrant {
+    function vetoSlash(uint256 slashIndex, bytes calldata hints) external nonReentrant {
         VetoSlashHints memory vetoSlashHints;
         if (hints.length > 0) {
             vetoSlashHints = abi.decode(hints, (VetoSlashHints));
@@ -227,11 +227,7 @@ contract VetoSlasher is BaseSlasher, IVetoSlasher {
         emit VetoSlash(slashIndex, msg.sender);
     }
 
-    function setResolver(
-        uint96 identifier,
-        address resolver_,
-        bytes calldata hints
-    ) external initialized nonReentrant {
+    function setResolver(uint96 identifier, address resolver_, bytes calldata hints) external nonReentrant {
         SetResolverHints memory setResolverHints;
         if (hints.length > 0) {
             setResolverHints = abi.decode(hints, (SetResolverHints));
@@ -261,9 +257,6 @@ contract VetoSlasher is BaseSlasher, IVetoSlasher {
         (InitParams memory params) = abi.decode(data, (InitParams));
 
         uint48 epochDuration = IVault(vault_).epochDuration();
-        if (!IVault(vault_).isInitialized()) {
-            revert VaultNotInitialized();
-        }
         if (params.vetoDuration >= epochDuration) {
             revert InvalidVetoDuration();
         }