@etherisc/gif-next 3.0.0-c0923b6f-772-12c20a7-167 → 3.0.0-c458de2-735

package/contracts/registry/RegistryService.sol

@@ -1,16 +1,18 @@
 // 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 {ObjectType, REGISTRY, SERVICE, PRODUCT, ORACLE, POOL, INSTANCE, COMPONENT, DISTRIBUTION, DISTRIBUTOR, APPLICATION, POLICY, CLAIM, BUNDLE, STAKE, STAKING, PRICE} from "../../contracts/type/ObjectType.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 {NftId, NftIdLib} from "../../contracts/type/NftId.sol";
 import {Service} from "../shared/Service.sol";
 
@@ -21,8 +23,6 @@ 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, 
@@ -33,16 +33,15 @@ 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);
     }
 
-
-    function registerStaking(IRegisterable staking, address owner)
+    // TODO register have no combos with STAKING; decide on parentNftId arg
+    function registerStaking(IRegisterable staking, address expectedOwner)
         external
         virtual
         restricted()
@@ -50,12 +49,16 @@ contract RegistryService is
             IRegistry.ObjectInfo memory info
         )
     {
-        info = _getAndVerifyContractInfo(staking, STAKING(), owner);
-        info.nftId = getRegistry().register(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);
     }
 
 
-    function registerInstance(IRegisterable instance, address owner)
+    function registerInstance(IRegisterable instance, address expectedOwner)
         external
         virtual
         restricted()
@@ -63,19 +66,21 @@ contract RegistryService is
             IRegistry.ObjectInfo memory info
         ) 
     {
-        if(!instance.supportsInterface(type(IInstance).interfaceId)) {
-            revert ErrorRegistryServiceNotInstance(address(instance));
-        }
+        _checkInterface(instance, type(IInstance).interfaceId);
 
-        info = _getAndVerifyContractInfo(instance, INSTANCE(), owner);
-        info.nftId = getRegistry().register(info);
+        address owner;
+        bytes memory data;
+        (info, owner, data) = _getAndVerifyContractInfo(instance, _getRegistry().getNftId(), INSTANCE(), expectedOwner);
+        info.nftId = _getRegistry().register(info, owner, data);
 
         instance.linkToRegisteredNftId(); // asume safe
     }
 
-    function registerProduct(
-        IComponent product, 
-        address initialOwner
+    function registerComponent(
+        IRegisterable component, 
+        NftId expectedParentNftId, 
+        ObjectType expectedType, 
+        address expectedOwner
     )
         external
         virtual
@@ -84,83 +89,75 @@ contract RegistryService is
             IRegistry.ObjectInfo memory info
         ) 
     {
-        if(!product.supportsInterface(type(IProductComponent).interfaceId)) {
-            revert ErrorRegistryServiceNotProduct(address(product));
-        }
-
-        info = _getAndVerifyContractInfo(product, PRODUCT(), initialOwner);
-        info.nftId = getRegistry().register(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);
     }
 
-    function registerProductLinkedComponent(
-        IComponent component, 
-        ObjectType objectType,
-        address initialOwner
-    )
-        external
-        virtual
-        restricted()
-        returns(
-            IRegistry.ObjectInfo memory info
-        ) 
-    {
-        // 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 registerDistributor(IRegistry.ObjectInfo memory info)
+    function registerDistributor(IRegistry.ObjectInfo memory info, address owner, bytes memory data)
         external
         virtual
         restricted()
         returns(NftId nftId) 
     {
-        _verifyObjectInfo(info, DISTRIBUTOR());
-        nftId = getRegistry().register(info);
+        _verifyObjectInfo(info, owner, DISTRIBUTOR());
+        nftId = _getRegistry().register(info, owner, data);
     }
 
-    function registerPolicy(IRegistry.ObjectInfo memory info)
+    function registerPolicy(IRegistry.ObjectInfo memory info, address owner, bytes memory data)
         external
         virtual
         restricted()
         returns(NftId nftId) 
     {
-        _verifyObjectInfo(info, POLICY());
-        nftId = getRegistry().register(info);
+        _verifyObjectInfo(info, owner, POLICY());
+        nftId = _getRegistry().register(info, owner, data);
     }
 
-    function registerBundle(IRegistry.ObjectInfo memory info)
+    function registerBundle(IRegistry.ObjectInfo memory info, address owner, bytes memory data)
         external
         virtual
         restricted()
         returns(NftId nftId) 
     {
-        _verifyObjectInfo(info, BUNDLE());
-        nftId = getRegistry().register(info);
+        _verifyObjectInfo(info, owner, BUNDLE());
+        nftId = _getRegistry().register(info, owner, data);
     }
 
-    function registerStake(IRegistry.ObjectInfo memory info)
+    function registerStake(IRegistry.ObjectInfo memory info, address owner, bytes memory data)
         external
         virtual
         restricted()
         returns(NftId nftId) 
     {
-        _verifyObjectInfo(info, STAKE());
-        nftId = getRegistry().register(info);
+        _verifyObjectInfo(info, owner, STAKE());
+        nftId = _getRegistry().register(info, owner, data);
     }
 
     // Internal
 
+    function _checkInterface(IRegisterable registerable, bytes4 interfaceId) internal view
+    {
+        if(!ContractLib.supportsInterface(address(registerable), interfaceId)) {
+            revert ErrorRegistryServiceInterfaceNotSupported(address(registerable), interfaceId);
+        }
+    }
+
+    /// @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
     function _getAndVerifyContractInfo(
         IRegisterable registerable,
+        NftId expectedParent,
         ObjectType expectedType, // assume can be valid only
         address expectedOwner // assume can be 0 when given by other service
     )
@@ -168,40 +165,62 @@ contract RegistryService is
         virtual
         view
         returns(
-            IRegistry.ObjectInfo memory info 
+            IRegistry.ObjectInfo memory info,
+            address initialOwner,
+            bytes memory data
         )
     {
         info = registerable.getInitialInfo();
+        data = registerable.getInitialData();
+        initialOwner = registerable.getOwner();
 
         if(info.objectAddress != address(registerable)) {
             revert ErrorRegistryServiceRegisterableAddressInvalid(registerable, info.objectAddress);
         }
 
-        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(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);
+            }
         }
 
-        address owner = info.initialOwner;
+        if(expectedParent.gtz()) {
+            // exact parent is important
+            if(info.parentNftId != expectedParent) {
+                revert ErrorRegistryServiceRegisterableParentInvalid(registerable, expectedParent, info.parentNftId);
+            }
+        }
 
-        if(owner != expectedOwner) { // registerable owner protection
-            revert ErrorRegistryServiceRegisterableOwnerInvalid(registerable, expectedOwner, owner);
+        if(expectedOwner > address(0)) {
+            // exact owner is important
+            if(initialOwner != expectedOwner) { // registerable owner protection
+                revert ErrorRegistryServiceRegisterableOwnerInvalid(registerable, expectedOwner, initialOwner);
+            }
         }
 
-        if(owner == address(registerable)) {
+        if(initialOwner == address(registerable)) {
             revert ErrorRegistryServiceRegisterableSelfRegistration(registerable);
         }
 
-        if(owner == address(0)) {
+        // redundant, checked by chainNft
+        if(initialOwner == address(0)) {
             revert ErrorRegistryServiceRegisterableOwnerZero(registerable);
         }
         
-        if(getRegistry().isRegistered(owner)) { 
-            revert ErrorRegistryServiceRegisterableOwnerRegistered(registerable, owner);
+        if(_getRegistry().isRegistered(initialOwner)) { 
+            revert ErrorRegistryServiceRegisterableOwnerRegistered(registerable, initialOwner);
         }
     }
 
     function _verifyObjectInfo(
         IRegistry.ObjectInfo memory info,
+        address initialOwner,
         ObjectType expectedType
     )
         internal
@@ -216,20 +235,18 @@ contract RegistryService is
             revert ErrorRegistryServiceObjectTypeInvalid(expectedType, info.objectType);
         }
 
-        address owner = info.initialOwner;
-
-        if(owner == address(0)) {
+        if(initialOwner == address(0)) {
             revert ErrorRegistryServiceObjectOwnerZero(info.objectType);
         }
 
-        if(owner == msg.sender) {
-            revert ErrorRegistryServiceInvalidInitialOwner(owner);
+        if(initialOwner == msg.sender) {
+            revert ErrorRegistryServiceInvalidInitialOwner(initialOwner);
         }
 
-        if(getRegistry().isRegistered(owner)) {
-            ObjectType ownerType = getRegistry().getObjectInfo(owner).objectType;
+        if(_getRegistry().isRegistered(initialOwner)) {
+            ObjectType ownerType = _getRegistry().getObjectInfo(initialOwner).objectType;
             if(ownerType == REGISTRY() || ownerType == STAKING() || ownerType == SERVICE() || ownerType == INSTANCE()) {
-                revert ErrorRegistryServiceObjectOwnerRegistered(info.objectType, owner);
+                revert ErrorRegistryServiceObjectOwnerRegistered(info.objectType, initialOwner);
             }
         }
     }

package/contracts/registry/RegistryServiceManager.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 {RegistryService} from "./RegistryService.sol";
 
@@ -9,7 +9,6 @@ contract RegistryServiceManager is
     ProxyManager
 {
     error ErrorRegistryAccessManagerAuthorityZero();
-    error ErrorRegistryAccessManagerRegistryZero();
 
     bytes32 constant public ACCESS_MANAGER_CREATION_CODE_HASH = 0x0;
 
@@ -18,27 +17,21 @@ 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);
-        IVersionable versionable = initialize(
-            registry,
+        bytes memory data = abi.encode(authority);
+        IUpgradeable upgradeable = initialize(
             address(srv), 
             data,
             salt);
 
-        _registryService = RegistryService(address(versionable));
+        _registryService = RegistryService(address(upgradeable));
     }
 
     //--- view functions ----------------------------------------------------//

package/contracts/registry/ReleaseAdmin.sol

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