@etherisc/gif-next 3.0.0-82728fa-320 → 3.0.0-83fcfa1-064

package/contracts/registry/RegistryAdmin.sol

@@ -7,11 +7,12 @@ 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 {VersionPart} from "../type/Version.sol";
 
 /*
     1) GIF_MANAGER_ROLE
@@ -51,6 +52,7 @@ contract RegistryAdmin is
     // completeSetup
     error ErrorRegistryAdminNotRegistry(address registry);
 
+    address internal _registry;
     address private _releaseRegistry;
     address private _tokenRegistry;
     address private _staking;
@@ -60,34 +62,49 @@ contract RegistryAdmin is
     constructor() {
         initialize(
             address(new AccessManagerCloneable()),
-            "RegistryAdmin",
-            GIF_INITIAL_RELEASE());
+            "RegistryAdmin");
     }
 
 
     function completeSetup(
+        address registry,
         address authorization,
+        VersionPart release,
         address gifAdmin, 
         address gifManager
     )
         public
         virtual
+        reinitializer(type(uint8).max)
     {
         // checks
-        _checkAuthorization(authorization, REGISTRY(), getRelease(), false, true);
-
-        // effects
+        AccessAdminLib.checkRegistry(registry);
+
+        AccessManagerCloneable(
+            authority()).completeSetup(
+                registry, 
+                release); 
+
+        AccessAdminLib.checkAuthorization(
+            address(_authorization),
+            authorization, 
+            REGISTRY(), 
+            release, 
+            false, // expectServiceAuthorization
+            false); // checkAlreadyInitialized);
+
+        _registry = registry;
         _authorization = IAuthorization(authorization);
 
-        IRegistry registry = _getRegistry();
-        _releaseRegistry = registry.getReleaseRegistryAddress();
-        _tokenRegistry = registry.getTokenRegistryAddress();
-        _staking = registry.getStakingAddress();
+        IRegistry registryContract = IRegistry(registry);
+        _releaseRegistry = registryContract.getReleaseRegistryAddress();
+        _tokenRegistry = registryContract.getTokenRegistryAddress();
+        _staking = registryContract.getStakingAddress();
         _stakingTargetHandler = address(IStaking(_staking).getTargetHandler());
         _stakingStore = address(IStaking(_staking).getStakingStore());
 
         // link nft ownability to registry
-        _linkToNftOwnable(address(_getRegistry()));
+        _linkToNftOwnable(_registry);
 
         _createRoles(_authorization);
 
@@ -132,7 +149,7 @@ contract RegistryAdmin is
         internal
     {
         // create unchecked registry targets
-        _createTarget(address(_getRegistry()), registryTargetName, TargetType.Core, false);
+        _createTarget(_registry, 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

@@ -12,7 +12,6 @@ import {PUBLIC_ROLE} from "../type/RoleId.sol";
 import {ReleaseRegistry} from "./ReleaseRegistry.sol";
 import {RegistryAdmin} from "./RegistryAdmin.sol";
 import {RoleIdLib, ADMIN_ROLE, GIF_ADMIN_ROLE, GIF_MANAGER_ROLE} from "../type/RoleId.sol";
-import {GIF_INITIAL_RELEASE} from "../registry/Registry.sol";
 import {StakingStore} from "../staking/StakingStore.sol";
 import {TargetHandler} from "../staking/TargetHandler.sol";
 import {TokenHandler} from "../shared/TokenHandler.sol";
@@ -50,7 +49,7 @@ contract RegistryAuthorization
           Authorization(
                REGISTRY_TARGET_NAME, 
                REGISTRY(), 
-               GIF_INITIAL_RELEASE(),
+               3, 
                commitHash, 
                TargetType.Core,
                false) // includeTokenHandler
@@ -101,7 +100,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_ADMIN_ROLE_NAME));
 
           // gif manager role
@@ -110,7 +109,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_MANAGER_ROLE_NAME));
 
      }

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, 
@@ -33,15 +33,16 @@ contract RegistryService is
         onlyInitializing
     {
         (
-            address authority
-        ) = abi.decode(data, (address));
+            address authority,
+            address registry
+        ) = abi.decode(data, (address, address));
 
-        __Service_init(authority, owner);
+        __Service_init(authority, registry, owner);
         _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()
@@ -49,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()
@@ -66,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
@@ -89,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
     )
@@ -165,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
@@ -235,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";
 
@@ -9,6 +9,7 @@ contract RegistryServiceManager is
     ProxyManager
 {
     error ErrorRegistryAccessManagerAuthorityZero();
+    error ErrorRegistryAccessManagerRegistryZero();
 
     bytes32 constant public ACCESS_MANAGER_CREATION_CODE_HASH = 0x0;
 
@@ -17,21 +18,27 @@ 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);
-        IUpgradeable upgradeable = initialize(
+        bytes memory data = abi.encode(authority, registry);
+        IVersionable versionable = initialize(
+            registry,
             address(srv), 
             data,
             salt);
 
-        _registryService = RegistryService(address(upgradeable));
+        _registryService = RegistryService(address(versionable));
     }
 
     //--- view functions ----------------------------------------------------//

package/contracts/registry/ReleaseAdmin.sol

@@ -10,7 +10,6 @@ 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";
@@ -47,30 +46,44 @@ 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);
+
+        AccessManagerCloneable(
+            authority()).completeSetup(
+                registry, 
+                release);
 
-        // effects
         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
-        _linkToNftOwnable(address(_getRegistry()));
+        _linkToNftOwnable(registry);
 
         _createRoles(_serviceAuthorization);
 
@@ -167,7 +180,8 @@ contract ReleaseAdmin is
     //--- private initialization functions -------------------------------------------//
 
     function _setupReleaseRegistry(address releaseRegistry)
-        private
+        private 
+        onlyInitializing()
     {
 
         _createRole(