@etherisc/gif-next 0.0.2-edf4742-498 → 0.0.2-ee7cb16-393

package/contracts/instance/InstanceAccessManager.sol

@@ -3,9 +3,9 @@ pragma solidity ^0.8.20;
 
 import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
 import {ShortString, ShortStrings} from "@openzeppelin/contracts/utils/ShortStrings.sol";
+import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";
+import {AccessManagerUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagerUpgradeable.sol";
 
-import {AccessManagedSimple} from "./AccessManagedSimple.sol";
-import {AccessManagerSimple} from "./AccessManagerSimple.sol";
 import {IBundle} from "./module/IBundle.sol";
 import {IPolicy} from "./module/IPolicy.sol";
 import {IRisk} from "./module/IRisk.sol";
@@ -21,7 +21,7 @@ import {StateId, ACTIVE} from "../types/StateId.sol";
 import {Timestamp, TimestampLib} from "../types/Timestamp.sol";
 
 contract InstanceAccessManager is
-    AccessManagedSimple
+    AccessManagedUpgradeable
 {
     string public constant ADMIN_ROLE_NAME = "AdminRole";
     string public constant PUBLIC_ROLE_NAME = "PublicRole";
@@ -76,12 +76,12 @@ contract InstanceAccessManager is
     mapping(ShortString name => address target) internal _targetForName;
     address [] internal _targets;
 
-    AccessManagerSimple internal _accessManager;
+    AccessManagerUpgradeable internal _accessManager;
 
     constructor(address accessManager)
     {
-        _accessManager = AccessManagerSimple(accessManager);
-        initializeAccessManagedSimple(accessManager);
+        _accessManager = AccessManagerUpgradeable(accessManager);
+        __AccessManaged_init(accessManager);
 
         _createRole(RoleIdLib.toRoleId(_accessManager.ADMIN_ROLE()), ADMIN_ROLE_NAME, false, false);
         _createRole(RoleIdLib.toRoleId(_accessManager.PUBLIC_ROLE()), PUBLIC_ROLE_NAME, false, false);

package/contracts/instance/InstanceBase.sol

@@ -0,0 +1,41 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.20;
+
+import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
+import {ShortString, ShortStrings} from "@openzeppelin/contracts/utils/ShortStrings.sol";
+
+import {IAccess} from "./module/IAccess.sol";
+import {IBundle} from "./module/IBundle.sol";
+import {IPolicy} from "./module/IPolicy.sol";
+import {IRisk} from "./module/IRisk.sol";
+import {ISetup} from "./module/ISetup.sol";
+import {Key32, KeyId, Key32Lib} from "../types/Key32.sol";
+import {KeyValueStore} from "./base/KeyValueStore.sol";
+import {IInstance} from "./IInstance.sol";
+import {InstanceReader} from "./InstanceReader.sol";
+import {BundleManager} from "./BundleManager.sol";
+import {NftId} from "../types/NftId.sol";
+import {NumberId} from "../types/NumberId.sol";
+import {ObjectType, BUNDLE, DISTRIBUTION, INSTANCE, POLICY, POOL, ROLE, PRODUCT, TARGET} from "../types/ObjectType.sol";
+import {RiskId, RiskIdLib} from "../types/RiskId.sol";
+import {RoleId, RoleIdLib} from "../types/RoleId.sol";
+import {StateId, ACTIVE} from "../types/StateId.sol";
+import {ERC165} from "../shared/ERC165.sol";
+import {Registerable} from "../shared/Registerable.sol";
+import {ComponentOwnerService} from "./service/ComponentOwnerService.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";
+import {VersionPart} from "../types/Version.sol";
+import {IInstanceBase} from "./IInstanceBase.sol";
+
+contract InstanceBase is
+    IInstanceBase,
+    KeyValueStore,
+    ERC165,
+    Registerable
+{
+
+
+}

package/contracts/instance/InstanceReader.sol

@@ -13,6 +13,7 @@ import {Registerable} from "../shared/Registerable.sol";
 import {RiskId} from "../types/RiskId.sol";
 import {UFixed, MathLib, UFixedLib} from "../types/UFixed.sol";
 import {Version} from "../types/Version.sol";
+import {StateId} from "../types/StateId.sol";
 
 import {IRegistry} from "../registry/IRegistry.sol";
 import {IBundle} from "../instance/module/IBundle.sol";
@@ -81,6 +82,14 @@ contract InstanceReader {
         }
     }
 
+    function getPolicyState(NftId policyNftId)
+        public
+        view
+        returns (StateId state)
+    {
+        return _instance.getState(toPolicyKey(policyNftId));
+    }
+
     function getRiskInfo(RiskId riskId)
         public 
         view 

package/contracts/instance/InstanceService.sol

@@ -2,12 +2,14 @@
 pragma solidity ^0.8.20;
 
 import {Clones} from "@openzeppelin/contracts/proxy/Clones.sol";
+import {AccessManagerUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagerUpgradeable.sol";
 
-import {AccessManagerSimple} from "./AccessManagerSimple.sol";
+import {AccessManagerUpgradeableInitializeable} from "./AccessManagerUpgradeableInitializeable.sol";
 import {InstanceAccessManager} from "./InstanceAccessManager.sol";
 import {Instance} from "./Instance.sol";
 import {IInstanceService} from "./IInstanceService.sol";
 import {InstanceReader} from "./InstanceReader.sol";
+import {BundleManager} from "./BundleManager.sol";
 import {IRegistry} from "../registry/IRegistry.sol";
 import {Registry} from "../registry/Registry.sol";
 import {RegistryService} from "../registry/RegistryService.sol";
@@ -17,7 +19,7 @@ import {ContractDeployerLib} from "../shared/ContractDeployerLib.sol";
 import {NftId, NftIdLib, zeroNftId} from "../../contracts/types/NftId.sol";
 import {RoleId} from "../types/RoleId.sol";
 import {VersionLib} from "../types/Version.sol";
-import {ADMIN_ROLE, INSTANCE_SERVICE_ROLE, DISTRIBUTION_SERVICE_ROLE, POOL_SERVICE_ROLE} from "../types/RoleId.sol";
+import {ADMIN_ROLE, INSTANCE_SERVICE_ROLE, DISTRIBUTION_SERVICE_ROLE, POOL_SERVICE_ROLE, PRODUCT_SERVICE_ROLE} from "../types/RoleId.sol";
 
 contract InstanceService is Service, IInstanceService {
 
@@ -25,6 +27,7 @@ contract InstanceService is Service, IInstanceService {
     address internal _accessManagerMaster;
     address internal _instanceMaster;
     address internal _instanceReaderMaster;
+    address internal _instanceBundleManagerMaster;
 
     // TODO update to real hash when instance is stable
     bytes32 public constant INSTANCE_CREATION_CODE_HASH = bytes32(0);
@@ -33,10 +36,11 @@ contract InstanceService is Service, IInstanceService {
     function createInstanceClone()
         external 
         returns (
-            AccessManagerSimple clonedAccessManager, 
+            AccessManagerUpgradeableInitializeable clonedAccessManager, 
             Instance clonedInstance,
-            NftId instanceNftId,
-            InstanceReader clonedInstanceReader
+            NftId clonedInstanceNftId,
+            InstanceReader clonedInstanceReader,
+            BundleManager clonedBundleManager
         )
     {
         address instanceOwner = msg.sender;
@@ -48,30 +52,36 @@ contract InstanceService is Service, IInstanceService {
         // initially set the authority of the access managar to this (being the instance service). 
         // This will allow the instance service to bootstrap the authorizations of the instance
         // and then transfer the ownership of the access manager to the instance owner once everything is setup
-        clonedAccessManager = AccessManagerSimple(Clones.clone(_accessManagerMaster));
-        clonedAccessManager.initialize(address(this));
+        clonedAccessManager = AccessManagerUpgradeableInitializeable(Clones.clone(_accessManagerMaster));
+        clonedAccessManager.__AccessManagerUpgradeableInitializeable_init(address(this));
 
         clonedInstance = Instance(Clones.clone(_instanceMaster));
         clonedInstance.initialize(address(clonedAccessManager), _registryAddress, registryNftId, msg.sender);
         ( IRegistry.ObjectInfo memory info, ) = registryService.registerInstance(clonedInstance);
-        instanceNftId = info.nftId;
+        clonedInstanceNftId = info.nftId;
         
         clonedInstanceReader = InstanceReader(Clones.clone(address(_instanceReaderMaster)));
-        clonedInstanceReader.initialize(_registryAddress, instanceNftId);
+        clonedInstanceReader.initialize(_registryAddress, clonedInstanceNftId);
+        clonedInstance.setInstanceReader(clonedInstanceReader);
 
-        _grantInitialAuthorizations(clonedAccessManager, clonedInstance);
+        clonedBundleManager = BundleManager(Clones.clone(_instanceBundleManagerMaster));
+        clonedBundleManager.initialize(address(clonedAccessManager), _registryAddress, clonedInstanceNftId);
+        clonedInstance.setBundleManager(clonedBundleManager);
+
+        // TODO amend setters with instance specific , policy manager ...
+
+        _grantInitialAuthorizations(clonedAccessManager, clonedInstance, clonedBundleManager);
 
-        clonedInstance.setInstanceReader(clonedInstanceReader);
-        
         // to complete setup switch instance ownership to the instance owner
         // TODO: use a role less powerful than admin, maybe INSTANCE_ADMIN (does not exist yet)
         clonedAccessManager.grantRole(ADMIN_ROLE().toInt(), instanceOwner, 0);
         clonedAccessManager.revokeRole(ADMIN_ROLE().toInt(), address(this));
 
-        emit LogInstanceCloned(address(clonedAccessManager), address(clonedInstance), address(clonedInstanceReader), instanceNftId);
+        emit LogInstanceCloned(address(clonedAccessManager), address(clonedInstance), address(clonedInstanceReader), clonedInstanceNftId);
     }
 
-    function _grantInitialAuthorizations(AccessManagerSimple clonedAccessManager, Instance clonedInstance) internal {
+    function _grantInitialAuthorizations(AccessManagerUpgradeable clonedAccessManager, Instance clonedInstance, BundleManager clonedBundleManager) internal {
+        // configure authorization for distribution service on instance
         address distributionServiceAddress = _registry.getServiceAddress("DistributionService", VersionLib.toVersion(3, 0, 0).toMajorPart());
         clonedAccessManager.grantRole(DISTRIBUTION_SERVICE_ROLE().toInt(), distributionServiceAddress, 0);
         bytes4[] memory instanceDistributionServiceSelectors = new bytes4[](2);
@@ -82,6 +92,7 @@ contract InstanceService is Service, IInstanceService {
             instanceDistributionServiceSelectors, 
             DISTRIBUTION_SERVICE_ROLE().toInt());
 
+        // configure authorization for pool service on instance
         address poolServiceAddress = _registry.getServiceAddress("PoolService", VersionLib.toVersion(3, 0, 0).toMajorPart());
         clonedAccessManager.grantRole(POOL_SERVICE_ROLE().toInt(), address(poolServiceAddress), 0);
         bytes4[] memory instancePoolServiceSelectors = new bytes4[](4);
@@ -93,28 +104,75 @@ contract InstanceService is Service, IInstanceService {
             address(clonedInstance),
             instancePoolServiceSelectors, 
             POOL_SERVICE_ROLE().toInt());
+        
+        // configure authorization for pool service on bundle manager
+        bytes4[] memory bundleManagerPoolServiceSelectors = new bytes4[](5);
+        bundleManagerPoolServiceSelectors[0] = clonedBundleManager.linkPolicy.selector;
+        bundleManagerPoolServiceSelectors[1] = clonedBundleManager.unlinkPolicy.selector;
+        bundleManagerPoolServiceSelectors[2] = clonedBundleManager.add.selector;
+        bundleManagerPoolServiceSelectors[3] = clonedBundleManager.lock.selector;
+        bundleManagerPoolServiceSelectors[4] = clonedBundleManager.unlock.selector;
+        clonedAccessManager.setTargetFunctionRole(
+            address(clonedBundleManager),
+            bundleManagerPoolServiceSelectors, 
+            POOL_SERVICE_ROLE().toInt());
 
+        // configure authorization for product service on instance
+        address productServiceAddress = _registry.getServiceAddress("ProductService", VersionLib.toVersion(3, 0, 0).toMajorPart());
+        clonedAccessManager.grantRole(PRODUCT_SERVICE_ROLE().toInt(), address(productServiceAddress), 0);
+        bytes4[] memory instanceProductServiceSelectors = new bytes4[](9);
+        instanceProductServiceSelectors[0] = clonedInstance.createProductSetup.selector;
+        instanceProductServiceSelectors[1] = clonedInstance.updateProductSetup.selector;
+        instanceProductServiceSelectors[2] = clonedInstance.createRisk.selector;
+        instanceProductServiceSelectors[3] = clonedInstance.updateRisk.selector;
+        instanceProductServiceSelectors[4] = clonedInstance.updateRiskState.selector;
+        instanceProductServiceSelectors[5] = clonedInstance.createPolicy.selector;
+        instanceProductServiceSelectors[6] = clonedInstance.updatePolicy.selector;
+        instanceProductServiceSelectors[7] = clonedInstance.updatePolicyState.selector;
+        clonedAccessManager.setTargetFunctionRole(
+            address(clonedInstance),
+            instanceProductServiceSelectors, 
+            PRODUCT_SERVICE_ROLE().toInt());
     }
 
-    function setAccessManagerMaster(address accessManagerMaster) external {
-        require(
-            _accessManagerMaster == address(0),
-            "ERROR:CRD-001:ACCESS_MANAGER_MASTER_ALREADY_SET");
-        _accessManagerMaster = accessManagerMaster;
+    function setMasterInstance(address accessManagerAddress, address instanceAddress, address instanceReaderAddress, address bundleManagerAddress) external onlyOwner {
+        require( _accessManagerMaster == address(0), "ERROR:CRD-001:ACCESS_MANAGER_MASTER_ALREADY_SET");
+        require( _instanceMaster == address(0), "ERROR:CRD-002:INSTANCE_MASTER_ALREADY_SET");
+        require( _instanceBundleManagerMaster == address(0), "ERROR:CRD-004:BUNDLE_MANAGER_MASTER_ALREADY_SET");
+
+        require (accessManagerAddress != address(0), "ERROR:CRD-005:ACCESS_MANAGER_ZERO");
+        require (instanceAddress != address(0), "ERROR:CRD-006:INSTANCE_ZERO");
+        require (instanceReaderAddress != address(0), "ERROR:CRD-007:INSTANCE_READER_ZERO");
+        require (bundleManagerAddress != address(0), "ERROR:CRD-008:BUNDLE_MANAGER_ZERO");
+
+        Instance instance = Instance(instanceAddress);
+        InstanceReader instanceReader = InstanceReader(instanceReaderAddress);
+        BundleManager bundleManager = BundleManager(bundleManagerAddress);
+
+        require(instance.authority() == accessManagerAddress, "ERROR:CRD-009:INSTANCE_AUTHORITY_MISMATCH");
+        require(instanceReader.getInstanceNftId() == instance.getNftId(), "ERROR:CRD-010:INSTANCE_READER_INSTANCE_MISMATCH");
+        require(bundleManager.getInstanceNftId() == instance.getNftId(), "ERROR:CRD-011:BUNDLE_MANAGER_INSTANCE_MISMATCH");
+
+        _accessManagerMaster = accessManagerAddress;
+        _instanceMaster = instanceAddress;
+        _instanceReaderMaster = instanceReaderAddress;
+        _instanceBundleManagerMaster = bundleManagerAddress;
     }
 
-    function setInstanceMaster(address instanceMaster) external {
-        require(
-            _instanceMaster == address(0),
-            "ERROR:CRD-002:INSTANCE_MASTER_ALREADY_SET");
-        _instanceMaster = instanceMaster;
+    function setMasterInstanceReader(address instanceReaderAddress) external onlyOwner {
+        require(_instanceReaderMaster != address(0), "ERROR:CRD-003:INSTANCE_READER_MASTER_NOT_SET");
+        require (instanceReaderAddress != address(0), "ERROR:CRD-012:INSTANCE_READER_ZERO");
+        require(instanceReaderAddress != _instanceReaderMaster, "ERROR:CRD-014:INSTANCE_READER_MASTER_SAME_AS_NEW");
+
+        InstanceReader instanceReader = InstanceReader(instanceReaderAddress);
+        require(instanceReader.getInstanceNftId() == Instance(_instanceMaster).getNftId(), "ERROR:CRD-015:INSTANCE_READER_INSTANCE_MISMATCH");
+
+        _instanceReaderMaster = instanceReaderAddress;
     }
 
-    function setInstanceReaderMaster(address instanceReaderMaster) external {
-        require(
-            _instanceReaderMaster == address(0),
-            "ERROR:CRD-003:INSTANCE_READER_MASTER_ALREADY_SET");
-        _instanceReaderMaster = instanceReaderMaster;
+    function upgradeInstanceReader(NftId instanceNftId) external {
+        // TODO: ensure this is done by instance owner
+        // TODO: upgrade instance reader of this instance to latest (set above here)
     }
 
     function getInstanceReaderMaster() external view returns (address) {
@@ -129,6 +187,10 @@ contract InstanceService is Service, IInstanceService {
         return _accessManagerMaster;
     }
 
+    function getBundleManagerMaster() external view returns (address) {
+        return _instanceBundleManagerMaster;
+    }
+
     // From IService
     function getName() public pure override(IService, Service) returns(string memory) {
         return NAME;
@@ -160,8 +222,9 @@ contract InstanceService is Service, IInstanceService {
 
         address initialOwner = address(0);
         (_registryAddress, initialOwner) = abi.decode(data, (address, address));
-
-        _initializeService(_registryAddress, initialOwner);
+        // TODO while InstanceService is not deployed in InstanceServiceManager constructor
+        //      owner is InstanceServiceManager deployer
+        _initializeService(_registryAddress, owner);
         
         _registerInterface(type(IService).interfaceId);
         _registerInterface(type(IInstanceService).interfaceId);
@@ -171,7 +234,7 @@ contract InstanceService is Service, IInstanceService {
         IRegistry.ObjectInfo memory instanceObjectInfo = getRegistry().getObjectInfo(instanceNftId);
         address instanceAddress = instanceObjectInfo.objectAddress;
         Instance instance = Instance(instanceAddress);
-        AccessManagerSimple accessManager = AccessManagerSimple(instance.authority());
+        AccessManagerUpgradeable accessManager = AccessManagerUpgradeable(instance.authority());
         (bool isMember, uint32 executionDelay) = accessManager.hasRole(role.toInt(), account);
         if (executionDelay > 0) {
             return false;

package/contracts/instance/InstanceServiceManager.sol

@@ -31,14 +31,15 @@ contract InstanceServiceManager is ProxyManager {
         Registry registry = Registry(registryAddress);
         address registryServiceAddress = registry.getServiceAddress("RegistryService", VersionLib.toVersion(3, 0, 0).toMajorPart());
         RegistryService registryService = RegistryService(registryServiceAddress);
-
-        registryService.registerService(_instanceService);
+        // TODO this must have a role or own nft to register service
+        //registryService.registerService(_instanceService);
         // RegistryService registryService = _instanceService.getRegistryService();
 
+        // TODO no nft to link yet
         // link ownership of instance service manager ot nft owner of instance service
-        _linkToNftOwnable(
-            address(registryAddress),
-            address(_instanceService));
+        //_linkToNftOwnable(
+        //    address(registryAddress),
+        //    address(_instanceService));
 
         // implies that after this constructor call only upgrade functionality is available
         _isDeployed = true;

package/contracts/instance/ObjectManager.sol

@@ -0,0 +1,101 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.20;
+
+import {Cloneable} from "./Cloneable.sol";
+
+import {IInstance} from "./IInstance.sol";
+import {INSTANCE} from "../types/ObjectType.sol";
+import {InstanceReader} from "./InstanceReader.sol";
+import {IRegistry} from "../registry/IRegistry.sol";
+import {LibNftIdSet} from "../types/NftIdSet.sol";
+import {NftId} from "../types/NftId.sol";
+
+contract ObjectManager is
+    Cloneable
+{
+
+    event LogObjectManagerInitialized(NftId instanceNftId, address instanceReader);
+
+    error ErrorObjectManagerNftIdInvalid(NftId instanceNftId);
+    error ErrorObjectManagerAlreadyAdded(NftId componentNftId, NftId objectNftId);
+
+    mapping(NftId compnentNftId => LibNftIdSet.Set objects) internal _activeObjects;
+    mapping(NftId compnentNftId => LibNftIdSet.Set objects) internal _allObjects;
+    NftId internal _instanceNftId;
+    InstanceReader internal _instanceReader;
+
+    constructor() Cloneable() {
+        _instanceReader = InstanceReader(address(0));
+    }
+
+    /// @dev call to initialize MUST be made in the same transaction as cloning of the contract
+    function initialize(
+        address authority,
+        address registry,
+        NftId instanceNftId
+    )
+        external 
+    {
+        initialize(authority, registry);
+
+        // check/handle instance nft id/instance reader
+        IRegistry.ObjectInfo memory instanceInfo = _registry.getObjectInfo(instanceNftId);
+        if (instanceInfo.objectType != INSTANCE()) {
+            revert ErrorObjectManagerNftIdInvalid(instanceNftId);
+        }
+
+        IInstance instance = IInstance(instanceInfo.objectAddress);
+        _instanceReader = instance.getInstanceReader();
+        _instanceNftId = instanceNftId;
+        
+        emit LogObjectManagerInitialized(instanceNftId, address(_instanceReader));
+    }
+
+    function getInstanceReader() external view returns (InstanceReader) {
+        return _instanceReader;
+    }
+
+    function getInstanceNftId() external view returns (NftId) {
+        return _instanceNftId;
+    }
+
+    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/base/ComponentServiceBase.sol

@@ -9,6 +9,7 @@ import {NftId, NftIdLib} from "../../types/NftId.sol";
 import {RoleId, PRODUCT_OWNER_ROLE, POOL_OWNER_ROLE, DISTRIBUTION_OWNER_ROLE, ORACLE_OWNER_ROLE} from "../../types/RoleId.sol";
 
 import {BaseComponent} from "../../components/BaseComponent.sol";
+import {Product} from "../../components/Product.sol";
 import {INftOwnable} from "../../shared/INftOwnable.sol";
 import {Service} from "../../shared/Service.sol";
 import {InstanceService} from "../InstanceService.sol";
@@ -35,6 +36,13 @@ abstract contract ComponentServiceBase is Service {
         _;
     }
 
+    /// @dev modifier to check if caller is a registered service
+    modifier onlyService() {
+        address caller = msg.sender;
+        require(getRegistry().isRegisteredService(caller), "ERROR_NOT_SERVICE");
+        _;
+    }
+
     function _initializeService(
         address registry, 
         address initialOwner
@@ -80,8 +88,10 @@ abstract contract ComponentServiceBase is Service {
         }
 
         componentNftId = objInfo.nftId;
-        IInstance instance = _getInstance(objInfo);
-        _finalizeComponentRegistration(componentNftId, initialObjData, instance);
+        {
+            IInstance instance = _getInstance(objInfo);
+            _finalizeComponentRegistration(componentNftId, initialObjData, instance);
+        }
     }
 
     function _finalizeComponentRegistration(NftId componentNftId, bytes memory initialObjData, IInstance instance) internal virtual;

package/contracts/instance/module/ISetup.sol

@@ -5,7 +5,6 @@ import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IER
 
 import {Fee} from "../../types/Fee.sol";
 import {NftId} from "../../types/NftId.sol";
-import {LibNftIdSet} from "../../types/NftIdSet.sol";
 import {UFixed} from "../../types/UFixed.sol";
 import {TokenHandler} from "../../shared/TokenHandler.sol";
 
@@ -21,6 +20,8 @@ interface ISetup {
         Fee poolFee; // pool fee on net premium
         Fee stakingFee; // pool fee on staked capital from investor
         Fee performanceFee; // pool fee on profits from capital investors
+        bool isIntercepting; // intercepts nft transfers (for products)
+        address wallet;
     }
 
     struct DistributionSetupInfo {
@@ -39,6 +40,7 @@ interface ISetup {
         Fee stakingFee; // pool fee on staked capital from investor
         Fee performanceFee; // pool fee on profits from capital investors
         bool isIntercepting; // intercepts nft transfers (for bundles)
+        bool isConfirmingApplication; // confirms applications before they are underwritten
         address wallet;
     }
 }

package/contracts/instance/service/DistributionService.sol

@@ -49,8 +49,9 @@ contract DistributionService is
     {
         address initialOwner = address(0);
         (_registryAddress, initialOwner) = abi.decode(data, (address, address));
-
-        _initializeService(_registryAddress, initialOwner);
+        // TODO while DistributionService is not deployed in DistributionServiceManager constructor
+        //      owner is DistributionServiceManager deployer
+        _initializeService(_registryAddress, owner);
 
         _registerInterface(type(IService).interfaceId);
         _registerInterface(type(IDistributionService).interfaceId);

package/contracts/instance/service/DistributionServiceManager.sol

@@ -29,13 +29,14 @@ contract DistributionServiceManager is ProxyManager {
         Registry registry = Registry(registryAddress);
         address registryServiceAddress = registry.getServiceAddress("RegistryService", VersionLib.toVersion(3, 0, 0).toMajorPart());
         RegistryService registryService = RegistryService(registryServiceAddress);
+        // TODO this must have a role or own nft to register service
+        //registryService.registerService(_distributionService);
         
-        registryService.registerService(_distributionService);
-        
+        // TODO no nft to link yet
         // link ownership of instance service manager ot nft owner of instance service
-        _linkToNftOwnable(
-            address(registryAddress),
-            address(_distributionService));
+        //_linkToNftOwnable(
+        //    address(registryAddress),
+        //    address(_distributionService));
 
         // implies that after this constructor call only upgrade functionality is available
         _isDeployed = true;

package/contracts/instance/service/IPoolService.sol

@@ -3,9 +3,14 @@ pragma solidity ^0.8.19;
 
 import {NftId} from "../../types/NftId.sol";
 import {Fee} from "../../types/Fee.sol";
+import {StateId} from "../../types/StateId.sol";
 import {IService} from "../../shared/IService.sol";
+import {IBundle} from "../module/IBundle.sol";
+import {IInstance} from "../../instance/IInstance.sol";
 
 interface IPoolService is IService {
+    error ErrorIPoolServiceInsufficientAllowance(address bundleOwner, address tokenHandlerAddress, uint256 amount);
+
     function setFees(
         Fee memory poolFee,
         Fee memory stakingFee,
@@ -25,13 +30,22 @@ interface IPoolService is IService {
         Fee memory fee
     ) external;
 
+    function updateBundle(NftId instanceNftId, NftId bundleNftId, IBundle.BundleInfo memory bundleInfo, StateId state) external;
+
+    function underwritePolicy(IInstance instanceNftId,
+        NftId policyNftId, 
+        NftId bundleNftId, 
+        uint256 collateralAmount,
+        uint256 netPremium
+    ) external;
+
     // function fundBundle(NftId bundleNftId, uint256 amount) external returns(uint256 netAmount);
 
     // function defundBundle(NftId bundleNftId, uint256 amount) external returns(uint256 netAmount);
 
-    // function lockBundle(NftId bundleNftId) external;
+    function lockBundle(NftId bundleNftId) external;
 
-    // function unlockBundle(NftId bundleNftId) external;
+    function unlockBundle(NftId bundleNftId) external;
 
     // function closeBundle(NftId bundleNftId) external;
 }

package/contracts/instance/service/IProductService.sol

@@ -13,6 +13,9 @@ import {UFixed} from "../../types/UFixed.sol";
 import {Fee} from "../../types/Fee.sol";
 
 interface IProductService is IService {
+
+    error ErrorIProductServiceInsufficientAllowance(address customer, address tokenHandlerAddress, uint256 amount);
+    
     function setFees(
         Fee memory productFee,
         Fee memory processingFee
@@ -24,15 +27,15 @@ interface IProductService is IService {
     ) external;
 
 
-    function setRiskInfo(
+    function updateRisk(
         RiskId riskId,
-        IRisk.RiskInfo memory data
+        bytes memory data
     ) external;
 
 
     function updateRiskState(
         RiskId riskId,
-        StateId state
+        StateId newState
     ) external;