@etherisc/gif-next 3.0.0-f90c901-018 → 3.0.0-fb87f3a-607

package/contracts/shared/ComponentService.sol

@@ -49,13 +49,14 @@ contract ComponentService is
     )
         internal
         virtual override
-        onlyInitializing()
+        initializer()
     {
         (
-            address authority
-        ) = abi.decode(data, (address));
+            address authority,
+            address registry
+        ) = abi.decode(data, (address, address));
 
-        __Service_init(authority, owner);
+        __Service_init(authority, registry, owner);
 
         _accountingService = IAccountingService(_getServiceAddress(ACCOUNTING()));
         _registryService = IRegistryService(_getServiceAddress(REGISTRY()));
@@ -73,21 +74,26 @@ contract ComponentService is
         restricted()
         returns (NftId componentNftId)
     {
+        // checks
         // check sender is registered product
-        IRegistry registry = _getRegistry();
-        if (!registry.isObjectType(msg.sender, PRODUCT(), getRelease())) {
+        IRegistry registry = getRegistry();
+        if (!registry.isObjectType(msg.sender, PRODUCT())) {
             revert ErrorComponentServiceCallerNotProduct(msg.sender);
         }
 
+        // check provided address is product contract
+        if (!_isInstanceLinkedComponent(componentAddress)) {
+            revert ErrorComponentServiceNotComponent(componentAddress);
+        }
+
         NftId productNftId = registry.getNftIdForAddress(msg.sender);
         IInstance instance = IInstance(
             registry.getObjectAddress(
                 registry.getParentNftId(productNftId)));
 
-        componentNftId = _register(
+        componentNftId = _verifyAndRegister(
             instance, 
-            componentAddress,
-            COMPONENT(),
+            componentAddress, 
             productNftId, // product is parent of component to be registered
             address(0)); // token will be inhereited from product
     }
@@ -178,7 +184,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, 
@@ -204,18 +210,23 @@ contract ComponentService is
         nonReentrant()
         returns (NftId productNftId)
     {
+        // checks
         // check sender is registered instance
-        IRegistry registry = _getRegistry();
-        if (!registry.isObjectType(msg.sender, INSTANCE(), getRelease())) {
+        IRegistry registry = getRegistry();
+        if (!registry.isObjectType(msg.sender, INSTANCE())) {
             revert ErrorComponentServiceCallerNotInstance(msg.sender);
         }
 
+        // check provided address is product contract
+        if (!_isProduct(productAddress)) {
+            revert ErrorComponentServiceNotProduct(productAddress);
+        }
+
         IInstance instance = IInstance(msg.sender);
         NftId instanceNftId = registry.getNftIdForAddress(msg.sender);
-        productNftId = _register(
+        productNftId = _verifyAndRegister(
             instance, 
             productAddress, 
-            PRODUCT(),
             instanceNftId, // instance is parent of product to be registered 
             token);
 
@@ -225,6 +236,25 @@ contract ComponentService is
             token);
     }
 
+
+    function _isProduct(address target) internal view virtual returns (bool) {
+        if (!_isInstanceLinkedComponent(target)) {
+            return false;
+        }
+
+        return IInstanceLinkedComponent(target).getInitialInfo().objectType == PRODUCT();
+    }
+
+
+    function _isInstanceLinkedComponent(address target) internal view virtual returns (bool) {
+        if (!ContractLib.isContract(target)) {
+            return false;
+        }
+
+        return ContractLib.supportsInterface(target, type(IInstanceLinkedComponent).interfaceId);
+    }
+
+
     /// @inheritdoc IComponentService
     function setProductFees(
         Fee memory productFee, // product fee on net premium
@@ -448,10 +478,9 @@ contract ComponentService is
 
     /// @dev Registers the component represented by the provided address.
     /// The caller must ensure componentAddress is IInstanceLinkedComponent.
-    function _register(
+    function _verifyAndRegister(
         IInstance instance,
         address componentAddress,
-        ObjectType componentType,
         NftId parentNftId,
         address token
     )
@@ -459,29 +488,36 @@ contract ComponentService is
         virtual
         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,
-            componentType,
-            address(0)); // component owner have no importance here
-
-        componentType = info.objectType;
-        componentNftId = info.nftId;
+        (
+            IInstanceLinkedComponent component,
+            IRegistry.ObjectInfo memory objectInfo // initial component info
+        ) = _getAndVerifyRegisterableComponent(
+            componentAddress,
+            parentNftId);
 
         InstanceStore instanceStore = instance.getInstanceStore();
-        InstanceReader instanceReader = instance.getInstanceReader();
+        ObjectType componentType = objectInfo.objectType;
 
         if(componentType == PRODUCT()) {
+            // register product with registry
+            componentNftId = _registryService.registerProduct(
+                component, 
+                objectInfo.initialOwner).nftId;
+
             // create product info in instance store
             _createProduct(instance.getProductStore(), componentNftId, componentAddress);
         } else {
+            // register non product component with registry
+            componentNftId = _registryService.registerProductLinkedComponent(
+                component, 
+                objectInfo.objectType, 
+                objectInfo.initialOwner).nftId;
+
+            InstanceReader instanceReader = instance.getInstanceReader();
+
             // create non product component info in instance store
-            NftId productNftId = info.parentNftId;
+            NftId productNftId = parentNftId;
             IComponents.ProductInfo memory productInfo = instanceReader.getProductInfo(productNftId);
-
             if(componentType == POOL()) {
                 _createPool(instanceStore, instance.getProductStore(), productNftId, componentNftId, componentAddress, productInfo);
             } else if(componentType == DISTRIBUTION()) {
@@ -493,7 +529,7 @@ contract ComponentService is
             }
 
             // get product's token
-            token = address(instanceReader.getToken(productNftId));
+            token = address(instanceReader.getTokenHandler(productNftId).TOKEN());
         }
 
         _checkToken(instance, token);
@@ -501,13 +537,17 @@ contract ComponentService is
         InstanceAdmin instanceAdmin = instance.getInstanceAdmin();
         
         // deploy and wire token handler
-        IRegistry registry = _getRegistry();
         IComponents.ComponentInfo memory componentInfo = component.getInitialComponentInfo();
         componentInfo.tokenHandler = TokenHandlerDeployerLib.deployTokenHandler(
-            address(registry),
-            componentAddress, // initially, component is its own wallet
+            address(getRegistry()),
+            address(component), // initially, component is its own wallet
             token, 
             instanceAdmin.authority());
+
+        emit LogComponentServiceTokenHandlerDeployed(
+            componentNftId, 
+            address(componentInfo.tokenHandler), 
+            token);
         
         // register component with instance
         instanceStore.createComponent(
@@ -518,15 +558,15 @@ contract ComponentService is
         component.linkToRegisteredNftId();
 
         // authorize
-        instanceAdmin.initializeComponentAuthorization(componentAddress, componentType, getRelease());
+        instanceAdmin.initializeComponentAuthorization(componentAddress, componentType);
 
         emit LogComponentServiceRegistered(
             instance.getNftId(),
             componentNftId, 
             componentType, 
-            componentAddress, 
+            address(component), 
             token, 
-            registry.ownerOf(componentNftId));
+            objectInfo.initialOwner);
     }
 
 
@@ -535,10 +575,9 @@ 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())
@@ -575,10 +614,47 @@ contract ComponentService is
             IComponents.FeeInfo memory info
         )
     {
-        productNftId = _getRegistry().getParentNftId(componentNftId);
+        productNftId = getRegistry().getParentNftId(componentNftId);
         info = instanceReader.getFeeInfo(productNftId);
     }
 
+
+    /// @dev Based on the provided component address required type the component 
+    /// and related instance contract this function reverts iff:
+    /// - the component parent does not match with the required parent
+    /// - the component release does not match with the service release
+    /// - the component has already been registered
+    function _getAndVerifyRegisterableComponent(
+        address componentAddress,
+        NftId requiredParent
+    )
+        internal
+        view
+        returns (
+            IInstanceLinkedComponent component,
+            IRegistry.ObjectInfo memory info
+        )
+    {
+        component = IInstanceLinkedComponent(componentAddress);
+        info = component.getInitialInfo();
+
+        // check component parent
+        if(info.parentNftId != requiredParent) {
+            revert ErrorComponentServiceComponentParentInvalid(componentAddress, requiredParent, info.parentNftId);
+        }
+
+        // check component release (must match with service release)
+        if(component.getRelease() != getRelease()) {
+            revert ErrorComponentServiceComponentReleaseMismatch(componentAddress, getRelease(), component.getRelease());
+        }
+
+        // check component has not already been registered
+        if (getRegistry().getNftIdForAddress(componentAddress).gtz()) {
+            revert ErrorComponentServiceComponentAlreadyRegistered(componentAddress);
+        }
+    }
+
+
     function _setLocked(InstanceAdmin instanceAdmin, address componentAddress, bool locked) internal {
         instanceAdmin.setTargetLocked(componentAddress, locked);
     }
@@ -592,11 +668,25 @@ contract ComponentService is
             IInstance instance
         )
     {
-        (componentNftId, instance) = ContractLib.getAndVerifyComponent(
-            msg.sender, // caller
-            expectedType,
-            getRelease(),
-            isActive);
+        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);
     }
 
 

package/contracts/shared/ComponentServiceManager.sol

@@ -2,7 +2,7 @@
 pragma solidity ^0.8.20;
 
 import {ComponentService} from "./ComponentService.sol";
-import {IUpgradeable} from "../upgradeability/IUpgradeable.sol";
+import {IVersionable} from "../upgradeability/IVersionable.sol";
 import {ProxyManager} from "../upgradeability/ProxyManager.sol";
 
 contract ComponentServiceManager is ProxyManager {
@@ -11,18 +11,20 @@ contract ComponentServiceManager is ProxyManager {
 
     /// @dev initializes proxy manager with service implementation 
     constructor(
-        address authority,
+        address authority, 
+        address registry,
         bytes32 salt
     )
     {
         ComponentService svc = new ComponentService();
-        bytes memory data = abi.encode(authority);
-        IUpgradeable upgradeable = initialize(
+        bytes memory data = abi.encode(authority, registry);
+        IVersionable versionable = initialize(
+            registry,
             address(svc), 
             data,
             salt);
 
-        _componentService = ComponentService(address(upgradeable));
+        _componentService = ComponentService(address(versionable));
     }
 
     //--- view functions ----------------------------------------------------//