@etherisc/gif-next 0.0.2-da77c50-824 → 0.0.2-de220d6-949

package/contracts/instance/module/access/Access.sol

@@ -5,7 +5,7 @@ pragma solidity ^0.8.19;
 // import {AccessControlEnumerable} from "@openzeppelin/contracts/access/AccessControlEnumerable.sol";
 import "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
 
-import {RoleId, toRoleId} from "../../../types/RoleId.sol";
+import {RoleId, RoleIdLib} from "../../../types/RoleId.sol";
 import {DISTRIBUTOR_OWNER_ROLE, ORACLE_OWNER_ROLE, POOL_OWNER_ROLE, PRODUCT_OWNER_ROLE} from "../../../types/RoleId.sol";
 import {DISTRIBUTOR_OWNER_ROLE_NAME, ORACLE_OWNER_ROLE_NAME, POOL_OWNER_ROLE_NAME, PRODUCT_OWNER_ROLE_NAME} from "../../../types/RoleId.sol";
 import {IAccessModule} from "./IAccess.sol";
@@ -45,7 +45,7 @@ abstract contract AccessModule is IAccessModule {
     function createRole(
         string memory roleName
     ) public override onlyAccessOwner returns (RoleId role) {
-        role = toRoleId(roleName);
+        role = RoleIdLib.toRoleId(roleName);
         require(
             !roleExists(role),
             "ERROR:ACS-010:ROLE_ALREADY_EXISTS");
@@ -95,7 +95,7 @@ abstract contract AccessModule is IAccessModule {
     }
 
     function getRoleId(string memory roleName) external pure override returns (RoleId role) {
-        return toRoleId(roleName);
+        return RoleIdLib.toRoleId(roleName);
     }
 
     function getRoleInfo(

package/contracts/instance/module/bundle/BundleModule.sol

@@ -3,32 +3,32 @@ pragma solidity ^0.8.19;
 
 import {IRegistry} from "../../../registry/IRegistry.sol";
 
-import {LifecycleModule} from "../lifecycle/LifecycleModule.sol";
 import {IProductService} from "../../service/IProductService.sol";
 import {IPoolService} from "../../service/IPoolService.sol";
 
 import {NftId} from "../../../types/NftId.sol";
+import {Key32, KeyId} from "../../../types/Key32.sol";
 import {LibNftIdSet} from "../../../types/NftIdSet.sol";
 import {ObjectType, PRODUCT, ORACLE, POOL, BUNDLE, POLICY} from "../../../types/ObjectType.sol";
 import {StateId, ACTIVE, PAUSED, ARCHIVED, CLOSED, APPLIED, REVOKED, DECLINED} from "../../../types/StateId.sol";
 import {Timestamp, blockTimestamp, zeroTimestamp} from "../../../types/Timestamp.sol";
 import {Blocknumber, blockNumber} from "../../../types/Blocknumber.sol";
 
-import {ILifecycleModule} from "../lifecycle/ILifecycle.sol";
+import {IKeyValueStore} from "../../base/IKeyValueStore.sol";
+import {ModuleBase} from "../../base/ModuleBase.sol";
+
 import {IBundleModule} from "./IBundle.sol";
 
-abstract contract BundleModule is
+abstract contract BundleModule is 
+    ModuleBase,
     IBundleModule
 {
 
     using LibNftIdSet for LibNftIdSet.Set;
 
-    mapping(NftId bundleNftId => BundleInfo info) private _bundleInfo;
     mapping(NftId bundleNftId => LibNftIdSet.Set policies) private _collateralizedPolicies;
     mapping(NftId bundleNftId => mapping(NftId policyNftId => uint256 amount)) private _collateralizationAmount;
 
-    LifecycleModule private _lifecycleModule;
-
     modifier onlyBundlePoolService() {
         require(
             msg.sender == address(this.getPoolService()),
@@ -54,8 +54,8 @@ abstract contract BundleModule is
         _;
     }
 
-    constructor() {
-        _lifecycleModule = LifecycleModule(address(this));
+    function initializeBundleModule(IKeyValueStore keyValueStore) internal {
+        _initialize(keyValueStore, BUNDLE());
     }
 
     function createBundleInfo(
@@ -69,22 +69,18 @@ abstract contract BundleModule is
         onlyBundlePoolService
         override
     {
-
-        _bundleInfo[bundleNftId] = BundleInfo(
+        BundleInfo memory bundleInfo = BundleInfo(
             bundleNftId,
             poolNftId,
-            _lifecycleModule.getInitialState(BUNDLE()),
             filter,
             amount, // capital
             0, // locked capital
             amount, // balance
-            blockTimestamp(), // createdAt
             blockTimestamp().addSeconds(lifetime), // expiredAt
-            zeroTimestamp(), // closedAt
-            blockNumber() // updatedIn
+            zeroTimestamp() // closedAt
         );
 
-        // TODO add logging
+        _create(bundleNftId, abi.encode(bundleInfo));
     }
 
     function setBundleInfo(BundleInfo memory bundleInfo)
@@ -92,78 +88,16 @@ abstract contract BundleModule is
         override
         onlyPoolOrProductService
     {
-        _bundleInfo[bundleInfo.nftId] = bundleInfo;
+        _updateData(bundleInfo.nftId, abi.encode(bundleInfo));
     }
 
-    // function updateBundleState(
-    //     NftId bundleNftId,
-    //     StateId newState
-    // )
-    //     external    
-    //     // add authz (both product and pool service)
-    //     override
-    // {
-    //     BundleInfo storage info = _bundleInfo[bundleNftId];
-    //     info.state = newState;
-    //     info.updatedIn = blockNumber();
-    // }
-
-    // function extendBundle(
-    //     NftId bundleNftId,
-    //     uint256 lifetimeExtension
-    // )
-    //     external
-    //     onlyBundlePoolService
-    //     override
-    // {
-    //     BundleInfo storage info = _bundleInfo[bundleNftId];
-    //     info.expiredAt = info.expiredAt.addSeconds(lifetimeExtension);
-    //     info.updatedIn = blockNumber();
-    // }
-
-    // function closeBundle(
-    //     NftId bundleNftId
-    // )
-    //     external
-    //     onlyBundlePoolService
-    //     override
-    // {
-    //     BundleInfo storage info = _bundleInfo[bundleNftId];
-    //     info.state = CLOSED();
-    //     info.closedAt = blockTimestamp();
-    //     info.updatedIn = blockNumber();
-    // }
-
-    // function processStake(
-    //     NftId nftId,
-    //     uint256 amount
-    // )
-    //     external
-    //     onlyBundlePoolService
-    //     override
-    // {
-    //     BundleInfo storage info = _bundleInfo[nftId];
-    //     info.capitalAmount += amount;
-    //     info.balanceAmount += amount;
-    //     info.updatedIn = blockNumber();
-    // }
-
-    // function processUnstake(
-    //     NftId nftId,
-    //     uint256 amount
-    // )
-    //     external
-    //     onlyBundlePoolService
-    //     override
-    // {
-    //     BundleInfo storage info = _bundleInfo[nftId];
-    //     // TODO fix book keeping in a way that provides
-    //     // continuous infor regarding profitability
-    //     // this is needed to properly apply performance fees
-    //     info.capitalAmount -= amount;
-    //     info.balanceAmount -= amount;
-    //     info.updatedIn = blockNumber();
-    // }
+    function updateBundleState(NftId bundleNftId, StateId state)
+        external
+        override
+        onlyBundlePoolService
+    {
+        _updateState(bundleNftId, state);
+    }
 
     function collateralizePolicy(
         NftId bundleNftId, 
@@ -187,42 +121,16 @@ abstract contract BundleModule is
         override 
         returns(uint256 collateralAmount)
     {
-    //     BundleInfo storage info = _bundleInfo[bundleNftId];
-    //     info.lockedAmount -= collateralAmount;
-    //     info.updatedIn = blockNumber();
-
         collateralAmount = _collateralizationAmount[bundleNftId][policyNftId];
         delete _collateralizationAmount[bundleNftId][policyNftId];
         _collateralizedPolicies[bundleNftId].remove(policyNftId);
     }
 
-    // function addPremium(NftId bundleNftId, uint256 amount)
-    //     external
-    //     onlyBundleProductService
-    //     override
-    // {
-    //     BundleInfo storage info = _bundleInfo[bundleNftId];
-    //     info.capitalAmount += amount;
-    //     info.balanceAmount += amount;
-    //     info.updatedIn = blockNumber();
-    // }
-
-    // function subtractPayout(NftId bundleNftId, NftId policyNftId, uint256 amount)
-    //     external
-    //     onlyBundleProductService
-    //     override
-    // {
-    //     BundleInfo storage info = _bundleInfo[bundleNftId];
-    //     info.capitalAmount -= amount;
-    //     info.lockedAmount -= amount;
-    //     info.balanceAmount -= amount;
-    //     info.updatedIn = blockNumber();
-
-    //     // deduct amount from sum insured for this policy
-    //     _collateralizationAmount[bundleNftId][policyNftId] -= amount;
-    // }
-
     function getBundleInfo(NftId bundleNftId) external view override returns(BundleInfo memory bundleInfo) {
-        return _bundleInfo[bundleNftId];
+        return abi.decode(_getData(bundleNftId), (BundleInfo));
     }
+
+    function toBundleKey32(NftId bundleNftId) external view override returns (Key32 key32) {
+        return _toKey32(bundleNftId);
+    } 
 }

package/contracts/instance/module/bundle/IBundle.sol

@@ -3,11 +3,13 @@ pragma solidity ^0.8.19;
 
 import {IRegistry} from "../../../registry/IRegistry.sol";
 import {IInstance} from "../../IInstance.sol";
+import {Key32} from "../../../types/Key32.sol";
 import {NftId} from "../../../types/NftId.sol";
 import {StateId} from "../../../types/StateId.sol";
 import {Timestamp} from "../../../types/Timestamp.sol";
 import {Blocknumber} from "../../../types/Blocknumber.sol";
 
+import {IKeyValueStore} from "../../base/IKeyValueStore.sol";
 import {IProductService} from "../../service/IProductService.sol";
 import {IPoolService} from "../../service/IPoolService.sol";
 
@@ -16,15 +18,12 @@ interface IBundle {
     struct BundleInfo {
         NftId nftId;
         NftId poolNftId;
-        StateId state; // active, paused, closed (expriy only implicit)
         bytes filter; // required conditions for applications to be considered for collateralization by this bundle
         uint256 capitalAmount; // net investment capital amount (<= balance)
         uint256 lockedAmount; // capital amount linked to collateralizaion of non-closed policies (<= balance)
         uint256 balanceAmount; // total amount of funds: net investment capital + net premiums - payouts
-        Timestamp createdAt;
         Timestamp expiredAt; // no new policies
         Timestamp closedAt;
-        Blocknumber updatedIn;
     }
 }
 
@@ -39,14 +38,20 @@ interface IBundleModule is IBundle {
     ) external;
 
     function setBundleInfo(BundleInfo memory bundleInfo) external;
+    function updateBundleState(NftId bundleNftId, StateId state) external;
+
     function collateralizePolicy(NftId bundleNftId, NftId policyNftId, uint256 amount) external;
     function releasePolicy(NftId bundleNftId, NftId policyNftId) external returns(uint256 collateralAmount);
 
     function getBundleInfo(NftId bundleNftId) external view returns(BundleInfo memory bundleInfo);
+    function toBundleKey32(NftId bundleNftId) external view returns (Key32 key32);
 
     // repeat registry linked signature
     function getRegistry() external view returns (IRegistry registry);
 
+    // repeat instance base signature
+    function getKeyValueStore() external view returns (IKeyValueStore keyValueStore);
+
     // repeat service linked signatures to avoid linearization issues
     function getProductService() external returns(IProductService);
     function getPoolService() external returns(IPoolService);

package/contracts/instance/module/compensation/CompensationModule.sol

@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.19;
+
+import {ICompensationModule} from "./ICompensation.sol";
+
+contract CompensationModule is ICompensationModule {
+    
+}

package/contracts/instance/module/compensation/ICompensation.sol

@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.19;
+
+interface ICompensation {
+
+}
+
+interface ICompensationModule is ICompensation {
+    
+}

package/contracts/instance/module/component/ComponentModule.sol

@@ -6,14 +6,12 @@ import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IER
 import {IRegistry} from "../../../registry/IRegistry.sol";
 import {IInstance} from "../../IInstance.sol";
 
-import {LifecycleModule} from "../lifecycle/LifecycleModule.sol";
 import {IComponent, IComponentModule} from "./IComponent.sol";
 import {IComponentOwnerService} from "../../service/IComponentOwnerService.sol";
 import {ObjectType, PRODUCT, ORACLE, POOL} from "../../../types/ObjectType.sol";
 import {StateId, ACTIVE, PAUSED} from "../../../types/StateId.sol";
 import {NftId, NftIdLib, zeroNftId} from "../../../types/NftId.sol";
-import {Fee, zeroFee} from "../../../types/Fee.sol";
-// import {IBaseComponent} from "../../../components/IBaseComponent.sol";
+import {Fee} from "../../../types/Fee.sol";
 
 abstract contract ComponentModule is
     IComponentModule
@@ -25,9 +23,6 @@ abstract contract ComponentModule is
 
     mapping(ObjectType cType => bytes32 role) private _componentOwnerRole;
 
-    // TODO maybe move this to Instance contract as internal variable?
-    LifecycleModule private _lifecycleModule;
-
     modifier onlyComponentOwnerService() {
         require(
             msg.sender == address(this.getComponentOwnerService()),
@@ -36,21 +31,17 @@ abstract contract ComponentModule is
         _;
     }
 
-    constructor() {
-        address componentAddress = address(this);
-        _lifecycleModule = LifecycleModule(componentAddress);
-    }
-
     function registerComponent(
         NftId nftId,
-        ObjectType objectType,
+        ObjectType, // objectType,
         IERC20Metadata token
     ) external override onlyComponentOwnerService {
 
         // create component info
         _componentInfo[nftId] = ComponentInfo(
             nftId,
-            _lifecycleModule.getInitialState(objectType),
+            // _lifecycleModule.getInitialState(objectType),
+            ACTIVE(),
             token
         );
 
@@ -71,13 +62,13 @@ abstract contract ComponentModule is
         // TODO decide if state changes should have explicit functions and not
         // just a generic setXYZInfo and implicit state transitions
         // when in doubt go for the explicit approach ...
-        ObjectType objectType = this.getRegistry().getObjectInfo(nftId).objectType;
-        _lifecycleModule.checkAndLogTransition(
-            nftId,
-            objectType,
-            _componentInfo[nftId].state,
-            info.state
-        );
+        // ObjectType objectType = this.getRegistry().getObjectInfo(nftId).objectType;
+        // _lifecycleModule.checkAndLogTransition(
+        //     nftId,
+        //     objectType,
+        //     _componentInfo[nftId].state,
+        //     info.state
+        // );
         _componentInfo[nftId] = info;
     }
 

package/contracts/instance/module/policy/IPolicy.sol

@@ -21,7 +21,8 @@ interface IPolicy {
         uint256 premiumAmount;
         uint256 premiumPaidAmount;
         uint256 lifetime;
-        bytes data;
+        bytes applicationData;
+        bytes policyData;
         Timestamp createdAt;
         Timestamp activatedAt; // time of underwriting
         Timestamp expiredAt; // no new claims (activatedAt + lifetime)

package/contracts/instance/module/policy/PolicyModule.sol

@@ -3,7 +3,6 @@ pragma solidity ^0.8.19;
 
 import {IRegistry} from "../../../registry/IRegistry.sol";
 
-import {LifecycleModule} from "../../module/lifecycle/LifecycleModule.sol";
 import {IProductService} from "../../service/IProductService.sol";
 import {IPolicy, IPolicyModule} from "./IPolicy.sol";
 import {ObjectType, POLICY} from "../../../types/ObjectType.sol";
@@ -12,15 +11,11 @@ import {NftId, NftIdLib} from "../../../types/NftId.sol";
 import {Timestamp, blockTimestamp, zeroTimestamp} from "../../../types/Timestamp.sol";
 import {Blocknumber, blockNumber} from "../../../types/Blocknumber.sol";
 
-import {LifecycleModule} from "../../module/lifecycle/LifecycleModule.sol";
-
 abstract contract PolicyModule is IPolicyModule {
     using NftIdLib for NftId;
 
     mapping(NftId nftId => PolicyInfo info) private _policyInfo;
 
-    LifecycleModule private _lifecycleModule;
-
     // TODO find a better place to avoid dupliation
     modifier onlyProductService2() {
         require(
@@ -30,10 +25,6 @@ abstract contract PolicyModule is IPolicyModule {
         _;
     }
 
-    constructor() {
-        _lifecycleModule = LifecycleModule(address(this));
-    }
-
     function createApplication(
         NftId productNftId,
         NftId policyNftId,
@@ -51,12 +42,14 @@ abstract contract PolicyModule is IPolicyModule {
             productNftId,
             bundleNftId,
             address(0), // beneficiary = policy nft holder
-            _lifecycleModule.getInitialState(POLICY()),
+            // _lifecycleModule.getInitialState(POLICY()),
+            APPLIED(),
             sumInsuredAmount,
             premiumAmount,
             0, // premium paid amount
             lifetime, 
-            "", // data
+            "", // applicationData
+            "", // policyData
             blockTimestamp(), // createdAt
             zeroTimestamp(), // activatedAt
             zeroTimestamp(), // expiredAt

package/contracts/instance/module/{product/IProductModule.sol → risk/IRisk.sol}

@@ -1,6 +1,10 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.19;
 
-interface IProductModule
-{
+interface IRisk {
+
 }
+
+interface IRiskModule is IRisk {
+    
+}

package/contracts/instance/module/risk/RiskModule.sol

@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.19;
+
+import {IRiskModule} from "./IRisk.sol";
+
+contract RiskModule is IRiskModule {
+    
+}

package/contracts/instance/module/treasury/ITreasury.sol

@@ -18,7 +18,6 @@ interface ITreasury {
         NftId distributorNftId;
         NftId poolNftId;
         IERC20Metadata token;
-        TokenHandler tokenHandler;
         address wallet;
         Fee policyFee;
         Fee processingFee;
@@ -27,7 +26,7 @@ interface ITreasury {
     struct DistributorSetup {
         NftId distributorNftId;
         address wallet;
-        Fee commissionFees;
+        Fee commissionFee;
     }
 
     struct PoolSetup {
@@ -70,7 +69,7 @@ interface ITreasuryModule is ITreasury {
     ) external;
 
     function getTokenHandler(
-        NftId productNftId
+        NftId componentNftId
     ) external view returns (TokenHandler tokenHandler);
 
     function getProductSetup(

package/contracts/instance/module/treasury/TreasuryModule.sol

@@ -4,7 +4,7 @@ pragma solidity ^0.8.19;
 import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 
 import {NftId} from "../../../types/NftId.sol";
-import {Fee, feeIsZero, toFee, zeroFee} from "../../../types/Fee.sol";
+import {Fee, FeeLib} from "../../../types/Fee.sol";
 import {UFixed, UFixedMathLib} from "../../../types/UFixed.sol";
 import {TokenHandler} from "./TokenHandler.sol";
 import {ITreasuryModule} from "./ITreasury.sol";
@@ -14,6 +14,7 @@ abstract contract TreasuryModule is ITreasuryModule {
     mapping(NftId distributorNftId => DistributorSetup setup)
         private _distributorSetup;
     mapping(NftId poolNftId => PoolSetup setup) private _poolSetup;
+    mapping(NftId componentNftId => TokenHandler tokenHanlder) _tokenHandler;
 
     function registerProduct(
         NftId productNftId,
@@ -25,17 +26,23 @@ abstract contract TreasuryModule is ITreasuryModule {
         Fee memory processingFee
     ) external override // TODO add authz (only component module)
     {
-        // TODO add validation
+        require(address(_tokenHandler[productNftId]) == address(0), "ERROR:TRS-010:TOKEN_HANDLER_ALREADY_REGISTERED");
+        require(address(_tokenHandler[poolNftId]) == address(0), "ERROR:TRS-011:TOKEN_HANDLER_ALREADY_REGISTERED");
+        require(address(_tokenHandler[distributorNftId]) == address(0), "ERROR:TRS-012:TOKEN_HANDLER_ALREADY_REGISTERED");
+        // TODO add additional validations
 
         // deploy product specific handler contract
         TokenHandler tokenHandler = new TokenHandler(productNftId, address(token));
+        _tokenHandler[productNftId] = tokenHandler;
+        _tokenHandler[poolNftId] = tokenHandler;
+        _tokenHandler[distributorNftId] = tokenHandler;
 
+        // create product setup
         _productSetup[productNftId] = ProductSetup(
             productNftId,
             distributorNftId,
             poolNftId,
             token,
-            tokenHandler,
             wallet,
             policyFee,
             processingFee
@@ -94,9 +101,9 @@ abstract contract TreasuryModule is ITreasuryModule {
     }
 
     function getTokenHandler(
-        NftId productNftId
+        NftId componentNftId
     ) external view override returns (TokenHandler tokenHandler) {
-        return _productSetup[productNftId].tokenHandler;
+        return _tokenHandler[componentNftId];
     }
 
     function getProductSetup(
@@ -115,21 +122,18 @@ abstract contract TreasuryModule is ITreasuryModule {
         uint256 amount,
         Fee memory fee
     ) public pure override returns (uint256 feeAmount, uint256 netAmount) {
-        UFixed fractionalAmount = UFixedMathLib.toUFixed(amount) *
-            fee.fractionalFee;
-        feeAmount = fractionalAmount.toInt() + fee.fixedFee;
-        netAmount = amount - feeAmount;
+        return FeeLib.calculateFee(amount, fee);
     }
 
     function getFee(
         UFixed fractionalFee, 
         uint256 fixedFee
     ) external pure override returns (Fee memory fee) {
-        return toFee(fractionalFee, fixedFee);
+        return FeeLib.toFee(fractionalFee, fixedFee);
     }
 
     function getZeroFee() external pure override returns (Fee memory fee) {
-        return zeroFee();
+        return FeeLib.zeroFee();
     }
 
     function getUFixed(

package/contracts/instance/service/ComponentOwnerService.sol

@@ -6,7 +6,6 @@ import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IER
 import {IRegistry} from "../../registry/IRegistry.sol";
 import {IInstance} from "../IInstance.sol";
 
-import {LifecycleModule} from "../module/lifecycle/LifecycleModule.sol";
 import {ITreasuryModule} from "../module/treasury/ITreasury.sol";
 import {TreasuryModule} from "../module/treasury/TreasuryModule.sol";
 import {IComponent, IComponentModule} from "../module/component/IComponent.sol";
@@ -20,11 +19,11 @@ import {RoleId, PRODUCT_OWNER_ROLE, POOL_OWNER_ROLE, ORACLE_OWNER_ROLE} from "..
 import {ObjectType, PRODUCT, ORACLE, POOL} from "../../types/ObjectType.sol";
 import {StateId, ACTIVE, PAUSED} from "../../types/StateId.sol";
 import {NftId, NftIdLib, zeroNftId} from "../../types/NftId.sol";
-import {Fee, zeroFee} from "../../types/Fee.sol";
-import {Version, toVersion, toVersionPart} from "../../types/Version.sol";
+import {Fee} from "../../types/Fee.sol";
+import {Version, VersionLib} from "../../types/Version.sol";
 
 import {IProductComponent} from "../../components/IProductComponent.sol";
-import {ServiceBase} from "./ServiceBase.sol";
+import {ServiceBase} from "../base/ServiceBase.sol";
 import {IComponentOwnerService} from "./IComponentOwnerService.sol";
 
 contract ComponentOwnerService is
@@ -55,10 +54,7 @@ contract ComponentOwnerService is
         virtual override (IVersionable, Versionable)
         returns(Version)
     {
-        return toVersion(
-            toVersionPart(3),
-            toVersionPart(0),
-            toVersionPart(0));
+        return VersionLib.toVersion(3,0,0);
     }
 
     function getName() external pure override returns(string memory name) {

package/contracts/instance/service/IComponentOwnerService.sol

@@ -5,7 +5,7 @@ import {NftId} from "../../types/NftId.sol";
 import {ObjectType} from "../../types/ObjectType.sol";
 import {RoleId} from "../../types/RoleId.sol";
 import {IBaseComponent} from "../../components/IBaseComponent.sol";
-import {IService} from "./IService.sol";
+import {IService} from "../base/IService.sol";
 
 // TODO rename to registry service
 interface IComponentOwnerService is IService {

package/contracts/instance/service/IPoolService.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.8.19;
 
 import {NftId} from "../../types/NftId.sol";
 import {Fee} from "../../types/Fee.sol";
-import {IService} from "./IService.sol";
+import {IService} from "../base/IService.sol";
 
 interface IPoolService is IService {
     function setFees(

package/contracts/instance/service/IProductService.sol

@@ -5,7 +5,7 @@ import {NftId} from "../../types/NftId.sol";
 import {Timestamp} from "../../types/Timestamp.sol";
 import {UFixed} from "../../types/UFixed.sol";
 import {Fee} from "../../types/Fee.sol";
-import {IService} from "./IService.sol";
+import {IService} from "../base/IService.sol";
 
 interface IProductService is IService {
     function setFees(