@etherisc/gif-next 0.0.2-979c9aa-391 → 0.0.2-984cc08-642

package/contracts/components/{BaseComponent.sol → Component.sol}

@@ -1,40 +1,59 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {IBaseComponent} from "./IBaseComponent.sol";
-import {IComponentOwnerService} from "../instance/service/IComponentOwnerService.sol";
-import {IInstanceService} from "../instance/IInstanceService.sol";
+import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
+
+import {IComponent} from "./IComponent.sol";
+import {IProductService} from "../instance/service/IProductService.sol";
+import {IInstanceService} from "../instance/IInstanceService.sol";
 import {IInstance} from "../instance/IInstance.sol";
 import {InstanceAccessManager} from "../instance/InstanceAccessManager.sol";
 import {IRegistry} from "../registry/IRegistry.sol";
 import {NftId, zeroNftId, NftIdLib} from "../types/NftId.sol";
-import {ObjectType} from "../types/ObjectType.sol";
+import {ObjectType, INSTANCE, PRODUCT} from "../types/ObjectType.sol";
 import {VersionLib} from "../types/Version.sol";
 import {Registerable} from "../shared/Registerable.sol";
 import {RoleId, RoleIdLib} from "../types/RoleId.sol";
-import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
+import {IAccess} from "../instance/module/IAccess.sol";
 
-abstract contract BaseComponent is
+// TODO discuss to inherit from oz accessmanaged
+// TODO make contract upgradeable, then add ComponentUpradeable that also intherits from Versionable
+// same pattern as for Service which is also upgradeable
+abstract contract Component is
     Registerable,
-    IBaseComponent
+    IComponent
 {
-    using NftIdLib for NftId;
-
-    IComponentOwnerService internal _componentOwnerService;
     IInstanceService internal _instanceService;
+    IProductService internal _productService;
 
-    address internal _deployer;
-    address internal _wallet;
-    IERC20Metadata internal _token;
     IInstance internal _instance;
-    InstanceAccessManager internal _instanceAccessManager;
+    IERC20Metadata internal _token;
+    address internal _wallet;
     NftId internal _productNftId;
 
+    modifier onlyProductService() {
+        if(msg.sender != address(_productService)) {
+            revert ErrorComponentNotProductService(msg.sender);
+        }
+        _;
+    }
+
+    // TODO discuss replacement with modifier restricted from accessmanaged
     modifier onlyInstanceRole(uint64 roleIdNum) {
         RoleId roleId = RoleIdLib.toRoleId(roleIdNum);
-        if( !_instanceAccessManager.hasRole(roleId, msg.sender)) {
-            revert ErrorBaseComponentUnauthorized(msg.sender, roleIdNum);
+        InstanceAccessManager accessManager = InstanceAccessManager(_instance.authority());
+        if( !accessManager.hasRole(roleId, msg.sender)) {
+            revert ErrorComponentUnauthorized(msg.sender, roleIdNum);
+        }
+        _;
+    }
+
+    // TODO discuss replacement with modifier restricted from accessmanaged
+    modifier isNotLocked() {
+        InstanceAccessManager accessManager = InstanceAccessManager(_instance.authority());
+        if (accessManager.isTargetLocked(address(this))) {
+            revert IAccess.ErrorIAccessTargetLocked(address(this));
         }
         _;
     }
@@ -51,40 +70,43 @@ abstract contract BaseComponent is
         bytes memory data = "";
         _initializeRegisterable(registry, instanceNftId, componentType, isInterceptor, initialOwner, data);
 
-        IRegistry.ObjectInfo memory instanceInfo = getRegistry().getObjectInfo(instanceNftId);
+        IRegistry.ObjectInfo memory instanceInfo = _registry.getObjectInfo(instanceNftId);
         _instance = IInstance(instanceInfo.objectAddress);
-        _instanceAccessManager = _instance.getInstanceAccessManager();
         require(
             _instance.supportsInterface(type(IInstance).interfaceId),
             ""
         );
 
-        _componentOwnerService = _instance.getComponentOwnerService();
-        _instanceService = IInstanceService(getRegistry().getServiceAddress("InstanceService", VersionLib.toVersion(3, 0, 0).toMajorPart()));
+        _instanceService = IInstanceService(_registry.getServiceAddress(INSTANCE(), VersionLib.toVersion(3, 0, 0).toMajorPart()));
+        _productService = IProductService(_registry.getServiceAddress(PRODUCT(), VersionLib.toVersion(3, 0, 0).toMajorPart()));
         _wallet = address(this);
         _token = IERC20Metadata(token);
 
-        _registerInterface(type(IBaseComponent).interfaceId);
+        _registerInterface(type(IComponent).interfaceId);
     }
 
-    // from component contract
-    // TODO consider to remove/replace with access manager contract locking
+    // TODO discuss replacement with modifier restricted from accessmanaged
     function lock() external onlyOwner override {
-        _componentOwnerService.lock(this);
+        _instanceService.setTargetLocked(getName(), true);
     }
-
-    // TODO consider to remove/replace with access manager contract locking
+    
+    // TODO discuss replacement with modifier restricted from accessmanaged
     function unlock() external onlyOwner override {
-        _componentOwnerService.unlock(this);
+        _instanceService.setTargetLocked(getName(), false);
     }
 
-    function getWallet()
+    // TODO discuss to split this base contract into a minimal component base (eg oracle)
+    // and a component base that is linked to a product component (all others in v3)
+    function setProductNftId(NftId productNftId)
         external
-        view
         override
-        returns (address walletAddress)
+        onlyProductService() 
     {
-        return _wallet;
+        if(_productNftId.gtz()) {
+            revert ErrorComponentProductNftAlreadySet();
+        }
+
+        _productNftId = productNftId;
     }
 
     /// @dev Sets the wallet address for the component. 
@@ -97,7 +119,7 @@ abstract contract BaseComponent is
 
         // checks
         if (newWallet == currentWallet) {
-            revert ErrorBaseComponentWalletAddressIsSameAsCurrent(newWallet);
+            revert ErrorComponentWalletAddressIsSameAsCurrent(newWallet);
         }
 
         if (currentBalance > 0) {
@@ -107,14 +129,14 @@ abstract contract BaseComponent is
                 // move tokens from external wallet to component smart contract or another external wallet
                 uint256 allowance = _token.allowance(currentWallet, address(this));
                 if (allowance < currentBalance) {
-                    revert ErrorBaseComponentWalletAllowanceTooSmall(currentWallet, newWallet, allowance, currentBalance);
+                    revert ErrorComponentWalletAllowanceTooSmall(currentWallet, newWallet, allowance, currentBalance);
                 }
             }
         }
 
         // effects
         _wallet = newWallet;
-        emit LogBaseComponentWalletAddressChanged(newWallet);
+        emit LogComponentWalletAddressChanged(newWallet);
 
         // interactions
         if (currentBalance > 0) {
@@ -125,10 +147,22 @@ abstract contract BaseComponent is
             }
             
             SafeERC20.safeTransferFrom(_token, currentWallet, newWallet, currentBalance);
-            emit LogBaseComponentWalletTokensTransferred(currentWallet, newWallet, currentBalance);
+            emit LogComponentWalletTokensTransferred(currentWallet, newWallet, currentBalance);
         }
     }
 
+    // TODO set name via constructor or initialization, pure function likely too restrictive
+    function getName() public pure virtual returns (string memory name);
+
+    function getWallet()
+        external
+        view
+        override
+        returns (address walletAddress)
+    {
+        return _wallet;
+    }
+
     function getToken() public view override returns (IERC20Metadata token) {
         return _token;
     }
@@ -137,11 +171,6 @@ abstract contract BaseComponent is
         return _instance;
     }
 
-    function setProductNftId(NftId productNftId) public override onlyOwner {
-        require(_productNftId.eq(zeroNftId()), "product nft id already set");
-        _productNftId = productNftId;
-    }
-
     function getProductNftId() public view override returns (NftId productNftId) {
         return _productNftId;
     }

package/contracts/components/Distribution.sol

@@ -7,7 +7,7 @@ import {IProductService} from "../instance/service/IProductService.sol";
 import {NftId, zeroNftId, NftIdLib} from "../types/NftId.sol";
 import {ReferralId} from "../types/Referral.sol";
 import {Fee, FeeLib} from "../types/Fee.sol";
-import {BaseComponent} from "./BaseComponent.sol";
+import {Component} from "./Component.sol";
 import {IDistributionComponent} from "./IDistributionComponent.sol";
 import {IRegistry} from "../registry/IRegistry.sol";
 import {IRegisterable} from "../shared/IRegisterable.sol";
@@ -16,8 +16,8 @@ import {Registerable} from "../shared/Registerable.sol";
 import {TokenHandler} from "../shared/TokenHandler.sol";
 import {InstanceReader} from "../instance/InstanceReader.sol";
 
-contract Distribution is
-    BaseComponent,
+abstract contract Distribution is
+    Component,
     IDistributionComponent
 {
     using NftIdLib for NftId;
@@ -28,14 +28,6 @@ contract Distribution is
     TokenHandler internal _tokenHandler;
 
     IDistributionService private _distributionService;
-    IProductService private _productService;
-
-    modifier onlyProductService() {
-        require(
-            msg.sender == address(_productService), 
-            "ERROR:POL-002:NOT_PRODUCT_SERVICE");
-        _;
-    }
 
     constructor(
         address registry,
@@ -46,15 +38,13 @@ contract Distribution is
         Fee memory distributionFee,
         address initialOwner
     )
-        BaseComponent(registry, instanceNftId, token, DISTRIBUTION(), true, initialOwner)
+        Component(registry, instanceNftId, token, DISTRIBUTION(), true, initialOwner)
     {
         _isVerifying = verifying;
         _initialDistributionFee = distributionFee;
 
         _tokenHandler = TokenHandler(token);
-
         _distributionService = _instance.getDistributionService();
-        _productService = _instance.getProductService();
 
         _registerInterface(type(IDistributionComponent).interfaceId);
     }
@@ -150,6 +140,7 @@ contract Distribution is
         return (
             info,
             abi.encode(
+                getName(),
                 ISetup.DistributionSetupInfo(
                     _productNftId,
                     _tokenHandler,

package/contracts/components/{IBaseComponent.sol → IComponent.sol}

@@ -7,16 +7,21 @@ import {IRegisterable} from "../shared/IRegisterable.sol";
 import {IInstance} from "../instance/IInstance.sol";
 import {NftId} from "../types/NftId.sol";
 
-interface IBaseComponent is IRegisterable {
-    error ErrorBaseComponentWalletAddressIsSameAsCurrent(address newWallet);
-    error ErrorBaseComponentWalletAllowanceTooSmall(address oldWallet, address newWallet, uint256 allowance, uint256 balance);
-    error ErrorBaseComponentUnauthorized(address caller, uint64 requiredRoleIdNum);
+interface IComponent is IRegisterable {
 
-    event LogBaseComponentWalletAddressChanged(address newWallet);
-    event LogBaseComponentWalletTokensTransferred(address from, address to, uint256 amount);
+    error ErrorComponentProductNftAlreadySet();
+    error ErrorComponentWalletAddressIsSameAsCurrent(address newWallet);
+    error ErrorComponentWalletAllowanceTooSmall(address oldWallet, address newWallet, uint256 allowance, uint256 balance);
+    error ErrorComponentUnauthorized(address caller, uint64 requiredRoleIdNum);
+    error ErrorComponentNotProductService(address caller);
 
-    function lock() external;
+    event LogComponentWalletAddressChanged(address newWallet);
+    event LogComponentWalletTokensTransferred(address from, address to, uint256 amount);
+
+    function getName() external pure returns (string memory name);
 
+    // TODO remove and replace with accessmanaged target locking mechanism
+    function lock() external;
     function unlock() external;
 
     function getToken() external view returns (IERC20Metadata token);

package/contracts/components/IProductComponent.sol

@@ -18,8 +18,8 @@ interface IProductComponent {
         RiskId riskId,
         uint256 lifetime,
         bytes memory applicationData,
-        ReferralId referralId,
-        NftId bundleNftId
+        NftId bundleNftId,
+        ReferralId referralId
     ) external view returns (uint256 premiumAmount);
 
     function calculateNetPremium(

package/contracts/components/Pool.sol

@@ -1,29 +1,26 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {ObjectType, POOL} from "../types/ObjectType.sol";
-import {IProductService} from "../instance/service/IProductService.sol";
+import {POOL} from "../types/ObjectType.sol";
 import {IPoolService} from "../instance/service/IPoolService.sol";
 import {IBundleService} from "../instance/service/IBundleService.sol";
-import {NftId, zeroNftId, NftIdLib} from "../types/NftId.sol";
+import {NftId, NftIdLib} from "../types/NftId.sol";
 import {Fee} from "../types/Fee.sol";
 import {UFixed} from "../types/UFixed.sol";
 import {IPoolComponent} from "./IPoolComponent.sol";
-import {BaseComponent} from "./BaseComponent.sol";
+import {Component} from "./Component.sol";
 import {TokenHandler} from "../shared/TokenHandler.sol";
 import {ISetup} from "../instance/module/ISetup.sol";
 
 import {IRegistry} from "../registry/IRegistry.sol";
 
-// import {IPool} from "../instance/module/pool/IPoolModule.sol";
-import {ITreasury} from "../instance/module/ITreasury.sol";
 import {ISetup} from "../instance/module/ISetup.sol";
 import {InstanceReader} from "../instance/InstanceReader.sol";
 
 import {IRegisterable} from "../shared/IRegisterable.sol";
 import {Registerable} from "../shared/Registerable.sol";
 
-contract Pool is BaseComponent, IPoolComponent {
+abstract contract Pool is Component, IPoolComponent {
     using NftIdLib for NftId;
 
     bool internal _isConfirmingApplication;
@@ -37,10 +34,6 @@ contract Pool is BaseComponent, IPoolComponent {
 
     // may be used to interact with instance by derived contracts
     IPoolService internal _poolService;
-
-    // only relevant to protect callback functions for "active" pools
-    IProductService private _productService;
-
     IBundleService private _bundleService;
 
     modifier onlyPoolService() {
@@ -50,13 +43,6 @@ contract Pool is BaseComponent, IPoolComponent {
         _;
     }
 
-    modifier onlyProductService() {
-        require(
-            msg.sender == address(_productService), 
-            "ERROR:POL-002:NOT_PRODUCT_SERVICE");
-        _;
-    }
-
     constructor(
         address registry,
         NftId instanceNftId,
@@ -70,7 +56,7 @@ contract Pool is BaseComponent, IPoolComponent {
         Fee memory performanceFee,
         address initialOwner
     )
-        BaseComponent(registry, instanceNftId, token, POOL(), isInterceptor, initialOwner)
+        Component(registry, instanceNftId, token, POOL(), isInterceptor, initialOwner)
     {
         _isConfirmingApplication = isConfirmingApplication;
         // TODO add validation
@@ -82,7 +68,7 @@ contract Pool is BaseComponent, IPoolComponent {
         _tokenHandler = new TokenHandler(token);
 
         _poolService = _instance.getPoolService();
-        _productService = _instance.getProductService();
+        // _productService = _instance.getProductService();
         _bundleService = _instance.getBundleService();
 
         _registerInterface(type(IPoolComponent).interfaceId);
@@ -217,6 +203,7 @@ contract Pool is BaseComponent, IPoolComponent {
         return (
             info,
             abi.encode(
+                getName(),
                 ISetup.PoolSetupInfo(
                     _productNftId,
                     _tokenHandler,

package/contracts/components/Product.sol

@@ -4,18 +4,16 @@ pragma solidity ^0.8.19;
 import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 
 import {IRisk} from "../instance/module/IRisk.sol";
-import {ITreasury} from "../instance/module/ITreasury.sol";
-import {IProductService} from "../instance/service/IProductService.sol";
 import {IPolicyService} from "../instance/service/IPolicyService.sol";
 import {IProductComponent} from "./IProductComponent.sol";
-import {NftId, zeroNftId, NftIdLib} from "../types/NftId.sol";
-import {ObjectType, PRODUCT} from "../types/ObjectType.sol";
+import {NftId, NftIdLib} from "../types/NftId.sol";
+import {PRODUCT} from "../types/ObjectType.sol";
 import {ReferralId} from "../types/Referral.sol";
 import {RiskId, RiskIdLib} from "../types/RiskId.sol";
 import {StateId} from "../types/StateId.sol";
 import {Timestamp} from "../types/Timestamp.sol";
-import {Fee, FeeLib} from "../types/Fee.sol";
-import {BaseComponent} from "./BaseComponent.sol";
+import {Fee} from "../types/Fee.sol";
+import {Component} from "./Component.sol";
 
 import {IRegistry} from "../registry/IRegistry.sol";
 import {IRegisterable} from "../shared/IRegisterable.sol";
@@ -27,12 +25,9 @@ import {ISetup} from "../instance/module/ISetup.sol";
 import {Pool} from "../components/Pool.sol";
 import {Distribution} from "../components/Distribution.sol";
 
-import {zeroNftId} from "../types/NftId.sol";
-
-contract Product is BaseComponent, IProductComponent {
+abstract contract Product is Component, IProductComponent {
     using NftIdLib for NftId;
 
-    IProductService internal _productService;
     IPolicyService internal _policyService;
     Pool internal _pool;
     Distribution internal _distribution;
@@ -53,9 +48,8 @@ contract Product is BaseComponent, IProductComponent {
         Fee memory productFee,
         Fee memory processingFee,
         address initialOwner
-    ) BaseComponent(registry, instanceNftid, token, PRODUCT(), isInterceptor, initialOwner) {
+    ) Component(registry, instanceNftid, token, PRODUCT(), isInterceptor, initialOwner) {
         // TODO add validation
-        _productService = _instance.getProductService();
         _policyService = _instance.getPolicyService(); 
         _pool = Pool(pool);
         _distribution = Distribution(distribution);
@@ -76,8 +70,8 @@ contract Product is BaseComponent, IProductComponent {
         RiskId riskId,
         uint256 lifetime,
         bytes memory applicationData,
-        ReferralId referralId,
-        NftId bundleNftId
+        NftId bundleNftId,
+        ReferralId referralId
     )
         external 
         view 
@@ -203,6 +197,14 @@ contract Product is BaseComponent, IProductComponent {
             activateAt);
     }
 
+    function _close(
+        NftId policyNftId
+    )
+        internal
+    {
+        _policyService.close(policyNftId);
+    }
+
     function getPoolNftId() external view override returns (NftId poolNftId) {
         return getRegistry().getNftId(address(_pool));
     }
@@ -256,8 +258,8 @@ contract Product is BaseComponent, IProductComponent {
         ) = _pool.getInitialInfo();
         
         (
-            ISetup.PoolSetupInfo memory poolSetupInfo
-        )  = abi.decode(poolData, (ISetup.PoolSetupInfo));
+            , ISetup.PoolSetupInfo memory poolSetupInfo
+        )  = abi.decode(poolData, (string, ISetup.PoolSetupInfo));
 
         // from DistributionComponent
         (
@@ -266,12 +268,13 @@ contract Product is BaseComponent, IProductComponent {
         ) = _distribution.getInitialInfo();
 
         (
-            ISetup.DistributionSetupInfo memory distributionSetupInfo
-        )  = abi.decode(distributionData, (ISetup.DistributionSetupInfo));
+            , ISetup.DistributionSetupInfo memory distributionSetupInfo
+        )  = abi.decode(distributionData, (string, ISetup.DistributionSetupInfo));
 
         return (
             productInfo,
             abi.encode(
+                getName(),
                 ISetup.ProductSetupInfo(
                     _token,
                     _tokenHandler,

package/contracts/instance/BundleManager.sol

@@ -32,17 +32,13 @@ contract BundleManager is
 
     mapping(NftId bundleNftId => LibNftIdSet.Set policies) internal _activePolicies;
 
-    constructor() ObjectManager() {
-    }
-
-
     /// @dev links a policy with its bundle
     // to link a policy it MUST NOT yet have been activated
     // the bundle MUST be unlocked (active) for linking (underwriting) and registered with this instance
     function linkPolicy(NftId policyNftId) external restricted() {
-        NftId bundleNftId = _instanceReader.getPolicyInfo(policyNftId).bundleNftId;
+        NftId bundleNftId = _instance.getInstanceReader().getPolicyInfo(policyNftId).bundleNftId;
         // decision will likely depend on the decision what to check here and what in the service
-        NftId poolNftId = _instanceReader.getBundleInfo(bundleNftId).poolNftId;
+        NftId poolNftId = _instance.getInstanceReader().getBundleInfo(bundleNftId).poolNftId;
 
         // ensure bundle is unlocked (in active set) and registered with this instance
         if (!_isActive(poolNftId, bundleNftId)) {
@@ -59,11 +55,11 @@ contract BundleManager is
     // - the policy MUST be past its expiry period and it MUST NOT have any open claims
     // - the policy's payoutAmount MUST be equal to its sumInsuredAmount and MUST NOT have any open claims
     function unlinkPolicy(NftId policyNftId) external restricted() {
-        IPolicy.PolicyInfo memory policyInfo = _instanceReader.getPolicyInfo(policyNftId);
+        IPolicy.PolicyInfo memory policyInfo = _instance.getInstanceReader().getPolicyInfo(policyNftId);
 
         NftId bundleNftId = policyInfo.bundleNftId;
         // decision will likely depend on the decision what to check here and what in the service
-        NftId poolNftId = _instanceReader.getBundleInfo(bundleNftId).poolNftId;
+        NftId poolNftId = _instance.getInstanceReader().getBundleInfo(bundleNftId).poolNftId;
 
         // ensure bundle is registered with this instance
         if (!_contains(poolNftId, bundleNftId)) {
@@ -78,7 +74,7 @@ contract BundleManager is
     /// @dev add a new bundle to a riskpool registerd with this instance
     // the corresponding pool is fetched via instance reader
     function add(NftId bundleNftId) external restricted() {
-        NftId poolNftId = _instanceReader.getBundleInfo(bundleNftId).poolNftId;
+        NftId poolNftId = _instance.getInstanceReader().getBundleInfo(bundleNftId).poolNftId;
 
         // ensure pool is registered with instance
         if(poolNftId.eqz()) {
@@ -91,14 +87,14 @@ contract BundleManager is
 
     /// @dev unlocked (active) bundles are available to underwrite new policies
     function unlock(NftId bundleNftId) external restricted() {
-        NftId poolNftId = _instanceReader.getBundleInfo(bundleNftId).poolNftId;
+        NftId poolNftId = _instance.getInstanceReader().getBundleInfo(bundleNftId).poolNftId;
         _activate(poolNftId, bundleNftId);
         emit LogBundleManagerBundleUnlocked(poolNftId, bundleNftId);
     }
 
     /// @dev locked (deactivated) bundles may not underwrite any new policies
     function lock(NftId bundleNftId) external restricted() {
-        NftId poolNftId = _instanceReader.getBundleInfo(bundleNftId).poolNftId;
+        NftId poolNftId = _instance.getInstanceReader().getBundleInfo(bundleNftId).poolNftId;
         _deactivate(poolNftId, bundleNftId);
         emit LogBundleManagerBundleLocked(poolNftId, bundleNftId);
     }

package/contracts/instance/IInstance.sol

@@ -2,12 +2,14 @@
 pragma solidity ^0.8.20;
 
 import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
+import {IAccessManaged} from "@openzeppelin/contracts/access/manager/IAccessManaged.sol";
 
 import {BundleManager} from "./BundleManager.sol";
 import {InstanceReader} from "./InstanceReader.sol";
 
+import {IInstanceBase} from "./IInstanceBase.sol";
+
 import {InstanceAccessManager} from "./InstanceAccessManager.sol";
-import {IComponentOwnerService} from "./service/IComponentOwnerService.sol";
 import {IDistributionService} from "./service/IDistributionService.sol";
 import {IPoolService} from "./service/IPoolService.sol";
 import {IProductService} from "./service/IProductService.sol";
@@ -23,9 +25,8 @@ import {IPolicy} from "./module/IPolicy.sol";
 import {IKeyValueStore} from "./base/IKeyValueStore.sol";
 
 
-interface IInstance is IERC165, IKeyValueStore {
+interface IInstance is IInstanceBase, IAccessManaged {
 
-    function getComponentOwnerService() external view returns (IComponentOwnerService);
     function getDistributionService() external view returns (IDistributionService);
     function getProductService() external view returns (IProductService);
     function getPoolService() external view returns (IPoolService);
@@ -56,7 +57,6 @@ interface IInstance is IERC165, IKeyValueStore {
     function updatePolicy(NftId policyNftId, IPolicy.PolicyInfo memory policy, StateId newState) external;
     function updatePolicyState(NftId policyNftId, StateId newState) external;
 
-    function getInstanceAccessManager() external view returns (InstanceAccessManager);
     function getInstanceReader() external view returns (InstanceReader);
     function getBundleManager() external view returns (BundleManager);
 }

package/contracts/instance/IInstanceBase.sol

@@ -6,7 +6,6 @@ import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
 import {BundleManager} from "./BundleManager.sol";
 import {InstanceReader} from "./InstanceReader.sol";
 
-import {IComponentOwnerService} from "./service/IComponentOwnerService.sol";
 import {IDistributionService} from "./service/IDistributionService.sol";
 import {IPoolService} from "./service/IPoolService.sol";
 import {IProductService} from "./service/IProductService.sol";
@@ -19,8 +18,10 @@ import {IRisk} from "./module/IRisk.sol";
 import {IPolicy} from "./module/IPolicy.sol";
 import {IKeyValueStore} from "./base/IKeyValueStore.sol";
 
+import {IRegisterable} from "../shared/IRegisterable.sol";
 
-interface IInstanceBase is IERC165, IKeyValueStore {
+
+interface IInstanceBase is IRegisterable, IKeyValueStore {
 
 
 }

package/contracts/instance/IInstanceService.sol

@@ -8,7 +8,7 @@ import {IService} from "../shared/IService.sol";
 import {IRegistry} from "../registry/IRegistry.sol";
 
 import {IRegisterable} from "../shared/IRegisterable.sol";
-import {IBaseComponent} from "../components/IBaseComponent.sol";
+import {IComponent} from "../components/IComponent.sol";
 
 import {InstanceAccessManager} from "./InstanceAccessManager.sol";
 import {Instance} from "./Instance.sol";
@@ -19,7 +19,8 @@ interface IInstanceService is IService {
 
     error ErrorInstanceServiceRequestUnauhorized(address caller);
     error ErrorInstanceServiceNotInstanceOwner(address caller, NftId instanceNftId);
-
+    error ErrorInstanceServiceComponentNotRegistered(address componentAddress);
+    
     event LogInstanceCloned(address clonedAccessManagerAddress, address clonedInstanceAddress, address clonedInstanceReaderAddress, NftId clonedInstanceNftId);
 
     function createInstanceClone()
@@ -33,6 +34,7 @@ interface IInstanceService is IService {
         );
 
     function hasRole(address account, RoleId role, address instanceAddress) external returns (bool);
+    function setTargetLocked(string memory targetName, bool locked) external;
 
 }