@etherisc/gif-next 0.0.2-b7d6ed2-016 → 0.0.2-b7e6198-021

package/contracts/product/ClaimService.sol

@@ -2,7 +2,6 @@
 pragma solidity ^0.8.20;
 
 import {IClaimService} from "./IClaimService.sol";
-import {IComponents} from "../instance/module/IComponents.sol";
 import {IInstance} from "../instance/IInstance.sol";
 import {IPolicy} from "../instance/module/IPolicy.sol";
 import {IPolicyHolder} from "../shared/IPolicyHolder.sol";
@@ -14,11 +13,10 @@ import {IRegistry} from "../registry/IRegistry.sol";
 import {Amount, AmountLib} from "../type/Amount.sol";
 import {ClaimId, ClaimIdLib} from "../type/ClaimId.sol";
 import {ContractLib} from "../shared/ContractLib.sol";
-import {FeeLib} from "../type/Fee.sol";
 import {InstanceReader} from "../instance/InstanceReader.sol";
 import {InstanceStore} from "../instance/InstanceStore.sol";
 import {NftId} from "../type/NftId.sol";
-import {ObjectType, COMPONENT, CLAIM, POLICY, POOL, PRODUCT} from "../type/ObjectType.sol";
+import {ObjectType, CLAIM, POLICY, POOL, PRODUCT} from "../type/ObjectType.sol";
 import {PayoutId, PayoutIdLib} from "../type/PayoutId.sol";
 import {Service} from "../shared/Service.sol";
 import {StateId} from "../type/StateId.sol";
@@ -68,14 +66,13 @@ contract ClaimService is
     {
         // checks
         (
-            ,
-            IInstance instance,,
+            ,,,
             InstanceStore instanceStore,
             IPolicy.PolicyInfo memory policyInfo
         ) = _verifyCallerWithPolicy(policyNftId);
 
         // check policy is in its active period
-        if(policyInfo.activatedAt.eqz() || TimestampLib.blockTimestamp() >= policyInfo.expiredAt) {
+        if(policyInfo.activatedAt.eqz() || TimestampLib.current() >= policyInfo.expiredAt) {
             revert ErrorClaimServicePolicyNotOpen(policyNftId);
         }
 
@@ -114,6 +111,7 @@ contract ClaimService is
     )
         external
         virtual
+        restricted()
         // nonReentrant() // prevents creating a reinsurance claim in a single tx
     {
         // checks
@@ -142,7 +140,7 @@ contract ClaimService is
 
         // should policy still be active it needs to become expired
         if (policyInfo.claimAmount >= policyInfo.sumInsuredAmount) {
-            _policyService.expirePolicy(instance, policyNftId, TimestampLib.blockTimestamp());
+            _policyService.expirePolicy(instance, policyNftId, TimestampLib.current());
         }
 
         emit LogClaimServiceClaimConfirmed(policyNftId, claimId, confirmedAmount);
@@ -163,13 +161,13 @@ contract ClaimService is
     )
         external
         virtual
+        restricted()
         // nonReentrant() // prevents creating a reinsurance claim in a single tx
     {
         _checkNftType(policyNftId, POLICY());
 
         (
-            ,
-            IInstance instance,
+            ,,
             InstanceReader instanceReader,
             InstanceStore instanceStore,
             IPolicy.PolicyInfo memory policyInfo
@@ -178,7 +176,7 @@ contract ClaimService is
         // check/update claim info
         IPolicy.ClaimInfo memory claimInfo = _verifyClaim(instanceReader, policyNftId, claimId, SUBMITTED());
         claimInfo.processData = data;
-        claimInfo.closedAt = TimestampLib.blockTimestamp();
+        claimInfo.closedAt = TimestampLib.current();
         instanceStore.updateClaim(policyNftId, claimId, claimInfo, DECLINED());
 
         // update and save policy info with instance
@@ -195,11 +193,11 @@ contract ClaimService is
     )
         external
         virtual
+        restricted()
         // nonReentrant() // prevents creating a reinsurance claim in a single tx
     {        
         (
-            ,
-            IInstance instance,
+            ,,
             InstanceReader instanceReader,
             InstanceStore instanceStore,
             IPolicy.PolicyInfo memory policyInfo
@@ -207,7 +205,7 @@ contract ClaimService is
 
         // check/update claim info
         IPolicy.ClaimInfo memory claimInfo = _verifyClaim(instanceReader, policyNftId, claimId, SUBMITTED());
-        claimInfo.closedAt = TimestampLib.blockTimestamp();
+        claimInfo.closedAt = TimestampLib.current();
         instanceStore.updateClaim(policyNftId, claimId, claimInfo, REVOKED());
 
         // update and save policy info with instance
@@ -218,22 +216,21 @@ contract ClaimService is
     }
 
 
-    function close(
+    function cancelConfirmedClaim(
         NftId policyNftId, 
         ClaimId claimId
     )
         external
         virtual
+        restricted()
         // nonReentrant() // prevents creating a reinsurance claim in a single tx
     {
         _checkNftType(policyNftId, POLICY());
         
         (
-            ,
-            IInstance instance,
+            ,,
             InstanceReader instanceReader,
             InstanceStore instanceStore,
-            IPolicy.PolicyInfo memory policyInfo
         ) = _verifyCallerWithPolicy(policyNftId);
 
         // check/update claim info
@@ -247,17 +244,10 @@ contract ClaimService is
                 claimInfo.openPayoutsCount);
         }
 
-        // check claim paid amount matches with claim amount
-        if(claimInfo.paidAmount.toInt() < claimInfo.claimAmount.toInt()) {
-            revert ErrorClaimServiceClaimWithMissingPayouts(
-                policyNftId, 
-                claimId, 
-                claimInfo.claimAmount,
-                claimInfo.paidAmount);
-        }
+        claimInfo.closedAt = TimestampLib.current();
+        instanceStore.updateClaim(policyNftId, claimId, claimInfo, CANCELLED());
 
-        claimInfo.closedAt = TimestampLib.blockTimestamp();
-        instanceStore.updateClaim(policyNftId, claimId, claimInfo, CLOSED());
+        emit LogClaimServiceClaimCancelled(policyNftId, claimId);
     }
 
 
@@ -270,6 +260,7 @@ contract ClaimService is
     )
         external
         virtual
+        restricted()
         // nonReentrant() // prevents creating a reinsurance claim in a single tx
         returns (PayoutId payoutId)
     {
@@ -294,6 +285,7 @@ contract ClaimService is
     )
         external
         virtual
+        restricted()
         // nonReentrant() // prevents creating a reinsurance payout in a single tx
         returns (PayoutId payoutId)
     {
@@ -314,51 +306,58 @@ contract ClaimService is
     )
         external
         virtual
+        restricted()
         // nonReentrant() // prevents creating a reinsurance payout in a single tx
+        returns (Amount netPayoutAmount, Amount processingFeeAmount)
     {
         // checks
         (
-            NftId productNftId,,
-            // IInstance instance,
+            ,,
             InstanceReader instanceReader,
             InstanceStore instanceStore,
             IPolicy.PolicyInfo memory policyInfo
         ) = _verifyCallerWithPolicy(policyNftId);
 
-        // check that payout exists and is open
-        IPolicy.PayoutInfo memory payoutInfo = instanceReader.getPayoutInfo(policyNftId, payoutId);
-        StateId payoutState = instanceReader.getPayoutState(policyNftId, payoutId);
-        if(payoutState != EXPECTED()) {
-            revert ErrorClaimServicePayoutNotExpected(policyNftId, payoutId, payoutState);
-        }
+        IPolicy.ClaimInfo memory claimInfo;
+        address payoutBeneficiary;
+        Amount payoutAmount;
+        
+        {
+            // check that payout exists and is open
+            IPolicy.PayoutInfo memory payoutInfo = instanceReader.getPayoutInfo(policyNftId, payoutId);
+            payoutBeneficiary = payoutInfo.beneficiary;
+            payoutAmount = payoutInfo.amount;
+            StateId payoutState = instanceReader.getPayoutState(policyNftId, payoutId);
+            if(payoutState != EXPECTED()) {
+                revert ErrorClaimServicePayoutNotExpected(policyNftId, payoutId, payoutState);
+            }
 
-        // check that payout amount does not violate claim amount
-        IPolicy.ClaimInfo memory claimInfo = instanceReader.getClaimInfo(policyNftId, payoutId.toClaimId());
-        if(claimInfo.paidAmount + payoutInfo.amount > claimInfo.claimAmount) {
-            revert ErrorClaimServicePayoutExceedsClaimAmount(
-                policyNftId, 
-                payoutId.toClaimId(), 
-                claimInfo.claimAmount, 
-                claimInfo.paidAmount + payoutInfo.amount);
-        }
+            // check that payout amount does not violate claim amount
+            claimInfo = instanceReader.getClaimInfo(policyNftId, payoutId.toClaimId());
+            if(claimInfo.paidAmount + payoutInfo.amount > claimInfo.claimAmount) {
+                revert ErrorClaimServicePayoutExceedsClaimAmount(
+                    policyNftId, 
+                    payoutId.toClaimId(), 
+                    claimInfo.claimAmount, 
+                    claimInfo.paidAmount + payoutInfo.amount);
+            }
 
-        // effects
-        // update and save payout info with instance
-        payoutInfo.paidAt = TimestampLib.blockTimestamp();
-        instanceStore.updatePayout(policyNftId, payoutId, payoutInfo, PAID());
+            // effects
+            // update and save payout info with instance
+            payoutInfo.paidAt = TimestampLib.current();
+            instanceStore.updatePayout(policyNftId, payoutId, payoutInfo, PAID());
+        }
 
         // update and save claim info with instance
-        Amount payoutAmount = payoutInfo.amount;
         {
             ClaimId claimId = payoutId.toClaimId();
-            IPolicy.ClaimInfo memory claimInfo = instanceReader.getClaimInfo(policyNftId, claimId);
             claimInfo.paidAmount = claimInfo.paidAmount.add(payoutAmount);
             claimInfo.openPayoutsCount -= 1;
 
             // check if this payout is closing the linked claim
             // update claim and policy info accordingly
             if(claimInfo.openPayoutsCount == 0 && claimInfo.paidAmount == claimInfo.claimAmount) {
-                claimInfo.closedAt = TimestampLib.blockTimestamp();
+                claimInfo.closedAt = TimestampLib.current();
                 instanceStore.updateClaim(policyNftId, claimId, claimInfo, CLOSED());
 
                 policyInfo.openClaimsCount -= 1;
@@ -375,7 +374,7 @@ contract ClaimService is
 
         // effects + interactions (push tokens to beneficiary, product)
         // delegate to pool to update book keeping and moving tokens payout
-        _poolService.processPayout(
+        (netPayoutAmount, processingFeeAmount) = _poolService.processPayout(
             instanceReader,
             instanceStore, 
             policyInfo.productNftId, // product nft id 
@@ -383,7 +382,7 @@ contract ClaimService is
             policyInfo.bundleNftId, 
             payoutId,
             payoutAmount,
-            payoutInfo.beneficiary);
+            payoutBeneficiary);
     }
 
     function cancelPayout(
@@ -392,14 +391,13 @@ contract ClaimService is
     )
         external
         virtual
+        restricted()
     {
         // checks
         (
-            ,
-            IInstance instance,
+            ,,
             InstanceReader instanceReader,
             InstanceStore instanceStore,
-            IPolicy.PolicyInfo memory policyInfo
         ) = _verifyCallerWithPolicy(policyNftId);
 
         StateId payoutState = instanceReader.getPayoutState(policyNftId, payoutId);
@@ -522,7 +520,7 @@ contract ClaimService is
             IPolicy.PolicyInfo memory policyInfo
         )
     {
-        (productNftId, instance) = _getAndVerifyActiveComponent(PRODUCT());
+        (productNftId, instance) = _getAndVerifyActiveProduct();
         instanceReader = instance.getInstanceReader();
         instanceStore = instance.getInstanceStore();
 
@@ -536,7 +534,7 @@ contract ClaimService is
     }
 
 
-    function _getAndVerifyActiveComponent(ObjectType expectedType) 
+    function _getAndVerifyActiveProduct() 
         internal 
         view 
         returns (

package/contracts/product/IApplicationService.sol

@@ -6,7 +6,6 @@ import {IService} from "../shared/IService.sol";
 
 import {Amount} from "../type/Amount.sol";
 import {NftId} from "../type/NftId.sol";
-import {ObjectType} from "../type/ObjectType.sol";
 import {ReferralId} from "../type/Referral.sol";
 import {RiskId} from "../type/RiskId.sol";
 import {Seconds} from "../type/Seconds.sol";
@@ -15,10 +14,30 @@ import {Seconds} from "../type/Seconds.sol";
 /// only product components may call transaction functions
 interface IApplicationService is IService {
     
+    event LogApplicationServiceApplicationCreated(
+        NftId applicationNftId,
+        NftId productNftId,
+        NftId bundleNftId, 
+        RiskId riskId,
+        ReferralId referralId,
+        address applicationOwner,
+        Amount sumInsuredAmount,
+        Amount premiumAmount,
+        Seconds lifetime);
+    event LogApplicationServiceApplicationRenewed(NftId policyNftId, NftId bundleNftId);
+    event LogApplicationServiceApplicationAdjusted(
+        NftId applicationNftId, 
+        NftId bundleNftId, 
+        RiskId riskId, 
+        ReferralId referralId, 
+        Amount sumInsuredAmount, 
+        Seconds lifetime);
+    event LogApplicationServiceApplicationRevoked(NftId applicationNftId);
+
     // _checkLinkedApplicationParameters
     error ErrorApplicationServiceRiskProductMismatch(RiskId riskId, NftId riskProductNftId, NftId productNftId);
     error ErrorApplicationServiceRiskUnknown(RiskId riskId, NftId productNftId);
-    error ErrorApplicationServiceRiskPaused(RiskId riskId, NftId productNftId);
+    error ErrorApplicationServiceRiskLocked(RiskId riskId, NftId productNftId);
     error ErrorApplicationServiceBundleUnknown(NftId bundleNftId, NftId poolNftId);
     error ErrorApplicationServiceBundleLocked(NftId bundleNftId, NftId poolNftId);
     error ErrorApplicationServiceReferralInvalid(NftId productNftId, NftId distributionNftId, ReferralId referralId);

package/contracts/product/IClaimService.sol

@@ -23,7 +23,7 @@ interface IClaimService is
     event LogClaimServiceClaimConfirmed(NftId policyNftId, ClaimId claimId, Amount confirmedAmount);
     event LogClaimServiceClaimDeclined(NftId policyNftId, ClaimId claimId);
     event LogClaimServiceClaimRevoked(NftId policyNftId, ClaimId claimId);
-    event LogClaimServiceClaimClosed(NftId policyNftId, ClaimId claimId);
+    event LogClaimServiceClaimCancelled(NftId policyNftId, ClaimId claimId);
 
     event LogClaimServicePayoutCreated(NftId policyNftId, PayoutId payoutId, Amount amount, address beneficiary);
     event LogClaimServicePayoutProcessed(NftId policyNftId, PayoutId payoutId, Amount amount);
@@ -83,9 +83,10 @@ interface IClaimService is
     ) external;
 
 
-    /// @dev closes the specified claim
+    /// @dev cancels a confirmed claim before it has been fully paid out. 
+    /// Can only be called when there are not pending payouts
     /// function can only be called by product, policy needs to match with calling product
-    function close(
+    function cancelConfirmedClaim(
         NftId policyNftId, 
         ClaimId claimId
     ) external;
@@ -125,7 +126,7 @@ interface IClaimService is
     function processPayout(
         NftId policyNftId, 
         PayoutId payoutId
-    ) external;
+    ) external returns (Amount netPayoutAmount, Amount processingFeeAmount);
 
     /// @dev cancels the specified payout. no tokens are moved, payout is set to cancelled. 
     function cancelPayout(

package/contracts/product/IPolicyService.sol

@@ -5,7 +5,6 @@ import {IService} from "../shared/IService.sol";
 
 import {Amount} from "../type/Amount.sol";
 import {IInstance} from "../instance/IInstance.sol";
-import {InstanceReader} from "../instance/InstanceReader.sol";
 import {NftId} from "../type/NftId.sol";
 import {StateId} from "../type/StateId.sol";
 import {Timestamp} from "../type/Timestamp.sol";
@@ -20,6 +19,7 @@ interface IPolicyService is IService {
     event LogPolicyServicePolicyExpirationUpdated(NftId policyNftId, Timestamp expiredAt);
     event LogPolicyServicePolicyClosed(NftId policyNftId);
 
+    error LogPolicyServiceMaxPremiumAmountExceeded(NftId policyNftId, Amount maxPremiumAmount, Amount premiumAmount);
     error ErrorPolicyServicePolicyProductMismatch(NftId applicationNftId, NftId expectedProductNftId, NftId actualProductNftId);
     error ErrorPolicyServicePolicyStateNotApplied(NftId applicationNftId);
     error ErrorPolicyServicePolicyStateNotCollateralized(NftId applicationNftId);
@@ -45,14 +45,21 @@ interface IPolicyService is IService {
     error ErrorPolicyServiceTransferredPremiumMismatch(NftId policyNftId, Amount expectedPremiumAmount, Amount transferredPremiumAmount);
 
     /// @dev creates the policy from {applicationNftId}. 
+    /// @param applicationNftId the application NftId
+    /// @param activateAt the timestamp when the policy should be activated
+    /// @param maxPremiumAmount the maximum premium amount that the policy holder is willing to pay
+    /// During policy creation, the effective premium amount is calculated based on the provided parameters. If this
+    /// amount is higher than the maxPremiumAmount, the function will revert.
     /// After successful completion of the function the policy can be referenced using the application NftId.
     /// Locks the sum insured amount in the pool, but does not transfer tokens. Call collectPremium to transfer tokens. 
     /// Sets the policy state to collateralized.
     /// Optionally activates the policy if activateAt is a non-zero timestamp.
     /// only the related product may create a policy from an application
+    /// @return premiumAmount the effective premium amount
     function createPolicy(
         NftId applicationNftId,
-        Timestamp activateAt
+        Timestamp activateAt,
+        Amount maxPremiumAmount
     )
         external
         returns (Amount premiumAmount);

package/contracts/product/IRiskService.sol

@@ -9,7 +9,16 @@ import {StateId} from "../type/StateId.sol";
 
 interface IRiskService is IService {
 
+    event LogRiskServiceRiskCreated(NftId productNftId, RiskId riskId);
+    event LogRiskServiceRiskUpdated(NftId productNftId, RiskId riskId);
+    event LogRiskServiceRiskLocked(NftId productNftId, RiskId riskId);
+    event LogRiskServiceRiskUnlocked(NftId productNftId, RiskId riskId);
+    event LogRiskServiceRiskClosed(NftId productNftId, RiskId riskId);
+    
     error ErrorRiskServiceRiskProductMismatch(RiskId riskId, NftId riskProductNftId, NftId productNftId);
+    error ErrorRiskServiceRiskNotActive(NftId productNftId, RiskId riskId);
+    error ErrorRiskServiceUnknownRisk(NftId productNftId, RiskId riskId);
+    error ErrorRiskServiceRiskNotLocked(NftId productNftId, RiskId riskId);
 
     /// @dev Create a new risk with the given id and provided data. 
     /// The key of the risk derived from the risk id in comination with the product NftId. 
@@ -25,9 +34,15 @@ interface IRiskService is IService {
         bytes memory data
     ) external;
 
-
-    function updateRiskState(
+    /// @dev Locks/unlocks the risk with the given id.
+    /// No new policies can be underwritten for a locked risk.
+    function setRiskLocked(
         RiskId riskId,
-        StateId newState
+        bool locked
+    ) external;
+
+    /// @dev Close the risk with the given id.
+    function closeRisk(
+        RiskId riskId
     ) external;
 }

package/contracts/product/PolicyService.sol

@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
-
 import {IAccountingService} from "../accounting/IAccountingService.sol";
 import {IComponentService} from "../shared/IComponentService.sol";
 import {IComponents} from "../instance/module/IComponents.sol";
@@ -26,7 +24,6 @@ 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";
@@ -73,6 +70,7 @@ contract PolicyService is
     )
         external
         virtual
+        restricted()
         nonReentrant()
     {
         // checks
@@ -96,10 +94,12 @@ contract PolicyService is
     /// @inheritdoc IPolicyService
     function createPolicy(
         NftId applicationNftId, // = policyNftId
-        Timestamp activateAt
+        Timestamp activateAt,
+        Amount maxPremiumAmount
     )
         external 
         virtual
+        restricted()
         nonReentrant()
         returns (Amount premiumAmount)
     {
@@ -128,7 +128,7 @@ contract PolicyService is
 
         // optional activation of policy
         if(activateAt.gtz()) {
-            applicationInfo = _activate(applicationNftId, applicationInfo, activateAt);
+            applicationInfo = PolicyServiceLib.activate(applicationNftId, applicationInfo, activateAt);
         }
 
         // update policy and set state to collateralized
@@ -150,7 +150,14 @@ contract PolicyService is
             bundleNftId,
             applicationInfo.referralId);
 
-        premiumAmount = premium.fullPremiumAmount;
+        if (premium.premiumAmount > maxPremiumAmount) {
+            revert LogPolicyServiceMaxPremiumAmountExceeded(
+                applicationNftId, 
+                maxPremiumAmount, 
+                premium.premiumAmount);
+        }
+
+        premiumAmount = premium.premiumAmount;
         instance.getInstanceStore().createPremium(
             applicationNftId,
             premium);
@@ -186,6 +193,7 @@ contract PolicyService is
     )
         external 
         virtual
+        restricted()
         nonReentrant()
     {
         // checks
@@ -202,7 +210,7 @@ contract PolicyService is
         }
 
         // check if premium has already been collected
-        if (instanceReader.getPremiumInfoState(policyNftId) == PAID()) {
+        if (instanceReader.getPremiumState(policyNftId) == PAID()) {
             revert ErrorPolicyServicePremiumAlreadyPaid(policyNftId);
         }
 
@@ -232,7 +240,7 @@ contract PolicyService is
 
         // optionally activate policy
         if(activateAt.gtz()) {
-            policyInfo = _activate(policyNftId, policyInfo, activateAt);
+            policyInfo = PolicyServiceLib.activate(policyNftId, policyInfo, activateAt);
         }
 
         instance.getInstanceStore().updatePolicy(policyNftId, policyInfo, KEEP_STATE());
@@ -250,6 +258,7 @@ contract PolicyService is
     function activate(NftId policyNftId, Timestamp activateAt)
         external
         virtual
+        restricted()
         nonReentrant()
     {
         // checks
@@ -259,7 +268,7 @@ contract PolicyService is
         ) = _getAndVerifyCallerForPolicy(policyNftId);
 
         // effects
-        policyInfo = _activate(policyNftId, policyInfo, activateAt);
+        policyInfo = PolicyServiceLib.activate(policyNftId, policyInfo, activateAt);
         instance.getInstanceStore().updatePolicy(policyNftId, policyInfo, KEEP_STATE());
 
         // log policy activation before interactions with policy holder
@@ -277,6 +286,7 @@ contract PolicyService is
     )
         external
         virtual
+        restricted()
         nonReentrant()
     {
         // checks
@@ -289,8 +299,8 @@ contract PolicyService is
             revert ErrorPolicyServicePolicyNotActivated(policyNftId);
         }
 
-        if (newActivateAt < TimestampLib.blockTimestamp()) {
-            revert ErrorPolicyServicePolicyActivationTooEarly(policyNftId, TimestampLib.blockTimestamp(), newActivateAt);
+        if (newActivateAt < TimestampLib.current()) {
+            revert ErrorPolicyServicePolicyActivationTooEarly(policyNftId, TimestampLib.current(), newActivateAt);
         }
 
         if (newActivateAt > policyInfo.expiredAt) {
@@ -317,6 +327,7 @@ contract PolicyService is
     )
         external
         virtual
+        restricted()
         nonReentrant()
         returns (Timestamp expiredAt)
     {
@@ -344,6 +355,7 @@ contract PolicyService is
     )
         external
         virtual
+        restricted()
         nonReentrant()
         returns (Timestamp expiredAt)
     {
@@ -368,6 +380,7 @@ contract PolicyService is
     )
         external 
         virtual
+        restricted()
         nonReentrant()
     {
         // checks
@@ -387,7 +400,7 @@ contract PolicyService is
         RiskId riskId = policyInfo.riskId;
         NftId bundleNftId = policyInfo.bundleNftId;
 
-        if (instanceReader.getPremiumInfoState(policyNftId) != PAID()) {
+        if (instanceReader.getPremiumState(policyNftId) != PAID()) {
             revert ErrorPolicyServicePremiumNotPaid(policyNftId, policyInfo.premiumAmount);
         }
 
@@ -401,7 +414,7 @@ contract PolicyService is
         // TODO consider to also set expiredAt to current block timestamp if that timestamp is still in the futue
 
         // update policy state to closed
-        policyInfo.closedAt = TimestampLib.blockTimestamp();
+        policyInfo.closedAt = TimestampLib.current();
         instance.getInstanceStore().updatePolicy(policyNftId, policyInfo, CLOSED());
 
         // unlink policy from risk and bundle
@@ -412,6 +425,7 @@ contract PolicyService is
         emit LogPolicyServicePolicyClosed(policyNftId);
     }
 
+
     /// @dev shared functionality for expire() and policyExpire().
     function _expire(
         IInstance instance,
@@ -422,19 +436,12 @@ contract PolicyService is
         internal
         returns (Timestamp)
     {
-        PolicyServiceLib.checkExpiration(
-            expireAt,
+        policyInfo = PolicyServiceLib.expire(
+            instance.getInstanceReader(),
             policyNftId,
-            instance.getInstanceReader().getPolicyState(policyNftId),
-            policyInfo);
+            policyInfo,
+            expireAt);
 
-        // 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());
 
         emit LogPolicyServicePolicyExpirationUpdated(policyNftId, policyInfo.expiredAt);
@@ -446,32 +453,6 @@ contract PolicyService is
     }
 
 
-    function _activate(
-        NftId policyNftId, 
-        IPolicy.PolicyInfo memory policyInfo,
-        Timestamp activateAt
-    )
-        internal
-        virtual
-        view 
-        returns (IPolicy.PolicyInfo memory)
-    {
-        // 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);
-
-        return policyInfo;
-    }
-
     /// @dev update counters by calling the involved services
     function _processSale(
         InstanceReader instanceReader,