@etherisc/gif-next 0.0.2-c0457ac-280 → 0.0.2-c0923b6-664

package/artifacts/contracts/type/UFixed.sol/MathLib.json

@@ -1,10 +0,0 @@
-{
-  "_format": "hh-sol-artifact-1",
-  "contractName": "MathLib",
-  "sourceName": "contracts/type/UFixed.sol",
-  "abi": [],
-  "bytecode": "0x60566037600b82828239805160001a607314602a57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600080fdfea26469706673582212204121b2b7c82b5a0ebe4e6caa829cbd500c88b21adac1785c28cd4e5ea0eb3e0c64736f6c63430008140033",
-  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600080fdfea26469706673582212204121b2b7c82b5a0ebe4e6caa829cbd500c88b21adac1785c28cd4e5ea0eb3e0c64736f6c63430008140033",
-  "linkReferences": {},
-  "deployedLinkReferences": {}
-}

package/contracts/instance/BundleManager.sol

@@ -1,126 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.20;
-
-import {IInstance} from "./IInstance.sol";
-import {INSTANCE} from "../type/ObjectType.sol";
-import {InstanceReader} from "./InstanceReader.sol";
-import {IPolicy} from "../instance/module/IPolicy.sol";
-import {IRegistry} from "../registry/IRegistry.sol";
-import {LibNftIdSet} from "../type/NftIdSet.sol";
-import {NftId} from "../type/NftId.sol";
-import {TimestampLib} from "../type/Timestamp.sol";
-
-import {ObjectManager} from "./base/ObjectManager.sol";
-
-contract BundleManager is 
-    ObjectManager
-{
-
-    event LogBundleManagerPolicyLinked(NftId bundleNftId, NftId policyNftId);
-    event LogBundleManagerPolicyUnlinked(NftId bundleNftId, NftId policyNftId);
-
-    event LogBundleManagerBundleAdded(NftId poolNftId, NftId bundleNftId);
-    event LogBundleManagerBundleUnlocked(NftId poolNftId, NftId bundleNftId);
-    event LogBundleManagerBundleLocked(NftId poolNftId, NftId bundleNftId);
-    event LogBundleManagerBundleClosed(NftId poolNftId, NftId bundleNftId);
-
-    error ErrorBundleManagerPolicyAlreadyActivated(NftId policyNftId);
-    error ErrorBundleManagerBundleLocked(NftId bundleNftId, NftId policyNftId);
-    error ErrorBundleManagerPolicyWithOpenClaims(NftId policyNftId, uint256 openClaimsCount);
-    error ErrorBundleManagerPolicyNotCloseable(NftId policyNftId);
-    error ErrorBundleManagerBundleUnknown(NftId bundleNftId);
-    error ErrorBundleManagerBundleNotRegistered(NftId bundleNftId);
-
-    mapping(NftId bundleNftId => LibNftIdSet.Set policies) internal _activePolicies;
-
-    /// @dev links a policy to its bundle
-    // to link a policy it MUST NOT yet have been linked
-    function linkPolicy(NftId policyNftId) external restricted() {
-        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 = _instance.getInstanceReader().getBundleInfo(bundleNftId).poolNftId;
-
-        // ensure bundle is unlocked (in active set) and registered with this instance
-        if (!_isActive(poolNftId, bundleNftId)) {
-            revert ErrorBundleManagerBundleLocked(bundleNftId, policyNftId);
-        }
-
-        LibNftIdSet.add(_activePolicies[bundleNftId], policyNftId);
-        emit LogBundleManagerPolicyLinked(bundleNftId, policyNftId);
-    }
-
-
-    /// @dev unlinks a policy from its bundle
-    // to unlink a policy it must closable, ie. meet one of the following criterias
-    // - 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 = _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 = _instance.getInstanceReader().getBundleInfo(bundleNftId).poolNftId;
-
-        // ensure bundle is registered with this instance
-        if (!_contains(poolNftId, bundleNftId)) {
-            revert ErrorBundleManagerBundleUnknown(bundleNftId);
-        }
-
-        LibNftIdSet.remove(_activePolicies[bundleNftId], policyNftId);
-        emit LogBundleManagerPolicyUnlinked(policyInfo.bundleNftId, policyNftId);
-    }
-
-
-    /// @dev add a new bundle to a pool registerd with this instance
-    // the corresponding pool is fetched via instance reader
-    function add(NftId bundleNftId) external restricted() {
-        NftId poolNftId = _instance.getInstanceReader().getBundleInfo(bundleNftId).poolNftId;
-
-        // ensure pool is registered with instance
-        if(poolNftId.eqz()) {
-            revert ErrorBundleManagerBundleNotRegistered(bundleNftId);
-        }
-
-        _add(poolNftId, bundleNftId);
-        emit LogBundleManagerBundleAdded(poolNftId, bundleNftId);
-    }
-
-
-    /// @dev unlocked (active) bundles are available to collateralize new policies
-    function unlock(NftId bundleNftId) external restricted() {
-        NftId poolNftId = _instance.getInstanceReader().getBundleInfo(bundleNftId).poolNftId;
-        _activate(poolNftId, bundleNftId);
-        emit LogBundleManagerBundleUnlocked(poolNftId, bundleNftId);
-    }
-
-    /// @dev locked (deactivated) bundles may not collateralize any new policies
-    function lock(NftId bundleNftId) external restricted() {
-        NftId poolNftId = _instance.getInstanceReader().getBundleInfo(bundleNftId).poolNftId;
-        _deactivate(poolNftId, bundleNftId);
-        emit LogBundleManagerBundleLocked(poolNftId, bundleNftId);
-    }
-
-    function bundles(NftId poolNftId) external view returns(uint256) {
-        return _objects(poolNftId);
-    }
-
-    function getBundleNftId(NftId poolNftId, uint256 idx) external view returns(NftId bundleNftId) {
-        return _getObject(poolNftId, idx);
-    }
-
-    function activeBundles(NftId poolNftId) external view returns(uint256) {
-        return _activeObjs(poolNftId);
-    }
-
-    function getActiveBundleNftId(NftId poolNftId, uint256 idx) external view returns(NftId bundleNftId) {
-        return _getActiveObject(poolNftId, idx);
-    }
-
-    function activePolicies(NftId bundleNftId) external view returns(uint256) {
-        return LibNftIdSet.size(_activePolicies[bundleNftId]);
-    }
-
-    function getActivePolicy(NftId bundleNftId, uint256 idx) external view returns(NftId policyNftId) {
-        return LibNftIdSet.getElementAt(_activePolicies[bundleNftId], idx);
-    }
-}

package/contracts/instance/InstanceAuthorizationsLib.sol

@@ -1,377 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.20;
-
-import {ADMIN_ROLE, INSTANCE_OWNER_ROLE, ORACLE_SERVICE_ROLE, DISTRIBUTION_OWNER_ROLE, POOL_OWNER_ROLE, PRODUCT_OWNER_ROLE, ORACLE_OWNER_ROLE, INSTANCE_SERVICE_ROLE, COMPONENT_SERVICE_ROLE, DISTRIBUTION_SERVICE_ROLE, POOL_SERVICE_ROLE, PRODUCT_SERVICE_ROLE, APPLICATION_SERVICE_ROLE, POLICY_SERVICE_ROLE, CLAIM_SERVICE_ROLE, BUNDLE_SERVICE_ROLE, INSTANCE_ROLE} from "../type/RoleId.sol";
-import {APPLICATION, BUNDLE, CLAIM, COMPONENT, DISTRIBUTION, INSTANCE, ORACLE, POLICY, POOL, PRODUCT, REGISTRY} from "../type/ObjectType.sol";
-import {VersionPart} from "../type/Version.sol";
-
-import {IRegistry} from "../registry/IRegistry.sol";
-
-import {Instance} from "./Instance.sol";
-import {InstanceAdmin} from "./InstanceAdmin.sol";
-import {InstanceReader} from "./InstanceReader.sol";
-import {BundleManager} from "./BundleManager.sol";
-import {AccessManagerExtendedInitializeable} from "../shared/AccessManagerExtendedInitializeable.sol";
-import {InstanceStore} from "./InstanceStore.sol";
-
-
-library InstanceAuthorizationsLib
-{
-    function grantInitialAuthorizations(
-        AccessManagerExtendedInitializeable accessManager,
-        InstanceAdmin instanceAdmin,
-        Instance instance,
-        BundleManager bundleManager,
-        InstanceStore instanceStore,
-        address instanceOwner,
-        IRegistry registry,
-        VersionPart majorVersion)
-            external
-    {
-        _createRoles(instanceAdmin);
-        _createTargets(instanceAdmin, instance, bundleManager, instanceStore);
-        _grantComponentServiceAuthorizations(accessManager, instanceAdmin, instanceStore, registry, majorVersion);
-        _grantOracleServiceAuthorizations(accessManager, instanceAdmin, instanceStore, registry, majorVersion);
-        _grantDistributionServiceAuthorizations(accessManager, instanceAdmin, instanceStore, registry, majorVersion);
-        _grantPoolServiceAuthorizations(accessManager, instanceAdmin, instanceStore, registry, majorVersion);
-        _grantProductServiceAuthorizations(accessManager, instanceAdmin, instanceStore, registry, majorVersion);
-        _grantApplicationServiceAuthorizations(accessManager, instanceAdmin, instanceStore, registry, majorVersion);
-        _grantPolicyServiceAuthorizations(accessManager, instanceAdmin, instanceStore, registry, majorVersion);
-        _grantClaimServiceAuthorizations(accessManager, instanceAdmin, instanceStore, registry, majorVersion);
-        _grantBundleServiceAuthorizations(accessManager, instanceAdmin, instanceStore, bundleManager, registry, majorVersion);
-        _grantInstanceServiceAuthorizations(accessManager, instanceAdmin, instance, registry, majorVersion);
-        _grantInstanceAuthorizations(accessManager, instanceAdmin, instance, registry, majorVersion);
-        _grantInstanceOwnerAuthorizations(instanceAdmin, instance, registry, majorVersion);
-    }
-
-    function _createRoles(InstanceAdmin instanceAdmin) private {
-        // default roles controlled by ADMIN_ROLE -> core roles
-        // all set/granted only once during cloning (the only exception is INSTANCE_OWNER_ROLE, hooked to instance nft)
-        instanceAdmin.createCoreRole(INSTANCE_SERVICE_ROLE(), "InstanceServiceRole");
-        instanceAdmin.createCoreRole(COMPONENT_SERVICE_ROLE(), "ComponentServiceRole");
-        instanceAdmin.createCoreRole(DISTRIBUTION_SERVICE_ROLE(), "DistributionServiceRole");
-        instanceAdmin.createCoreRole(ORACLE_SERVICE_ROLE(), "OracleServiceRole");
-        instanceAdmin.createCoreRole(POOL_SERVICE_ROLE(), "PoolServiceRole");
-        instanceAdmin.createCoreRole(APPLICATION_SERVICE_ROLE(), "ApplicationServiceRole");
-        instanceAdmin.createCoreRole(PRODUCT_SERVICE_ROLE(), "ProductServiceRole");
-        instanceAdmin.createCoreRole(CLAIM_SERVICE_ROLE(), "ClaimServiceRole");
-        instanceAdmin.createCoreRole(POLICY_SERVICE_ROLE(), "PolicyServiceRole");
-        instanceAdmin.createCoreRole(BUNDLE_SERVICE_ROLE(), "BundleServiceRole");
-
-        // default roles controlled by INSTANCE_OWNER_ROLE -> gif roles
-        instanceAdmin.createGifRole(DISTRIBUTION_OWNER_ROLE(), "DistributionOwnerRole", INSTANCE_OWNER_ROLE());
-        instanceAdmin.createGifRole(ORACLE_OWNER_ROLE(), "OracleOwnerRole", INSTANCE_OWNER_ROLE());
-        instanceAdmin.createGifRole(POOL_OWNER_ROLE(), "PoolOwnerRole", INSTANCE_OWNER_ROLE());
-        instanceAdmin.createGifRole(PRODUCT_OWNER_ROLE(), "ProductOwnerRole", INSTANCE_OWNER_ROLE());
-    }
-
-    function _createTargets(
-        InstanceAdmin instanceAdmin,
-        Instance instance,
-        BundleManager bundleManager,
-        InstanceStore instanceStore)
-        private
-    {
-        instanceAdmin.createCoreTarget(address(instance), "Instance");
-        //instanceAdmin.createCoreTarget(address(instanceAdmin), "InstanceAdmin");
-        instanceAdmin.createCoreTarget(address(bundleManager), "BundleManager");
-        instanceAdmin.createCoreTarget(address(instanceStore), "InstanceStore");
-    }
-
-    function _grantComponentServiceAuthorizations(
-        AccessManagerExtendedInitializeable accessManager,
-        InstanceAdmin instanceAdmin,
-        InstanceStore instanceStore,
-        IRegistry registry,
-        VersionPart majorVersion)
-        private
-    {
-        // configure authorization for component service on instance store
-        address componentServiceAddress = registry.getServiceAddress(COMPONENT(), majorVersion);
-        accessManager.grantRole(COMPONENT_SERVICE_ROLE().toInt(), componentServiceAddress, 0);
-
-        bytes4[] memory serviceSelectors = new bytes4[](8);
-        serviceSelectors[0] = instanceStore.createComponent.selector;
-        serviceSelectors[1] = instanceStore.updateComponent.selector;
-        serviceSelectors[2] = instanceStore.createPool.selector;
-        serviceSelectors[3] = instanceStore.createProduct.selector;
-        serviceSelectors[5] = instanceStore.updateProduct.selector;
-        serviceSelectors[6] = instanceStore.increaseBalance.selector;
-        serviceSelectors[7] = instanceStore.increaseFees.selector;
-
-        instanceAdmin.setTargetFunctionRoleByService(
-            "InstanceStore",
-            serviceSelectors,
-            COMPONENT_SERVICE_ROLE());
-    }
-
-    function _grantOracleServiceAuthorizations(
-        AccessManagerExtendedInitializeable accessManager,
-        InstanceAdmin instanceAdmin,
-        InstanceStore instanceStore,
-        IRegistry registry,
-        VersionPart majorVersion
-    )
-        private
-    {
-        // configure authorization for distribution service on instance
-        address oracleServiceAddress = registry.getServiceAddress(ORACLE(), majorVersion);
-        accessManager.grantRole(ORACLE_SERVICE_ROLE().toInt(), oracleServiceAddress, 0);
-
-        bytes4[] memory instanceOracleServiceSelectors = new bytes4[](3);
-        instanceOracleServiceSelectors[0] = instanceStore.createRequest.selector;
-        instanceOracleServiceSelectors[1] = instanceStore.updateRequest.selector;
-        instanceOracleServiceSelectors[2] = instanceStore.updateRequestState.selector;
-
-        instanceAdmin.setTargetFunctionRoleByService(
-            "InstanceStore",
-            instanceOracleServiceSelectors,
-            ORACLE_SERVICE_ROLE());
-    }
-
-    function _grantDistributionServiceAuthorizations(
-        AccessManagerExtendedInitializeable accessManager,
-        InstanceAdmin instanceAdmin,
-        InstanceStore instanceStore,
-        IRegistry registry,
-        VersionPart majorVersion
-    )
-        private
-    {
-        // configure authorization for distribution service on instance
-        address distributionServiceAddress = registry.getServiceAddress(DISTRIBUTION(), majorVersion);
-        accessManager.grantRole(DISTRIBUTION_SERVICE_ROLE().toInt(), distributionServiceAddress, 0);
-        bytes4[] memory instanceDistributionServiceSelectors = new bytes4[](9);
-        //instanceDistributionServiceSelectors[0] = instanceStore.createDistributionSetup.selector;
-        //instanceDistributionServiceSelectors[1] = instanceStore.updateDistributionSetup.selector;
-        instanceDistributionServiceSelectors[0] = instanceStore.createDistributorType.selector;
-        instanceDistributionServiceSelectors[1] = instanceStore.updateDistributorType.selector;
-        instanceDistributionServiceSelectors[2] = instanceStore.updateDistributorTypeState.selector;
-        instanceDistributionServiceSelectors[3] = instanceStore.createDistributor.selector;
-        instanceDistributionServiceSelectors[4] = instanceStore.updateDistributor.selector;
-        instanceDistributionServiceSelectors[5] = instanceStore.updateDistributorState.selector;
-        instanceDistributionServiceSelectors[6] = instanceStore.createReferral.selector;
-        instanceDistributionServiceSelectors[7] = instanceStore.updateReferral.selector;
-        instanceDistributionServiceSelectors[8] = instanceStore.updateReferralState.selector;
-        instanceAdmin.setTargetFunctionRoleByService(
-            "InstanceStore",
-            instanceDistributionServiceSelectors,
-            DISTRIBUTION_SERVICE_ROLE());
-    }
-
-    function _grantPoolServiceAuthorizations(
-        AccessManagerExtendedInitializeable accessManager,
-        InstanceAdmin instanceAdmin,
-        InstanceStore instanceStore,
-        IRegistry registry,
-        VersionPart majorVersion)
-        private
-    {
-        // configure authorization for pool service on instance
-        address poolServiceAddress = registry.getServiceAddress(POOL(), majorVersion);
-        accessManager.grantRole(POOL_SERVICE_ROLE().toInt(), address(poolServiceAddress), 0);
-        bytes4[] memory instancePoolServiceSelectors = new bytes4[](1); // TODO works with (4)
-        instancePoolServiceSelectors[0] = instanceStore.updatePool.selector;
-        instanceAdmin.setTargetFunctionRoleByService(
-            "InstanceStore",
-            instancePoolServiceSelectors,
-            POOL_SERVICE_ROLE());
-    }
-
-    function _grantProductServiceAuthorizations(
-        AccessManagerExtendedInitializeable accessManager,
-        InstanceAdmin instanceAdmin,
-        InstanceStore instanceStore,
-        IRegistry registry,
-        VersionPart majorVersion)
-        private
-    {
-        // configure authorization for product service on instance
-        address productServiceAddress = registry.getServiceAddress(PRODUCT(), majorVersion);
-        accessManager.grantRole(PRODUCT_SERVICE_ROLE().toInt(), productServiceAddress, 0);
-        bytes4[] memory instanceProductServiceSelectors = new bytes4[](3);
-        instanceProductServiceSelectors[0] = instanceStore.createRisk.selector;
-        instanceProductServiceSelectors[1] = instanceStore.updateRisk.selector;
-        instanceProductServiceSelectors[2] = instanceStore.updateRiskState.selector;
-        instanceAdmin.setTargetFunctionRoleByService(
-            "InstanceStore",
-            instanceProductServiceSelectors,
-            PRODUCT_SERVICE_ROLE());
-    }
-
-    function _grantApplicationServiceAuthorizations(
-        AccessManagerExtendedInitializeable accessManager,
-        InstanceAdmin instanceAdmin,
-        InstanceStore instanceStore,
-        IRegistry registry,
-        VersionPart majorVersion)
-        private
-    {
-        // configure authorization for application services on instance
-        address applicationServiceAddress = registry.getServiceAddress(APPLICATION(), majorVersion);
-        accessManager.grantRole(APPLICATION_SERVICE_ROLE().toInt(), applicationServiceAddress, 0);
-        bytes4[] memory instanceApplicationServiceSelectors = new bytes4[](3);
-        instanceApplicationServiceSelectors[0] = instanceStore.createApplication.selector;
-        instanceApplicationServiceSelectors[1] = instanceStore.updateApplication.selector;
-        instanceApplicationServiceSelectors[2] = instanceStore.updateApplicationState.selector;
-        instanceAdmin.setTargetFunctionRoleByService(
-            "InstanceStore",
-            instanceApplicationServiceSelectors,
-            APPLICATION_SERVICE_ROLE());
-    }
-
-    function _grantPolicyServiceAuthorizations(
-        AccessManagerExtendedInitializeable accessManager,
-        InstanceAdmin instanceAdmin,
-        InstanceStore instanceStore,
-        IRegistry registry,
-        VersionPart majorVersion)
-        private
-    {
-        // configure authorization for policy services on instance
-        address policyServiceAddress = registry.getServiceAddress(POLICY(), majorVersion);
-        accessManager.grantRole(POLICY_SERVICE_ROLE().toInt(), policyServiceAddress, 0);
-        bytes4[] memory instancePolicyServiceSelectors = new bytes4[](2);
-        instancePolicyServiceSelectors[0] = instanceStore.updatePolicy.selector;
-        instancePolicyServiceSelectors[1] = instanceStore.updatePolicyState.selector;
-        instanceAdmin.setTargetFunctionRoleByService(
-            "InstanceStore",
-            instancePolicyServiceSelectors,
-            POLICY_SERVICE_ROLE());
-    }
-
-    function _grantClaimServiceAuthorizations(
-        AccessManagerExtendedInitializeable accessManager,
-        InstanceAdmin instanceAdmin,
-        InstanceStore instanceStore,
-        IRegistry registry,
-        VersionPart majorVersion)
-        private
-    {
-        // configure authorization for claim/payout services on instance
-        address claimServiceAddress = registry.getServiceAddress(CLAIM(), majorVersion);
-        accessManager.grantRole(CLAIM_SERVICE_ROLE().toInt(), claimServiceAddress, 0);
-
-        bytes4[] memory instancePolicyServiceSelectors = new bytes4[](1);
-        instancePolicyServiceSelectors[0] = instanceStore.updatePolicyClaims.selector;
-        instanceAdmin.setTargetFunctionRoleByService(
-            "InstanceStore",
-            instancePolicyServiceSelectors, 
-            CLAIM_SERVICE_ROLE());
-
-        bytes4[] memory instanceClaimServiceSelectors = new bytes4[](4);
-        instanceClaimServiceSelectors[0] = instanceStore.createClaim.selector;
-        instanceClaimServiceSelectors[1] = instanceStore.updateClaim.selector;
-        instanceClaimServiceSelectors[2] = instanceStore.createPayout.selector;
-        instanceClaimServiceSelectors[3] = instanceStore.updatePayout.selector;
-        instanceAdmin.setTargetFunctionRoleByService(
-            "InstanceStore",
-            instanceClaimServiceSelectors, 
-            CLAIM_SERVICE_ROLE());
-    }
-
-    function _grantBundleServiceAuthorizations(
-        AccessManagerExtendedInitializeable accessManager,
-        InstanceAdmin instanceAdmin,
-        InstanceStore instanceStore,
-        BundleManager bundleManager,
-        IRegistry registry,
-        VersionPart majorVersion)
-        private
-    {
-        // configure authorization for bundle service on instance
-        address bundleServiceAddress = registry.getServiceAddress(BUNDLE(), majorVersion);
-        accessManager.grantRole(BUNDLE_SERVICE_ROLE().toInt(), bundleServiceAddress, 0);
-        bytes4[] memory instanceBundleServiceSelectors = new bytes4[](5);
-        instanceBundleServiceSelectors[0] = instanceStore.createBundle.selector;
-        instanceBundleServiceSelectors[1] = instanceStore.updateBundle.selector;
-        instanceBundleServiceSelectors[2] = instanceStore.updateBundleState.selector;
-        instanceBundleServiceSelectors[3] = instanceStore.increaseLocked.selector;
-        instanceBundleServiceSelectors[4] = instanceStore.decreaseLocked.selector;
-        instanceAdmin.setTargetFunctionRoleByService(
-            "InstanceStore",
-            instanceBundleServiceSelectors,
-            BUNDLE_SERVICE_ROLE());
-
-        // configure authorization for bundle service on bundle manager
-        bytes4[] memory bundleManagerBundleServiceSelectors = new bytes4[](5);
-        bundleManagerBundleServiceSelectors[0] = bundleManager.linkPolicy.selector;
-        bundleManagerBundleServiceSelectors[1] = bundleManager.unlinkPolicy.selector;
-        bundleManagerBundleServiceSelectors[2] = bundleManager.add.selector;
-        bundleManagerBundleServiceSelectors[3] = bundleManager.lock.selector;
-        bundleManagerBundleServiceSelectors[4] = bundleManager.unlock.selector;
-        instanceAdmin.setTargetFunctionRoleByService(
-            "BundleManager",
-            bundleManagerBundleServiceSelectors,
-            BUNDLE_SERVICE_ROLE());
-    }
-
-    function _grantInstanceServiceAuthorizations(
-        AccessManagerExtendedInitializeable accessManager,
-        InstanceAdmin instanceAdmin,
-        Instance instance,
-        IRegistry registry,
-        VersionPart majorVersion)
-        private
-    {
-        // configure authorization for instance service on instance
-        address instanceServiceAddress = registry.getServiceAddress(INSTANCE(), majorVersion);
-        accessManager.grantRole(INSTANCE_SERVICE_ROLE().toInt(), instanceServiceAddress, 0);
-        bytes4[] memory instanceInstanceServiceSelectors = new bytes4[](1);
-        instanceInstanceServiceSelectors[0] = instance.setInstanceReader.selector;
-        instanceAdmin.setTargetFunctionRoleByService(
-            "Instance",
-            instanceInstanceServiceSelectors,
-            INSTANCE_SERVICE_ROLE());
-
-        // configure authorizations for instance service on instance access manager
-        bytes4[] memory instanceAdminInstanceServiceSelectors = new bytes4[](3);
-        instanceAdminInstanceServiceSelectors[0] = instanceAdmin.createGifTarget.selector;
-        instanceAdminInstanceServiceSelectors[1] = instanceAdmin.setTargetLockedByService.selector;
-        instanceAdminInstanceServiceSelectors[2] = instanceAdmin.setTargetFunctionRoleByService.selector;
-        instanceAdmin.setTargetFunctionRoleByService(
-            "InstanceAdmin",
-            instanceAdminInstanceServiceSelectors,
-            INSTANCE_SERVICE_ROLE());
-    }
-
-    function _grantInstanceAuthorizations(
-        AccessManagerExtendedInitializeable accessManager,
-        InstanceAdmin instanceAdmin,
-        Instance instance,
-        IRegistry registry,
-        VersionPart majorVersion)
-        private
-    {
-        // configure authorizations for instance on instance admin
-        bytes4[] memory instanceAdminInstanceSelectors = new bytes4[](4);
-        instanceAdminInstanceSelectors[0] = instanceAdmin.createRole.selector;
-        instanceAdminInstanceSelectors[1] = instanceAdmin.createTarget.selector;
-        instanceAdminInstanceSelectors[2] = instanceAdmin.setTargetFunctionRoleByInstance.selector;
-        instanceAdminInstanceSelectors[3] = instanceAdmin.setTargetLockedByInstance.selector;
-        instanceAdmin.setTargetFunctionRoleByService(
-            "InstanceAdmin",
-            instanceAdminInstanceSelectors,
-            INSTANCE_ROLE());
-    }
-
-    function _grantInstanceOwnerAuthorizations(
-        InstanceAdmin instanceAdmin,
-        Instance instance,
-        IRegistry registry,
-        VersionPart majorVersion) 
-        private 
-    {
-        // configure authorization for instance owner on instance access manager
-        // instance owner role is granted/revoked ONLY by INSTANCE_ROLE
-        bytes4[] memory instanceInstanceOwnerSelectors = new bytes4[](4);
-        instanceInstanceOwnerSelectors[0] = instance.createRole.selector;
-        instanceInstanceOwnerSelectors[1] = instance.createTarget.selector;
-        instanceInstanceOwnerSelectors[2] = instance.setTargetFunctionRole.selector;
-        instanceInstanceOwnerSelectors[3] = instance.setTargetLocked.selector;
-        instanceAdmin.setTargetFunctionRoleByService(
-            "Instance",
-            instanceInstanceOwnerSelectors,
-            INSTANCE_OWNER_ROLE());
-    }
-}

package/contracts/instance/base/ObjectManager.sol

@@ -1,80 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.20;
-
-import {Cloneable} from "./Cloneable.sol";
-
-import {IInstance} from "../IInstance.sol";
-import {INSTANCE} from "../../type/ObjectType.sol";
-import {InstanceReader} from "../InstanceReader.sol";
-import {IRegistry} from "../../registry/IRegistry.sol";
-import {LibNftIdSet} from "../../type/NftIdSet.sol";
-import {NftId} from "../../type/NftId.sol";
-
-contract ObjectManager is
-    Cloneable
-{
-
-    event LogObjectManagerInitialized(address instance);
-
-    error ErrorObjectManagerNftIdInvalid(NftId instanceNftId);
-
-    mapping(NftId compnentNftId => LibNftIdSet.Set objects) internal _activeObjects;
-    mapping(NftId compnentNftId => LibNftIdSet.Set objects) internal _allObjects;
-    IInstance internal _instance; // store instance address -> more flexible, instance may not be registered during ObjectManager initialization
-
-    /// @dev call to initialize MUST be made in the same transaction as cloning of the contract
-    function initialize(address instanceAddress) 
-        initializer
-        external 
-    {
-        IInstance instance = IInstance(instanceAddress);
-        __Cloneable_init(instance.authority(), address(instance.getRegistry()));
-        _instance = instance;
-        
-        emit LogObjectManagerInitialized(instanceAddress);
-    }
-
-    function getInstance() external view returns (IInstance) {
-        return _instance;
-    }
-
-    function _add(NftId componentNftId, NftId objectNftId) internal {
-        LibNftIdSet.Set storage allSet = _allObjects[componentNftId];
-        LibNftIdSet.Set storage activeSet = _activeObjects[componentNftId];
-
-        LibNftIdSet.add(allSet, objectNftId);
-        LibNftIdSet.add(activeSet, objectNftId);
-    }
-
-    function _activate(NftId componentNftId, NftId objectNftId) internal {
-        LibNftIdSet.add(_activeObjects[componentNftId], objectNftId);
-    }
-
-    function _deactivate(NftId componentNftId, NftId objectNftId) internal {
-        LibNftIdSet.remove(_activeObjects[componentNftId], objectNftId);
-    }
-
-    function _objects(NftId componentNftId) internal view returns (uint256) {
-        return LibNftIdSet.size(_allObjects[componentNftId]);
-    }
-
-    function _contains(NftId componentNftId, NftId objectNftId) internal view returns (bool) {
-        return LibNftIdSet.contains(_allObjects[componentNftId], objectNftId);
-    }
-
-    function _getObject(NftId componentNftId, uint256 idx) internal view returns (NftId) {
-        return LibNftIdSet.getElementAt(_allObjects[componentNftId], idx);
-    }
-
-    function _activeObjs(NftId componentNftId) internal view returns (uint256)  {
-        return LibNftIdSet.size(_activeObjects[componentNftId]);
-    }
-
-    function _isActive(NftId componentNftId, NftId objectNftId) internal view returns (bool) {
-        return LibNftIdSet.contains(_activeObjects[componentNftId], objectNftId);
-    }
-
-    function _getActiveObject(NftId componentNftId, uint256 idx) internal view returns (NftId) {
-        return LibNftIdSet.getElementAt(_activeObjects[componentNftId], idx);
-    }
-}

package/contracts/instance/module/IAccess.sol

@@ -1,46 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.20;
-
-import {ShortString, ShortStrings} from "@openzeppelin/contracts/utils/ShortStrings.sol";
-
-import {NftId} from "../../type/NftId.sol";
-import {RoleId} from "../../type/RoleId.sol";
-import {Timestamp} from "../../type/Timestamp.sol";
-
-interface IAccess {
-
-    enum Type {
-        NotInitialized,
-        Core,
-        Gif,
-        Custom        
-    }
-
-    struct RoleInfo {
-        ShortString name;
-        Type rtype;
-        //bool isLocked;
-        RoleId admin;
-        Timestamp createdAt;
-        Timestamp updatedAt;
-    }
-
-    struct TargetInfo {
-        ShortString name;
-        Type ttype;
-        bool isLocked;
-        Timestamp createdAt;
-        Timestamp updatedAt;
-    }
-
-    error ErrorIAccessRoleIdTooBig(RoleId roleId);
-    error ErrorIAccessRoleIdTooSmall(RoleId roleId);
-    error ErrorIAccessRoleTypeInvalid(RoleId roleId, Type rtype);
-
-    error ErrorIAccessTargetAddressZero();
-    error ErrorIAccessTargetTypeInvalid(address target, Type ttype);
-    error ErrorIAccessTargetLocked(address target);
-    error ErrorIAccessTargetNotRegistered(address target);
-    error ErrorIAccessTargetAuthorityInvalid(address target, address targetAuthority);
-    error ErrorIAccessTargetInstanceMismatch(address target, NftId targetParentNftId, NftId instanceNftId);
-}

package/contracts/product/IProductService.sol

@@ -1,33 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.20;
-
-import {IRisk} from "../instance/module/IRisk.sol";
-import {IService} from "../shared/IService.sol";
-
-import {NftId} from "../type/NftId.sol";
-import {ReferralId} from "../type/Referral.sol";
-import {RiskId} from "../type/RiskId.sol";
-import {StateId} from "../type/StateId.sol";
-import {Timestamp} from "../type/Timestamp.sol";
-import {UFixed} from "../type/UFixed.sol";
-import {Fee} from "../type/Fee.sol";
-
-interface IProductService is IService {
-
-    function createRisk(
-        RiskId riskId,
-        bytes memory data
-    ) external;
-
-
-    function updateRisk(
-        RiskId riskId,
-        bytes memory data
-    ) external;
-
-
-    function updateRiskState(
-        RiskId riskId,
-        StateId newState
-    ) external;
-}