@etherisc/gif-next 0.0.2-f034782-101 → 0.0.2-f080b71-868

package/contracts/instance/service/PolicyService.sol

@@ -16,10 +16,11 @@ import {TokenHandler} from "../../shared/TokenHandler.sol";
 
 import {Timestamp, TimestampLib, zeroTimestamp} from "../../types/Timestamp.sol";
 import {UFixed, UFixedLib} from "../../types/UFixed.sol";
-import {ObjectType, APPLICATION, DISTRIBUTION, PRODUCT, POOL, POLICY, BUNDLE} from "../../types/ObjectType.sol";
+import {ObjectType, APPLICATION, DISTRIBUTION, PRODUCT, POOL, POLICY, BUNDLE, PRICE} from "../../types/ObjectType.sol";
 import {APPLIED, UNDERWRITTEN, ACTIVE, KEEP_STATE, CLOSED} from "../../types/StateId.sol";
 import {NftId, NftIdLib} from "../../types/NftId.sol";
 import {StateId} from "../../types/StateId.sol";
+import {VersionPart} from "../../types/Version.sol";
 
 import {ComponentService} from "../base/ComponentService.sol";
 import {IApplicationService} from "./IApplicationService.sol";
@@ -28,6 +29,7 @@ import {IDistributionService} from "./IDistributionService.sol";
 import {InstanceReader} from "../InstanceReader.sol";
 import {IPolicyService} from "./IPolicyService.sol";
 import {IPoolService} from "./IPoolService.sol";
+import {IPricingService} from "./IPricingService.sol";
 import {IService} from "../../shared/IService.sol";
 import {Service} from "../../shared/Service.sol";
 
@@ -43,6 +45,7 @@ contract PolicyService is
     IBundleService internal _bundleService;
     IApplicationService internal _applicationService;
     IDistributionService internal _distributionService;
+    IPricingService internal _pricingService;
 
     event LogProductServiceSender(address sender);
 
@@ -58,58 +61,55 @@ contract PolicyService is
         address initialOwner;
         (registryAddress, initialOwner) = abi.decode(data, (address, address));
 
-        initializeService(registryAddress, owner);
+        initializeService(registryAddress, address(0), owner);
 
-        _poolService = IPoolService(getRegistry().getServiceAddress(POOL(), getMajorVersion()));
-        _bundleService = IBundleService(getRegistry().getServiceAddress(BUNDLE(), getMajorVersion()));
-        _applicationService = IApplicationService(getRegistry().getServiceAddress(APPLICATION(), getMajorVersion()));
-        _distributionService = IDistributionService(getRegistry().getServiceAddress(DISTRIBUTION(), getMajorVersion()));
+        VersionPart majorVersion = getVersion().toMajorPart();
+        _poolService = IPoolService(getRegistry().getServiceAddress(POOL(), majorVersion));
+        _bundleService = IBundleService(getRegistry().getServiceAddress(BUNDLE(), majorVersion));
+        _applicationService = IApplicationService(getRegistry().getServiceAddress(APPLICATION(), majorVersion));
+        _distributionService = IDistributionService(getRegistry().getServiceAddress(DISTRIBUTION(), majorVersion));
+        _pricingService = IPricingService(getRegistry().getServiceAddress(PRICE(), majorVersion));
 
         registerInterface(type(IPolicyService).interfaceId);
     }
 
 
-    function getDomain() public pure override(IService, Service) returns(ObjectType) {
+    function getDomain() public pure override returns(ObjectType) {
         return POLICY();
     }
 
 
     function _getAndVerifyInstanceAndProduct() internal view returns (Product product) {
         IRegistry.ObjectInfo memory productInfo;
-        (productInfo,) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
+        (, productInfo,) = _getAndVerifyCallingComponentAndInstance(PRODUCT());
         product = Product(productInfo.objectAddress);
     }
 
-    function _getAndVerifyUnderwritingSetup(
-        IInstance instance,
-        InstanceReader instanceReader,
-        IPolicy.PolicyInfo memory policyInfo,
-        ISetup.ProductSetupInfo memory productSetupInfo
-    )
-        internal
-        view
-        returns (
-            NftId poolNftId,
-            NftId bundleNftId,
-            IBundle.BundleInfo memory bundleInfo,
-            uint256 collateralAmount
-        )
-    {
-        // check match between policy and bundle (via pool)
-        poolNftId = productSetupInfo.poolNftId;
-        bundleNftId = policyInfo.bundleNftId;
-        bundleInfo = instanceReader.getBundleInfo(bundleNftId);
-        require(bundleInfo.poolNftId == poolNftId, "POLICY_BUNDLE_MISMATCH");
-
-        // calculate required collateral
-        IComponents.ComponentInfo memory componentInfo = instanceReader.getComponentInfo(poolNftId);
-        IComponents.PoolInfo memory poolInfo = abi.decode(
-            componentInfo.data, (IComponents.PoolInfo));
-
-        // obtain remaining return values
-        // TODO required collateral amount should be calculated by pool service, not policy service
-        collateralAmount = calculateRequiredCollateral(poolInfo.collateralizationLevel, policyInfo.sumInsuredAmount);
-    }
+    // function _getAndVerifyUnderwritingSetup(
+    //     IInstance instance,
+    //     InstanceReader instanceReader,
+    //     IPolicy.PolicyInfo memory policyInfo,
+    //     ISetup.ProductSetupInfo memory productSetupInfo
+    // )
+    //     internal
+    //     view
+    //     returns (
+    //         NftId poolNftId,
+    //         IComponents.PoolInfo memory poolInfo,
+    //         NftId bundleNftId,
+    //         IBundle.BundleInfo memory bundleInfo
+    //     )
+    // {
+    //     // check match between policy and bundle (via pool)
+    //     poolNftId = productSetupInfo.poolNftId;
+    //     bundleNftId = policyInfo.bundleNftId;
+    //     bundleInfo = instanceReader.getBundleInfo(bundleNftId);
+    //     equire(bundleInfo.poolNftId == poolNftId, "BUNDLE_POOL_MISMATCH");
+
+    //     // calculate required collateral
+    //     IComponents.ComponentInfo memory componentInfo = instanceReader.getComponentInfo(poolNftId);
+    //     poolInfo = abi.decode(componentInfo.data, (IComponents.PoolInfo));
+    // }
 
 
     function decline(
@@ -118,7 +118,7 @@ contract PolicyService is
         external
         override
     {
-        require(false, "ERROR:PRS-235:NOT_YET_IMPLEMENTED");
+        revert();
     }
 
 
@@ -132,42 +132,33 @@ contract PolicyService is
         virtual override
     {
         // check caller is registered product
-        IInstance instance;
-        InstanceReader instanceReader;
-        NftId productNftId;
-        {
-            IRegistry.ObjectInfo memory productInfo;
-            (productInfo, instance) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
-            instanceReader = instance.getInstanceReader();
-            productNftId = productInfo.nftId;
-        }
+        (NftId productNftId,, IInstance instance) = _getAndVerifyCallingComponentAndInstance(PRODUCT());
+        InstanceReader instanceReader = instance.getInstanceReader();
 
         // check policy matches with calling product
-        IPolicy.PolicyInfo memory policyInfo = instanceReader.getPolicyInfo(applicationNftId);
-        require(policyInfo.productNftId == productNftId, "POLICY_PRODUCT_MISMATCH");
+        IPolicy.PolicyInfo memory applicationInfo = instanceReader.getPolicyInfo(applicationNftId);
+        if(applicationInfo.productNftId != productNftId) {
+            revert ErrorIPolicyServicePolicyProductMismatch(
+                applicationNftId, 
+                applicationInfo.productNftId, 
+                productNftId);
+        }
 
         // check policy is in state applied
-        require(instanceReader.getPolicyState(applicationNftId) == APPLIED(), "ERROR:PRS-021:STATE_NOT_APPLIED");
-        
-        (
-            NftId poolNftId,
-            NftId bundleNftId,
-            IBundle.BundleInfo memory bundleInfo,
-            uint256 collateralAmount
-        ) = _getAndVerifyUnderwritingSetup(
-            instance,
-            instanceReader,
-            policyInfo,
-            instanceReader.getProductSetupInfo(productNftId)
-        );
+        if(instanceReader.getPolicyState(applicationNftId) != APPLIED()) {
+            revert ErrorIPolicyServicePolicyStateInvalid(
+                applicationNftId, 
+                APPLIED(), 
+                instanceReader.getPolicyState(applicationNftId));
+        }
         
         StateId newPolicyState = UNDERWRITTEN();
 
         // optional activation of policy
         if(activateAt > zeroTimestamp()) {
             newPolicyState = ACTIVE();
-            policyInfo.activatedAt = activateAt;
-            policyInfo.expiredAt = activateAt.addSeconds(policyInfo.lifetime);
+            applicationInfo.activatedAt = activateAt;
+            applicationInfo.expiredAt = activateAt.addSeconds(applicationInfo.lifetime);
         }
 
         // lock bundle collateral
@@ -178,48 +169,25 @@ contract PolicyService is
             netPremiumAmount = _processPremiumByTreasury(
                 instance, 
                 applicationNftId, 
-                policyInfo.premiumAmount);
+                applicationInfo.premiumAmount);
 
-            policyInfo.premiumPaidAmount += policyInfo.premiumAmount;
+            applicationInfo.premiumPaidAmount += applicationInfo.premiumAmount;
         }
 
-        // lock collateral and update bundle book keeping
-        // TODO introduct indirection via pool service?
-        // well pool would only need to be involved when a part of the collateral
-        // is provided by a "re insurance policy" of the pool
-        // but then again the policiy would likely best be attached to the bundle. really? why?
-        // retention level: fraction of sum insured that product will cover from pool funds directly
+        // store updated policy info
+        instance.getInstanceStore().updatePolicy(applicationNftId, applicationInfo, newPolicyState);
+
+        // lock collateral and update pool and bundle book keeping
+        // pool retention level: fraction of sum insured that product will cover from pool funds directly
         // eg retention level 30%, payouts up to 30% of the sum insured will be made from the product's pool directly
         // for the remaining 70% the pool owns a policy that will cover claims that exceed the 30% of the sum insured
-        // open points:
-        // - do we need a link of a bundle to this policy or is it enough to know that the pool has an active policy?
-        // - when to buy such policies and for which amount? manual trigger or link to bundle creation and/or funding?
-        bundleInfo = _bundleService.lockCollateral(
+        // might also call pool component (for isVerifyingApplications pools)
+        _poolService.lockCollateral(
             instance,
+            productNftId,
             applicationNftId, 
-            bundleNftId,
-            collateralAmount,
-            netPremiumAmount);
-
-        instance.updatePolicy(applicationNftId, policyInfo, newPolicyState);
-
-        // also verify/confirm application by pool if necessary
-        if(abi.decode(
-            instanceReader.getComponentInfo(poolNftId).data, 
-            (IComponents.PoolInfo)
-            ).isVerifyingApplications
-        )
-        {
-            IPoolComponent pool = IPoolComponent(
-                getRegistry().getObjectInfo(poolNftId).objectAddress);
-
-            pool.verifyApplication(
-                applicationNftId, 
-                policyInfo.applicationData, 
-                bundleNftId,
-                bundleInfo.filter,
-                collateralAmount);
-        }
+            applicationInfo,
+            netPremiumAmount); // for pool book keeping (fee + additional capital)
 
         // TODO: add logging
     }
@@ -233,7 +201,7 @@ contract PolicyService is
 
     function collectPremium(NftId policyNftId, Timestamp activateAt) external override {
         // check caller is registered product
-        (IRegistry.ObjectInfo memory productInfo, IInstance instance) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
+        (NftId productNftId,, IInstance instance) = _getAndVerifyCallingComponentAndInstance(PRODUCT());
         InstanceReader instanceReader = instance.getInstanceReader();
         IPolicy.PolicyInfo memory policyInfo = instanceReader.getPolicyInfo(policyNftId);
 
@@ -251,7 +219,7 @@ contract PolicyService is
         policyInfo.premiumPaidAmount += unpaidPremiumAmount;
 
         _bundleService.increaseBalance(instance, policyInfo.bundleNftId, netPremiumAmount);
-        instance.updatePolicy(policyNftId, policyInfo, KEEP_STATE());
+        instance.getInstanceStore().updatePolicy(policyNftId, policyInfo, KEEP_STATE());
 
         if(activateAt.gtz() && policyInfo.activatedAt.eqz()) {
             activate(policyNftId, activateAt);
@@ -262,7 +230,7 @@ contract PolicyService is
 
     function activate(NftId policyNftId, Timestamp activateAt) public override {
         // check caller is registered product
-        (, IInstance instance) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
+        (,, IInstance instance) = _getAndVerifyCallingComponentAndInstance(PRODUCT());
         InstanceReader instanceReader = instance.getInstanceReader();
 
         IPolicy.PolicyInfo memory policyInfo = instanceReader.getPolicyInfo(policyNftId);
@@ -274,7 +242,7 @@ contract PolicyService is
         policyInfo.activatedAt = activateAt;
         policyInfo.expiredAt = activateAt.addSeconds(policyInfo.lifetime);
 
-        instance.updatePolicy(policyNftId, policyInfo, ACTIVE());
+        instance.getInstanceStore().updatePolicy(policyNftId, policyInfo, ACTIVE());
 
         // TODO: add logging
     }
@@ -296,7 +264,7 @@ contract PolicyService is
         external 
         override
     {
-        (, IInstance instance) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
+        (,, IInstance instance) = _getAndVerifyCallingComponentAndInstance(PRODUCT());
         InstanceReader instanceReader = instance.getInstanceReader();
 
         IPolicy.PolicyInfo memory policyInfo = instanceReader.getPolicyInfo(policyNftId);
@@ -328,8 +296,12 @@ contract PolicyService is
 
         policyInfo.closedAt = TimestampLib.blockTimestamp();
 
-        _bundleService.closePolicy(instance, policyNftId, policyInfo.bundleNftId, policyInfo.sumInsuredAmount);
-        instance.updatePolicy(policyNftId, policyInfo, CLOSED());
+        _poolService.releaseCollateral(
+            instance, 
+            policyNftId, 
+            policyInfo);
+
+        instance.getInstanceStore().updatePolicy(policyNftId, policyInfo, CLOSED());
     }
 
     function _getPoolNftId(
@@ -357,20 +329,21 @@ contract PolicyService is
         // process token transfer(s)
         if(premiumAmount > 0) {
             NftId productNftId = getRegistry().getObjectInfo(policyNftId).parentNftId;
-            ISetup.ProductSetupInfo memory productSetupInfo = instance.getInstanceReader().getProductSetupInfo(productNftId);
-            IPolicy.PolicyInfo memory policyInfo = instance.getInstanceReader().getPolicyInfo(policyNftId);
+            InstanceReader reader = instance.getInstanceReader();
+            ISetup.ProductSetupInfo memory productSetupInfo = reader.getProductSetupInfo(productNftId);
+            IPolicy.PolicyInfo memory policyInfo = reader.getPolicyInfo(policyNftId);
             TokenHandler tokenHandler = productSetupInfo.tokenHandler;
             address policyOwner = getRegistry().ownerOf(policyNftId);
-            address poolWallet = instance.getInstanceReader().getComponentInfo(productSetupInfo.poolNftId).wallet;
-            IPolicy.Premium memory premium = _applicationService.calculatePremium(
+            address poolWallet = reader.getComponentInfo(productSetupInfo.poolNftId).wallet;
+            // TODO calculated for the second time -> can differ from the first calculation during applicationService.create()?
+            IPolicy.Premium memory premium = _pricingService.calculatePremium(
                 productNftId,
+                policyInfo.bundleNftId,
                 policyInfo.riskId,
+                policyInfo.referralId,
                 policyInfo.sumInsuredAmount,
                 policyInfo.lifetime,
-                policyInfo.applicationData,
-                policyInfo.bundleNftId,
-                policyInfo.referralId
-                );
+                policyInfo.applicationData);
 
             if (premium.premiumAmount != premiumAmount) {
                 revert ErrorIPolicyServicePremiumMismatch(policyNftId, premiumAmount, premium.premiumAmount);

package/contracts/instance/service/PoolService.sol

@@ -13,6 +13,7 @@ import {IVersionable} from "../../shared/IVersionable.sol";
 import {Versionable} from "../../shared/Versionable.sol";
 import {INftOwnable} from "../../shared/INftOwnable.sol";
 
+import {Amount} from "../../types/Amount.sol";
 import {Fee, FeeLib} from "../../types/Fee.sol";
 import {NftId, NftIdLib, zeroNftId} from "../../types/NftId.sol";
 import {ObjectType, POOL, BUNDLE} from "../../types/ObjectType.sol";
@@ -20,6 +21,7 @@ import {PUBLIC_ROLE, POOL_OWNER_ROLE, POLICY_SERVICE_ROLE, RoleId} from "../../t
 import {Fee, FeeLib} from "../../types/Fee.sol";
 import {Version, VersionLib} from "../../types/Version.sol";
 import {KEEP_STATE, StateId} from "../../types/StateId.sol";
+import {Seconds} from "../../types/Seconds.sol";
 import {TimestampLib, zeroTimestamp} from "../../types/Timestamp.sol";
 import {Version, VersionLib} from "../../types/Version.sol";
 
@@ -27,6 +29,7 @@ import {IService} from "../../shared/IService.sol";
 import {Service} from "../../shared/Service.sol";
 import {BundleManager} from "../BundleManager.sol";
 import {ComponentService} from "../base/ComponentService.sol";
+import {IBundleService} from "./IBundleService.sol";
 import {IPoolService} from "./IPoolService.sol";
 import {IRegistryService} from "../../registry/IRegistryService.sol";
 import {InstanceService} from "../InstanceService.sol";
@@ -42,7 +45,7 @@ contract PoolService is
 {
     using NftIdLib for NftId;
 
-    address internal _registryAddress;
+    IBundleService internal _bundleService;
 
     function _initialize(
         address owner, 
@@ -57,54 +60,17 @@ contract PoolService is
         (registryAddress, initialOwner) = abi.decode(data, (address, address));
         // TODO while PoolService is not deployed in PoolServiceManager constructor
         //      owner is PoolServiceManager deployer
-        initializeService(registryAddress, owner);
+        initializeService(registryAddress, address(0), owner);
+
+        _bundleService = IBundleService(getRegistry().getServiceAddress(BUNDLE(), getVersion().toMajorPart()));
+
         registerInterface(type(IPoolService).interfaceId);
     }
 
-    function getDomain() public pure override(Service, IService) returns(ObjectType) {
+    function getDomain() public pure override returns(ObjectType) {
         return POOL();
     }
 
-    /*function register(address poolAddress) 
-        external
-        returns(NftId poolNftId)
-    {
-        (
-            IComponent component,
-            address owner,
-            IInstance instance,
-            NftId instanceNftId
-        ) = _checkComponentForRegistration(
-            poolAddress,
-            POOL(),
-            POOL_OWNER_ROLE());
-
-        IPoolComponent pool = IPoolComponent(poolAddress);
-        IRegistry.ObjectInfo memory registryInfo = getRegistryService().registerPool(pool, owner);
-        pool.linkToRegisteredNftId();
-        poolNftId = registryInfo.nftId;
-
-        instance.createPoolSetup(poolNftId, pool.getSetupInfo());
-
-        bytes4[][] memory selectors = new bytes4[][](2);
-        selectors[0] = new bytes4[](1);
-        selectors[1] = new bytes4[](1);
-
-        selectors[0][0] = IPoolComponent.setFees.selector;
-        selectors[1][0] = IPoolComponent.verifyApplication.selector;
-
-        RoleId[] memory roles = new RoleId[](2);
-        roles[0] = POOL_OWNER_ROLE();
-        roles[1] = POLICY_SERVICE_ROLE();
-
-        getInstanceService().createGifTarget(
-            instanceNftId, 
-            poolAddress, 
-            pool.getName(), 
-            selectors, 
-            roles);
-    }*/
-
     function register(address poolAddress) 
         external
         returns(NftId poolNftId)
@@ -129,7 +95,7 @@ contract PoolService is
         componentInfo.tokenHandler = new TokenHandler(address(componentInfo.token));
 
         // save amended component info with instance
-        instance.createPoolSetup(poolNftId, componentInfo);
+        instance.getInstanceStore().createPoolSetup(poolNftId, componentInfo);
 
         bytes4[][] memory selectors = new bytes4[][](2);
         selectors[0] = new bytes4[](1);
@@ -155,9 +121,8 @@ contract PoolService is
         external
         virtual
     {
-        (IRegistry.ObjectInfo memory registryInfo, IInstance instance) = _getAndVerifyComponentInfoAndInstance(POOL());
+        (NftId poolNftId,, IInstance instance) = _getAndVerifyCallingComponentAndInstance(POOL());
         InstanceReader instanceReader = instance.getInstanceReader();
-        NftId poolNftId = registryInfo.nftId;
 
         IComponents.ComponentInfo memory componentInfo = instanceReader.getComponentInfo(poolNftId);
         IComponents.PoolInfo memory poolInfo = abi.decode(componentInfo.data, (IComponents.PoolInfo));
@@ -165,7 +130,7 @@ contract PoolService is
 
         poolInfo.maxCapitalAmount = maxCapitalAmount;
         componentInfo.data = abi.encode(poolInfo);
-        instance.updatePoolSetup(poolNftId, componentInfo, KEEP_STATE());
+        instance.getInstanceStore().updatePoolSetup(poolNftId, componentInfo, KEEP_STATE());
 
         emit LogPoolServiceMaxCapitalAmountUpdated(poolNftId, previousMaxCapitalAmount, maxCapitalAmount);
     }
@@ -174,9 +139,8 @@ contract PoolService is
         external
         virtual
     {
-        (IRegistry.ObjectInfo memory registryInfo, IInstance instance) = _getAndVerifyComponentInfoAndInstance(POOL());
+        (NftId poolNftId,, IInstance instance) = _getAndVerifyCallingComponentAndInstance(POOL());
         InstanceReader instanceReader = instance.getInstanceReader();
-        NftId poolNftId = registryInfo.nftId;
 
         IComponents.ComponentInfo memory componentInfo = instanceReader.getComponentInfo(poolNftId);
         IComponents.PoolInfo memory poolInfo = abi.decode(componentInfo.data, (IComponents.PoolInfo));
@@ -188,7 +152,7 @@ contract PoolService is
 
         poolInfo.bundleOwnerRole = bundleOwnerRole;
         componentInfo.data = abi.encode(poolInfo);
-        instance.updatePoolSetup(poolNftId, componentInfo, KEEP_STATE());
+        instance.getInstanceStore().updatePoolSetup(poolNftId, componentInfo, KEEP_STATE());
 
         emit LogPoolServiceBundleOwnerRoleSet(poolNftId, bundleOwnerRole);
     }
@@ -202,9 +166,8 @@ contract PoolService is
         external
         virtual
     {
-        (IRegistry.ObjectInfo memory registryInfo, IInstance instance) = _getAndVerifyComponentInfoAndInstance(POOL());
+        (NftId poolNftId,, IInstance instance) = _getAndVerifyCallingComponentAndInstance(POOL());
         InstanceReader instanceReader = instance.getInstanceReader();
-        NftId poolNftId = registryInfo.nftId;
 
         IComponents.ComponentInfo memory componentInfo = instanceReader.getComponentInfo(poolNftId);
         IComponents.PoolInfo memory poolInfo = abi.decode(componentInfo.data, (IComponents.PoolInfo));
@@ -213,8 +176,128 @@ contract PoolService is
         poolInfo.stakingFee = stakingFee;
         poolInfo.performanceFee = performanceFee;
         componentInfo.data = abi.encode(poolInfo);
-        instance.updatePoolSetup(poolNftId, componentInfo, KEEP_STATE());
+        instance.getInstanceStore().updatePoolSetup(poolNftId, componentInfo, KEEP_STATE());
 
         // TODO add logging
     }
+
+
+    function createBundle(
+        address owner, // initial bundle owner
+        Fee memory fee, // fees deducted from premium that go to bundle owner
+        Amount stakingAmount, // staking amount - staking fees result in initial bundle capital
+        Seconds lifetime, // initial duration for which new policies are covered
+        bytes calldata filter // optional use case specific criteria that define if a policy may be covered by this bundle
+    )
+        external 
+        virtual
+        returns(NftId bundleNftId)
+    {
+        (NftId poolNftId,, IInstance instance) = _getAndVerifyCallingComponentAndInstance(POOL());
+        InstanceReader instanceReader = instance.getInstanceReader();
+
+        // TODO add implementation that takes care of staking fees
+        Amount stakingAfterFeesAmount = stakingAmount;
+
+        bundleNftId = _bundleService.create(
+            instance,
+            poolNftId,
+            owner,
+            fee,
+            stakingAfterFeesAmount,
+            lifetime,
+            filter);
+
+        emit LogPoolServiceBundleCreated(instance.getNftId(), poolNftId, bundleNftId);
+    }
+
+
+    function closeBundle(NftId bundleNftId)
+        external
+        virtual
+    {
+        (NftId poolNftId,, IInstance instance) = _getAndVerifyCallingComponentAndInstance(POOL());
+
+        // TODO book keeping for pool collateral released outside of retention level
+
+        // releasing collateral in bundle
+        _bundleService.close(instance, bundleNftId);
+
+        // TODO get performance fee for pool, transfer of remaining funds + bundle fees to bundle owner
+
+        emit LogPoolServiceBundleClosed(instance.getNftId(), poolNftId, bundleNftId);
+    }
+
+
+    function lockCollateral(
+        IInstance instance, 
+        NftId productNftId,
+        NftId applicationNftId,
+        IPolicy.PolicyInfo memory applicationInfo,
+        uint256 premiumAmount // premium amount after product and distribution fees
+    )
+        external
+        virtual
+        // TODO add restricted and granting for policy service
+    {
+        InstanceReader instanceReader = instance.getInstanceReader();
+        NftId poolNftId = instanceReader.getProductSetupInfo(productNftId).poolNftId;
+        NftId bundleNftId = applicationInfo.bundleNftId;
+
+        // TODO move this check to application creation and don't repeat this here
+        // ensure that pool for bundle from application matches with pool for product of application
+        IBundle.BundleInfo memory bundleInfo = instanceReader.getBundleInfo(bundleNftId);
+        if(bundleInfo.poolNftId != poolNftId) {
+            revert ErrorPoolServiceBundlePoolMismatch(bundleInfo.poolNftId, poolNftId);
+        }
+
+        IComponents.ComponentInfo memory componentInfo = instanceReader.getComponentInfo(poolNftId);
+        IComponents.PoolInfo memory poolInfo = abi.decode(componentInfo.data, (IComponents.PoolInfo));
+
+        // TODO add correct required collateral calculation (collateralization level mibht be != 1, retention level might be < 1)
+        uint256 collateralAmount = applicationInfo.sumInsuredAmount;
+
+        // TODO add correct net premium calculation (pool fee might be > 0)
+        uint256 premiumAfterPoolFeeAmount = premiumAmount;
+
+        // lock collateral amount from involvedd bundle
+        _bundleService.lockCollateral(
+            instance,
+            applicationNftId, 
+            bundleNftId,
+            collateralAmount,
+            premiumAfterPoolFeeAmount);
+
+        // also verify/confirm application by pool if necessary
+        if(poolInfo.isVerifyingApplications) {
+            address poolAddress = getRegistry().getObjectInfo(poolNftId).objectAddress;
+            IPoolComponent(poolAddress).verifyApplication(
+                applicationNftId, 
+                applicationInfo.applicationData, 
+                bundleNftId,
+                bundleInfo.filter,
+                collateralAmount);
+        }
+    }
+
+
+    /// @dev releases the remaining collateral linked to the specified policy
+    /// may only be called by the policy service for unlocked pool components
+    function releaseCollateral(
+        IInstance instance, 
+        NftId policyNftId, 
+        IPolicy.PolicyInfo memory policyInfo
+    )
+        external
+        virtual
+        // TODO add restricted and granting for policy service
+    {
+        // release collateral from involved bundle
+        _bundleService.releaseCollateral(
+            instance, 
+            policyNftId, 
+            policyInfo.bundleNftId, 
+            policyInfo.sumInsuredAmount);
+    }
+
 }