@etherisc/gif-next 0.0.2-7177fd8-761 → 0.0.2-71b939f-497

package/contracts/product/PolicyService.sol

@@ -3,53 +3,42 @@ 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 {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 {TokenTransferLib} from "../shared/TokenTransferLib.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, KEEP_STATE, CLOSED, DECLINED} from "../type/StateId.sol";
-import {NftId, NftIdLib} from "../type/NftId.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, COMPONENT, DISTRIBUTION, PRODUCT, POOL, POLICY, PRICE} from "../type/ObjectType.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";
 
-import {ComponentVerifyingService} from "../shared/ComponentVerifyingService.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 {IPolicyService} from "./IPolicyService.sol";
-import {IPoolService} from "../pool/IPoolService.sol";
-import {IPricingService} from "./IPricingService.sol";
 
 contract PolicyService is
-    ComponentVerifyingService, 
+    Service, 
     IPolicyService
 {
-    using NftIdLib for NftId;
-    using TimestampLib for Timestamp;
-
-    IApplicationService internal _applicationService;
     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
@@ -59,23 +48,19 @@ contract PolicyService is
         initializer
     {
         (
-            address registryAddress,, 
-            //address managerAddress
+            address registryAddress,
             address authority
-        ) = abi.decode(data, (address, address, address));
+        ) = abi.decode(data, (address, address));
 
-        initializeService(registryAddress, authority, owner);
+        _initializeService(registryAddress, authority, owner);
 
         VersionPart majorVersion = getVersion().toMajorPart();
-        _applicationService = IApplicationService(getRegistry().getServiceAddress(APPLICATION(), majorVersion));
-        _bundleService = IBundleService(getRegistry().getServiceAddress(BUNDLE(), 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);
     }
 
 
@@ -83,26 +68,18 @@ contract PolicyService is
         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,37 +92,29 @@ contract PolicyService is
     /// @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),
             productNftId,
@@ -154,39 +123,55 @@ contract PolicyService is
             applicationInfo.sumInsuredAmount);
 
         // optional activation of policy
-        if(activateAt > zeroTimestamp()) {
-            applicationInfo.activatedAt = activateAt;
-            applicationInfo.expiredAt = activateAt.addSeconds(applicationInfo.lifetime);
+        if(activateAt > TimestampLib.zero()) {
+            applicationInfo = _activate(applicationNftId, applicationInfo, activateAt);
         }
 
-        IPolicy.Premium memory premium;
-
-        // optional: calculate the premium and update counters for collection at the end of this function
-        if(requirePremiumPayment) {
-            premium = _calculateAndProcessPremium(
-                instance,
-                applicationNftId,
-                applicationInfo);
-
-            applicationInfo.premiumPaidAmount = AmountLib.toAmount(premium.premiumAmount);
-        }
-
-        // store updated policy info
+        // update policy and set state to collateralized
         instance.getInstanceStore().updatePolicy(
             applicationNftId, 
             applicationInfo, 
-            newPolicyState);
+            COLLATERALIZED());
+
+        // calculate and store premium
+        RiskId riskId = applicationInfo.riskId;
+        NftId bundleNftId = applicationInfo.bundleNftId;
 
-        // TODO add calling pool contract if it needs to validate application
+        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);
 
-        // optional: transfer funds for premium 
-        if(requirePremiumPayment) {
-            _transferFunds(instanceReader, applicationNftId, applicationInfo.productNftId, 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);
+            }
         }
 
-        // TODO: add callback IPolicyHolder.policyActivated() if applicable
+        // link policy to risk and bundle
+        NftId poolNftId = getRegistry().getObjectInfo(bundleNftId).parentNftId;
+        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);
     }
 
 
@@ -197,31 +182,43 @@ contract PolicyService is
     )
         external 
         virtual
+        nonReentrant()
     {
-        // check caller is registered product
-        (,, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
-        InstanceReader instanceReader = instance.getInstanceReader();
-        StateId stateId = instanceReader.getPolicyState(policyNftId);
+        // checks
+        (
+            IInstance instance,
+            NftId productNftId,
+            IPolicy.PolicyInfo memory policyInfo
+        ) = _getAndVerifyCallerForPolicy(policyNftId);
 
-        // check policy is in state collateralized or active
-        if (!(stateId == COLLATERALIZED())) {
+        // check policy is in state collateralized
+        InstanceReader instanceReader = instance.getInstanceReader();
+        if (instanceReader.getPolicyState(policyNftId) != COLLATERALIZED()) {
             revert ErrorPolicyServicePolicyStateNotCollateralized(policyNftId);
         }
 
-        IPolicy.PolicyInfo memory policyInfo = instanceReader.getPolicyInfo(policyNftId);
-
-        // check if premium is already collected
-        if (policyInfo.premiumPaidAmount.gtz()) {
-            revert ErrorPolicyServicePremiumAlreadyPaid(policyNftId, policyInfo.premiumPaidAmount);
+        // check if premium has already been collected
+        if (instanceReader.getPremiumInfoState(policyNftId) == PAID()) {
+            revert ErrorPolicyServicePremiumAlreadyPaid(policyNftId);
         }
 
-        // calculate premium
-        IPolicy.Premium memory premium = _calculateAndProcessPremium(
-                instance,
-                policyNftId,
-                policyInfo);
+        // check funds and allowance of policy holder
+        IPolicy.PremiumInfo memory premium = instanceReader.getPremiumInfo(policyNftId);
+        TokenHandler tokenHandler = _getTokenHandler(instanceReader, policyInfo.productNftId);        
+        _checkPremiumBalanceAndAllowance(
+            tokenHandler.TOKEN(), 
+            address(tokenHandler),
+            getRegistry().ownerOf(policyNftId), 
+            premium.premiumAmount);
 
-        policyInfo.premiumPaidAmount = AmountLib.toAmount(premium.premiumAmount);
+        // effects
+        _processSale(
+            instanceReader, 
+            instance.getInstanceStore(), 
+            productNftId, 
+            policyInfo.bundleNftId, 
+            policyInfo.referralId, 
+            premium);
 
         // optionally activate policy
         if(activateAt.gtz()) {
@@ -229,28 +226,38 @@ contract PolicyService is
         }
 
         instance.getInstanceStore().updatePolicy(policyNftId, policyInfo, KEEP_STATE());
+        instance.getInstanceStore().updatePremiumState(policyNftId, PAID());
 
-        // TODO: add logging
+        // log premium collection before interactions with token
+        emit LogPolicyServicePolicyPremiumCollected(policyNftId, premium.premiumAmount);
 
+        // interactions
         _transferFunds(instanceReader, policyNftId, policyInfo.productNftId, premium);
-
-        // TODO: add callback IPolicyHolder.policyActivated() if applicable
     }
 
+
     /// @inheritdoc IPolicyService
-    function activate(NftId policyNftId, Timestamp activateAt) public override {
-        // check caller is registered product
-        (,, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
-        InstanceReader instanceReader = instance.getInstanceReader();
+    function activate(NftId policyNftId, Timestamp activateAt)
+        external
+        virtual
+        nonReentrant()
+    {
+        // checks
+        (
+            IInstance instance,,
+            IPolicy.PolicyInfo memory policyInfo
+        ) = _getAndVerifyCallerForPolicy(policyNftId);
 
-        IPolicy.PolicyInfo memory policyInfo = instanceReader.getPolicyInfo(policyNftId);
+        // effects
         policyInfo = _activate(policyNftId, policyInfo, activateAt);
-
         instance.getInstanceStore().updatePolicy(policyNftId, policyInfo, KEEP_STATE());
 
-        // TODO: add logging
+        // log policy activation before interactions with policy holder
+        emit LogPolicyServicePolicyActivated(policyNftId, activateAt);
 
-        // TODO: add callback IPolicyHolder.policyActivated() if applicable
+        // interactions
+        // callback to policy holder if applicable
+        _policyHolderPolicyActivated(policyNftId, activateAt);
     }
 
 
@@ -260,90 +267,86 @@ contract PolicyService is
         Timestamp expireAt
     )
         external
-        override
         virtual
+        nonReentrant()
         returns (Timestamp expiredAt)
     {
-        (NftId productNftId,, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
-        InstanceReader instanceReader = instance.getInstanceReader();
-
-        // check policy matches with calling product
-        IPolicy.PolicyInfo memory policyInfo = instanceReader.getPolicyInfo(policyNftId);
-        if(policyInfo.productNftId != productNftId) {
-            revert ErrorPolicyServicePolicyProductMismatch(
-                policyNftId, 
-                policyInfo.productNftId, 
-                productNftId);
-        }
-
-        // check policy is active
-        StateId policyState = instanceReader.getPolicyState(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();
-        }
+        // checks
+        (
+            IInstance instance,,
+            IPolicy.PolicyInfo memory policyInfo
+        ) = _getAndVerifyCallerForPolicy(policyNftId);
 
-        // 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);
-        }
+        // more checks, effects + interactions
+        return _expire(
+            instance,
+            policyNftId,
+            policyInfo,
+            expireAt
+        );
+    }
 
-        // update policyInfo with new expiredAt timestamp
-        policyInfo.expiredAt = expiredAt;
-        instance.getInstanceStore().updatePolicy(policyNftId, policyInfo, KEEP_STATE());
 
-        emit LogPolicyServicePolicyExpirationUpdated(policyNftId, expiredAt);
+    /// @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);
 
-        // TODO: add callback IPolicyHolder.policyExpired() if applicable
+        // 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();
 
-        // 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 (!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 (!(policyInfo.premiumAmount == policyInfo.premiumPaidAmount)) {
-            revert ErrorPolicyServicePremiumNotFullyPaid(policyNftId, policyInfo.premiumAmount, policyInfo.premiumPaidAmount);
+        if (instanceReader.getPremiumInfoState(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),
+            address(instanceReader.getComponentInfo(productNftId).token),
             policyNftId, 
             policyInfo);
 
@@ -353,57 +356,110 @@ contract PolicyService is
         policyInfo.closedAt = TimestampLib.blockTimestamp();
         instance.getInstanceStore().updatePolicy(policyNftId, policyInfo, CLOSED());
 
-        // TODO add logging
+        // unlink policy from risk and bundle
+        NftId poolNftId = getRegistry().getObjectInfo(bundleNftId).parentNftId;
+        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 _calculateAndProcessPremium(
+    function policyIsCloseable(InstanceReader instanceReader, NftId policyNftId)
+        public
+        view
+        returns (bool isCloseable)
+    {
+        // policy already closed
+        if (instanceReader.getPolicyState(policyNftId) == CLOSED()) {
+            return false;
+        }
+
+        IPolicy.PolicyInfo memory info = instanceReader.getPolicyInfo(policyNftId);
+        
+        if (info.productNftId.eqz()) { return false; } // not closeable: policy does not exist (or does not belong to this instance)
+        if (info.activatedAt.eqz()) { return false; } // not closeable: not yet activated
+        if (info.openClaimsCount > 0) { return false; } // not closeable: has open claims
+
+        // closeable: if sum of claims matches sum insured a policy may be closed prior to the expiry date
+        if (info.claimAmount == info.sumInsuredAmount) { return true; }
+
+        // not closeable: not yet expired
+        if (TimestampLib.blockTimestamp() < info.expiredAt) { return false; }
+
+        // all conditions to close the policy are met
+        return true; 
+    }
+
+    /// @dev shared functionality for expire() and policyExpire().
+    function _expire(
         IInstance instance,
-        NftId applicationNftId,
-        IPolicy.PolicyInfo memory applicationInfo
+        NftId policyNftId,
+        IPolicy.PolicyInfo memory policyInfo,
+        Timestamp expireAt
     )
         internal
-        virtual
-        returns (
-            IPolicy.Premium memory premium
-        )
+        returns (Timestamp expiredAt)
     {
-        NftId productNftId = applicationInfo.productNftId;
-        InstanceReader instanceReader = instance.getInstanceReader();
+        // checks
+        // check policy is active
+        StateId policyState = instance.getInstanceReader().getPolicyState(policyNftId);
+        if (!_policyHasBeenActivated(policyState, policyInfo)) {
+            revert ErrorPolicyServicePolicyNotActive(policyNftId, policyState);
+        }
 
-        // calculate premium details
-        premium = _pricingService.calculatePremium(
-            productNftId,
-            applicationInfo.riskId,
-            applicationInfo.sumInsuredAmount,
-            applicationInfo.lifetime,
-            applicationInfo.applicationData,
-            applicationInfo.bundleNftId,
-            applicationInfo.referralId);
+        // set return value to provided timestamp
+        expiredAt = expireAt;
 
-        // 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, 
-                AmountLib.toAmount(premium.premiumAmount));
+        // update expiredAt to current block timestamp if not set
+        if (expiredAt.eqz()) {
+            expiredAt = TimestampLib.blockTimestamp();
         }
 
-        // update the counters
-        _processSale(
-            instanceReader, 
-            instance.getInstanceStore(), 
-            productNftId, 
-            applicationInfo.bundleNftId, 
-            applicationInfo.referralId, 
-            premium);
+        // 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);
+        }
+
+        // effects
+        // 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);
+
+        // interactions
+        // callback to policy holder if applicable
+        _policyHolderPolicyExpired(policyNftId, expiredAt);
     }
 
+    // TODO cleanup
+    // /// @dev Calculates the premium and updates all counters in the other services.
+    // /// Only book keeping, no token transfers.
+    // function _processPremium(
+    //     IInstance instance,
+    //     NftId applicationNftId,
+    //     IPolicy.PolicyInfo memory applicationInfo,
+    //     IPolicy.PremiumInfo memory premium
+    // )
+    //     internal
+    //     virtual
+    // {
+    //     // update the counters
+    //     _processSale(
+    //         instanceReader, 
+    //         instance.getInstanceStore(), 
+    //         productNftId, 
+    //         applicationInfo.bundleNftId, 
+    //         applicationInfo.referralId, 
+    //         premium);
+    // }
+
 
     function _activate(
         NftId policyNftId, 
@@ -415,10 +471,16 @@ contract PolicyService is
         view 
         returns (IPolicy.PolicyInfo memory)
     {
-        if(! policyInfo.activatedAt.eqz()) {
+        // fail if policy has already been activated and activateAt is different
+        if(! policyInfo.activatedAt.eqz() && activateAt != policyInfo.activatedAt) {
             revert ErrorPolicyServicePolicyAlreadyActivated(policyNftId);
         }
 
+        // ignore if policy has already been activated and activateAt is the same
+        if (policyInfo.activatedAt == activateAt) {
+            return policyInfo;
+        }
+
         policyInfo.activatedAt = activateAt;
         policyInfo.expiredAt = activateAt.addSeconds(policyInfo.lifetime);
 
@@ -432,17 +494,12 @@ contract PolicyService is
         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);
 
@@ -450,13 +507,15 @@ contract PolicyService is
         _componentService.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(
@@ -470,7 +529,7 @@ contract PolicyService is
         InstanceReader instanceReader,
         NftId policyNftId,
         NftId productNftId,
-        IPolicy.Premium memory premium
+        IPolicy.PremiumInfo memory premium
     )
         internal
         virtual
@@ -487,27 +546,14 @@ contract PolicyService is
             instanceReader, 
             productNftId);
 
-        if (premium.productFeeAmount.gtz()) {
-            TokenTransferLib.collectTokens(
-                policyHolder,
-                productWallet,
-                premium.productFeeAmount,
-                tokenHandler);
-        }
-        if (premium.distributionFeeAndCommissionAmount.gtz()) {
-            TokenTransferLib.collectTokens(
-                policyHolder,
-                distributionWallet,
-                premium.distributionFeeAndCommissionAmount,
-                tokenHandler);
-        }
-        if (premium.poolPremiumAndFeeAmount.gtz()) {
-            TokenTransferLib.collectTokens(
-                policyHolder,
-                poolWallet,
-                premium.poolPremiumAndFeeAmount,
-                tokenHandler);
-        }
+        tokenHandler.collectTokensToThreeRecipients(
+            policyHolder,
+            productWallet,
+            premium.productFeeAmount,
+            distributionWallet,
+            premium.distributionFeeAndCommissionAmount,
+            poolWallet,
+            premium.poolPremiumAndFeeAmount);
     }
 
 
@@ -552,6 +598,64 @@ contract PolicyService is
     }
 
 
+    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 (IPolicyHolder policyHolder)
+    {
+        address policyHolderAddress = getRegistry().ownerOf(policyNftId);
+        policyHolder = IPolicyHolder(policyHolderAddress);
+
+        if (!ContractLib.isPolicyHolder(policyHolderAddress)) {
+            policyHolder = IPolicyHolder(address(0));
+        }
+    }
+
+
     function _getTokenHandler(
         InstanceReader instanceReader,
         NftId productNftId
@@ -566,6 +670,7 @@ contract PolicyService is
         tokenHandler = instanceReader.getComponentInfo(productNftId).tokenHandler;
     }
 
+
     function _getDistributionNftAndWallets(
         InstanceReader instanceReader,
         NftId productNftId
@@ -580,17 +685,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;
+        instance = IInstance(instanceAddress);
+        policyInfo = instance.getInstanceReader().getPolicyInfo(policyNftId);
+
+        if (policyInfo.productNftId != productNftId) {
+            revert ErrorPolicyServicePolicyProductMismatch(
+                policyNftId, 
+                productNftId,
+                policyInfo.productNftId);
+        }
     }