@etherisc/gif-next 3.0.0-a511887-523 → 3.0.0-ab0fcb2-112

package/contracts/registry/RegistryAdmin.sol

@@ -7,13 +7,11 @@ import {IService} from "../shared/IService.sol";
 import {IStaking} from "../staking/IStaking.sol";
 
 import {AccessAdmin} from "../authorization/AccessAdmin.sol";
-import {AccessAdminLib} from "../authorization/AccessAdminLib.sol";
 import {AccessManagerCloneable} from "../authorization/AccessManagerCloneable.sol";
 import {ObjectType, REGISTRY} from "../type/ObjectType.sol";
 import {RoleId, RoleIdLib, GIF_MANAGER_ROLE, GIF_ADMIN_ROLE} from "../type/RoleId.sol";
 import {GIF_INITIAL_RELEASE} from "../registry/Registry.sol";
 import {Str} from "../type/String.sol";
-import {VersionPartLib} from "../type/Version.sol";
 
 /*
     1) GIF_MANAGER_ROLE
@@ -68,7 +66,6 @@ contract RegistryAdmin is
 
 
     function completeSetup(
-        address registry,
         address authorization,
         address gifAdmin, 
         address gifManager
@@ -80,19 +77,17 @@ contract RegistryAdmin is
         _checkAuthorization(authorization, REGISTRY(), getRelease(), false, true);
 
         // effects
-        __RegistryLinked_init(registry);
-
         _authorization = IAuthorization(authorization);
 
-        IRegistry registryContract = IRegistry(registry);
-        _releaseRegistry = registryContract.getReleaseRegistryAddress();
-        _tokenRegistry = registryContract.getTokenRegistryAddress();
-        _staking = registryContract.getStakingAddress();
+        IRegistry registry = _getRegistry();
+        _releaseRegistry = registry.getReleaseRegistryAddress();
+        _tokenRegistry = registry.getTokenRegistryAddress();
+        _staking = registry.getStakingAddress();
         _stakingTargetHandler = address(IStaking(_staking).getTargetHandler());
         _stakingStore = address(IStaking(_staking).getStakingStore());
 
         // link nft ownability to registry
-        _linkToNftOwnable(address(getRegistry()));
+        _linkToNftOwnable(address(_getRegistry()));
 
         _createRoles(_authorization);
 
@@ -137,7 +132,7 @@ contract RegistryAdmin is
         internal
     {
         // create unchecked registry targets
-        _createTarget(address(getRegistry()), registryTargetName, TargetType.Core, false);
+        _createTarget(address(_getRegistry()), registryTargetName, TargetType.Core, false);
         _createTarget(address(this), REGISTRY_ADMIN_TARGET_NAME, TargetType.Core, false);
         _createTarget(_releaseRegistry, RELEASE_REGISTRY_TARGET_NAME, TargetType.Core, false);
         _createTarget(_tokenRegistry, TOKEN_REGISTRY_TARGET_NAME, TargetType.Core, false);

package/contracts/registry/RegistryAuthorization.sol

@@ -101,7 +101,7 @@ contract RegistryAuthorization
                AccessAdminLib.roleInfo(
                     ADMIN_ROLE(),
                     TargetType.Custom, // custom is only type that allows role removal
-                    2, // TODO decide on max member count
+                    1, // TODO decide on max member count
                     GIF_ADMIN_ROLE_NAME));
 
           // gif manager role
@@ -110,7 +110,7 @@ contract RegistryAuthorization
                AccessAdminLib.roleInfo(
                     ADMIN_ROLE(),
                     TargetType.Custom, // custom is only type that allows role removal
-                    1, // TODO decide on max member count
+                    2, // TODO decide on max member count
                     GIF_MANAGER_ROLE_NAME));
 
      }

package/contracts/registry/RegistryService.sol

@@ -33,11 +33,10 @@ contract RegistryService is
         onlyInitializing
     {
         (
-            address authority,
-            address registry
-        ) = abi.decode(data, (address, address));
+            address authority
+        ) = abi.decode(data, (address));
 
-        __Service_init(authority, registry, owner);
+        __Service_init(authority, owner);
         _registerInterface(type(IRegistryService).interfaceId);
     }
 
@@ -55,7 +54,7 @@ contract RegistryService is
         address owner;
         bytes memory data;
         (info, owner, data) = _getAndVerifyContractInfo(staking, NftIdLib.zero(), STAKING(), expectedOwner);
-        info.nftId = getRegistry().register(info, owner, data);
+        info.nftId = _getRegistry().register(info, owner, data);
     }
 
 
@@ -71,8 +70,8 @@ contract RegistryService is
 
         address owner;
         bytes memory data;
-        (info, owner, data) = _getAndVerifyContractInfo(instance, getRegistry().getNftId(), INSTANCE(), expectedOwner);
-        info.nftId = getRegistry().register(info, owner, data);
+        (info, owner, data) = _getAndVerifyContractInfo(instance, _getRegistry().getNftId(), INSTANCE(), expectedOwner);
+        info.nftId = _getRegistry().register(info, owner, data);
 
         instance.linkToRegisteredNftId(); // asume safe
     }
@@ -97,7 +96,7 @@ contract RegistryService is
         address owner;
         bytes memory data;
         (info, owner, data) = _getAndVerifyContractInfo(component, expectedParentNftId, expectedType, expectedOwner);
-        info.nftId = getRegistry().register(info, owner, data);
+        info.nftId = _getRegistry().register(info, owner, data);
     }
 
     function registerDistributor(IRegistry.ObjectInfo memory info, address owner, bytes memory data)
@@ -107,7 +106,7 @@ contract RegistryService is
         returns(NftId nftId) 
     {
         _verifyObjectInfo(info, owner, DISTRIBUTOR());
-        nftId = getRegistry().register(info, owner, data);
+        nftId = _getRegistry().register(info, owner, data);
     }
 
     function registerPolicy(IRegistry.ObjectInfo memory info, address owner, bytes memory data)
@@ -117,7 +116,7 @@ contract RegistryService is
         returns(NftId nftId) 
     {
         _verifyObjectInfo(info, owner, POLICY());
-        nftId = getRegistry().register(info, owner, data);
+        nftId = _getRegistry().register(info, owner, data);
     }
 
     function registerBundle(IRegistry.ObjectInfo memory info, address owner, bytes memory data)
@@ -127,7 +126,7 @@ contract RegistryService is
         returns(NftId nftId) 
     {
         _verifyObjectInfo(info, owner, BUNDLE());
-        nftId = getRegistry().register(info, owner, data);
+        nftId = _getRegistry().register(info, owner, data);
     }
 
     function registerStake(IRegistry.ObjectInfo memory info, address owner, bytes memory data)
@@ -137,7 +136,7 @@ contract RegistryService is
         returns(NftId nftId) 
     {
         _verifyObjectInfo(info, owner, STAKE());
-        nftId = getRegistry().register(info, owner, data);
+        nftId = _getRegistry().register(info, owner, data);
     }
 
     // Internal
@@ -214,7 +213,7 @@ contract RegistryService is
             revert ErrorRegistryServiceRegisterableOwnerZero(registerable);
         }
         
-        if(getRegistry().isRegistered(initialOwner)) { 
+        if(_getRegistry().isRegistered(initialOwner)) { 
             revert ErrorRegistryServiceRegisterableOwnerRegistered(registerable, initialOwner);
         }
     }
@@ -244,8 +243,8 @@ contract RegistryService is
             revert ErrorRegistryServiceInvalidInitialOwner(initialOwner);
         }
 
-        if(getRegistry().isRegistered(initialOwner)) {
-            ObjectType ownerType = getRegistry().getObjectInfo(initialOwner).objectType;
+        if(_getRegistry().isRegistered(initialOwner)) {
+            ObjectType ownerType = _getRegistry().getObjectInfo(initialOwner).objectType;
             if(ownerType == REGISTRY() || ownerType == STAKING() || ownerType == SERVICE() || ownerType == INSTANCE()) {
                 revert ErrorRegistryServiceObjectOwnerRegistered(info.objectType, initialOwner);
             }

package/contracts/registry/RegistryServiceManager.sol

@@ -9,7 +9,6 @@ contract RegistryServiceManager is
     ProxyManager
 {
     error ErrorRegistryAccessManagerAuthorityZero();
-    error ErrorRegistryAccessManagerRegistryZero();
 
     bytes32 constant public ACCESS_MANAGER_CREATION_CODE_HASH = 0x0;
 
@@ -18,22 +17,16 @@ contract RegistryServiceManager is
     /// @dev initializes proxy manager with registry service implementation and deploys registry
     constructor(
         address authority, // used by implementation 
-        address registry, // used by implementation 
         bytes32 salt
     ) 
     {
         if(authority == address(0)) {
             revert ErrorRegistryAccessManagerAuthorityZero();
         }
-
-        if(registry == address(0)) {
-            revert ErrorRegistryAccessManagerRegistryZero();
-        }
         
         RegistryService srv = new RegistryService{ salt: salt }();
-        bytes memory data = abi.encode(authority, registry);
+        bytes memory data = abi.encode(authority);
         IUpgradeable upgradeable = initialize(
-            registry,
             address(srv), 
             data,
             salt);

package/contracts/registry/ReleaseAdmin.sol

@@ -13,7 +13,7 @@ import {ObjectType, ObjectTypeLib, RELEASE} from "../type/ObjectType.sol";
 import {GIF_INITIAL_RELEASE} from "../registry/Registry.sol";
 import {RoleId, ADMIN_ROLE, RELEASE_REGISTRY_ROLE} from "../type/RoleId.sol";
 import {Str} from "../type/String.sol";
-import {VersionPartLib, VersionPart} from "../type/Version.sol";
+import {VersionPart} from "../type/Version.sol";
 
 
 /// @dev The ReleaseAdmin contract implements the central authorization for the services of a specific release.
@@ -57,29 +57,20 @@ contract ReleaseAdmin is
 
 
     function completeSetup(
-        address registry,
         address authorization,
         address releaseRegistry
     )
         external
         //onlyDeployer()
     {
-        // checks
-        AccessAdminLib.checkRegistry(registry);
 
         // effects
-        //AccessManagerCloneable(
-        //    authority()).completeSetup(
-        //        registry);
-
-        __RegistryLinked_init(registry);
-
         IServiceAuthorization serviceAuthorization = IServiceAuthorization(authorization);
         _checkAuthorization(address(serviceAuthorization), RELEASE(), getRelease(), true, true);
         _serviceAuthorization = serviceAuthorization;
 
         // link nft ownability to registry
-        _linkToNftOwnable(registry);
+        _linkToNftOwnable(address(_getRegistry()));
 
         _createRoles(_serviceAuthorization);
 

package/contracts/registry/ReleaseRegistry.sol

@@ -7,7 +7,7 @@ import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManage
 import {IAccessAdmin} from "../authorization/IAccessAdmin.sol";
 import {IRegistry} from "./IRegistry.sol";
 import {IRelease} from "./IRelease.sol";
-import {IRegistryLinked} from "../shared/IRegistryLinked.sol";
+import {RegistryLinked} from "../shared/RegistryLinked.sol";
 import {IService} from "../shared/IService.sol";
 import {IServiceAuthorization} from "../authorization/IServiceAuthorization.sol";
 
@@ -33,16 +33,13 @@ import {VersionPart, VersionPartLib} from "../type/Version.sol";
 contract ReleaseRegistry is 
     AccessManaged,
     ReleaseLifecycle, 
-    IRegistryLinked
+    RegistryLinked
 {
     event LogReleaseCreation(IAccessAdmin admin, VersionPart release, bytes32 salt); 
     event LogReleaseActivation(VersionPart release);
     event LogReleaseDisabled(VersionPart release);
     event LogReleaseEnabled(VersionPart release);
 
-    // constructor
-    error ErrorReleaseRegistryNotRegistry(Registry registry);
-
     // _verifyServiceAuthorization
     error ErrorReleaseRegistryNotServiceAuth(address notAuth);
     error ErrorReleaseRegistryServiceAuthVersionMismatch(IServiceAuthorization auth, VersionPart expected, VersionPart actual);
@@ -69,7 +66,6 @@ contract ReleaseRegistry is
     error ErrorReleaseRegistryServiceOwnerRegistered(IService service, address owner);
 
     RegistryAdmin public immutable _registryAdmin;
-    Registry public immutable _registry;
 
     mapping(VersionPart release => IRelease.ReleaseInfo info) internal _releaseInfo;
     VersionPart [] internal _release; // array of all created releases    
@@ -83,17 +79,14 @@ contract ReleaseRegistry is
     uint256 internal _servicesToRegister = 0;
 
     // TODO move master relase admin outside constructor (same construction as for registry admin)
-    constructor(Registry registry)
+    constructor()
         AccessManaged(msg.sender)
     {
-        if (!ContractLib.isRegistry(address(registry))) {
-            revert ErrorReleaseRegistryNotRegistry(registry);
-        }
+        IRegistry registry = _getRegistry();
 
         setAuthority(registry.getAuthority());
 
-        _registry = registry;
-        _registryAdmin = RegistryAdmin(_registry.getRegistryAdminAddress());
+        _registryAdmin = RegistryAdmin(registry.getRegistryAdminAddress());
         _masterReleaseAdmin = new ReleaseAdmin(
             _cloneNewAccessManager());
 
@@ -115,7 +108,7 @@ contract ReleaseRegistry is
         }
 
         release = VersionPartLib.toVersionPart(release.toInt() + 1);
-        _release.push(release);
+        _release.push(release); // TODO push only activated releases, _next keeps total release count
 
         _next = release;
         _releaseInfo[release].version = release;
@@ -216,7 +209,7 @@ contract ReleaseRegistry is
         releaseAdmin.setReleaseLocked(true); 
 
         // register service with registry
-        nftId = _registry.registerService(info, expectedOwner, serviceDomain, data);
+        nftId = _getRegistry().registerService(info, expectedOwner, serviceDomain, data);
         service.linkToRegisteredNftId();
     }
 
@@ -239,25 +232,27 @@ contract ReleaseRegistry is
         // grant special roles for registry/staking/pool services
         // this will enable access to core contracts functions
 
+        IRegistry registry = _getRegistry();
+
         // registry service MUST be registered for each release
-        address service = _registry.getServiceAddress(REGISTRY(), release);
+        address service = registry.getServiceAddress(REGISTRY(), release);
         if(service == address(0)) {
             revert ErrorReleaseRegistryRegistryServiceMissing(release);
         }
 
         _registryAdmin.grantServiceRoleForAllVersions(IService(service), REGISTRY());
 
-        service = _registry.getServiceAddress(STAKING(), release);
+        service = registry.getServiceAddress(STAKING(), release);
         if(service != address(0)) {
             _registryAdmin.grantServiceRoleForAllVersions(IService(service), STAKING());
         }
 
-        service = _registry.getServiceAddress(COMPONENT(), release);
+        service = registry.getServiceAddress(COMPONENT(), release);
         if(service != address(0)) {
             _registryAdmin.grantServiceRoleForAllVersions(IService(service), COMPONENT());
         }
 
-        service = _registry.getServiceAddress(POOL(), release);
+        service = registry.getServiceAddress(POOL(), release);
         if(service != address(0)) {
             _registryAdmin.grantServiceRoleForAllVersions(IService(service), POOL());
         }
@@ -350,12 +345,6 @@ contract ReleaseRegistry is
         return address(_registryAdmin);
     }
 
-    //--- IRegistryLinked ------------------------------------------------------//
-
-    function getRegistry() external view returns (IRegistry) {
-        return _registry;
-    }
-
     //--- private functions ----------------------------------------------------//
 
     function _setReleaseLocked(VersionPart release, bool locked)
@@ -387,7 +376,6 @@ contract ReleaseRegistry is
             release);
 
         clonedAdmin.completeSetup(
-            address(_registry), 
             address(serviceAuthorization),
             address(this)); // release registry (this contract)
 
@@ -519,7 +507,7 @@ contract ReleaseRegistry is
             revert ErrorReleaseRegistryServiceSelfRegistration(service);
         }
         
-        if(_registry.isRegistered(initialOwner)) { 
+        if(_getRegistry().isRegistered(initialOwner)) { 
             revert ErrorReleaseRegistryServiceOwnerRegistered(service, initialOwner);
         }
     }

package/contracts/registry/TokenRegistry.sol

@@ -5,7 +5,7 @@ import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManage
 import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 
 import {IRegistry} from "./IRegistry.sol";
-import {IRegistryLinked} from "../shared/IRegistryLinked.sol";
+import {RegistryLinked} from "../shared/RegistryLinked.sol";
 import {IStaking} from "../staking/IStaking.sol";
 
 import {ChainId, ChainIdLib} from "../type/ChainId.sol";
@@ -16,7 +16,7 @@ import {VersionPart} from "../type/Version.sol";
 /// Only whitelisted tokens can be used as default tokens for products, distribution and pools components.
 contract TokenRegistry is
     AccessManaged,
-    IRegistryLinked
+    RegistryLinked
 {
     event LogTokenRegistryTokenRegistered(ChainId chainId, address token, uint256 decimals, string symbol);
     event LogTokenRegistryTokenGlobalStateSet(ChainId chainId, address token, bool active);
@@ -47,7 +47,6 @@ contract TokenRegistry is
     mapping(ChainId chainId => mapping(address token => mapping(VersionPart release => bool isActive))) internal _active;
     TokenInfo [] internal _token;
 
-    IRegistry internal _registry;
     ChainId internal _chainId = ChainIdLib.current();
     IERC20Metadata internal _dipToken;
 
@@ -59,14 +58,13 @@ contract TokenRegistry is
         _;
     }
 
-    constructor(IRegistry registry, IERC20Metadata dipToken)
+    constructor(IERC20Metadata dipToken)
         AccessManaged(msg.sender)
     {
         // set authority
-        address authority = RegistryAdmin(registry.getRegistryAdminAddress()).authority();
+        address authority = RegistryAdmin(
+            _getRegistry().getRegistryAdminAddress()).authority();
         setAuthority(authority);
-        
-        _registry = registry;
 
         // TODO deal with chains without a dip token
         _dipToken = _verifyOnchainToken(address(dipToken));
@@ -180,7 +178,7 @@ contract TokenRegistry is
         // verify valid major version
         if(enforceVersionCheck) {
             uint256 version = release.toInt();
-            if (!getRegistry().isActiveRelease(release)) {
+            if (!_getRegistry().isActiveRelease(release)) {
                 revert ErrorTokenRegistryMajorVersionInvalid(release);
             }
         }
@@ -228,13 +226,6 @@ contract TokenRegistry is
         return address(_dipToken);
     }
 
-    //--- IRegistryLinked --------------------------------------------------//
-
-    /// @dev returns the dip token for this chain
-    function getRegistry() public view returns (IRegistry) {
-        return _registry;
-    }
-
     //--- internal functions ------------------------------------------------//
 
 

package/contracts/shared/Component.sol

@@ -33,7 +33,7 @@ abstract contract Component is
 
 
     modifier onlyChainNft() {
-        if(msg.sender != getRegistry().getChainNftAddress()) {
+        if(msg.sender != _getRegistry().getChainNftAddress()) {
             revert ErrorComponentNotChainNft(msg.sender);
         }
         _;
@@ -50,7 +50,6 @@ abstract contract Component is
     /// @dev requires component parent to be registered 
     function __Component_init(
         address authority,
-        address registry,
         NftId parentNftId,
         string memory name,
         ObjectType componentType,
@@ -68,7 +67,6 @@ abstract contract Component is
 
         __Registerable_init(
             authority,
-            registry, 
             parentNftId, 
             componentType, 
             isInterceptor, 
@@ -140,7 +138,7 @@ abstract contract Component is
 
 
     function isRegistered() public virtual view returns (bool) {
-        return getRegistry().getNftIdForAddress(address(this)).gtz();
+        return _getRegistry().getNftIdForAddress(address(this)).gtz();
     }
 
 
@@ -212,6 +210,6 @@ abstract contract Component is
     /// @dev returns the service address for the specified domain
     /// gets address via lookup from registry using the major version form the linked instance
     function _getServiceAddress(ObjectType domain) internal view returns (address) {
-        return getRegistry().getServiceAddress(domain, getRelease());
+        return _getRegistry().getServiceAddress(domain, getRelease());
     }
 }

package/contracts/shared/ComponentService.sol

@@ -52,11 +52,10 @@ contract ComponentService is
         onlyInitializing()
     {
         (
-            address authority,
-            address registry
-        ) = abi.decode(data, (address, address));
+            address authority
+        ) = abi.decode(data, (address));
 
-        __Service_init(authority, registry, owner);
+        __Service_init(authority, owner);
 
         _accountingService = IAccountingService(_getServiceAddress(ACCOUNTING()));
         _registryService = IRegistryService(_getServiceAddress(REGISTRY()));
@@ -75,7 +74,7 @@ contract ComponentService is
         returns (NftId componentNftId)
     {
         // check sender is registered product
-        IRegistry registry = getRegistry();
+        IRegistry registry = _getRegistry();
         if (!registry.isObjectType(msg.sender, PRODUCT(), getRelease())) {
             revert ErrorComponentServiceCallerNotProduct(msg.sender);
         }
@@ -179,7 +178,7 @@ contract ComponentService is
             withdrawnAmount);
         
         // transfer amount to component owner
-        address componentOwner = getRegistry().ownerOf(componentNftId);
+        address componentOwner = _getRegistry().ownerOf(componentNftId);
         TokenHandler tokenHandler = instanceReader.getTokenHandler(componentNftId);
         emit LogComponentServiceComponentFeesWithdrawn(
             componentNftId, 
@@ -206,7 +205,7 @@ contract ComponentService is
         returns (NftId productNftId)
     {
         // check sender is registered instance
-        IRegistry registry = getRegistry();
+        IRegistry registry = _getRegistry();
         if (!registry.isObjectType(msg.sender, INSTANCE(), getRelease())) {
             revert ErrorComponentServiceCallerNotInstance(msg.sender);
         }
@@ -461,6 +460,8 @@ contract ComponentService is
         returns (NftId componentNftId)
     {
         IInstanceLinkedComponent component = IInstanceLinkedComponent(componentAddress);
+        // TODO consider adding release arg to _registryService.registerComponent() and similar
+        // in order to be 100% sure that services have same release?
         IRegistry.ObjectInfo memory info = _registryService.registerComponent(
             component,
             parentNftId,
@@ -500,7 +501,7 @@ contract ComponentService is
         InstanceAdmin instanceAdmin = instance.getInstanceAdmin();
         
         // deploy and wire token handler
-        IRegistry registry = getRegistry();
+        IRegistry registry = _getRegistry();
         IComponents.ComponentInfo memory componentInfo = component.getInitialComponentInfo();
         componentInfo.tokenHandler = TokenHandlerDeployerLib.deployTokenHandler(
             address(registry),
@@ -517,7 +518,7 @@ contract ComponentService is
         component.linkToRegisteredNftId();
 
         // authorize
-        instanceAdmin.initializeComponentAuthorization(componentAddress, componentType);
+        instanceAdmin.initializeComponentAuthorization(componentAddress, componentType, getRelease());
 
         emit LogComponentServiceRegistered(
             instance.getNftId(),
@@ -534,9 +535,10 @@ contract ComponentService is
         view
     {
         if (! instance.isTokenRegistryDisabled()) {
+            // TODO call token registry directlly?
             // check if provided token is whitelisted and active
             if (!ContractLib.isActiveToken(
-                getRegistry().getTokenRegistryAddress(), 
+                _getRegistry().getTokenRegistryAddress(), 
                 ChainIdLib.current(), 
                 token, 
                 AccessManagerCloneable(authority()).getRelease())
@@ -573,7 +575,7 @@ contract ComponentService is
             IComponents.FeeInfo memory info
         )
     {
-        productNftId = getRegistry().getParentNftId(componentNftId);
+        productNftId = _getRegistry().getParentNftId(componentNftId);
         info = instanceReader.getFeeInfo(productNftId);
     }
 
@@ -590,25 +592,11 @@ contract ComponentService is
             IInstance instance
         )
     {
-        IRegistry.ObjectInfo memory info;
-        address instanceAddress;
-
-        if (expectedType != COMPONENT()) {
-            (info, instanceAddress) = ContractLib.getAndVerifyComponent(
-                getRegistry(),
-                msg.sender, // caller
-                expectedType,
-                isActive); 
-        } else {
-            (info, instanceAddress) = ContractLib.getAndVerifyAnyComponent(
-                getRegistry(),
-                msg.sender,
-                isActive); 
-        }
-
-        // get component nft id and instance
-        componentNftId = info.nftId;
-        instance = IInstance(instanceAddress);
+        (componentNftId, instance) = ContractLib.getAndVerifyComponent(
+            msg.sender, // caller
+            expectedType,
+            getRelease(),
+            isActive);
     }
 
 

package/contracts/shared/ComponentServiceManager.sol

@@ -11,15 +11,13 @@ contract ComponentServiceManager is ProxyManager {
 
     /// @dev initializes proxy manager with service implementation 
     constructor(
-        address authority, 
-        address registry,
+        address authority,
         bytes32 salt
     )
     {
         ComponentService svc = new ComponentService();
-        bytes memory data = abi.encode(authority, registry);
+        bytes memory data = abi.encode(authority);
         IUpgradeable upgradeable = initialize(
-            registry,
             address(svc), 
             data,
             salt);