@etherisc/gif-next 3.0.0-a511887-523 → 3.0.0-a77d620-054

package/contracts/registry/RegistryService.sol

@@ -1,18 +1,16 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
+import {IComponent} from "../../contracts/shared/IComponent.sol";
 import {IDistributionComponent} from "../../contracts/distribution/IDistributionComponent.sol";
 import {IInstance} from "../instance/IInstance.sol";
-import {IInstanceLinkedComponent} from "../../contracts/shared/IInstanceLinkedComponent.sol";
 import {IPoolComponent} from "../../contracts/pool/IPoolComponent.sol";
 import {IProductComponent} from "../../contracts/product/IProductComponent.sol";
 import {IRegisterable} from "../../contracts/shared/IRegisterable.sol";
 import {IRegistry} from "./IRegistry.sol";
 import {IRegistryService} from "./IRegistryService.sol";
-import {IStaking} from "../../contracts/staking/IStaking.sol";
 
-import {ContractLib} from "../shared/ContractLib.sol";
-import {ObjectType, REGISTRY, SERVICE, PRODUCT, ORACLE, POOL, INSTANCE, COMPONENT, DISTRIBUTION, DISTRIBUTOR, POLICY, BUNDLE, STAKE, STAKING} from "../../contracts/type/ObjectType.sol";
+import {ObjectType, REGISTRY, SERVICE, PRODUCT, ORACLE, POOL, INSTANCE, COMPONENT, DISTRIBUTION, DISTRIBUTOR, APPLICATION, POLICY, CLAIM, BUNDLE, STAKE, STAKING, PRICE} from "../../contracts/type/ObjectType.sol";
 import {NftId, NftIdLib} from "../../contracts/type/NftId.sol";
 import {Service} from "../shared/Service.sol";
 
@@ -23,6 +21,8 @@ contract RegistryService is
     // TODO update to real hash when registry is stable
     bytes32 public constant REGISTRY_CREATION_CODE_HASH = bytes32(0);
 
+    // from Versionable
+
     /// @dev top level initializer
     function _initialize(
         address owner, 
@@ -41,8 +41,8 @@ contract RegistryService is
         _registerInterface(type(IRegistryService).interfaceId);
     }
 
-    // TODO register have no combos with STAKING; decide on parentNftId arg
-    function registerStaking(IRegisterable staking, address expectedOwner)
+
+    function registerStaking(IRegisterable staking, address owner)
         external
         virtual
         restricted()
@@ -50,16 +50,12 @@ contract RegistryService is
             IRegistry.ObjectInfo memory info
         )
     {
-        _checkInterface(staking, type(IStaking).interfaceId);
-
-        address owner;
-        bytes memory data;
-        (info, owner, data) = _getAndVerifyContractInfo(staking, NftIdLib.zero(), STAKING(), expectedOwner);
-        info.nftId = getRegistry().register(info, owner, data);
+        info = _getAndVerifyContractInfo(staking, STAKING(), owner);
+        info.nftId = getRegistry().register(info);
     }
 
 
-    function registerInstance(IRegisterable instance, address expectedOwner)
+    function registerInstance(IRegisterable instance, address owner)
         external
         virtual
         restricted()
@@ -67,21 +63,19 @@ contract RegistryService is
             IRegistry.ObjectInfo memory info
         ) 
     {
-        _checkInterface(instance, type(IInstance).interfaceId);
+        if(!instance.supportsInterface(type(IInstance).interfaceId)) {
+            revert ErrorRegistryServiceNotInstance(address(instance));
+        }
 
-        address owner;
-        bytes memory data;
-        (info, owner, data) = _getAndVerifyContractInfo(instance, getRegistry().getNftId(), INSTANCE(), expectedOwner);
-        info.nftId = getRegistry().register(info, owner, data);
+        info = _getAndVerifyContractInfo(instance, INSTANCE(), owner);
+        info.nftId = getRegistry().register(info);
 
         instance.linkToRegisteredNftId(); // asume safe
     }
 
-    function registerComponent(
-        IRegisterable component, 
-        NftId expectedParentNftId, 
-        ObjectType expectedType, 
-        address expectedOwner
+    function registerProduct(
+        IComponent product, 
+        address initialOwner
     )
         external
         virtual
@@ -90,75 +84,83 @@ contract RegistryService is
             IRegistry.ObjectInfo memory info
         ) 
     {
-        _checkInterface(
-            component, 
-            type(IInstanceLinkedComponent).interfaceId);
-
-        address owner;
-        bytes memory data;
-        (info, owner, data) = _getAndVerifyContractInfo(component, expectedParentNftId, expectedType, expectedOwner);
-        info.nftId = getRegistry().register(info, owner, data);
+        if(!product.supportsInterface(type(IProductComponent).interfaceId)) {
+            revert ErrorRegistryServiceNotProduct(address(product));
+        }
+
+        info = _getAndVerifyContractInfo(product, PRODUCT(), initialOwner);
+        info.nftId = getRegistry().register(info);
     }
 
-    function registerDistributor(IRegistry.ObjectInfo memory info, address owner, bytes memory data)
+    function registerProductLinkedComponent(
+        IComponent component, 
+        ObjectType objectType,
+        address initialOwner
+    )
         external
         virtual
         restricted()
-        returns(NftId nftId) 
+        returns(
+            IRegistry.ObjectInfo memory info
+        ) 
     {
-        _verifyObjectInfo(info, owner, DISTRIBUTOR());
-        nftId = getRegistry().register(info, owner, data);
+        // CAN revert if no ERC165 support -> will revert with empty message 
+        if(!component.supportsInterface(type(IComponent).interfaceId)) {
+            revert ErrorRegistryServiceNotComponent(address(component));
+        }
+
+        if (!(objectType == DISTRIBUTION() || objectType == ORACLE() || objectType == POOL())) {
+            revert ErrorRegistryServiceNotProductLinkedComponent(address(component));
+        }
+
+        info = _getAndVerifyContractInfo(component, objectType, initialOwner);
+        info.nftId = getRegistry().register(info);
     }
 
-    function registerPolicy(IRegistry.ObjectInfo memory info, address owner, bytes memory data)
+    function registerDistributor(IRegistry.ObjectInfo memory info)
         external
         virtual
         restricted()
         returns(NftId nftId) 
     {
-        _verifyObjectInfo(info, owner, POLICY());
-        nftId = getRegistry().register(info, owner, data);
+        _verifyObjectInfo(info, DISTRIBUTOR());
+        nftId = getRegistry().register(info);
     }
 
-    function registerBundle(IRegistry.ObjectInfo memory info, address owner, bytes memory data)
+    function registerPolicy(IRegistry.ObjectInfo memory info)
         external
         virtual
         restricted()
         returns(NftId nftId) 
     {
-        _verifyObjectInfo(info, owner, BUNDLE());
-        nftId = getRegistry().register(info, owner, data);
+        _verifyObjectInfo(info, POLICY());
+        nftId = getRegistry().register(info);
     }
 
-    function registerStake(IRegistry.ObjectInfo memory info, address owner, bytes memory data)
+    function registerBundle(IRegistry.ObjectInfo memory info)
         external
         virtual
         restricted()
         returns(NftId nftId) 
     {
-        _verifyObjectInfo(info, owner, STAKE());
-        nftId = getRegistry().register(info, owner, data);
+        _verifyObjectInfo(info, BUNDLE());
+        nftId = getRegistry().register(info);
     }
 
-    // Internal
-
-    function _checkInterface(IRegisterable registerable, bytes4 interfaceId) internal view
+    function registerStake(IRegistry.ObjectInfo memory info)
+        external
+        virtual
+        restricted()
+        returns(NftId nftId) 
     {
-        if(!ContractLib.supportsInterface(address(registerable), interfaceId)) {
-            revert ErrorRegistryServiceInterfaceNotSupported(address(registerable), interfaceId);
-        }
+        _verifyObjectInfo(info, STAKE());
+        nftId = getRegistry().register(info);
     }
 
-    /// @dev Based on the provided component address, parent, type and owner this function reverts iff:
-    /// - the component address does not match with address stored in component's initial info
-    /// - the component type does not match with the required type
-    /// - the component parent does not match with the required parent (when required parent is not zero)
-    /// - the component initialOwner does not match with the required owner (when required owner is not zero)
-    /// - the component initialOwner is zero (redundant, consider deleting)
-    /// - the component initialOwner is already registered
+    // Internal
+
     function _getAndVerifyContractInfo(
         IRegisterable registerable,
-        NftId expectedParent,
         ObjectType expectedType, // assume can be valid only
         address expectedOwner // assume can be 0 when given by other service
     )
@@ -166,62 +168,40 @@ contract RegistryService is
         virtual
         view
         returns(
-            IRegistry.ObjectInfo memory info,
-            address initialOwner,
-            bytes memory data
+            IRegistry.ObjectInfo memory info 
         )
     {
         info = registerable.getInitialInfo();
-        data = registerable.getInitialData();
-        initialOwner = registerable.getOwner();
 
         if(info.objectAddress != address(registerable)) {
             revert ErrorRegistryServiceRegisterableAddressInvalid(registerable, info.objectAddress);
         }
 
-        if(expectedType != COMPONENT()) {
-            // exact match
-            if(info.objectType != expectedType) {// type is checked in registry anyway...but service logic may depend on expected value
-                revert ErrorRegistryServiceRegisterableTypeInvalid(registerable, expectedType, info.objectType);
-            }
-        } else {
-            // match any component except product
-            if(!(info.objectType == DISTRIBUTION() || info.objectType == ORACLE() || info.objectType == POOL())) {
-                revert ErrorRegistryServiceRegisterableTypeInvalid(registerable, expectedType, info.objectType);
-            }
+        if(info.objectType != expectedType) {// type is checked in registry anyway...but service logic may depend on expected value
+            revert ErrorRegistryServiceRegisterableTypeInvalid(registerable, expectedType, info.objectType);
         }
 
-        if(expectedParent.gtz()) {
-            // exact parent is important
-            if(info.parentNftId != expectedParent) {
-                revert ErrorRegistryServiceRegisterableParentInvalid(registerable, expectedParent, info.parentNftId);
-            }
-        }
+        address owner = info.initialOwner;
 
-        if(expectedOwner > address(0)) {
-            // exact owner is important
-            if(initialOwner != expectedOwner) { // registerable owner protection
-                revert ErrorRegistryServiceRegisterableOwnerInvalid(registerable, expectedOwner, initialOwner);
-            }
+        if(owner != expectedOwner) { // registerable owner protection
+            revert ErrorRegistryServiceRegisterableOwnerInvalid(registerable, expectedOwner, owner);
         }
 
-        if(initialOwner == address(registerable)) {
+        if(owner == address(registerable)) {
             revert ErrorRegistryServiceRegisterableSelfRegistration(registerable);
         }
 
-        // redundant, checked by chainNft
-        if(initialOwner == address(0)) {
+        if(owner == address(0)) {
             revert ErrorRegistryServiceRegisterableOwnerZero(registerable);
         }
         
-        if(getRegistry().isRegistered(initialOwner)) { 
-            revert ErrorRegistryServiceRegisterableOwnerRegistered(registerable, initialOwner);
+        if(getRegistry().isRegistered(owner)) { 
+            revert ErrorRegistryServiceRegisterableOwnerRegistered(registerable, owner);
         }
     }
 
     function _verifyObjectInfo(
         IRegistry.ObjectInfo memory info,
-        address initialOwner,
         ObjectType expectedType
     )
         internal
@@ -236,18 +216,20 @@ contract RegistryService is
             revert ErrorRegistryServiceObjectTypeInvalid(expectedType, info.objectType);
         }
 
-        if(initialOwner == address(0)) {
+        address owner = info.initialOwner;
+
+        if(owner == address(0)) {
             revert ErrorRegistryServiceObjectOwnerZero(info.objectType);
         }
 
-        if(initialOwner == msg.sender) {
-            revert ErrorRegistryServiceInvalidInitialOwner(initialOwner);
+        if(owner == msg.sender) {
+            revert ErrorRegistryServiceInvalidInitialOwner(owner);
         }
 
-        if(getRegistry().isRegistered(initialOwner)) {
-            ObjectType ownerType = getRegistry().getObjectInfo(initialOwner).objectType;
+        if(getRegistry().isRegistered(owner)) {
+            ObjectType ownerType = getRegistry().getObjectInfo(owner).objectType;
             if(ownerType == REGISTRY() || ownerType == STAKING() || ownerType == SERVICE() || ownerType == INSTANCE()) {
-                revert ErrorRegistryServiceObjectOwnerRegistered(info.objectType, initialOwner);
+                revert ErrorRegistryServiceObjectOwnerRegistered(info.objectType, owner);
             }
         }
     }

package/contracts/registry/RegistryServiceManager.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {IUpgradeable} from "../upgradeability/IUpgradeable.sol";
+import {IVersionable} from "../upgradeability/IVersionable.sol";
 import {ProxyManager} from "../upgradeability/ProxyManager.sol";
 import {RegistryService} from "./RegistryService.sol";
 
@@ -32,13 +32,13 @@ contract RegistryServiceManager is
         
         RegistryService srv = new RegistryService{ salt: salt }();
         bytes memory data = abi.encode(authority, registry);
-        IUpgradeable upgradeable = initialize(
+        IVersionable versionable = initialize(
             registry,
             address(srv), 
             data,
             salt);
 
-        _registryService = RegistryService(address(upgradeable));
+        _registryService = RegistryService(address(versionable));
     }
 
     //--- view functions ----------------------------------------------------//

package/contracts/registry/ReleaseAdmin.sol

@@ -10,10 +10,9 @@ import {AccessAdmin} from "../authorization/AccessAdmin.sol";
 import {AccessAdminLib} from "../authorization/AccessAdminLib.sol";
 import {AccessManagerCloneable} from "../authorization/AccessManagerCloneable.sol";
 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.
@@ -47,35 +46,40 @@ contract ReleaseAdmin is
     }
 
 
-    /// @dev Only used for master release admin
+    // @dev Only used for master release admin
     constructor(address accessManager) {
         initialize(
             accessManager,
-            "MasterReleaseAdmin",
-            GIF_INITIAL_RELEASE());
+            "MasterReleaseAdmin");
     }
 
 
     function completeSetup(
         address registry,
         address authorization,
+        VersionPart release,
         address releaseRegistry
     )
         external
-        //onlyDeployer()
+        reinitializer(uint64(release.toInt()))
     {
         // checks
         AccessAdminLib.checkRegistry(registry);
 
-        // effects
-        //AccessManagerCloneable(
-        //    authority()).completeSetup(
-        //        registry);
-
-        __RegistryLinked_init(registry);
+        AccessManagerCloneable(
+            authority()).completeSetup(
+                registry, 
+                release);
 
         IServiceAuthorization serviceAuthorization = IServiceAuthorization(authorization);
-        _checkAuthorization(address(serviceAuthorization), RELEASE(), getRelease(), true, true);
+        AccessAdminLib.checkAuthorization(
+            address(_authorization),
+            address(serviceAuthorization), 
+            RELEASE(), 
+            release, 
+            true, // expectServiceAuthorization
+            true); // checkAlreadyInitialized);
+
         _serviceAuthorization = serviceAuthorization;
 
         // link nft ownability to registry
@@ -176,7 +180,8 @@ contract ReleaseAdmin is
     //--- private initialization functions -------------------------------------------//
 
     function _setupReleaseRegistry(address releaseRegistry)
-        private
+        private 
+        onlyInitializing()
     {
 
         _createRole(

package/contracts/registry/ReleaseRegistry.sol

@@ -5,6 +5,7 @@ import {Clones} from "@openzeppelin/contracts/proxy/Clones.sol";
 import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";
 
 import {IAccessAdmin} from "../authorization/IAccessAdmin.sol";
+import {AccessManagerCloneable} from "../authorization/AccessManagerCloneable.sol";
 import {IRegistry} from "./IRegistry.sol";
 import {IRelease} from "./IRelease.sol";
 import {IRegistryLinked} from "../shared/IRegistryLinked.sol";
@@ -15,7 +16,7 @@ import {ContractLib} from "../shared/ContractLib.sol";
 import {NftId} from "../type/NftId.sol";
 import {ObjectType, ObjectTypeLib, COMPONENT, POOL, RELEASE, REGISTRY, SERVICE, STAKING} from "../type/ObjectType.sol";
 import {RegistryAdmin} from "./RegistryAdmin.sol";
-import {Registry, GIF_INITIAL_RELEASE} from "./Registry.sol";
+import {Registry} from "./Registry.sol";
 import {ReleaseAdmin} from "./ReleaseAdmin.sol";
 import {ReleaseLifecycle} from "./ReleaseLifecycle.sol";
 import {Seconds} from "../type/Seconds.sol";
@@ -35,6 +36,8 @@ contract ReleaseRegistry is
     ReleaseLifecycle, 
     IRegistryLinked
 {
+    uint256 public constant INITIAL_GIF_VERSION = 3;// first active release version  
+
     event LogReleaseCreation(IAccessAdmin admin, VersionPart release, bytes32 salt); 
     event LogReleaseActivation(VersionPart release);
     event LogReleaseDisabled(VersionPart release);
@@ -56,14 +59,14 @@ contract ReleaseRegistry is
 
     // _verifyService
     error ErrorReleaseRegistryNotService(address notService);
-    error ErrorReleaseRegistryServiceAuthorityMismatch(IService service, address expectedAuthority, address actualAuthority);
+    error ErrorReleaseRegistryServiceAuthorityMismatch(IService service, address serviceAuthority, address releaseAuthority);
+    error ErrorReleaseRegistryServiceVersionMismatch(IService service, VersionPart serviceVersion, VersionPart releaseVersion);
     error ErrorReleaseRegistryServiceDomainMismatch(IService service, ObjectType expectedDomain, ObjectType actualDomain);
 
-    // _getAndVerifyServiceInfo
+    // _verifyServiceInfo
     error ErrorReleaseRegistryServiceInfoAddressInvalid(IService service, address expected);
     error ErrorReleaseRegistryServiceInfoInterceptorInvalid(IService service, bool isInterceptor);
     error ErrorReleaseRegistryServiceInfoTypeInvalid(IService service, ObjectType expected, ObjectType found);
-    error ErrorReleaseRegistryServiceInfoReleaseMismatch(IService service, VersionPart expected, VersionPart actual);
     error ErrorReleaseRegistryServiceInfoOwnerInvalid(IService service, address expected, address found);
     error ErrorReleaseRegistryServiceSelfRegistration(IService service);
     error ErrorReleaseRegistryServiceOwnerRegistered(IService service, address owner);
@@ -97,7 +100,7 @@ contract ReleaseRegistry is
         _masterReleaseAdmin = new ReleaseAdmin(
             _cloneNewAccessManager());
 
-        _next = VersionPartLib.toVersionPart(GIF_INITIAL_RELEASE().toInt() - 1);
+        _next = VersionPartLib.toVersionPart(INITIAL_GIF_VERSION - 1);
     }
 
     /// @dev Initiates the creation of a new GIF release by the GIF admin.
@@ -181,21 +184,24 @@ contract ReleaseRegistry is
         address releaseAuthority = ReleaseAdmin(_releaseInfo[releaseVersion].releaseAdmin).authority();
         IServiceAuthorization releaseAuthz = _releaseInfo[releaseVersion].auth;
         ObjectType expectedDomain = releaseAuthz.getServiceDomain(_registeredServices);
-        address expectedOwner = msg.sender;
 
         // service can work with release registry and release version
         (
             IRegistry.ObjectInfo memory info,
-            bytes memory data,
-            ObjectType serviceDomain
+            ObjectType serviceDomain,
+            VersionPart serviceVersion
+            //,string memory serviceName
         ) = _verifyService(
             service, 
-            expectedOwner,
             releaseAuthority, 
             releaseVersion, 
             expectedDomain
         );
 
+        //_releaseInfo[releaseVersion].addresses.push(address(service)); // TODO get this info from auth contract?
+        //_releaseInfo[releaseVersion].domains.push(serviceDomain);
+        //_releaseInfo[releaseVersion].names.push(serviceName); // TODO if needed read in _verifyService()
+
         _registeredServices++; // TODO use releaseInfo.someArray.length instead of _registeredServices
 
         // release fully deployed
@@ -216,7 +222,7 @@ contract ReleaseRegistry is
         releaseAdmin.setReleaseLocked(true); 
 
         // register service with registry
-        nftId = _registry.registerService(info, expectedOwner, serviceDomain, data);
+        nftId = _registry.registerService(info, serviceVersion, serviceDomain);
         service.linkToRegisteredNftId();
     }
 
@@ -383,12 +389,12 @@ contract ReleaseRegistry is
 
         clonedAdmin.initialize(
             address(_cloneNewAccessManager()),
-            releaseAdminName,
-            release);
+            releaseAdminName);
 
         clonedAdmin.completeSetup(
             address(_registry), 
             address(serviceAuthorization),
+            release,
             address(this)); // release registry (this contract)
 
         // lock release (remains locked until activation)
@@ -433,65 +439,62 @@ contract ReleaseRegistry is
 
     // TODO get service names 
     function _verifyService(
-        IService service,
-        address expectedOwner,
+        IService service, 
         address expectedAuthority, 
-        VersionPart expectedRelease,
+        VersionPart expectedVersion,
         ObjectType expectedDomain
     )
         internal
         view
         returns(
-            IRegistry.ObjectInfo memory info,
-            bytes memory data,
-            ObjectType domain
+            IRegistry.ObjectInfo memory serviceInfo,
+            ObjectType serviceDomain, 
+            VersionPart serviceVersion
         )
     {
         if(!service.supportsInterface(type(IService).interfaceId)) {
             revert ErrorReleaseRegistryNotService(address(service));
         }
 
-        address authority = service.authority();
-        domain = service.getDomain();// checked in registry
+        address owner = msg.sender;
+        address serviceAuthority = service.authority();
+        serviceVersion = service.getVersion().toMajorPart();
+        serviceDomain = service.getDomain();// checked in registry
+        serviceInfo = service.getInitialInfo();
 
-        (info,, data) = _getAndVerifyServiceInfo(
-            service,
-            expectedOwner,
-            expectedRelease);
+        _verifyServiceInfo(service, serviceInfo, owner);
 
-        if(authority != expectedAuthority) {
+        if(serviceAuthority != expectedAuthority) {
             revert ErrorReleaseRegistryServiceAuthorityMismatch(
                 service,
-                expectedAuthority,
-                authority);
+                serviceAuthority,
+                expectedAuthority);
         }
 
-        if(domain != expectedDomain) {
+        if(serviceVersion != expectedVersion) {
+            revert ErrorReleaseRegistryServiceVersionMismatch(
+                service,
+                serviceVersion,
+                expectedVersion);            
+        }
+
+        if(serviceDomain != expectedDomain) {
             revert ErrorReleaseRegistryServiceDomainMismatch(
                 service,
                 expectedDomain,
-                domain);
+                serviceDomain);
         }
     }
 
 
-    function _getAndVerifyServiceInfo(
+    function _verifyServiceInfo(
         IService service,
-        address expectedOwner, // assume always valid, can not be 0
-        VersionPart expectedRelease
+        IRegistry.ObjectInfo memory info,
+        address expectedOwner // assume always valid, can not be 0
     )
         internal
         view
-        returns (
-            IRegistry.ObjectInfo memory info,
-            address initialOwner,
-            bytes memory data
-        )
     {
-        info = service.getInitialInfo();
-        initialOwner = service.getOwner();
-        data = service.getInitialData();
-
         if(info.objectAddress != address(service)) {
             revert ErrorReleaseRegistryServiceInfoAddressInvalid(service, info.objectAddress);
         }
@@ -504,23 +507,18 @@ contract ReleaseRegistry is
             revert ErrorReleaseRegistryServiceInfoTypeInvalid(service, SERVICE(), info.objectType);
         }
 
-        if(info.release != expectedRelease) {
-            revert ErrorReleaseRegistryServiceInfoReleaseMismatch(
-                service,
-                expectedRelease,
-                info.release);            
-        }
+        address owner = info.initialOwner;
 
-        if(initialOwner != expectedOwner) { // registerable owner protection
-            revert ErrorReleaseRegistryServiceInfoOwnerInvalid(service, expectedOwner, initialOwner); 
+        if(owner != expectedOwner) { // registerable owner protection
+            revert ErrorReleaseRegistryServiceInfoOwnerInvalid(service, expectedOwner, owner); 
         }
 
-        if(initialOwner == address(service)) {
+        if(owner == address(service)) {
             revert ErrorReleaseRegistryServiceSelfRegistration(service);
         }
         
-        if(_registry.isRegistered(initialOwner)) { 
-            revert ErrorReleaseRegistryServiceOwnerRegistered(service, initialOwner);
+        if(_registry.isRegistered(owner)) { 
+            revert ErrorReleaseRegistryServiceOwnerRegistered(service, owner);
         }
     }
 }

package/contracts/registry/ServiceAuthorizationV3.sol

@@ -21,8 +21,6 @@ import {IRegistryService} from "./IRegistryService.sol";
 import {IRiskService} from "../product/IRiskService.sol";
 
 import {ServiceAuthorization} from "../authorization/ServiceAuthorization.sol";
-import {VersionPartLib} from "../../contracts/type/Version.sol";
-import {GIF_INITIAL_RELEASE} from "../registry/Registry.sol";
 
 
 contract ServiceAuthorizationV3
@@ -33,7 +31,7 @@ contract ServiceAuthorizationV3
           ServiceAuthorization(
                "ReleaseAdmin",
                RELEASE(),
-               GIF_INITIAL_RELEASE(),
+               3,
                commitHash)
      {}
 
@@ -92,7 +90,8 @@ contract ServiceAuthorizationV3
           _authorize(functions, IRegistryService.registerBundle.selector, "registerBundle");
 
           functions = _authorizeForService(REGISTRY(), COMPONENT());
-          _authorize(functions, IRegistryService.registerComponent.selector, "registerComponent");
+          _authorize(functions, IRegistryService.registerProduct.selector, "registerProduct");
+          _authorize(functions, IRegistryService.registerProductLinkedComponent.selector, "registerProductLinkedComponent");
 
           functions = _authorizeForService(REGISTRY(), DISTRIBUTION());
           _authorize(functions, IRegistryService.registerDistributor.selector, "registerDistributor");