@etherisc/gif-next 3.0.0-a511887-523 → 3.0.0-b216819-597

package/contracts/shared/Component.sol

@@ -12,7 +12,7 @@ import {NftId} from "../type/NftId.sol";
 import {ObjectType, COMPONENT} from "../type/ObjectType.sol";
 import {Registerable} from "../shared/Registerable.sol";
 import {TokenHandler} from "../shared/TokenHandler.sol";
-import {Version, VersionPart, VersionLib} from "../type/Version.sol";
+import {Version, VersionLib} from "../type/Version.sol";
 
 
 abstract contract Component is
@@ -23,12 +23,9 @@ abstract contract Component is
     bytes32 public constant COMPONENT_LOCATION_V1 = 0xffe8d4462baed26a47154f4b8f6db497d2f772496965791d25bd456e342b7f00;
 
     struct ComponentStorage {
-        // slot 0
+        string _name; // unique (per instance) component name
+        bool _isInterceptor;
         IComponentService _componentService;
-        // slot 1
-        string _name; // unique (per instance) component name -> make pure to save gas?
-        // slot 2
-        bytes _data;
     }
 
 
@@ -47,7 +44,7 @@ abstract contract Component is
         }
     }
 
-    /// @dev requires component parent to be registered 
+
     function __Component_init(
         address authority,
         address registry,
@@ -78,6 +75,7 @@ abstract contract Component is
         // set component state
         ComponentStorage storage $ = _getComponentStorage();
         $._name = name;
+        $._isInterceptor = isInterceptor;
         $._componentService = IComponentService(_getServiceAddress(COMPONENT()));
 
         _registerInterface(type(IAccessManaged).interfaceId);
@@ -95,17 +93,6 @@ abstract contract Component is
         _nftTransferFrom(from, to, tokenId, operator);
     }
 
-    /// @inheritdoc IComponent
-    function withdrawFees(Amount amount)
-        external
-        virtual
-        restricted()
-        onlyOwner()
-        returns (Amount withdrawnAmount)
-    {
-        return _withdrawFees(amount);
-    }
-
 
     function getWallet() public view virtual returns (address walletAddress) {
         return getTokenHandler().getWallet();
@@ -123,6 +110,10 @@ abstract contract Component is
         return getComponentInfo().name;
     }
 
+    function getVersion() public view virtual returns (Version version) {
+        return VersionLib.toVersion(1, 0, 0);
+    }
+
     function getComponentInfo() public virtual view returns (IComponents.ComponentInfo memory info) {
         if (isRegistered()) {
             return _getComponentInfo();
@@ -138,6 +129,14 @@ abstract contract Component is
     }
 
 
+    function isNftInterceptor() public virtual view returns(bool isInterceptor) {
+        if (isRegistered()) {
+            return getRegistry().getObjectInfo(address(this)).isInterceptor;
+        } else {
+            return _getComponentStorage()._isInterceptor;
+        }
+    }
+
 
     function isRegistered() public virtual view returns (bool) {
         return getRegistry().getNftIdForAddress(address(this)).gtz();
@@ -171,12 +170,6 @@ abstract contract Component is
         // empty default implementation
     }
 
-    function _withdrawFees(Amount amount)
-        internal
-        returns (Amount withdrawnAmount)
-    {
-        return _getComponentStorage()._componentService.withdrawFees(amount);
-    }
 
     /// @dev Sets the components wallet to the specified address.
     /// Depending on the source of the component information this function needs to be overwritten. 

package/contracts/shared/ComponentService.sol

@@ -49,7 +49,7 @@ contract ComponentService is
     )
         internal
         virtual override
-        onlyInitializing()
+        initializer()
     {
         (
             address authority,
@@ -74,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())) {
+        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
     }
@@ -205,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())) {
+        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);
 
@@ -226,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
@@ -449,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
     )
@@ -460,27 +488,36 @@ contract ComponentService is
         virtual
         returns (NftId componentNftId)
     {
-        IInstanceLinkedComponent component = IInstanceLinkedComponent(componentAddress);
-        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()) {
@@ -492,7 +529,7 @@ contract ComponentService is
             }
 
             // get product's token
-            token = address(instanceReader.getToken(productNftId));
+            token = address(instanceReader.getTokenHandler(productNftId).TOKEN());
         }
 
         _checkToken(instance, token);
@@ -500,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(
@@ -523,9 +564,9 @@ contract ComponentService is
             instance.getNftId(),
             componentNftId, 
             componentType, 
-            componentAddress, 
+            address(component), 
             token, 
-            registry.ownerOf(componentNftId));
+            objectInfo.initialOwner);
     }
 
 
@@ -577,6 +618,43 @@ contract ComponentService is
         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);
     }

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 {
@@ -18,13 +18,13 @@ contract ComponentServiceManager is ProxyManager {
     {
         ComponentService svc = new ComponentService();
         bytes memory data = abi.encode(authority, registry);
-        IUpgradeable upgradeable = initialize(
+        IVersionable versionable = initialize(
             registry,
             address(svc), 
             data,
             salt);
 
-        _componentService = ComponentService(address(upgradeable));
+        _componentService = ComponentService(address(versionable));
     }
 
     //--- view functions ----------------------------------------------------//

package/contracts/shared/EcdsaChecker.sol

@@ -0,0 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.20;
+
+import {MessageHashUtils} from "@openzeppelin/contracts/utils/cryptography/MessageHashUtils.sol";
+import {SignatureChecker} from "@openzeppelin/contracts/utils/cryptography/SignatureChecker.sol";

package/contracts/shared/IAuthorizedComponent.sol

@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.20;
+
+import {IComponent} from "../shared/IComponent.sol";
+import {IAuthorization} from "../authorization/IAuthorization.sol";
+
+/// @dev component base class
+/// component examples are product, distribution, pool and oracle
+interface IAuthorizedComponent is 
+    IComponent
+{
+    /// @dev returns the initial component authorization specification.
+    function getAuthorization() external view returns (IAuthorization authorization);
+
+}

package/contracts/shared/IComponent.sol

@@ -29,11 +29,6 @@ interface IComponent is
     event LogComponentWalletTokensTransferred(address from, address to, uint256 amount);
     event LogComponentTokenHandlerApproved(address tokenHandler, address token, Amount limit, bool isMaxAmount);
 
-    /// @dev Withdraw fees from the distribution component. Only component owner is allowed to withdraw fees.
-    /// @param amount the amount to withdraw
-    /// @return withdrawnAmount the amount that was actually withdrawn
-    function withdrawFees(Amount amount) external returns (Amount withdrawnAmount);
-
     /// @dev returns the name of this component
     /// to successfully register the component with an instance the name MUST be unique in the linked instance
     function getName() external view returns (string memory name);
@@ -48,6 +43,9 @@ interface IComponent is
     /// the default address is the token handler address
     function getWallet() external view returns (address walletAddress);
 
+    /// @dev returns true iff this compoent intercepts nft minting and transfers for objects registered by this component
+    function isNftInterceptor() external view returns(bool isInterceptor);
+
     /// @dev returns true iff this component is registered with the registry
     function isRegistered() external view returns (bool);
 

package/contracts/shared/IComponentService.sol

@@ -18,11 +18,18 @@ interface IComponentService is
 {
     // registerProduct
     error ErrorComponentServiceCallerNotInstance(address caller);
+    error ErrorComponentServiceNotProduct(address product);
     error ErrorComponentServiceTokenInvalid(address token);
 
     // registerComponent
     error ErrorComponentServiceCallerNotProduct(address caller);
+    error ErrorComponentServiceNotComponent(address component);
+
+    error ErrorComponentServiceNotInstanceLinkedComponent(address component);
     error ErrorComponentServiceComponentTypeNotSupported(address component, ObjectType invalid);
+    error ErrorComponentServiceComponentParentInvalid(address component, NftId required, NftId actual);
+    error ErrorComponentServiceComponentReleaseMismatch(address component, VersionPart serviceRelease, VersionPart componentRelease);
+    error ErrorComponentServiceComponentAlreadyRegistered(address component);
     
     error ErrorProductServiceNoDistributionExpected(NftId productNftId);
     error ErrorProductServiceDistributionAlreadyRegistered(NftId productNftId, NftId distributionNftId);
@@ -30,11 +37,19 @@ interface IComponentService is
     error ErrorProductServiceOraclesAlreadyRegistered(NftId productNftId, uint8 expectedOracles);
     error ErrorProductServicePoolAlreadyRegistered(NftId productNftId, NftId poolNftId);
 
+    error ErrorComponentServiceNewWalletAddressZero();
+    error ErrorComponentServiceWalletAddressZero();
+    error ErrorComponentServiceWalletAddressIsSameAsCurrent();
+
     error ErrorComponentServiceWithdrawAmountIsZero();
     error ErrorComponentServiceWithdrawAmountExceedsLimit(Amount withdrawnAmount, Amount withdrawLimit);
+    error ErrorComponentServiceWalletAllowanceTooSmall(address wallet, address spender, uint256 allowance, uint256 amount);
 
     event LogComponentServiceComponentLocked(address component, bool locked);
+    event LogComponentServiceTokenHandlerDeployed(NftId componentNftId, address tokenHandler, address token);
     event LogComponentServiceRegistered(NftId instanceNftId, NftId componentNftId, ObjectType componentType, address component, address token, address initialOwner); 
+    event LogComponentServiceWalletAddressChanged(NftId componentNftId, address currentWallet, address newWallet);
+    event LogComponentServiceWalletTokensTransferred(NftId componentNftId, address currentWallet, address newWallet, uint256 currentBalance);
     event LogComponentServiceComponentFeesWithdrawn(NftId componentNftId, address recipient, address token, Amount withdrawnAmount);
     event LogComponentServiceProductFeesUpdated(NftId productNftId);
     event LogComponentServiceDistributionFeesUpdated(NftId distributionNftId);

package/contracts/shared/IInstanceLinkedComponent.sol

@@ -2,26 +2,26 @@
 pragma solidity ^0.8.20;
 
 import {Amount} from "../type/Amount.sol";
-import {IComponent} from "../shared/IComponent.sol";
+import {IAuthorizedComponent} from "../shared/IAuthorizedComponent.sol";
 import {IAuthorization} from "../authorization/IAuthorization.sol";
 import {IInstance} from "../instance/IInstance.sol";
 import {NftId} from "../type/NftId.sol";
 import {ObjectType} from "../type/ObjectType.sol";
-import {VersionPart} from "../type/Version.sol";
 
 /// @dev component base class
 /// component examples are product, distribution, pool and oracle
 interface IInstanceLinkedComponent is 
-    IComponent
+    IAuthorizedComponent
 {
-    error ErrorInstanceLinkedComponentInstanceInvalid();
-    error ErrorInstanceLinkedComponentInstanceMismatch(VersionPart instanceRelease, VersionPart componentRelease);
+    error ErrorInstanceLinkedComponentTypeMismatch(ObjectType requiredType, ObjectType objectType);
+    error ErrorInstanceLinkedComponentNotProduct(NftId nftId, ObjectType objectType);
+
+    /// @dev Withdraw fees from the distribution component. Only component owner is allowed to withdraw fees.
+    /// @param amount the amount to withdraw
+    /// @return withdrawnAmount the amount that was actually withdrawn
+    function withdrawFees(Amount amount) external returns (Amount withdrawnAmount);
 
     /// @dev defines the instance to which this component is linked to
     function getInstance() external view returns (IInstance instance);
 
-    // TODO consider moving to Registerable -> it works with authority
-    /// @dev returns the initial component authorization specification.
-    function getAuthorization() external view returns (IAuthorization authorization);
-
 }

package/contracts/shared/IRegisterable.sol

@@ -4,8 +4,8 @@ pragma solidity ^0.8.20;
 import {IAccessManaged} from "@openzeppelin/contracts/access/manager/IAccessManaged.sol";
 
 import {INftOwnable} from "./INftOwnable.sol";
+import {IRelease} from "../registry/IRelease.sol";
 import {IRegistry} from "../registry/IRegistry.sol";
-import {IVersionable} from "./IVersionable.sol";
 
 /// @title IRegisterable
 /// @dev Marks contracts that are intended to be registered in the registry.
@@ -13,7 +13,7 @@ import {IVersionable} from "./IVersionable.sol";
 interface IRegisterable is
     IAccessManaged,
     INftOwnable,
-    IVersionable
+    IRelease
 {
     // __Registerable_init
     error ErrorAuthorityInvalid(address authority);
@@ -32,10 +32,5 @@ interface IRegisterable is
     function getInitialInfo() 
         external 
         view
-        returns (IRegistry.ObjectInfo memory info);
-
-    function getInitialData() 
-        external 
-        view
-        returns (bytes memory data);
+        returns (IRegistry.ObjectInfo memory);
 }

package/contracts/shared/IRegistryLinked.sol

@@ -5,9 +5,7 @@ import {IRegistry} from "../registry/IRegistry.sol";
 
 interface IRegistryLinked {
 
-    error ErrorRegistryLinkedRegistryAlreadyInitialized(address target, address registry);
-    error ErrorRegistryLinkedNotRegistry(address target, address notRegistry);
-    error ErrorRegistryLinkedRegistryMismatch(address target, address givenRegistry, address pureRegistry);
+    error ErrorNotRegistry(address registryAddress);
 
     function getRegistry() external view returns (IRegistry);
 }

package/contracts/shared/IService.sol

@@ -4,14 +4,14 @@ pragma solidity ^0.8.20;
 import {IAccessManaged} from "@openzeppelin/contracts/access/manager/IAccessManaged.sol";
 
 import {IRegisterable} from "./IRegisterable.sol";
-import {IUpgradeable} from "../upgradeability/IUpgradeable.sol";
+import {IVersionable} from "../upgradeability/IVersionable.sol";
 import {ObjectType} from "../type/ObjectType.sol";
 import {RoleId} from "../type/RoleId.sol";
 
 interface IService is 
     IAccessManaged,
     IRegisterable,
-    IUpgradeable
+    IVersionable
 {
     /// @dev returns the domain for this service.
     /// In any GIF release only one service for any given domain may be deployed.