@etherisc/gif-next 0.0.2-860ef47-116 → 0.0.2-864c5f3-808

package/contracts/product/PolicyService.sol

@@ -1,52 +1,47 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {IRegistry} from "../registry/IRegistry.sol";
-import {Product} from "./Product.sol";
-import {IComponents} from "../instance/module/IComponents.sol";
-import {IInstance} from "../instance/IInstance.sol";
-import {IPolicy} from "../instance/module/IPolicy.sol";
+import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.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 {APPLIED, COLLATERALIZED, ACTIVE, KEEP_STATE, CLOSED, DECLINED} from "../type/StateId.sol";
-import {NftId, NftIdLib} from "../type/NftId.sol";
-import {ReferralId} from "../type/Referral.sol";
-import {StateId} from "../type/StateId.sol";
-import {VersionPart} from "../type/Version.sol";
-
-import {ComponentVerifyingService} from "../shared/ComponentVerifyingService.sol";
-import {IApplicationService} from "./IApplicationService.sol";
-import {IBundleService} from "../pool/IBundleService.sol";
-import {IClaimService} from "./IClaimService.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 {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 {RiskId} from "../type/RiskId.sol";
+import {Service} from "../shared/Service.sol";
+import {StateId} from "../type/StateId.sol";
+import {Timestamp, TimestampLib} from "../type/Timestamp.sol";
+import {TokenHandler} from "../shared/TokenHandler.sol";
+import {VersionPart} from "../type/Version.sol";
+
 
 contract PolicyService is
-    ComponentVerifyingService, 
+    Service, 
     IPolicyService
 {
-    using NftIdLib for NftId;
-    using TimestampLib for Timestamp;
-
-    IApplicationService internal _applicationService;
+    IAccountingService private _accountingService;
     IComponentService internal _componentService;
-    IBundleService internal _bundleService;
-    IClaimService internal _claimService;
     IDistributionService internal _distributionService;
     IPoolService internal _poolService;
     IPricingService internal _pricingService;
 
-    event LogProductServiceSender(address sender);
-
     function _initialize(
         address owner, 
         bytes memory data
@@ -56,57 +51,39 @@ contract PolicyService is
         initializer
     {
         (
-            address registryAddress,, 
-            //address managerAddress
-            address authority
-        ) = abi.decode(data, (address, address, address));
+            address authority,
+            address registry
+        ) = abi.decode(data, (address, address));
 
-        initializeService(registryAddress, authority, owner);
+        __Service_init(authority, registry, owner);
 
         VersionPart majorVersion = getVersion().toMajorPart();
-        _applicationService = IApplicationService(getRegistry().getServiceAddress(APPLICATION(), majorVersion));
-        _bundleService = IBundleService(getRegistry().getServiceAddress(BUNDLE(), majorVersion));
+        _accountingService = IAccountingService(getRegistry().getServiceAddress(ACCOUNTING(), majorVersion));
         _componentService = IComponentService(getRegistry().getServiceAddress(COMPONENT(), majorVersion));
-        _claimService = IClaimService(getRegistry().getServiceAddress(CLAIM(), majorVersion));
         _poolService = IPoolService(getRegistry().getServiceAddress(POOL(), majorVersion));
         _distributionService = IDistributionService(getRegistry().getServiceAddress(DISTRIBUTION(), majorVersion));
         _pricingService = IPricingService(getRegistry().getServiceAddress(PRICE(), majorVersion));
 
-        registerInterface(type(IPolicyService).interfaceId);
+        _registerInterface(type(IPolicyService).interfaceId);
     }
 
 
-    function _getAndVerifyInstanceAndProduct() internal view returns (Product product) {
-        IRegistry.ObjectInfo memory productInfo;
-        (, productInfo,) = _getAndVerifyActiveComponent(PRODUCT());
-        product = Product(productInfo.objectAddress);
-    }
-    
-
     function decline(
         NftId applicationNftId // = policyNftId
     )
         external
-        virtual override
+        virtual
+        nonReentrant()
     {
-        (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, 
@@ -115,393 +92,534 @@ contract PolicyService is
         emit LogPolicyServicePolicyDeclined(applicationNftId);
     }
 
-    event LogDebug(uint idx, string message);
 
-    /// @dev underwites application which includes the locking of the required collateral from the pool.
-    function collateralize(
+    /// @inheritdoc IPolicyService
+    function createPolicy(
         NftId applicationNftId, // = policyNftId
-        bool requirePremiumPayment,
         Timestamp activateAt
     )
         external 
-        virtual override
+        virtual
+        nonReentrant()
+        returns (Amount premiumAmount)
     {
-        // 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);
-        }
-        
-        StateId newPolicyState = COLLATERALIZED();
-
+        // effects
         // actual collateralizaion
-        (
-            Amount localCollateralAmount,
-            Amount totalCollateralAmount
-        ) = _poolService.lockCollateral(
+        _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()) {
-            newPolicyState = ACTIVE();
-            applicationInfo.activatedAt = activateAt;
-            applicationInfo.expiredAt = activateAt.addSeconds(applicationInfo.lifetime);
+        if(activateAt.gtz()) {
+            applicationInfo = _activate(applicationNftId, applicationInfo, activateAt);
         }
 
-        // optional collection of premium
-        if(requirePremiumPayment) {
-            Amount premiumPaidAmount = _calculateAndCollectPremium(
-                instance,
-                applicationNftId,
-                applicationInfo);
-
-            applicationInfo.premiumPaidAmount = premiumPaidAmount;
-        }
-
-        // store updated policy info
+        // update policy and set state to collateralized
         instance.getInstanceStore().updatePolicy(
             applicationNftId, 
             applicationInfo, 
-            newPolicyState);
+            COLLATERALIZED());
 
-        // TODO add calling pool contract if it needs to validate application
+        // calculate and store premium
+        RiskId riskId = applicationInfo.riskId;
+        NftId bundleNftId = applicationInfo.bundleNftId;
+
+        IPolicy.PremiumInfo memory premium = _pricingService.calculatePremium(
+            productNftId,
+            riskId,
+            applicationInfo.sumInsuredAmount,
+            applicationInfo.lifetime,
+            applicationInfo.applicationData,
+            bundleNftId,
+            applicationInfo.referralId);
 
-        // TODO: add logging
+        premiumAmount = premium.fullPremiumAmount;
+        instance.getInstanceStore().createPremium(
+            applicationNftId,
+            premium);
+
+        // update referral counter if product has linked distributino component
+        {
+            IComponents.ProductInfo memory productInfo = instanceReader.getProductInfo(productNftId);
+            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);
+
+        // interactions
+        // callback to policy holder if applicable
+        _policyHolderPolicyActivated(applicationNftId, activateAt);
     }
 
 
+    /// @inheritdoc IPolicyService
     function collectPremium(
         NftId policyNftId, 
         Timestamp activateAt
     )
         external 
         virtual
+        nonReentrant()
     {
-        // check caller is registered product
-        (,, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
+        // checks
+        (
+            IInstance instance,
+            NftId productNftId,
+            IPolicy.PolicyInfo memory policyInfo
+        ) = _getAndVerifyCallerForPolicy(policyNftId);
+
+        // check policy is in state collateralized
         InstanceReader instanceReader = instance.getInstanceReader();
-        StateId stateId = instanceReader.getPolicyState(policyNftId);
+        if (instanceReader.getPolicyState(policyNftId) != COLLATERALIZED()) {
+            revert ErrorPolicyServicePolicyStateNotCollateralized(policyNftId);
+        }
 
-        // check policy is in state collateralized or active
-        if (!(stateId == COLLATERALIZED() || stateId == ACTIVE())) {
-            revert ErrorPolicyServicePolicyStateNotCollateralizedOrApplied(policyNftId);
+        // check if premium has already been collected
+        if (instanceReader.getPremiumInfoState(policyNftId) == PAID()) {
+            revert ErrorPolicyServicePremiumAlreadyPaid(policyNftId);
         }
 
-        IPolicy.PolicyInfo memory policyInfo = instanceReader.getPolicyInfo(policyNftId);
+        // 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);
 
-        // check if premium is already collected
-        if (policyInfo.premiumPaidAmount.gtz()) {
-            revert ErrorPolicyServicePremiumAlreadyPaid(policyNftId, policyInfo.premiumPaidAmount);
+        // optionally activate policy
+        if(activateAt.gtz()) {
+            policyInfo = _activate(policyNftId, policyInfo, activateAt);
         }
 
-        policyInfo.premiumPaidAmount = _calculateAndCollectPremium(
-                instance,
-                policyNftId,
-                policyInfo);
-
         instance.getInstanceStore().updatePolicy(policyNftId, policyInfo, KEEP_STATE());
+        instance.getInstanceStore().updatePremiumState(policyNftId, PAID());
 
-        if(activateAt.gtz() && policyInfo.activatedAt.eqz()) {
-            activate(policyNftId, activateAt);
-        }
+        // log premium collection before interactions with token
+        emit LogPolicyServicePolicyPremiumCollected(policyNftId, premium.premiumAmount);
 
-        // TODO: add logging
+        // interactions
+        _transferPremiumAmounts(instanceReader, policyNftId, policyInfo.productNftId, premium);
     }
 
-    function activate(NftId policyNftId, Timestamp activateAt) public override {
-        // check caller is registered product
-        (,, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
-        InstanceReader instanceReader = instance.getInstanceReader();
-
-        IPolicy.PolicyInfo memory policyInfo = instanceReader.getPolicyInfo(policyNftId);
 
-        require(
-            policyInfo.activatedAt.eqz(),
-            "ERROR:PRS-020:ALREADY_ACTIVATED");
+    /// @inheritdoc IPolicyService
+    function activate(NftId policyNftId, Timestamp activateAt)
+        external
+        virtual
+        nonReentrant()
+    {
+        // checks
+        (
+            IInstance instance,,
+            IPolicy.PolicyInfo memory policyInfo
+        ) = _getAndVerifyCallerForPolicy(policyNftId);
 
-        policyInfo.activatedAt = activateAt;
-        policyInfo.expiredAt = activateAt.addSeconds(policyInfo.lifetime);
+        // effects
+        policyInfo = _activate(policyNftId, policyInfo, activateAt);
+        instance.getInstanceStore().updatePolicy(policyNftId, policyInfo, KEEP_STATE());
 
-        instance.getInstanceStore().updatePolicy(policyNftId, policyInfo, ACTIVE());
+        // log policy activation before interactions with policy holder
+        emit LogPolicyServicePolicyActivated(policyNftId, activateAt);
 
-        // TODO: add logging
+        // interactions
+        // callback to policy holder if applicable
+        _policyHolderPolicyActivated(policyNftId, activateAt);
     }
 
     /// @inheritdoc IPolicyService
-    function expire(
+    function adjustActivation(
         NftId policyNftId,
-        Timestamp expireAt
+        Timestamp newActivateAt
     )
         external
-        override
         virtual
-        returns (Timestamp)
+        nonReentrant()
     {
-        (NftId productNftId,, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
-        InstanceReader instanceReader = instance.getInstanceReader();
-
-        // check policy is in state applied
-        if (instanceReader.getPolicyState(policyNftId) != ACTIVE()) {
-            revert ErrorIPolicyServicePolicyNotActive(policyNftId, instanceReader.getPolicyState(policyNftId));
-        }
+        // checks
+        (
+            IInstance instance,,
+            IPolicy.PolicyInfo memory policyInfo
+        ) = _getAndVerifyCallerForPolicy(policyNftId);
 
-        // check policy matches with calling product
-        IPolicy.PolicyInfo memory policyInfo = instanceReader.getPolicyInfo(policyNftId);
-        if(policyInfo.productNftId != productNftId) {
-            revert ErrorPolicyServicePolicyProductMismatch(
-                policyNftId, 
-                policyInfo.productNftId, 
-                productNftId);
+        if (policyInfo.activatedAt.eqz()) {
+            revert ErrorPolicyServicePolicyNotActivated(policyNftId);
         }
 
-        if (expireAt.eqz()) {
-            expireAt = TimestampLib.blockTimestamp();
+        if (newActivateAt < TimestampLib.blockTimestamp()) {
+            revert ErrorPolicyServicePolicyActivationTooEarly(policyNftId, TimestampLib.blockTimestamp(), newActivateAt);
         }
 
-        // check preconditions
-        if (expireAt >= policyInfo.expiredAt) {
-            revert ErrorIPolicyServicePolicyExpirationTooLate(policyNftId, policyInfo.expiredAt, expireAt);
-        }
-        if (expireAt < TimestampLib.blockTimestamp()) {
-            revert ErrorIPolicyServicePolicyExpirationTooEarly(policyNftId, TimestampLib.blockTimestamp(), expireAt);
-        }
-        if (policyInfo.openClaimsCount > 0) {
-            revert ErrorIPolicyServiceOpenClaims(policyNftId, policyInfo.openClaimsCount);
+        if (newActivateAt > policyInfo.expiredAt) {
+            revert ErrorPolicyServicePolicyActivationTooLate(policyNftId, policyInfo.expiredAt, newActivateAt);
         }
 
-        policyInfo.expiredAt = expireAt;
+        // effects
+        policyInfo.activatedAt = newActivateAt;
         instance.getInstanceStore().updatePolicy(policyNftId, policyInfo, KEEP_STATE());
 
-        emit LogPolicyServicePolicyExpirationUpdated(policyNftId, expireAt);
+        // log policy activation before interactions with policy holder
+        emit LogPolicyServicePolicyActivatedUpdated(policyNftId, newActivateAt);
 
-        return expireAt;
+        // interactions
+        // callback to policy holder if applicable
+        _policyHolderPolicyActivated(policyNftId, newActivateAt);
     }
 
+
+    /// @inheritdoc IPolicyService
+    function expire(
+        NftId policyNftId,
+        Timestamp expireAt
+    )
+        external
+        virtual
+        nonReentrant()
+        returns (Timestamp expiredAt)
+    {
+        // 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,
+        NftId policyNftId,
+        Timestamp expireAt
+    )
+        external
+        virtual
+        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
+        );
+    }
+
+
+    /// @inheritdoc IPolicyService
     function close(
         NftId policyNftId
     )
         external 
-        override
+        virtual
+        nonReentrant()
     {
-        (,, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
+        // checks
+        (
+            IInstance instance,
+            NftId productNftId,
+            IPolicy.PolicyInfo memory policyInfo
+        ) = _getAndVerifyCallerForPolicy(policyNftId);
         InstanceReader instanceReader = instance.getInstanceReader();
 
-        IPolicy.PolicyInfo memory policyInfo = instanceReader.getPolicyInfo(policyNftId);
-
-        if (policyInfo.activatedAt.eqz()) {
-            revert ErrorIPolicyServicePolicyNotActivated(policyNftId);
-        }
-
-        StateId state = instanceReader.getPolicyState(policyNftId);
-        if (state != ACTIVE()) {
-            revert ErrorIPolicyServicePolicyNotActive(policyNftId, state);
+        // check policy is in a closeable state
+        if (!PolicyServiceLib.policyIsCloseable(instanceReader, policyNftId)) {
+            revert ErrorPolicyServicePolicyNotCloseable(policyNftId);
         }
 
-        if (policyInfo.closedAt.gtz()) {
-            revert ErrorIPolicyServicePolicyAlreadyClosed(policyNftId);
-        }
-
-        // TODO consider to allow for underpaid premiums (with the effects of reducing max payouts accordingly)
-        if (!(policyInfo.premiumAmount == policyInfo.premiumPaidAmount)) {
-            revert ErrorPolicyServicePremiumNotFullyPaid(policyNftId, policyInfo.premiumAmount, policyInfo.premiumPaidAmount);
-        }
+        // check that policy has been activated
+        RiskId riskId = policyInfo.riskId;
+        NftId bundleNftId = policyInfo.bundleNftId;
 
-        if (policyInfo.openClaimsCount > 0) {
-            revert ErrorIPolicyServiceOpenClaims(policyNftId, policyInfo.openClaimsCount);
+        if (instanceReader.getPremiumInfoState(policyNftId) != PAID()) {
+            revert ErrorPolicyServicePremiumNotPaid(policyNftId, policyInfo.premiumAmount);
         }
 
-        policyInfo.closedAt = TimestampLib.blockTimestamp();
-
+        // effects
+        // release (remaining) collateral that was blocked by policy
         _poolService.releaseCollateral(
             instance, 
-            address(instanceReader.getComponentInfo(policyInfo.productNftId).token),
             policyNftId, 
             policyInfo);
 
-        instance.getInstanceStore().updatePolicy(policyNftId, policyInfo, CLOSED());
-    }
-
+        // TODO consider to also set expiredAt to current block timestamp if that timestamp is still in the futue
 
-    function _calculateAndCollectPremium(
-        IInstance instance,
-        NftId applicationNftId,
-        IPolicy.PolicyInfo memory applicationInfo
-    )
-        internal
-        virtual
-        returns (
-            Amount premiumPaidAmount
-        )
-    {
-        NftId productNftId = applicationInfo.productNftId;
-
-        // calculate premium details
-        IPolicy.Premium memory premium = _pricingService.calculatePremium(
-            productNftId,
-            applicationInfo.riskId,
-            applicationInfo.sumInsuredAmount,
-            applicationInfo.lifetime,
-            applicationInfo.applicationData,
-            applicationInfo.bundleNftId,
-            applicationInfo.referralId);
+        // update policy state to closed
+        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);
 
-        // update financials and transfer premium tokens
-        premiumPaidAmount = _processAndCollect(
-            instance, 
-            productNftId,
-            applicationNftId, 
-            applicationInfo.premiumAmount,
-            applicationInfo.bundleNftId,
-            applicationInfo.referralId,
-            premium);
+        emit LogPolicyServicePolicyClosed(policyNftId);
     }
 
-
-    function _processAndCollect(
+    /// @dev shared functionality for expire() and policyExpire().
+    function _expire(
         IInstance instance,
-        NftId productNftId,
         NftId policyNftId,
-        Amount premiumExpectedAmount,
-        NftId bundleNftId,
-        ReferralId referralId,
-        IPolicy.Premium memory premium
+        IPolicy.PolicyInfo memory policyInfo,
+        Timestamp expireAt
     )
         internal
-        virtual
-        returns (Amount premiumPaidAmount)
+        returns (Timestamp)
     {
-        InstanceReader instanceReader = instance.getInstanceReader();
-        TokenHandler tokenHandler = instanceReader.getComponentInfo(productNftId).tokenHandler;
-        address policyHolder = getRegistry().ownerOf(policyNftId);
-        premiumPaidAmount = AmountLib.toAmount(premium.premiumAmount);
+        PolicyServiceLib.checkExpiration(
+            expireAt,
+            policyNftId,
+            instance.getInstanceReader().getPolicyState(policyNftId),
+            policyInfo);
 
-        _checkPremiumBalanceAndAllowance(
-            tokenHandler, 
-            policyHolder, 
-            premiumExpectedAmount,
-            premiumPaidAmount);
+        // effects
+        // update policyInfo with new expiredAt timestamp
+        if (expireAt.gtz()) {
+            policyInfo.expiredAt = expireAt;
+        } else {
+            policyInfo.expiredAt = TimestampLib.blockTimestamp();
+        }
+        instance.getInstanceStore().updatePolicy(policyNftId, policyInfo, KEEP_STATE());
 
-        _processSaleAndTransferFunds(
-            instanceReader, 
-            instance.getInstanceStore(), 
-            tokenHandler, 
-            policyHolder, 
-            productNftId, 
-            bundleNftId, 
-            referralId, 
-            premium);
+        emit LogPolicyServicePolicyExpirationUpdated(policyNftId, policyInfo.expiredAt);
+
+        // interactions
+        // callback to policy holder if applicable
+        _policyHolderPolicyExpired(policyNftId, policyInfo.expiredAt);
+        return policyInfo.expiredAt;
     }
 
 
-    function _checkPremiumBalanceAndAllowance(
-        TokenHandler tokenHandler, 
-        address policyHolder, 
-        Amount premiumExpectedAmount,
-        Amount premiumPaidAmount
+    function _activate(
+        NftId policyNftId, 
+        IPolicy.PolicyInfo memory policyInfo,
+        Timestamp activateAt
     )
         internal
         virtual
-        view
+        view 
+        returns (IPolicy.PolicyInfo memory)
     {
-        // TODO decide how to handle this properly
-        // not clear if this is the best way to handle this
-        if (premiumExpectedAmount < premiumPaidAmount) {
-            revert ErrorPolicyServicePremiumHigherThanExpected(premiumExpectedAmount, premiumPaidAmount);
+        // fail if policy has already been activated and activateAt is different
+        if(! policyInfo.activatedAt.eqz() && activateAt != policyInfo.activatedAt) {
+            revert ErrorPolicyServicePolicyAlreadyActivated(policyNftId);
         }
 
-        uint256 premiumAmount = premiumPaidAmount.toInt();
-        uint256 balance = tokenHandler.getToken().balanceOf(policyHolder);
-        uint256 allowance = tokenHandler.getToken().allowance(policyHolder, address(tokenHandler));
-    
-        if (balance < premiumAmount) {
-            revert ErrorPolicyServiceBalanceInsufficient(policyHolder, premiumAmount, balance);
+        // ignore if policy has already been activated and activateAt is the same
+        if (policyInfo.activatedAt == activateAt) {
+            return policyInfo;
         }
 
-        if (allowance < premiumAmount) {
-            revert ErrorPolicyServiceAllowanceInsufficient(policyHolder, address(tokenHandler), premiumAmount, allowance);
-        }
-    }
+        policyInfo.activatedAt = activateAt;
+        policyInfo.expiredAt = activateAt.addSeconds(policyInfo.lifetime);
 
+        return policyInfo;
+    }
 
-    function _processSaleAndTransferFunds(
+    /// @dev update counters by calling the involved services
+    function _processSale(
         InstanceReader instanceReader,
         InstanceStore instanceStore,
-        TokenHandler tokenHandler,
-        address policyHolder,
         NftId productNftId,
         NftId bundleNftId,
         ReferralId referralId,
-        IPolicy.Premium memory premium
+        IPolicy.PremiumInfo memory premium
     )
         internal
         virtual
     {
-        (
-            NftId distributionNftId,
-            address distributionWallet,
-            address poolWallet,
-            address productWallet
-        ) = _getDistributionNftAndWallets(
+        (NftId distributionNftId,,,) = _getDistributionNftAndWallets(
             instanceReader, 
             productNftId);
 
         // update product fees, distribution and pool fees 
-        _componentService.increaseProductFees(
+        _accountingService.increaseProductFees(
             instanceStore, 
             productNftId, 
-            AmountLib.toAmount(premium.productFeeVarAmount + premium.productFeeFixAmount));
+            premium.productFeeVarAmount + premium.productFeeFixAmount);
 
         // update distribution fees and distributor commission and pool fees 
-        _distributionService.processSale(
-            distributionNftId, 
-            referralId, 
-            premium);
+        if (!distributionNftId.eqz()) { // only call distribution service if a distribution component is connected to the product
+            _distributionService.processSale(
+                distributionNftId, 
+                referralId, 
+                premium);
+        }
 
         // update pool and bundle fees 
         _poolService.processSale(
             bundleNftId, 
             premium);
-
-        // TODO: centralize token handling (issue #471)
-        // transfer premium amounts to target wallets
-        tokenHandler.transfer(policyHolder, productWallet, premium.productFeeAmount);
-        tokenHandler.transfer(policyHolder, distributionWallet, premium.distributionFeeAndCommissionAmount);
-        tokenHandler.transfer(policyHolder, poolWallet, premium.poolPremiumAndFeeAmount);
     }
 
 
-    function _getTokenHandlerAndProductWallet(
+    /// @dev transfer the premium to the wallets the premium is distributed to
+    function _transferPremiumAmounts(
         InstanceReader instanceReader,
-        NftId productNftId
+        NftId policyNftId,
+        NftId productNftId,
+        IPolicy.PremiumInfo memory premium
     )
-        internal 
+        internal
         virtual
+    {
+        address policyHolder = getRegistry().ownerOf(policyNftId);
+
+        (
+            ,
+            address distributionWallet,
+            address poolWallet,
+            address productWallet
+        ) = _getDistributionNftAndWallets(
+            instanceReader, 
+            productNftId);
+
+        // step 1: collect premium amount from policy holder
+        TokenHandler tokenHandler = instanceReader.getTokenHandler(productNftId);
+        tokenHandler.pullToken(policyHolder, premium.premiumAmount);
+
+        // step 2: push distribution fee to distribution wallet
+        if (premium.distributionFeeAndCommissionAmount.gtz()) {
+            tokenHandler.pushToken(distributionWallet, premium.distributionFeeAndCommissionAmount);
+        }
+
+        // step 3: push pool fee, bundle fee and pool premium to pool wallet
+        if (premium.poolPremiumAndFeeAmount.gtz()) {
+            tokenHandler.pushToken(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;
+    }
+
+
+    function _policyHolderPolicyActivated(
+        NftId policyNftId,
+        Timestamp activateAt
+    )
+        internal
+        virtual
+    {
+        // immediately return if policy is not activated
+        if (activateAt.eqz()) {
+            return;
+        }
+
+        // get policy holder address
+        IPolicyHolder policyHolder = _getPolicyHolder(policyNftId);
+
+        // execute callback if policy holder implements IPolicyHolder
+        if (address(policyHolder) != address(0)) {
+            policyHolder.policyActivated(policyNftId, activateAt);
+        }
+    }
+
+
+    function _policyHolderPolicyExpired(
+        NftId policyNftId,
+        Timestamp expiredAt
+    )
+        internal
+        virtual
+    {
+        // immediately return if policy is not activated
+        if (expiredAt.eqz()) {
+            return;
+        }
+
+        // get policy holder address
+        IPolicyHolder policyHolder = _getPolicyHolder(policyNftId);
+
+        // execute callback if policy holder implements IPolicyHolder
+        if (address(policyHolder) != address(0)) {
+            policyHolder.policyExpired(policyNftId, expiredAt);
+        }
+    }
+
+
+    function _getPolicyHolder(NftId policyNftId)
+        internal 
         view 
-        returns (
-            TokenHandler tokenHandler
-        )
+        returns (IPolicyHolder policyHolder)
     {
-        tokenHandler = instanceReader.getComponentInfo(productNftId).tokenHandler;
+        address policyHolderAddress = getRegistry().ownerOf(policyNftId);
+        policyHolder = IPolicyHolder(policyHolderAddress);
+
+        if (!ContractLib.isPolicyHolder(policyHolderAddress)) {
+            policyHolder = IPolicyHolder(address(0));
+        }
     }
 
+
     function _getDistributionNftAndWallets(
         InstanceReader instanceReader,
         NftId productNftId
@@ -516,10 +634,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  _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);
+        }
     }