@etherisc/gif-next 3.0.0-9a6ca4b-922 → 3.0.0-a511887-523

package/contracts/shared/InstanceLinkedComponent.sol

@@ -1,10 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";
-import {IAccessManaged} from "@openzeppelin/contracts/access/manager/IAccessManaged.sol";
-import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
-import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 
 import {Amount} from "../type/Amount.sol";
 import {Component} from "./Component.sol";
@@ -12,17 +8,11 @@ import {IComponentService} from "./IComponentService.sol";
 import {IInstanceLinkedComponent} from "./IInstanceLinkedComponent.sol";
 import {IAuthorization} from "../authorization/IAuthorization.sol";
 import {IComponents} from "../instance/module/IComponents.sol";
-import {IInstanceService} from "../instance/IInstanceService.sol";
 import {IInstance} from "../instance/IInstance.sol";
 import {InstanceReader} from "../instance/InstanceReader.sol";
 import {IRegistry} from "../registry/IRegistry.sol";
 import {NftId} from "../type/NftId.sol";
 import {ObjectType, COMPONENT, INSTANCE, PRODUCT} from "../type/ObjectType.sol";
-import {VersionPart} from "../type/Version.sol";
-import {RoleId, RoleIdLib} from "../type/RoleId.sol";
-import {IAccess} from "../authorization/IAccess.sol";
-import {TokenHandler} from "../shared/TokenHandler.sol";
-import {VersionPart} from "../type/Version.sol";
 
 // then add (Distribution|Pool|Product)Upradeable that also intherit from Versionable
 // same pattern as for Service which is also upgradeable
@@ -35,24 +25,11 @@ abstract contract InstanceLinkedComponent is
 
     struct InstanceLinkedComponentStorage {
         IInstance _instance; // instance for this component
-        InstanceReader _instanceReader; // instance reader for this component
         IAuthorization _initialAuthorization;
-        IComponentService _componentService;
     }
 
     /// @inheritdoc IInstanceLinkedComponent
-    function withdrawFees(Amount amount)
-        external
-        virtual
-        restricted()
-        onlyOwner()
-        returns (Amount withdrawnAmount)
-    {
-        return _withdrawFees(amount);
-    }
-
-    /// @inheritdoc IInstanceLinkedComponent
-    function getInstance() public view virtual override returns (IInstance instance) {
+    function getInstance() public view virtual returns (IInstance instance) {
         return _getInstanceLinkedComponentStorage()._instance;
     }
 
@@ -61,12 +38,6 @@ abstract contract InstanceLinkedComponent is
         return _getInstanceLinkedComponentStorage()._initialAuthorization;
     }
 
-    function _getInstanceLinkedComponentStorage() private pure returns (InstanceLinkedComponentStorage storage $) {
-        assembly {
-            $.slot := INSTANCE_LINKED_COMPONENT_LOCATION_V1
-        }
-    }
-
     function __InstanceLinkedComponent_init(
         address registry,
         NftId parentNftId,
@@ -76,79 +47,64 @@ abstract contract InstanceLinkedComponent is
         bool isInterceptor,
         address initialOwner
     )
-        internal
+        internal 
         virtual
         onlyInitializing()
     {
-        // validate registry, nft ids and get parent nft id
-        NftId instanceNftId = _checkAndGetInstanceNftId(
-            registry, 
-            parentNftId, 
-            componentType);
-
-        // set and check linked instance
-        InstanceLinkedComponentStorage storage $ = _getInstanceLinkedComponentStorage();
-        $._instance = IInstance(
-            IRegistry(registry).getObjectAddress(instanceNftId));
+        // TODO calling registry and checking release before component is initialized
+        //      at least breaks order of checks -> e.g. if registry is not contract no meaningfull error will be given
+        IInstance instance = _checkAndGetInstance(registry, parentNftId, componentType);
 
         // set component specific parameters
         __Component_init(
-            $._instance.authority(), // instance linked components need to point to instance admin
+            instance.authority(),
             registry, 
             parentNftId, 
             name, 
-            componentType, 
+            componentType,
             isInterceptor, 
             initialOwner, 
             ""); // registry data
 
         // set instance linked specific parameters
-        $._instanceReader = $._instance.getInstanceReader();
+        InstanceLinkedComponentStorage storage $ = _getInstanceLinkedComponentStorage();
+        $._instance = instance;
         $._initialAuthorization = authorization;
-        $._componentService = IComponentService(_getServiceAddress(COMPONENT())); 
 
         // register interfaces
         _registerInterface(type(IInstanceLinkedComponent).interfaceId);
     }
 
-
-    function _checkAndGetInstanceNftId(
+    function _checkAndGetInstance(
         address registryAddress,
         NftId parentNftId,
         ObjectType componentType
     )
-        internal
+        private
         view
-        returns (NftId instanceNftId)
+        returns (IInstance instance)
     {
-        // if product, then parent is already instance
-        if (componentType == PRODUCT()) {
-            _checkAndGetRegistry(registryAddress, parentNftId, INSTANCE());
-            return parentNftId;
+        NftId instanceNftId;
+        IRegistry registry = IRegistry(registryAddress);
+
+        if(componentType == PRODUCT()) {
+            instanceNftId = parentNftId;
+        } else {
+            NftId productNftId = parentNftId;
+            instanceNftId = registry.getParentNftId(productNftId);
         }
 
-        // if not product parent is product, and parent of product is instance
-        IRegistry registry = _checkAndGetRegistry(registryAddress, parentNftId, PRODUCT());
-        return registry.getParentNftId(parentNftId);
-    }
+        IRegistry.ObjectInfo memory info = registry.getObjectInfo(instanceNftId);
 
-    /// @dev checks the and gets registry.
-    /// validates registry using a provided nft id and expected object type.
-    function _checkAndGetRegistry(
-        address registryAddress,
-        NftId objectNftId,
-        ObjectType requiredType
-    )
-        internal
-        view
-        returns (IRegistry registry)
-    {
-        registry = IRegistry(registryAddress);
-        IRegistry.ObjectInfo memory info = registry.getObjectInfo(objectNftId);
+        if (info.objectType != INSTANCE()) {
+            revert ErrorInstanceLinkedComponentInstanceInvalid();
+        }
 
-        if (info.objectType != requiredType) {
-            revert ErrorInstanceLinkedComponentTypeMismatch(requiredType, info.objectType);
+        if(info.release != getRelease()) {
+            revert ErrorInstanceLinkedComponentInstanceMismatch(info.release, getRelease());
         }
+
+        instance = IInstance(info.objectAddress); 
     }
 
 
@@ -180,13 +136,12 @@ abstract contract InstanceLinkedComponent is
 
     /// @dev returns reader for linked instance
     function _getInstanceReader() internal view returns (InstanceReader reader) {
-        return _getInstanceLinkedComponentStorage()._instanceReader;
+        return _getInstanceLinkedComponentStorage()._instance.getInstanceReader();
     }
 
-    function _withdrawFees(Amount amount)
-        internal
-        returns (Amount withdrawnAmount)
-    {
-        return _getInstanceLinkedComponentStorage()._componentService.withdrawFees(amount);
+    function _getInstanceLinkedComponentStorage() private pure returns (InstanceLinkedComponentStorage storage $) {
+        assembly {
+            $.slot := INSTANCE_LINKED_COMPONENT_LOCATION_V1
+        }
     }
 }

package/contracts/shared/NftOwnable.sol

@@ -4,7 +4,6 @@ pragma solidity ^0.8.20;
 import {InitializableERC165} from "./InitializableERC165.sol";
 import {INftOwnable} from "./INftOwnable.sol";
 import {NftId} from "../type/NftId.sol";
-import {ObjectType} from "../type/ObjectType.sol";
 import {RegistryLinked} from "./RegistryLinked.sol";
 
 contract NftOwnable is
@@ -35,20 +34,8 @@ contract NftOwnable is
         _;
     }
 
-    modifier onlyNftOfType(NftId nftId, ObjectType expectedObjectType) {
-        _checkNftType(nftId, expectedObjectType);
-        _;
-    }
-
-    function _checkNftType(NftId nftId, ObjectType expectedObjectType) internal view {
-        if(expectedObjectType.eqz() || !getRegistry().isObjectType(nftId, expectedObjectType)) {
-            revert ErrorNftOwnableInvalidType(nftId, expectedObjectType);
-        }
-    }
-
-
     /// @dev Initialization for upgradable contracts.
-    // used in __Registerable_init, ProxyManager._preDeployChecksAndSetup
+    // used in __Registerable_init, ProxyManager.initialize
     function __NftOwnable_init(
         address registry,
         address initialOwner

package/contracts/shared/PolicyHolder.sol

@@ -23,7 +23,7 @@ contract PolicyHolder is
     // callbacks must only be allowed from the policy and claim services
     // will need a release parameter to fetch the right service addresses for the modifiers
 
-    function _initializePolicyHolder(
+    function __PolicyHolder_init(
         address registryAddress
     )
         internal
@@ -47,7 +47,7 @@ contract PolicyHolder is
     /// @dev empty default implementation
     function payoutExecuted(NftId policyNftId, PayoutId payoutId, Amount amount, address beneficiary) external virtual {}
 
-    //--- IERC165 functions ---------------// 
+    //--- IERC721 functions ---------------// 
     function onERC721Received(
         address, // operator
         address, // from

package/contracts/shared/Registerable.sol

@@ -9,15 +9,16 @@ import {ContractLib} from "../shared/ContractLib.sol";
 import {NftId, NftIdLib} from "../type/NftId.sol";
 import {NftOwnable} from "../shared/NftOwnable.sol";
 import {ObjectType} from "../type/ObjectType.sol";
+import {Versionable} from "../shared/Versionable.sol";
 import {VersionPart, VersionPartLib} from "../type/Version.sol";
 
 import {IRegistry} from "../registry/IRegistry.sol";
 import {IRegisterable} from "./IRegisterable.sol";
-import {IRelease} from "../registry/IRelease.sol";
 
 abstract contract Registerable is
     AccessManagedUpgradeable,
     NftOwnable,
+    Versionable,
     IRegisterable
 {
     // keccak256(abi.encode(uint256(keccak256("gif-next.contracts.shared.Registerable.sol")) - 1)) & ~bytes32(uint256(0xff));
@@ -37,6 +38,19 @@ abstract contract Registerable is
         _;
     }
 
+    // TODO move to registerables verification library
+    modifier onlyNftOfType(NftId nftId, ObjectType expectedObjectType) {
+        _checkNftType(nftId, expectedObjectType);
+        _;
+    }
+
+    // TODO move to registerables verification library
+    function _checkNftType(NftId nftId, ObjectType expectedObjectType) internal view {
+        if(expectedObjectType.eqz() || !getRegistry().isObjectType(nftId, expectedObjectType, getRelease())) {
+            revert ErrorNftOwnableInvalidType(nftId, expectedObjectType);
+        }
+    }
+
     function __Registerable_init(
         address authority,
         address registry,
@@ -44,7 +58,7 @@ abstract contract Registerable is
         ObjectType objectType,
         bool isInterceptor,
         address initialOwner,
-        bytes memory data // writeonly data that will saved in the object info record of the registry
+        bytes memory data
     )
         internal
         virtual
@@ -54,14 +68,20 @@ abstract contract Registerable is
             revert ErrorAuthorityInvalid(authority);
         }
 
+        // release must allign with authority -> not a release check of third contract...
+        VersionPart release = AccessManagerCloneable(authority).getRelease();
+
         __AccessManaged_init(authority);
         __NftOwnable_init(registry, initialOwner);
+        __Versionable_init(release);
 
         RegisterableStorage storage $ = _getRegisterableStorage();
         $._parentNftId = parentNftId;
         $._objectType = objectType;
         $._isInterceptor = isInterceptor;
-        $._data = data;
+        if(data.length > 0) { 
+            $._data = data;
+        }
 
         _registerInterface(type(IAccessManaged).interfaceId);
     }
@@ -72,13 +92,6 @@ abstract contract Registerable is
         return !AccessManagerCloneable(authority()).isTargetClosed(address(this));
     }
 
-
-    /// @inheritdoc IRelease
-    function getRelease() public virtual view returns (VersionPart release) {
-        return AccessManagerCloneable(authority()).getRelease();
-    }
-
-
     /// @inheritdoc IRegisterable
     function getInitialInfo() 
         public 
@@ -87,14 +100,19 @@ abstract contract Registerable is
         returns (IRegistry.ObjectInfo memory info) 
     {
         RegisterableStorage storage $ = _getRegisterableStorage();
-        return IRegistry.ObjectInfo(
-            NftIdLib.zero(),
-            $._parentNftId,
-            $._objectType,
-            $._isInterceptor,
-            address(this), 
-            getOwner(),
-            $._data);
+        return (
+            IRegistry.ObjectInfo(
+                NftIdLib.zero(),
+                $._parentNftId,
+                $._objectType,
+                getRelease(),
+                $._isInterceptor,
+                address(this))
+        );
+    }
+
+    function getInitialData() public view virtual returns (bytes memory data) {
+        return _getRegisterableStorage()._data;
     }
 
 

package/contracts/shared/RegistryLinked.sol

@@ -12,20 +12,27 @@ contract RegistryLinked is
     IRegistryLinked
 {
 
-    // priorize simplicity and size over using standard upgradeability structs
+    // priorize simplicity and size over using standard upgradeability structs 
+    // registry address MUST NOT be upgraded
     IRegistry private _registry;
 
     /// @dev initialization for upgradable contracts
-    // used in _initializeRegisterable
+    // used in RegistryAdmin / InstanceAdmin / ReleaseAdmin.completeSetup()
     function __RegistryLinked_init(
         address registry
     )
         internal
         virtual
-        onlyInitializing()
     {
+        if(address(_registry) != address(0) ) {
+            if(_registry != IRegistry(registry)) {
+                revert ErrorRegistryLinkedRegistryAlreadyInitialized(address(this), address(_registry));
+            }
+            return;
+        }
+
         if (!ContractLib.isRegistry(registry)) {
-            revert ErrorNotRegistry(registry);
+            revert ErrorRegistryLinkedNotRegistry(address(this), registry);
         }
 
         _registry = IRegistry(registry);

package/contracts/shared/Service.sol

@@ -5,18 +5,19 @@ import {ReentrancyGuardUpgradeable} from "@openzeppelin/contracts-upgradeable/ut
 
 import {IRegistry} from "../registry/IRegistry.sol";
 import {IService} from "./IService.sol";
-import {IVersionable} from "../upgradeability/IVersionable.sol";
+import {IVersionable} from "../shared/IVersionable.sol";
 import {ObjectType, SERVICE} from "../type/ObjectType.sol";
 import {Registerable} from "./Registerable.sol";
 import {RoleId, RoleIdLib} from "../type/RoleId.sol";
-import {Version, VersionLib} from "../type/Version.sol";
-import {Versionable} from "../upgradeability/Versionable.sol";
+import {Version, VersionLib, VersionPartLib} from "../type/Version.sol";
+import {Versionable} from "../shared/Versionable.sol";
+import {Upgradeable} from "../upgradeability/Upgradeable.sol";
 
 
 /// @dev service base contract
 abstract contract Service is 
-    Registerable,
-    Versionable,
+    Registerable, 
+    Upgradeable,
     ReentrancyGuardUpgradeable,
     IService
 {

package/contracts/shared/TokenHandler.sol

@@ -10,6 +10,7 @@ import {ContractLib} from "../shared/ContractLib.sol";
 import {IRegistry} from "../registry/IRegistry.sol";
 import {NftId} from "../type/NftId.sol";
 import {SERVICE} from "../type/ObjectType.sol";
+import {VersionPart} from "../type/Version.sol";
 
 
 /// @dev Token specific transfer helper base contract.
@@ -49,6 +50,7 @@ contract TokenHandlerBase {
     IERC20Metadata public immutable TOKEN;
     address public immutable COMPONENT;
     NftId public immutable NFT_ID;
+    VersionPart public immutable RELEASE;
 
     address internal _wallet;
 
@@ -69,6 +71,7 @@ contract TokenHandlerBase {
         REGISTRY = IRegistry(registry);
         COMPONENT = component;
         NFT_ID = REGISTRY.getNftIdForAddress(component);
+        RELEASE = REGISTRY.getObjectRelease(NFT_ID);
 
         if (NFT_ID.eqz()) {
             revert ErrorTokenHandlerComponentNotRegistered(component);
@@ -254,7 +257,7 @@ contract TokenHandler is
     error ErrorTokenHandlerNotService(address service);
 
     modifier onlyService() {
-        if (!REGISTRY.isObjectType(msg.sender, SERVICE())) {
+        if (!REGISTRY.isObjectType(msg.sender, SERVICE(), RELEASE)) {
             revert ErrorTokenHandlerNotService(msg.sender);
         }
         _;

package/contracts/shared/Versionable.sol

@@ -0,0 +1,47 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.20;
+
+import {IVersionable} from "./IVersionable.sol";
+import {GIF_INITIAL_RELEASE} from "../registry/Registry.sol";
+import {Version, VersionPart, VersionLib, VersionPartLib} from "../type/Version.sol";
+
+
+abstract contract Versionable is
+    IVersionable 
+{
+    // TODO use arg of type Version
+    function __Versionable_init(
+        VersionPart release // wants to initialize to this release version
+    )
+        internal
+        view
+        virtual
+    {
+        VersionPart currentRelease = getRelease();
+        if (!currentRelease.isValidRelease()) {
+            revert ErrorVersionableReleaseInvalid(address(this), currentRelease);
+        }
+
+        //Version initializedVersion = VersionLib.toVersion(_getInitializedVersion());
+        //if(initializedVersion != getVersion()) {}
+
+        _checkRelease(release);
+    }
+
+    function getVersion() public pure virtual returns(Version)
+    {
+        return VersionLib.toVersion(GIF_INITIAL_RELEASE().toInt(), 0, 0);
+    }
+
+    function getRelease() public pure returns(VersionPart)
+    {
+        return getVersion().toMajorPart();
+    }
+
+    function _checkRelease(VersionPart release) internal view {
+        VersionPart currentRelease = getRelease();
+        if(currentRelease != release) {
+            revert ErrorVersionableReleaseMismatch(address(this), release, currentRelease);
+        }
+    }
+}

package/contracts/staking/IStaking.sol

@@ -4,7 +4,7 @@ pragma solidity ^0.8.20;
 import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 
 import {IComponent} from "../shared/IComponent.sol";
-import {IVersionable} from "../upgradeability/IVersionable.sol";
+import {IUpgradeable} from "../upgradeability/IUpgradeable.sol";
 
 import {Amount} from "../type/Amount.sol";
 import {Blocknumber} from "../type/Blocknumber.sol";
@@ -22,7 +22,7 @@ import {VersionPart} from "../type/Version.sol";
 
 interface IStaking is 
     IComponent,
-    IVersionable
+    IUpgradeable
 {
 
     // owner functions

package/contracts/staking/Staking.sol

@@ -4,11 +4,10 @@ pragma solidity ^0.8.20;
 import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 
 import {IRegistry} from "../registry/IRegistry.sol";
-import {IRelease} from "../registry/IRelease.sol";
 import {IStaking} from "./IStaking.sol";
 import {IStakingService} from "./IStakingService.sol";
 import {ITargetLimitHandler} from "./ITargetLimitHandler.sol";
-import {IVersionable} from "../upgradeability/IVersionable.sol";
+import {IVersionable} from "../shared/IVersionable.sol";
 
 import {Amount, AmountLib} from "../type/Amount.sol";
 import {Blocknumber} from "../type/Blocknumber.sol";
@@ -16,7 +15,7 @@ import {ChainId, ChainIdLib} from "../type/ChainId.sol";
 import {Component} from "../shared/Component.sol";
 import {IComponent} from "../shared/IComponent.sol";
 import {NftId} from "../type/NftId.sol";
-import {ObjectType, PROTOCOL, INSTANCE, STAKE, STAKING, TARGET} from "../type/ObjectType.sol";
+import {ObjectType, PROTOCOL, STAKE, STAKING, TARGET} from "../type/ObjectType.sol";
 import {Seconds, SecondsLib} from "../type/Seconds.sol";
 import {Registerable} from "../shared/Registerable.sol";
 import {StakingLib} from "./StakingLib.sol";
@@ -28,12 +27,13 @@ import {TokenHandlerDeployerLib} from "../shared/TokenHandlerDeployerLib.sol";
 import {TokenRegistry} from "../registry/TokenRegistry.sol";
 import {UFixed, UFixedLib} from "../type/UFixed.sol";
 import {Version, VersionLib, VersionPart, VersionPartLib} from "../type/Version.sol";
-import {Versionable} from "../upgradeability/Versionable.sol";
+import {Versionable} from "../shared/Versionable.sol";
+import {Upgradeable} from "../upgradeability/Upgradeable.sol";
 
 
 contract Staking is 
     Component,
-    Versionable,
+    Upgradeable,
     IStaking
 {
     string public constant CONTRACT_NAME = "Staking";
@@ -649,21 +649,11 @@ contract Staking is
         return _getStakingStorage()._tokenHandler;
     }
 
-    // from IRegisterable
-    function getRelease()
-        public 
-        pure 
-        virtual override (IRelease, Registerable)
-        returns(VersionPart)
-    {
-        return VersionPartLib.toVersionPart(3);
-    }
-
     // from IVersionable
     function getVersion()
         public 
         pure 
-        virtual override (Component, IVersionable, Versionable)
+        virtual override (IVersionable, Versionable)
         returns(Version)
     {
         return VersionLib.toVersion(3,0,0);
@@ -747,7 +737,7 @@ contract Staking is
         // initialize component
         __Component_init(
             registry.getAuthority(),
-            address(registry), 
+            registryAddress, 
             registry.getNftId(), // parent nft id
             CONTRACT_NAME,
             STAKING(), 

package/contracts/staking/StakingManager.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {IVersionable} from "../upgradeability/IVersionable.sol";
+import {IUpgradeable} from "../upgradeability/IUpgradeable.sol";
 import {ProxyManager} from "../upgradeability/ProxyManager.sol";
 import {Staking} from "./Staking.sol";
 
@@ -32,13 +32,13 @@ contract StakingManager is
             stakingStore,
             tokenRegistry);
         
-        IVersionable versionable = initialize(
+        IUpgradeable upgradeable = initialize(
             registry,
             _initialImplementation,
             _initializationData,
             salt);
 
-        _staking = Staking(address(versionable));
+        _staking = Staking(address(upgradeable));
     }
 
     //--- view functions ----------------------------------------------------//

package/contracts/staking/StakingService.sol

@@ -3,7 +3,6 @@ pragma solidity ^0.8.20;
 
 import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 
-import {IRegisterable} from "../shared/IRegisterable.sol";
 import {IRegistry} from "../registry/IRegistry.sol";
 import {IStaking} from "./IStaking.sol";
 import {IStakingService} from "./IStakingService.sol";
@@ -158,11 +157,12 @@ contract StakingService is
                 nftId: NftIdLib.zero(),
                 parentNftId: targetNftId,
                 objectType: STAKE(),
+                release: getRelease(),
                 isInterceptor: false,
-                objectAddress: address(0),
-                initialOwner: stakeOwner,
-                data: ""
-            }));
+                objectAddress: address(0)}),
+            stakeOwner, // initialOwner
+            "" // data
+        );
 
         emit LogStakingServiceStakeObjectCreated(stakeNftId, targetNftId, stakeOwner);
     }
@@ -255,7 +255,7 @@ contract StakingService is
     )
         internal
         virtual override
-        initializer()
+        onlyInitializing()
     {
         (
             address authority,
@@ -294,6 +294,9 @@ contract StakingService is
             return IStaking(stakingAddress);
         }
 
+        // TODO staking is registered in registry.initialize()
+        // consider deleting the rest of the function
+
         // check that contract implements IStaking
         if(!IStaking(stakingAddress).supportsInterface(type(IStaking).interfaceId)) {
             revert ErrorStakingServiceNotSupportingIStaking(stakingAddress);
@@ -301,7 +304,7 @@ contract StakingService is
 
         address owner = msg.sender;
         _getStakingServiceStorage()._registryService.registerStaking(
-            IRegisterable(stakingAddress),
+            IStaking(stakingAddress),
             owner);
 
         return IStaking(stakingAddress);