@etherisc/gif-next 0.0.2-d9bed37-033 → 0.0.2-d9d5e42-801

package/contracts/product/PolicyService.sol

@@ -1,43 +1,39 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
-
-import {IRegistry} from "../registry/IRegistry.sol";
-import {Product} from "./Product.sol";
+import {IAccountingService} from "../accounting/IAccountingService.sol";
+import {IComponentService} from "../shared/IComponentService.sol";
 import {IComponents} from "../instance/module/IComponents.sol";
+import {IDistributionService} from "../distribution/IDistributionService.sol";
+import {InstanceReader} from "../instance/InstanceReader.sol";
+import {InstanceStore} from "../instance/InstanceStore.sol";
 import {IInstance} from "../instance/IInstance.sol";
 import {IPolicy} from "../instance/module/IPolicy.sol";
+import {IPolicyHolder} from "../shared/IPolicyHolder.sol";
+import {IPolicyService} from "./IPolicyService.sol";
+import {IPoolService} from "../pool/IPoolService.sol";
+import {IPricingService} from "./IPricingService.sol";
+import {IRegistry} from "../registry/IRegistry.sol";
 
-import {TokenHandler} from "../shared/TokenHandler.sol";
-
-import {Amount, AmountLib} from "../type/Amount.sol";
-import {Timestamp, TimestampLib, zeroTimestamp} from "../type/Timestamp.sol";
-import {ObjectType, APPLICATION, COMPONENT, DISTRIBUTION, PRODUCT, POOL, POLICY, BUNDLE, CLAIM, PRICE} from "../type/ObjectType.sol";
+import {Amount} from "../type/Amount.sol";
 import {APPLIED, COLLATERALIZED, KEEP_STATE, CLOSED, DECLINED, PAID} from "../type/StateId.sol";
+import {ContractLib} from "../shared/ContractLib.sol";
 import {NftId} from "../type/NftId.sol";
+import {ObjectType, ACCOUNTING, COMPONENT, DISTRIBUTION, PRODUCT, POOL, POLICY, PRICE} from "../type/ObjectType.sol";
+import {PolicyServiceLib} from "./PolicyServiceLib.sol";
 import {ReferralId} from "../type/Referral.sol";
-import {StateId} from "../type/StateId.sol";
+import {RiskId} from "../type/RiskId.sol";
+import {Service} from "../shared/Service.sol";
+import {Timestamp, TimestampLib} from "../type/Timestamp.sol";
+import {TokenHandler} from "../shared/TokenHandler.sol";
 import {VersionPart} from "../type/Version.sol";
 
-import {ComponentVerifyingService} from "../shared/ComponentVerifyingService.sol";
-import {ContractLib} from "../shared/ContractLib.sol";
-import {IApplicationService} from "./IApplicationService.sol";
-import {IBundleService} from "../pool/IBundleService.sol";
-import {IClaimService} from "./IClaimService.sol";
-import {IComponentService} from "../shared/IComponentService.sol";
-import {IDistributionService} from "../distribution/IDistributionService.sol";
-import {InstanceReader} from "../instance/InstanceReader.sol";
-import {InstanceStore} from "../instance/InstanceStore.sol";
-import {IPolicyHolder} from "../shared/IPolicyHolder.sol";
-import {IPolicyService} from "./IPolicyService.sol";
-import {IPoolService} from "../pool/IPoolService.sol";
-import {IPricingService} from "./IPricingService.sol";
 
 contract PolicyService is
-    ComponentVerifyingService, 
+    Service, 
     IPolicyService
 {
+    IAccountingService private _accountingService;
     IComponentService internal _componentService;
     IDistributionService internal _distributionService;
     IPoolService internal _poolService;
@@ -52,13 +48,14 @@ contract PolicyService is
         initializer
     {
         (
-            address registryAddress,
-            address authority
+            address authority,
+            address registry
         ) = abi.decode(data, (address, address));
 
-        _initializeService(registryAddress, authority, owner);
+        __Service_init(authority, registry, owner);
 
         VersionPart majorVersion = getVersion().toMajorPart();
+        _accountingService = IAccountingService(getRegistry().getServiceAddress(ACCOUNTING(), majorVersion));
         _componentService = IComponentService(getRegistry().getServiceAddress(COMPONENT(), majorVersion));
         _poolService = IPoolService(getRegistry().getServiceAddress(POOL(), majorVersion));
         _distributionService = IDistributionService(getRegistry().getServiceAddress(DISTRIBUTION(), majorVersion));
@@ -73,28 +70,18 @@ contract PolicyService is
     )
         external
         virtual
+        restricted()
         nonReentrant()
     {
-        _checkNftType(applicationNftId, POLICY());
-
-        (NftId productNftId,, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
-        InstanceReader instanceReader = instance.getInstanceReader();
+        // checks
+        (IInstance instance,,) = _getAndVerifyCallerForPolicy(applicationNftId);
 
         // check policy is in state applied
-        if (instanceReader.getPolicyState(applicationNftId) != APPLIED()) {
+        if (instance.getInstanceReader().getPolicyState(applicationNftId) != APPLIED()) {
             revert ErrorPolicyServicePolicyStateNotApplied(applicationNftId);
         }
 
-        // check policy matches with calling product
-        IPolicy.PolicyInfo memory applicationInfo = instanceReader.getPolicyInfo(applicationNftId);
-        if(applicationInfo.productNftId != productNftId) {
-            revert ErrorPolicyServicePolicyProductMismatch(
-                applicationNftId, 
-                applicationInfo.productNftId, 
-                productNftId);
-        }
-        
-
+        // effects
         // store updated policy info
         instance.getInstanceStore().updatePolicyState(
             applicationNftId, 
@@ -111,43 +98,36 @@ contract PolicyService is
     )
         external 
         virtual
+        restricted()
         nonReentrant()
+        returns (Amount premiumAmount)
     {
-        _checkNftType(applicationNftId, POLICY());
-
-        // check caller is registered product
-        (NftId productNftId,, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
-        InstanceReader instanceReader = instance.getInstanceReader();
+        // checks
+        (
+            IInstance instance,
+            NftId productNftId,
+            IPolicy.PolicyInfo memory applicationInfo
+        ) = _getAndVerifyCallerForPolicy(applicationNftId);
 
         // check policy is in state applied
+        InstanceReader instanceReader = instance.getInstanceReader();
         if (instanceReader.getPolicyState(applicationNftId) != APPLIED()) {
             revert ErrorPolicyServicePolicyStateNotApplied(applicationNftId);
         }
 
-        // check policy matches with calling product
-        IPolicy.PolicyInfo memory applicationInfo = instanceReader.getPolicyInfo(applicationNftId);
-        if(applicationInfo.productNftId != productNftId) {
-            revert ErrorPolicyServicePolicyProductMismatch(
-                applicationNftId, 
-                applicationInfo.productNftId, 
-                productNftId);
-        }
-        
+        // effects
         // actual collateralizaion
         _poolService.lockCollateral(
             instance,
-            address(instanceReader.getComponentInfo(productNftId).token),
+            address(instanceReader.getToken(productNftId)),
             productNftId,
             applicationNftId,
             applicationInfo.bundleNftId,
             applicationInfo.sumInsuredAmount);
 
         // optional activation of policy
-        if(activateAt > zeroTimestamp()) {
-            applicationInfo = _activate(
-                applicationNftId, 
-                applicationInfo, 
-                activateAt);
+        if(activateAt.gtz()) {
+            applicationInfo = PolicyServiceLib.activate(applicationNftId, applicationInfo, activateAt);
         }
 
         // update policy and set state to collateralized
@@ -157,35 +137,42 @@ contract PolicyService is
             COLLATERALIZED());
 
         // calculate and store premium
+        RiskId riskId = applicationInfo.riskId;
+        NftId bundleNftId = applicationInfo.bundleNftId;
+
         IPolicy.PremiumInfo memory premium = _pricingService.calculatePremium(
             productNftId,
-            applicationInfo.riskId,
+            riskId,
             applicationInfo.sumInsuredAmount,
             applicationInfo.lifetime,
             applicationInfo.applicationData,
-            applicationInfo.bundleNftId,
+            bundleNftId,
             applicationInfo.referralId);
 
+        premiumAmount = premium.fullPremiumAmount;
         instance.getInstanceStore().createPremium(
             applicationNftId,
             premium);
 
-        // update referral counter 
+        // update referral counter if product has linked distributino component
         {
             IComponents.ProductInfo memory productInfo = instanceReader.getProductInfo(productNftId);
-
-            if (! productInfo.distributionNftId.eqz()) { // only call distribution service if a distribution component is connected to the product    
+            if (productInfo.hasDistribution) {    
                 _distributionService.processReferral(
                     productInfo.distributionNftId, 
                     applicationInfo.referralId);
             }
         }
 
+        // link policy to risk and bundle
+        NftId poolNftId = getRegistry().getParentNftId(bundleNftId);
+        instance.getRiskSet().linkPolicy(productNftId, riskId, applicationNftId);
+        instance.getBundleSet().linkPolicy(poolNftId, bundleNftId, applicationNftId);
+
         // log policy creation before interactions with token and policy holder
         emit LogPolicyServicePolicyCreated(applicationNftId, premium.premiumAmount, activateAt);
 
-        // TODO add calling pool contract if it needs to validate application
-
+        // interactions
         // callback to policy holder if applicable
         _policyHolderPolicyActivated(applicationNftId, activateAt);
     }
@@ -198,37 +185,54 @@ contract PolicyService is
     )
         external 
         virtual
+        restricted()
         nonReentrant()
     {
-        _checkNftType(policyNftId, POLICY());
+        // checks
+        (
+            IInstance instance,
+            NftId productNftId,
+            IPolicy.PolicyInfo memory policyInfo
+        ) = _getAndVerifyCallerForPolicy(policyNftId);
 
-        // check caller is registered product
-        (,, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
+        // check policy is in state collateralized
         InstanceReader instanceReader = instance.getInstanceReader();
-        StateId stateId = instanceReader.getPolicyState(policyNftId);
-
-        // check policy is in state collateralized or active
-        if (!(stateId == COLLATERALIZED())) {
+        if (instanceReader.getPolicyState(policyNftId) != COLLATERALIZED()) {
             revert ErrorPolicyServicePolicyStateNotCollateralized(policyNftId);
         }
 
-        // check if premium is already collected
-        if (instanceReader.getPremiumInfoState(policyNftId) == PAID()) {
+        // check if premium has already been collected
+        if (instanceReader.getPremiumState(policyNftId) == PAID()) {
             revert ErrorPolicyServicePremiumAlreadyPaid(policyNftId);
         }
 
-        IPolicy.PolicyInfo memory policyInfo = instanceReader.getPolicyInfo(policyNftId);
-        IPolicy.PremiumInfo memory premium = instanceReader.getPremiumInfo(policyNftId); 
-        
-        _processPremium(
-            instance,
-            policyNftId,
-            policyInfo,
+        // check funds and allowance of policy holder
+        IPolicy.PremiumInfo memory premium = instanceReader.getPremiumInfo(policyNftId);
+        instanceReader.getTokenHandler(
+            productNftId).checkBalanceAndAllowance(
+                getRegistry().ownerOf(policyNftId), 
+                premium.premiumAmount, 
+                false);
+
+        // )
+        // _checkPremiumBalanceAndAllowance(
+        //     tokenHandler.TOKEN(), 
+        //     address(tokenHandler),
+        //     getRegistry().ownerOf(policyNftId), 
+        //     premium.premiumAmount);
+
+        // effects
+        _processSale(
+            instanceReader, 
+            instance.getInstanceStore(), 
+            productNftId, 
+            policyInfo.bundleNftId, 
+            policyInfo.referralId, 
             premium);
 
         // optionally activate policy
         if(activateAt.gtz()) {
-            policyInfo = _activate(policyNftId, policyInfo, activateAt);
+            policyInfo = PolicyServiceLib.activate(policyNftId, policyInfo, activateAt);
         }
 
         instance.getInstanceStore().updatePolicy(policyNftId, policyInfo, KEEP_STATE());
@@ -237,33 +241,76 @@ contract PolicyService is
         // log premium collection before interactions with token
         emit LogPolicyServicePolicyPremiumCollected(policyNftId, premium.premiumAmount);
 
-        _transferFunds(instanceReader, policyNftId, policyInfo.productNftId, premium);
+        // interactions
+        _transferPremiumAmounts(instanceReader, policyNftId, policyInfo.productNftId, premium);
     }
 
+
     /// @inheritdoc IPolicyService
     function activate(NftId policyNftId, Timestamp activateAt)
         external
         virtual
+        restricted()
         nonReentrant()
     {
-        _checkNftType(policyNftId, POLICY());
-
-        // check caller is registered product
-        (,, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
-        InstanceReader instanceReader = instance.getInstanceReader();
-
-        IPolicy.PolicyInfo memory policyInfo = instanceReader.getPolicyInfo(policyNftId);
-        policyInfo = _activate(policyNftId, policyInfo, activateAt);
+        // checks
+        (
+            IInstance instance,,
+            IPolicy.PolicyInfo memory policyInfo
+        ) = _getAndVerifyCallerForPolicy(policyNftId);
 
+        // effects
+        policyInfo = PolicyServiceLib.activate(policyNftId, policyInfo, activateAt);
         instance.getInstanceStore().updatePolicy(policyNftId, policyInfo, KEEP_STATE());
 
         // log policy activation before interactions with policy holder
         emit LogPolicyServicePolicyActivated(policyNftId, activateAt);
 
+        // interactions
         // callback to policy holder if applicable
         _policyHolderPolicyActivated(policyNftId, activateAt);
     }
 
+    /// @inheritdoc IPolicyService
+    function adjustActivation(
+        NftId policyNftId,
+        Timestamp newActivateAt
+    )
+        external
+        virtual
+        restricted()
+        nonReentrant()
+    {
+        // checks
+        (
+            IInstance instance,,
+            IPolicy.PolicyInfo memory policyInfo
+        ) = _getAndVerifyCallerForPolicy(policyNftId);
+
+        if (policyInfo.activatedAt.eqz()) {
+            revert ErrorPolicyServicePolicyNotActivated(policyNftId);
+        }
+
+        if (newActivateAt < TimestampLib.blockTimestamp()) {
+            revert ErrorPolicyServicePolicyActivationTooEarly(policyNftId, TimestampLib.blockTimestamp(), newActivateAt);
+        }
+
+        if (newActivateAt > policyInfo.expiredAt) {
+            revert ErrorPolicyServicePolicyActivationTooLate(policyNftId, policyInfo.expiredAt, newActivateAt);
+        }
+
+        // effects
+        policyInfo.activatedAt = newActivateAt;
+        instance.getInstanceStore().updatePolicy(policyNftId, policyInfo, KEEP_STATE());
+
+        // log policy activation before interactions with policy holder
+        emit LogPolicyServicePolicyActivatedUpdated(policyNftId, newActivateAt);
+
+        // interactions
+        // callback to policy holder if applicable
+        _policyHolderPolicyActivated(policyNftId, newActivateAt);
+    }
+
 
     /// @inheritdoc IPolicyService
     function expire(
@@ -272,29 +319,26 @@ contract PolicyService is
     )
         external
         virtual
+        restricted()
         nonReentrant()
         returns (Timestamp expiredAt)
     {
-        _checkNftType(policyNftId, POLICY());
-
-        (NftId productNftId,, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
-        
-        // check policy matches with calling product
-        IPolicy.PolicyInfo memory policyInfo = instance.getInstanceReader().getPolicyInfo(policyNftId);
-        if(policyInfo.productNftId != productNftId) {
-            revert ErrorPolicyServicePolicyProductMismatch(
-                policyNftId, 
-                policyInfo.productNftId, 
-                productNftId);
-        }
+        // checks
+        (
+            IInstance instance,,
+            IPolicy.PolicyInfo memory policyInfo
+        ) = _getAndVerifyCallerForPolicy(policyNftId);
 
+        // more checks, effects + interactions
         return _expire(
             instance,
             policyNftId,
+            policyInfo,
             expireAt
         );
     }
 
+
     /// @inheritdoc IPolicyService
     function expirePolicy(
         IInstance instance,
@@ -303,102 +347,59 @@ contract PolicyService is
     )
         external
         virtual
+        restricted()
         nonReentrant()
         returns (Timestamp expiredAt)
     {
+        // checks
         _checkNftType(policyNftId, POLICY());
+        IPolicy.PolicyInfo memory policyInfo = instance.getInstanceReader().getPolicyInfo(
+            policyNftId);
 
+        // more checks, effects + interactions
         return _expire(
             instance,
             policyNftId,
+            policyInfo,
             expireAt
         );
     }
 
-    function _expire(
-        IInstance instance,
-        NftId policyNftId,
-        Timestamp expireAt
-    )
-        internal
-        returns (Timestamp expiredAt)
-    {
-        InstanceReader instanceReader = instance.getInstanceReader();
-        
-        // check policy is active
-        StateId policyState = instanceReader.getPolicyState(policyNftId);
-        IPolicy.PolicyInfo memory policyInfo = instance.getInstanceReader().getPolicyInfo(policyNftId);
-        if (!_policyHasBeenActivated(policyState, policyInfo)) {
-            revert ErrorPolicyServicePolicyNotActive(policyNftId, policyState);
-        }
-
-        // set return value to provided timestamp
-        expiredAt = expireAt;
-
-        // update expiredAt to current block timestamp if not set
-        if (expiredAt.eqz()) {
-            expiredAt = TimestampLib.blockTimestamp();
-        }
-
-        // check expiredAt represents a valid expiry time
-        if (expiredAt >= policyInfo.expiredAt) {
-            revert ErrorPolicyServicePolicyExpirationTooLate(policyNftId, policyInfo.expiredAt, expireAt);
-        }
-        if (expiredAt < TimestampLib.blockTimestamp()) {
-            revert ErrorPolicyServicePolicyExpirationTooEarly(policyNftId, TimestampLib.blockTimestamp(), expireAt);
-        }
-
-        // update policyInfo with new expiredAt timestamp
-        Timestamp originalExpiredAt = policyInfo.expiredAt;
-        policyInfo.expiredAt = expiredAt;
-        instance.getInstanceStore().updatePolicy(policyNftId, policyInfo, KEEP_STATE());
-
-        emit LogPolicyServicePolicyExpirationUpdated(policyNftId, originalExpiredAt, expiredAt);
-
-        // callback to policy holder if applicable
-        _policyHolderPolicyExpired(policyNftId, expiredAt);
-    }
-
 
+    /// @inheritdoc IPolicyService
     function close(
         NftId policyNftId
     )
         external 
         virtual
+        restricted()
         nonReentrant()
     {
-        _checkNftType(policyNftId, POLICY());
-        
-        (,, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
+        // checks
+        (
+            IInstance instance,
+            NftId productNftId,
+            IPolicy.PolicyInfo memory policyInfo
+        ) = _getAndVerifyCallerForPolicy(policyNftId);
         InstanceReader instanceReader = instance.getInstanceReader();
 
-        // check that policy has been activated
-        IPolicy.PolicyInfo memory policyInfo = instanceReader.getPolicyInfo(policyNftId);
-        StateId policyState = instanceReader.getPolicyState(policyNftId);
-        if (!_policyHasBeenActivated(policyState, policyInfo)) {
-            revert ErrorPolicyServicePolicyNotActive(policyNftId, policyState);
-        }
-
-        // check that policy has not already been closed
-        if (policyInfo.closedAt.gtz()) {
-            revert ErrorPolicyServicePolicyAlreadyClosed(policyNftId);
+        // check policy is in a closeable state
+        if (!PolicyServiceLib.policyIsCloseable(instanceReader, policyNftId)) {
+            revert ErrorPolicyServicePolicyNotCloseable(policyNftId);
         }
 
-        // check that policy does not have any open claims
-        if (policyInfo.openClaimsCount > 0) {
-            revert ErrorPolicyServiceOpenClaims(policyNftId, policyInfo.openClaimsCount);
-        }
+        // check that policy has been activated
+        RiskId riskId = policyInfo.riskId;
+        NftId bundleNftId = policyInfo.bundleNftId;
 
-        // TODO consider to allow for underpaid premiums (with the effects of reducing max payouts accordingly)
-        // TODO consider to remove requirement for fully paid premiums altogether
-        if (! instanceReader.getPremiumInfoState(policyNftId).eq(PAID())) {
+        if (instanceReader.getPremiumState(policyNftId) != PAID()) {
             revert ErrorPolicyServicePremiumNotPaid(policyNftId, policyInfo.premiumAmount);
         }
 
+        // effects
         // release (remaining) collateral that was blocked by policy
         _poolService.releaseCollateral(
             instance, 
-            address(instanceReader.getComponentInfo(policyInfo.productNftId).token),
             policyNftId, 
             policyInfo);
 
@@ -408,71 +409,42 @@ contract PolicyService is
         policyInfo.closedAt = TimestampLib.blockTimestamp();
         instance.getInstanceStore().updatePolicy(policyNftId, policyInfo, CLOSED());
 
+        // unlink policy from risk and bundle
+        NftId poolNftId = getRegistry().getParentNftId(bundleNftId);
+        instance.getRiskSet().unlinkPolicy(productNftId, riskId, policyNftId);
+        instance.getBundleSet().unlinkPolicy(poolNftId, bundleNftId, policyNftId);
+
         emit LogPolicyServicePolicyClosed(policyNftId);
     }
 
 
-    /// @dev calculates the premium and updates all counters in the other services
-    function _processPremium(
+    /// @dev shared functionality for expire() and policyExpire().
+    function _expire(
         IInstance instance,
-        NftId applicationNftId,
-        IPolicy.PolicyInfo memory applicationInfo,
-        IPolicy.PremiumInfo memory premium
-    )
-        internal
-        virtual
-    {
-        NftId productNftId = applicationInfo.productNftId;
-        InstanceReader instanceReader = instance.getInstanceReader();
-
-        // check if premium balance and allowance of policy holder is sufficient
-        {
-            TokenHandler tokenHandler = _getTokenHandler(instanceReader, productNftId);
-            address policyHolder = getRegistry().ownerOf(applicationNftId);
-        
-            _checkPremiumBalanceAndAllowance(
-                tokenHandler.getToken(), 
-                address(tokenHandler),
-                policyHolder, 
-                premium.premiumAmount);
-        }
-
-        // update the counters
-        _processSale(
-            instanceReader, 
-            instance.getInstanceStore(), 
-            productNftId, 
-            applicationInfo.bundleNftId, 
-            applicationInfo.referralId, 
-            premium);
-    }
-
-    function _activate(
-        NftId policyNftId, 
+        NftId policyNftId,
         IPolicy.PolicyInfo memory policyInfo,
-        Timestamp activateAt
+        Timestamp expireAt
     )
         internal
-        virtual
-        view 
-        returns (IPolicy.PolicyInfo memory)
+        returns (Timestamp)
     {
-        // fail if policy has already been activated and activateAt is different
-        if(! policyInfo.activatedAt.eqz() && activateAt != policyInfo.activatedAt) {
-            revert ErrorPolicyServicePolicyAlreadyActivated(policyNftId);
-        }
+        policyInfo = PolicyServiceLib.expire(
+            instance.getInstanceReader(),
+            policyNftId,
+            policyInfo,
+            expireAt);
 
-        // ignore if policy has already been activated and activateAt is the same
-        if (policyInfo.activatedAt == activateAt) {
-            return policyInfo;
-        }
+        instance.getInstanceStore().updatePolicy(policyNftId, policyInfo, KEEP_STATE());
 
-        policyInfo.activatedAt = activateAt;
-        policyInfo.expiredAt = activateAt.addSeconds(policyInfo.lifetime);
+        emit LogPolicyServicePolicyExpirationUpdated(policyNftId, policyInfo.expiredAt);
 
-        return policyInfo;
+        // interactions
+        // callback to policy holder if applicable
+        _policyHolderPolicyExpired(policyNftId, policyInfo.expiredAt);
+        return policyInfo.expiredAt;
     }
 
+
     /// @dev update counters by calling the involved services
     function _processSale(
         InstanceReader instanceReader,
@@ -485,12 +457,12 @@ contract PolicyService is
         internal
         virtual
     {
-        (NftId distributionNftId, , , ) = _getDistributionNftAndWallets(
+        (NftId distributionNftId,,,) = _getDistributionNftAndWallets(
             instanceReader, 
             productNftId);
 
         // update product fees, distribution and pool fees 
-        _componentService.increaseProductFees(
+        _accountingService.increaseProductFees(
             instanceStore, 
             productNftId, 
             premium.productFeeVarAmount + premium.productFeeFixAmount);
@@ -511,7 +483,7 @@ contract PolicyService is
 
 
     /// @dev transfer the premium to the wallets the premium is distributed to
-    function _transferFunds(
+    function _transferPremiumAmounts(
         InstanceReader instanceReader,
         NftId policyNftId,
         NftId productNftId,
@@ -520,7 +492,6 @@ contract PolicyService is
         internal
         virtual
     {
-        TokenHandler tokenHandler = _getTokenHandler(instanceReader, productNftId);
         address policyHolder = getRegistry().ownerOf(policyNftId);
 
         (
@@ -532,58 +503,20 @@ contract PolicyService is
             instanceReader, 
             productNftId);
 
-        tokenHandler.collectTokensToThreeRecipients(
-            policyHolder,
-            productWallet,
-            premium.productFeeAmount,
-            distributionWallet,
-            premium.distributionFeeAndCommissionAmount,
-            poolWallet,
-            premium.poolPremiumAndFeeAmount);
-    }
-
-
-    /// @dev checks that policy has been collateralized and has been activated.
-    /// does not check if policy has been expired or closed.
-    function _policyHasBeenActivated(
-        StateId policyState,
-        IPolicy.PolicyInfo memory policyInfo
-    )
-        internal
-        view
-        returns (bool)
-    {
-        if (policyState != COLLATERALIZED()) { return false; } 
-        if (TimestampLib.blockTimestamp() < policyInfo.activatedAt) { return false; } 
-        return true;
-    }
-
+        // step 1: collect premium amount from policy holder
+        TokenHandler tokenHandler = instanceReader.getTokenHandler(productNftId);
+        tokenHandler.pullToken(policyHolder, premium.premiumAmount);
 
-    /// @dev checks the balance and allowance of the policy holder
-    function _checkPremiumBalanceAndAllowance(
-        IERC20Metadata token,
-        address tokenHandlerAddress, 
-        address policyHolder, 
-        Amount premiumAmount
-    )
-        internal
-        virtual
-        view
-    {
-        uint256 premium = premiumAmount.toInt();
-        uint256 balance = token.balanceOf(policyHolder);
-        uint256 allowance = token.allowance(policyHolder, tokenHandlerAddress);
-    
-        if (balance < premium) {
-            revert ErrorPolicyServiceBalanceInsufficient(policyHolder, premium, balance);
+        // step 2: push distribution fee to distribution wallet
+        if (premium.distributionFeeAndCommissionAmount.gtz()) {
+            tokenHandler.pushToken(distributionWallet, premium.distributionFeeAndCommissionAmount);
         }
 
-        if (allowance < premium) {
-            revert ErrorPolicyServiceAllowanceInsufficient(policyHolder, tokenHandlerAddress, premium, allowance);
+        // step 3: push pool fee, bundle fee and pool premium to pool wallet
+        if (premium.poolPremiumAndFeeAmount.gtz()) {
+            tokenHandler.pushToken(poolWallet, premium.poolPremiumAndFeeAmount);
         }
     }
-
-
     function _policyHolderPolicyActivated(
         NftId policyNftId,
         Timestamp activateAt
@@ -642,21 +575,6 @@ contract PolicyService is
     }
 
 
-    function _getTokenHandler(
-        InstanceReader instanceReader,
-        NftId productNftId
-    )
-        internal 
-        virtual
-        view 
-        returns (
-            TokenHandler tokenHandler
-        )
-    {
-        tokenHandler = instanceReader.getComponentInfo(productNftId).tokenHandler;
-    }
-
-
     function _getDistributionNftAndWallets(
         InstanceReader instanceReader,
         NftId productNftId
@@ -671,17 +589,45 @@ contract PolicyService is
         )
     {
         IComponents.ProductInfo memory productInfo = instanceReader.getProductInfo(productNftId);
-        distributionNftId = productInfo.distributionNftId;
-        distributionWallet = instanceReader.getComponentInfo(distributionNftId).wallet;
-        poolWallet = instanceReader.getComponentInfo(productInfo.poolNftId).wallet;
-        productWallet = instanceReader.getComponentInfo(productNftId).wallet;
+        productWallet = instanceReader.getComponentInfo(productNftId).tokenHandler.getWallet();
+        poolWallet = instanceReader.getComponentInfo(productInfo.poolNftId).tokenHandler.getWallet();
+
+        if (productInfo.hasDistribution) {
+            distributionNftId = productInfo.distributionNftId;
+            distributionWallet = instanceReader.getComponentInfo(distributionNftId).tokenHandler.getWallet();
+        }
     }
 
 
-    function _getAndVerifyInstanceAndProduct() internal view returns (Product product) {
-        IRegistry.ObjectInfo memory productInfo;
-        (, productInfo,) = _getAndVerifyActiveComponent(PRODUCT());
-        product = Product(productInfo.objectAddress);
+    function  _getAndVerifyCallerForPolicy(NftId policyNftId)
+        internal
+        virtual
+        view
+        returns (
+            IInstance instance,
+            NftId productNftId,
+            IPolicy.PolicyInfo memory policyInfo
+        )
+    {
+        (
+            IRegistry.ObjectInfo memory productInfo, 
+            address instanceAddress
+        ) = ContractLib.getAndVerifyComponent(
+            getRegistry(), 
+            msg.sender, // caller contract 
+            PRODUCT(), // caller must be product
+            true); // only active caller
+
+        productNftId = productInfo.nftId; // calling product nft id
+        instance = IInstance(instanceAddress);
+        policyInfo = instance.getInstanceReader().getPolicyInfo(policyNftId);
+
+        if (policyInfo.productNftId != productNftId) {
+            revert ErrorPolicyServicePolicyProductMismatch(
+                policyNftId, 
+                productNftId,
+                policyInfo.productNftId);
+        }
     }