@etherisc/gif-next 0.0.2-78e428e-483 → 0.0.2-79292f9-089

package/contracts/registry/ReleaseRegistry.sol

@@ -9,12 +9,12 @@ import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManage
 import {Math} from "@openzeppelin/contracts/utils/math/Math.sol";
 
 import {NftId} from "../type/NftId.sol";
-import {RoleId, ADMIN_ROLE, PUBLIC_ROLE} from "../type/RoleId.sol";
+import {RoleId, RoleIdLib, ADMIN_ROLE, PUBLIC_ROLE} from "../type/RoleId.sol";
 import {ObjectType, ObjectTypeLib, POOL, RELEASE, REGISTRY, SERVICE, STAKING} from "../type/ObjectType.sol";
 import {Version, VersionLib, VersionPart, VersionPartLib} from "../type/Version.sol";
 import {Timestamp, TimestampLib, zeroTimestamp, ltTimestamp} from "../type/Timestamp.sol";
 import {Seconds, SecondsLib} from "../type/Seconds.sol";
-import {StateId, INITIAL, SCHEDULED, DEPLOYING, ACTIVE, PAUSED, CLOSED} from "../type/StateId.sol";
+import {StateId, INITIAL, SCHEDULED, DEPLOYING, SKIPPED, ACTIVE, PAUSED, CLOSED} from "../type/StateId.sol";
 import {Version, VersionLib, VersionPart, VersionPartLib} from "../type/Version.sol";
 
 import {IService} from "../shared/IService.sol";
@@ -39,7 +39,7 @@ contract ReleaseRegistry is
 {
     using ObjectTypeLib for ObjectType;
 
-    uint256 public constant INITIAL_GIF_VERSION = 3;
+    uint256 public constant INITIAL_GIF_VERSION = 3;// first active version  
 
     event LogReleaseCreation(VersionPart version, bytes32 salt); 
     event LogReleaseActivation(VersionPart version);
@@ -95,15 +95,9 @@ contract ReleaseRegistry is
     address private _stakingOwner;
 
     mapping(VersionPart version => IRegistry.ReleaseInfo info) internal _releaseInfo;
-    mapping(VersionPart version => IServiceAuthorization authz) internal _serviceAuthorization;
 
-    // TODO check where/why this is used
-    mapping(address registryService => VersionPart version) _releaseVersionByAddress;
-
-    VersionPart private _initial;// first active version    
     VersionPart internal _latest; // latest active version
     VersionPart internal _next; // version to create and activate 
-    mapping(VersionPart verson => StateId releaseState) private _state;
 
     uint256 internal _registeredServices;
     uint256 internal _servicesToRegister;
@@ -121,7 +115,6 @@ contract ReleaseRegistry is
         _registry = registry;
         _admin = RegistryAdmin(_registry.getRegistryAdminAddress());
 
-        _initial = VersionPartLib.toVersionPart(INITIAL_GIF_VERSION);
         _next = VersionPartLib.toVersionPart(INITIAL_GIF_VERSION - 1);
     }
 
@@ -132,10 +125,19 @@ contract ReleaseRegistry is
         restricted() // GIF_ADMIN_ROLE
         returns(VersionPart)
     {
-        _next = VersionPartLib.toVersionPart(_next.toInt() + 1);
+        VersionPart version = _next;
+
+        if(isValidTransition(RELEASE(), _releaseInfo[version].state, SKIPPED())) {
+            // set previous release into SKIPPED state if was created but not activated
+            _releaseInfo[version].state == SKIPPED();
+        }
+
+        version = VersionPartLib.toVersionPart(version.toInt() + 1);
+
+        _next = version;
+        _releaseInfo[version].state = getInitialState(RELEASE());
         _servicesToRegister = 0;
         _registeredServices = 0;
-        _state[_next] = getInitialState(RELEASE());
 
         return _next;
     }
@@ -148,75 +150,75 @@ contract ReleaseRegistry is
         restricted() // GIF_MANAGER_ROLE
         returns(
             address authority, 
-            VersionPart version, 
+            VersionPart releaseVersion, 
             bytes32 releaseSalt
         )
     {
         authority = _admin.authority();
-        version = _next;
+        releaseVersion = _next;
+        StateId state = _releaseInfo[releaseVersion].state;
+        StateId newState = DEPLOYING();
 
         // ensures unique salt
         // TODO CreateX have clones capability also
         // what would releaseSalt look like if used with CreateX in pemissioned mode?
         releaseSalt = keccak256(
             bytes.concat(
-                bytes32(version.toInt()),
+                bytes32(releaseVersion.toInt()),
                 salt));
 
-        // verify release in state SCHEDULED
-        if (!isValidTransition(RELEASE(), _state[version], DEPLOYING())) {
-            revert ErrorReleaseRegistryReleasePreparationDisallowed(version, _state[version]);
+        // verify release in state SCHEDULED or DEPLOYING
+        if (!isValidTransition(RELEASE(), state, newState)) {
+            revert ErrorReleaseRegistryReleasePreparationDisallowed(releaseVersion, state);
         }
 
-        _state[version] = DEPLOYING();
-
         // verify authorizaion contract release matches with expected version
-        VersionPart releaseVersion = serviceAuthorization.getRelease();
-        if (releaseVersion != version) {
-            revert ErrorReleaseRegistryVersionMismatch(version, releaseVersion);
+        VersionPart authVersion = serviceAuthorization.getRelease();
+        if (releaseVersion != authVersion) {
+            revert ErrorReleaseRegistryVersionMismatch(releaseVersion, authVersion);
         }
 
-
         // sanity check to ensure service domain list is not empty
         uint256 serviceDomainsCount = serviceAuthorization.getServiceDomains().length;
         if (serviceDomainsCount == 0) {
-            revert ErrorReleaseRegistryNoDomains(version);
+            revert ErrorReleaseRegistryNoDomains(releaseVersion);
         }
 
-        // verify prepareNextRelease is only called once per release
+        // verify prepareNextRelease is only called once per release, in state SCHEDULED
         if(_servicesToRegister > 0) {
-            revert ErrorReleaseRegistryReleaseAlreadyPrepared(version, _state[version]);
+            revert ErrorReleaseRegistryReleaseAlreadyPrepared(releaseVersion, state);
         }
 
         _servicesToRegister = serviceDomainsCount;
-        _serviceAuthorization[version] = serviceAuthorization;
+        // TODO allow for the same serviceAuthorization address to be used for multiple releases????
+        _releaseInfo[releaseVersion].auth = serviceAuthorization;
+        _releaseInfo[releaseVersion].state = newState;
 
-        emit LogReleaseCreation(version, releaseSalt);
+        emit LogReleaseCreation(releaseVersion, releaseSalt);
     }
 
-    // TODO this function can have 0 args -> use stored addresses from prepareNextRelease()
     function registerService(IService service) 
         external
         restricted // GIF_MANAGER_ROLE
         returns(NftId nftId)
     {
         VersionPart releaseVersion = _next;
-        StateId state = _state[releaseVersion];
+        StateId state = _releaseInfo[releaseVersion].state;
+        StateId newState = DEPLOYING();
+        IServiceAuthorization auth = _releaseInfo[releaseVersion].auth;
 
         // verify release in state DEPLOYING
-        if (!isValidTransition(RELEASE(), state, DEPLOYING())) {
+        if (!isValidTransition(RELEASE(), state, newState)) {
             // TOOD name must represent failed state transition
             revert ErrorReleaseRegistryServiceRegistrationDisallowed(state);
         }
 
-        _state[releaseVersion] = DEPLOYING();
-
         // not all services are registered
         if (_servicesToRegister == _registeredServices) {
             revert ErrorReleaseRegistryNoServiceRegistrationExpected();
         }
 
-        // service can work with release manager
+        // service can work with release registry and release version
         (
             IRegistry.ObjectInfo memory info,
             ObjectType serviceDomain,
@@ -224,27 +226,39 @@ contract ReleaseRegistry is
         ) = _verifyService(service);
 
         // service domain matches defined in release config
-        ObjectType expectedDomain = _serviceAuthorization[releaseVersion].getServiceDomain(_registeredServices);
+        ObjectType expectedDomain = auth.getServiceDomain(_registeredServices);
         if (serviceDomain != expectedDomain) {
             revert ErrorReleaseRegistryServiceDomainMismatch(expectedDomain, serviceDomain);
         }
 
-        // register service with registry
-        nftId = _registry.registerService(info, serviceVersion, serviceDomain);
-        service.linkToRegisteredNftId();
-        _registeredServices++;
+        // TODO: service address matches defined in release auth
 
         // setup service authorization
         _admin.authorizeService(
-            _serviceAuthorization[releaseVersion], 
-            service);
+            auth, 
+            service,
+            serviceDomain,
+            releaseVersion);
 
-        // TODO consider to extend this to REGISTRY
         // special roles for registry/staking/pool service
-        if (serviceDomain == STAKING() || serviceDomain == POOL()) {
-            // TODO rename to grantServiceDomainRole()
+        if (
+            serviceDomain == REGISTRY() ||
+            serviceDomain == STAKING() ||
+            serviceDomain == POOL()) 
+        {
             _admin.grantServiceRoleForAllVersions(service, serviceDomain);
         }
+
+        _releaseInfo[releaseVersion].state = newState;
+        //_releaseInfo[releaseVersion].addresses.push(address(service)); // TODO get this info from auth contract?
+        //_releaseInfo[releaseVersion].domains.push(serviceDomain);
+        //_releaseInfo[releaseVersion].names.push(service.getName()); // TODO if needed read name in _verifyService()?
+
+        _registeredServices++;
+
+        // register service with registry
+        nftId = _registry.registerService(info, serviceVersion, serviceDomain);
+        service.linkToRegisteredNftId();
     }
 
 
@@ -253,7 +267,7 @@ contract ReleaseRegistry is
         restricted // GIF_ADMIN_ROLE
     {
         VersionPart version = _next;
-        StateId state = _state[version];
+        StateId state = _releaseInfo[version].state;
         StateId newState = ACTIVE();
 
         // verify release in state DEPLOYING
@@ -273,9 +287,7 @@ contract ReleaseRegistry is
         }
 
         _latest = version;
-        _state[version] = newState;
-
-        _releaseVersionByAddress[service] = version;
+        _releaseInfo[version].state = newState;
         _releaseInfo[version].activatedAt = TimestampLib.blockTimestamp();
 
         emit LogReleaseActivation(version);
@@ -286,7 +298,7 @@ contract ReleaseRegistry is
         external
         restricted // GIF_ADMIN_ROLE
     {
-        StateId state = _state[version];
+        StateId state = _releaseInfo[version].state;
         StateId newState = PAUSED();
 
         // verify release in state ACTIVE
@@ -294,22 +306,22 @@ contract ReleaseRegistry is
             revert ErrorReleaseRegistryReleaseActivationDisallowed(version, state);
         }
 
-        // TODO come up with a substitute
-        //_releaseAccessManager[version].disable();
+        // TODO may run out of gas
+        // TODO test how many service roles can be revoked in one transaction -> add to docs + each release must test for this -> add to release registry tests, call in test with some gas limit?
+        _revokeReleaseRoles(version);
 
-        _state[version] = newState;
+        _releaseInfo[version].state = newState;
         _releaseInfo[version].disabledAt = TimestampLib.blockTimestamp();
 
         emit LogReleaseDisabled(version);
     }
 
-    // TODO consider revert if some delay is expired -> becomes disabled automatically
     /// @dev resume operations with release services
     function unpauseRelease(VersionPart version)
         external
         restricted // GIF_ADMIN_ROLE
     {
-        StateId state = _state[version];
+        StateId state = _releaseInfo[version].state;
         StateId newState = ACTIVE();
 
         // verify release in state PAUSED
@@ -317,10 +329,9 @@ contract ReleaseRegistry is
             revert ErrorReleaseRegistryReleaseActivationDisallowed(version, state);
         }
 
-        // TODO come up with a substitute
-        // _releaseAccessManager[version].enable();
+        _grantReleaseRoles(version);
         
-        _state[version] = newState;
+        _releaseInfo[version].state = newState;
         _releaseInfo[version].disabledAt = zeroTimestamp();
 
         emit LogReleaseEnabled(version);
@@ -336,13 +347,8 @@ contract ReleaseRegistry is
         return Clones.predictDeterministicAddress(implementation, salt, deployer);
     }
 
-    function isActiveRegistryService(address service) external view returns(bool) {
-        VersionPart version = _releaseVersionByAddress[service];
-        return isActiveRelease(version);
-    }
-
     function isActiveRelease(VersionPart version) public view returns(bool) {
-        return _state[version] == ACTIVE();
+        return _releaseInfo[version].state == ACTIVE();
     }
 
     function getReleaseInfo(VersionPart version) external view returns(IRegistry.ReleaseInfo memory) {
@@ -357,12 +363,8 @@ contract ReleaseRegistry is
         return _latest;
     }
 
-    function getInitialVersion() external view returns(VersionPart) {
-        return _initial;
-    }
-
     function getState(VersionPart version) external view returns (StateId stateId) {
-        return _state[version];
+        return _releaseInfo[version].state;
     }
 
     function getRemainingServicesToRegister() external view returns (uint256 services) {
@@ -374,7 +376,7 @@ contract ReleaseRegistry is
         view
         returns (IServiceAuthorization serviceAuthorization)
     {
-        return _serviceAuthorization[version];
+        return _releaseInfo[version].auth;
     }
 
     function getRegistryAdmin() external view returns (address) {
@@ -389,6 +391,58 @@ contract ReleaseRegistry is
 
     //--- private functions ----------------------------------------------------//
 
+    function _revokeReleaseRoles(VersionPart version)
+        private
+    {
+        address service;
+        ObjectType domain;
+        IServiceAuthorization auth = _releaseInfo[version].auth;
+
+        ObjectType[] memory domains = auth.getServiceDomains();
+        for(uint idx = 0; idx < domains.length; idx++)
+        {
+            domain = domains[idx];
+            service = _registry.getServiceAddress(domain, version);
+            _admin.revokeServiceRole(IService(service), domain, version);
+
+            // special roles for registry/staking/pool service
+            if(
+                domain == REGISTRY() ||
+                domain == STAKING() ||
+                domain == POOL()
+            )
+            {
+                _admin.revokeServiceRoleForAllVersions(IService(service), domain);
+            }
+        }
+    }
+
+    function _grantReleaseRoles(VersionPart version)
+        private
+    {
+        address service;
+        ObjectType domain;
+        IServiceAuthorization auth = _releaseInfo[version].auth;
+
+        ObjectType[] memory domains = auth.getServiceDomains();
+        for(uint idx = 0; idx < domains.length; idx++)
+        {
+            domain = domains[idx];
+            service = _registry.getServiceAddress(domain, version);
+            _admin.grantServiceRole(IService(service), domain, version);
+
+            // special roles for registry/staking/pool service
+            if(
+                domain == REGISTRY() ||
+                domain == STAKING() ||
+                domain == POOL()
+            )
+            {
+                _admin.grantServiceRoleForAllVersions(IService(service), domain);
+            }
+        }
+    }
+
     function _verifyService(IService service)
         internal
         view
@@ -472,8 +526,7 @@ contract ReleaseRegistry is
         if (registryAddress == address(0)) {
             return false;
         }
-        // TODO try catch and return false in case of revert
-        // or just panic
+        // TODO try catch and return false in case of revert or just panic
         // check if contract returns a zero nft id for its own address
         if (IRegistry(registryAddress).getNftId(registryAddress).eqz()) {
             return false;

package/contracts/registry/ServiceAuthorizationV3.sol

@@ -22,7 +22,7 @@ contract ServiceAuthorizationV3
 {
 
      constructor(string memory commitHash)
-          ServiceAuthorization(commitHash)
+          ServiceAuthorization(commitHash, 3)
      {}
 
      function _setupDomains()

package/contracts/shared/Component.sol

@@ -6,7 +6,7 @@ import {IAccessManaged} from "@openzeppelin/contracts/access/manager/IAccessMana
 import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 
-import {Amount} from "../type/Amount.sol";
+import {Amount, AmountLib} from "../type/Amount.sol";
 import {IComponent} from "./IComponent.sol";
 import {IComponents} from "../instance/module/IComponents.sol";
 import {NftId, NftIdLib} from "../type/NftId.sol";
@@ -109,11 +109,11 @@ abstract contract Component is
             revert ErrorComponentWalletNotComponent();
         }
 
+        emit LogComponentTokenHandlerApproved(address(getTokenHandler()), spendingLimitAmount);
+
         IERC20Metadata(token).approve(
             address(getTokenHandler()),
             spendingLimitAmount.toInt());
-
-        emit LogComponentTokenHandlerApproved(address(getTokenHandler()), spendingLimitAmount);
     }
 
     function setWallet(address newWallet)
@@ -124,34 +124,22 @@ abstract contract Component is
     {
         // checks
         address currentWallet = getWallet();
-        IERC20Metadata token = getToken();
-        uint256 currentBalance = token.balanceOf(currentWallet);
-
-        if (currentBalance > 0) {
-            if (currentWallet == address(this)) {
-                // move tokens from component smart contract to external wallet
-            } else {
-                // move tokens from external wallet to component smart contract or another external wallet
-                uint256 allowance = token.allowance(currentWallet, address(this));
-                if (allowance < currentBalance) {
-                    revert ErrorComponentWalletAllowanceTooSmall(currentWallet, newWallet, allowance, currentBalance);
-                }
-            }
-        }
+        uint256 currentBalance = getToken().balanceOf(currentWallet);
 
         // effects
         _setWallet(newWallet);
 
         // interactions
         if (currentBalance > 0) {
-            // transfer tokens from current wallet to new wallet
+            // move tokens from old to new wallet 
+            emit LogComponentWalletTokensTransferred(currentWallet, newWallet, currentBalance);
+
             if (currentWallet == address(this)) {
-                // transferFrom requires self allowance too
-                token.approve(address(this), currentBalance);
+                // transfer from the component requires an allowance
+                getTokenHandler().distributeTokens(currentWallet, newWallet, AmountLib.toAmount(currentBalance));
+            } else {
+                getTokenHandler().collectTokens(currentWallet, newWallet, AmountLib.toAmount(currentBalance));
             }
-            
-            SafeERC20.safeTransferFrom(token, currentWallet, newWallet, currentBalance);
-            emit LogComponentWalletTokensTransferred(currentWallet, newWallet, currentBalance);
         }
     }
 

package/contracts/shared/ComponentService.sol

@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
-
 import {Amount, AmountLib} from "../type/Amount.sol";
 import {ComponentVerifyingService} from "../shared/ComponentVerifyingService.sol";
 import {Fee, FeeLib} from "../type/Fee.sol";
@@ -21,7 +19,7 @@ import {KEEP_STATE} from "../type/StateId.sol";
 import {NftId} from "../type/NftId.sol";
 import {ObjectType, REGISTRY, COMPONENT, DISTRIBUTION, INSTANCE, ORACLE, POOL, PRODUCT} from "../type/ObjectType.sol";
 import {RoleId, DISTRIBUTION_OWNER_ROLE, ORACLE_OWNER_ROLE, POOL_OWNER_ROLE, PRODUCT_OWNER_ROLE} from "../type/RoleId.sol";
-import {TokenHandler} from "./TokenHandler.sol";
+import {TokenHandlerDeployerLib} from "../shared/TokenHandlerDeployerLib.sol";
 
 contract ComponentService is
     ComponentVerifyingService,
@@ -48,7 +46,7 @@ contract ComponentService is
     )
         internal
         virtual override
-        initializer()
+        onlyInitializing()
     {
         // TODO check this, might no longer be the way, refactor if necessary
         address registryAddress;
@@ -115,23 +113,13 @@ contract ComponentService is
             }
         }
 
-        // check allowance
-        TokenHandler tokenHandler = info.tokenHandler;
-        IERC20Metadata token = IERC20Metadata(info.token);
-        uint256 tokenAllowance = token.allowance(componentWallet, address(tokenHandler));
-        if (tokenAllowance < withdrawnAmount.toInt()) {
-            revert ErrorComponentServiceWalletAllowanceTooSmall(componentWallet, address(tokenHandler), tokenAllowance, withdrawnAmount.toInt());
-        }
-
         // decrease fee counters by withdrawnAmount
         _changeTargetBalance(DECREASE, instance.getInstanceStore(), componentNftId, AmountLib.zero(), withdrawnAmount);
         
         // transfer amount to component owner
         address componentOwner = getRegistry().ownerOf(componentNftId);
-        // TODO: centralize token handling (issue #471)
-        tokenHandler.transfer(componentWallet, componentOwner, withdrawnAmount);
-
-        emit LogComponentServiceComponentFeesWithdrawn(componentNftId, componentOwner, address(token), withdrawnAmount);
+        emit LogComponentServiceComponentFeesWithdrawn(componentNftId, componentOwner, address(info.token), withdrawnAmount);
+        info.tokenHandler.distributeTokens(componentWallet, componentOwner, withdrawnAmount);
     }
 
 
@@ -152,7 +140,7 @@ contract ComponentService is
             contractAddress,
             PRODUCT(),
             PRODUCT_OWNER_ROLE());
-
+        
         // create product info
         IComponents.ProductInfo memory productInfo = IProductComponent(contractAddress).getInitialProductInfo();
         instanceStore.createProduct(productNftId, productInfo);
@@ -523,22 +511,24 @@ contract ComponentService is
 
         component.linkToRegisteredNftId();
 
-        // setup initial component authorization
-        _instanceService.initializeAuthorization(
-            instance.getNftId(),
-            component);
-
         // save amended component info with instance
         instanceReader = instance.getInstanceReader();
         instanceStore = instance.getInstanceStore();
 
-        IComponents.ComponentInfo memory componentInfo = component.getComponentInfo();
-        componentInfo.tokenHandler = new TokenHandler(address(componentInfo.token));
+        IComponents.ComponentInfo memory componentInfo = component.getInitialComponentInfo();
+        componentInfo.tokenHandler = TokenHandlerDeployerLib.deployTokenHandler(
+            address(componentInfo.token), 
+            address(instance.getInstanceAdmin().authority()));
 
         instanceStore.createComponent(
             component.getNftId(), 
             componentInfo);
 
+        // setup initial component authorization
+        _instanceService.initializeAuthorization(
+            instance.getNftId(),
+            component);
+
         // TODO add logging
     }
 

package/contracts/shared/IComponent.sol

@@ -23,7 +23,6 @@ interface IComponent is
     error ErrorComponentNameLengthZero();
     error ErrorComponentWalletAddressZero();
     error ErrorComponentWalletAddressIsSameAsCurrent();
-    error ErrorComponentWalletAllowanceTooSmall(address oldWallet, address newWallet, uint256 allowance, uint256 balance);
     error ErrorComponentWalletNotComponent();
 
     event LogComponentWalletAddressChanged(address oldWallet, address newWallet);
@@ -35,10 +34,11 @@ interface IComponent is
     /// only component owner (nft holder) is authorizes to call this function
     function approveTokenHandler(Amount spendingLimitAmount) external;
 
-    /// @dev sets the wallet address for the component
-    /// if the current wallet has tokens, these will be transferred
+    /// @dev sets the wallet address for the component.
+    /// if the current wallet has tokens, these will be transferred.
     /// if the new wallet address is externally owned, an approval from the 
-    /// owner of the external wallet for the component to move all tokens must exist
+    /// owner of the external wallet to the tokenhandler of the component that 
+    /// covers the current component balance must exist
     function setWallet(address walletAddress) external;
 
     /// @dev returns the name of this component

package/contracts/shared/IInstanceLinkedComponent.sol

@@ -7,21 +7,14 @@ import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IER
 import {Amount} from "../type/Amount.sol";
 import {IComponent} from "../shared/IComponent.sol";
 import {IAuthorization} from "../authorization/IAuthorization.sol";
-import {IComponents} from "../instance/module/IComponents.sol";
 import {IInstance} from "../instance/IInstance.sol";
-import {IInstanceService} from "../instance/IInstanceService.sol";
-import {IProductService} from "../product/IProductService.sol";
-import {IRegisterable} from "../shared/IRegisterable.sol";
 import {NftId} from "../type/NftId.sol";
-import {ObjectType} from "../type/ObjectType.sol";
-import {TokenHandler} from "../shared/TokenHandler.sol";
 
 /// @dev component base class
 /// component examples are product, distribution, pool and oracle
 interface IInstanceLinkedComponent is 
     IComponent
 {
-    error ErrorComponentNotProductService(address caller);
     error ErrorComponentNotInstance(NftId instanceNftId);
     error ErrorComponentProductNftAlreadySet();
 
@@ -38,19 +31,19 @@ interface IInstanceLinkedComponent is
     /// only component owner (nft holder) is authorizes to call this function
     function unlock() external;
 
+    /// @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);
 
-    /// @dev defines the product to which this component is linked to
-    /// this is only relevant for pool and distribution components
-    function getProductNftId() external view returns (NftId productNftId);
-
     /// @dev returns the initial component authorization specification.
     function getAuthorization() external view returns (IAuthorization authorization);
 
-    /// @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 product to which this component is linked to
+    /// this is only relevant for pool and distribution components
+    function getProductNftId() external view returns (NftId productNftId);
 
 }