@etherisc/gif-next 0.0.2-9e6b423-414 → 0.0.2-9f1b659-471

package/contracts/product/ApplicationService.sol

@@ -11,6 +11,7 @@ import {IPricingService} from "./IPricingService.sol";
 import {IRegistryService} from "../registry/IRegistryService.sol";
 
 import {AmountLib} from "../type/Amount.sol";
+import {ContractLib} from "../shared/ContractLib.sol";
 import {Seconds} from "../type/Seconds.sol";
 import {zeroTimestamp} from "../type/Timestamp.sol";
 import {ObjectType, BUNDLE, DISTRIBUTION, PRODUCT, REGISTRY, APPLICATION, POLICY, PRICE} from "../type/ObjectType.sol";
@@ -19,13 +20,12 @@ import {NftId, NftIdLib} from "../type/NftId.sol";
 import {ReferralId} from "../type/Referral.sol";
 import {RiskId} from "../type/RiskId.sol";
 import {Amount, AmountLib} from "../type/Amount.sol";
-import {ComponentVerifyingService} from "../shared/ComponentVerifyingService.sol";
+import {Service} from "../shared/Service.sol";
 import {InstanceReader} from "../instance/InstanceReader.sol";
 
 
-
 contract ApplicationService is 
-    ComponentVerifyingService, 
+    Service, 
     IApplicationService
 {
     IDistributionService private _distributionService;
@@ -69,7 +69,7 @@ contract ApplicationService is
         // check risk with product
         (bool exists, bool active) = instanceReader.getRiskSet().checkRisk(productNftId, riskId);
         if (!exists) { revert ErrorApplicationServiceRiskUnknown(riskId, productNftId); }
-        if (!active) { revert ErrorApplicationServiceRiskPaused(riskId, productNftId); }
+        if (!active) { revert ErrorApplicationServiceRiskLocked(riskId, productNftId); }
 
         NftId riskProductNftId = instanceReader.getRiskInfo(riskId).productNftId;
         if (productNftId != riskProductNftId) {
@@ -155,7 +155,7 @@ contract ApplicationService is
     {
         _checkNftType(bundleNftId, BUNDLE());
 
-        (NftId productNftId,, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
+        (NftId productNftId, IInstance instance) = _getAndVerifyActiveProduct();
 
         // check if provided references are valid and linked to calling product contract
         InstanceReader instanceReader = instance.getInstanceReader();
@@ -185,7 +185,28 @@ contract ApplicationService is
             applicationNftId, 
             applicationInfo);
 
-        // TODO: add logging
+        _emitApplicationCreatedEvent(applicationNftId, applicationOwner, applicationInfo);
+    }
+
+    function _emitApplicationCreatedEvent(
+        NftId applicationNftId,
+        address applicationOwner,
+        IPolicy.PolicyInfo memory applicationInfo
+    )
+        internal
+        virtual
+    {
+        emit LogApplicationServiceApplicationCreated(
+            applicationNftId,
+            applicationInfo.productNftId,
+            applicationInfo.bundleNftId, 
+            applicationInfo.riskId,
+            applicationInfo.referralId,
+            applicationOwner,
+            applicationInfo.sumInsuredAmount,
+            applicationInfo.premiumAmount,
+            applicationInfo.lifetime
+        );
     }
 
     function _createApplicationInfo(
@@ -234,7 +255,10 @@ contract ApplicationService is
     {
         _checkNftType(policyNftId, POLICY());
         _checkNftType(bundleNftId, BUNDLE());
-        // TODO implement
+        
+        // TODO: implement
+
+        emit LogApplicationServiceApplicationRenewed(policyNftId, bundleNftId);
     }
 
 
@@ -254,7 +278,10 @@ contract ApplicationService is
     {
         _checkNftType(applicationNftId, POLICY());
         _checkNftType(bundleNftId, BUNDLE());
-        // TODO implement
+
+        // TODO: implement
+        
+        emit LogApplicationServiceApplicationAdjusted(applicationNftId, bundleNftId, riskId, referralId, sumInsuredAmount, lifetime);
     }
 
     function revoke(NftId applicationNftId)
@@ -265,12 +292,34 @@ contract ApplicationService is
     {
         _checkNftType(applicationNftId, POLICY());
 
-        (,, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
+        (, IInstance instance) = _getAndVerifyActiveProduct();
         instance.getInstanceStore().updateApplicationState(applicationNftId, REVOKED());
+        emit LogApplicationServiceApplicationRevoked(applicationNftId);
     }
 
     // internal functions
 
+    function _getAndVerifyActiveProduct()
+        internal
+        view
+        returns (
+            NftId productNftId,
+            IInstance instance
+        )
+    {
+        (
+            IRegistry.ObjectInfo memory info, 
+            address instanceAddress
+        ) = ContractLib.getAndVerifyComponent(
+            getRegistry(), 
+            msg.sender,
+            PRODUCT(),
+            true); // only active pools
+
+        productNftId = info.nftId;
+        instance = IInstance(instanceAddress);
+    }
+
 
     function _getDomain() internal pure override returns(ObjectType) {
         return APPLICATION();

package/contracts/product/BasicProduct.sol

@@ -36,7 +36,7 @@ abstract contract BasicProduct is
         virtual
         onlyInitializing()
     {
-        _initializeProduct(
+        __Product_init(
             registry, 
             instanceNftId, 
             name, 

package/contracts/product/BasicProductAuthorization.sol

@@ -3,6 +3,7 @@ pragma solidity ^0.8.20;
 
 import {IAccess} from "../authorization/IAccess.sol";
 import {IInstanceLinkedComponent} from "../shared/IInstanceLinkedComponent.sol";
+import {IProductComponent} from "./IProductComponent.sol";
 
 import {Authorization} from "../authorization/Authorization.sol";
 import {BasicProduct} from "./BasicProduct.sol"; 
@@ -55,6 +56,7 @@ contract BasicProductAuthorization
           // authorize public role (open access to any account, only allows to lock target)
           functions = _authorizeForTarget(getMainTargetName(), PUBLIC_ROLE());
           _authorize(functions, BasicProduct.setFees.selector, "setFees");
+          _authorize(functions, IProductComponent.registerComponent.selector, "registerComponent");
           _authorize(functions, IInstanceLinkedComponent.withdrawFees.selector, "withdrawFees");
      }
 }

package/contracts/product/ClaimService.sol

@@ -72,7 +72,7 @@ contract ClaimService is
         ) = _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);
         }
 
@@ -140,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);
@@ -176,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
@@ -205,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
@@ -216,7 +216,7 @@ contract ClaimService is
     }
 
 
-    function close(
+    function cancelConfirmedClaim(
         NftId policyNftId, 
         ClaimId claimId
     )
@@ -244,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);
     }
 
 
@@ -315,6 +308,7 @@ contract ClaimService is
         virtual
         restricted()
         // nonReentrant() // prevents creating a reinsurance payout in a single tx
+        returns (Amount netPayoutAmount, Amount processingFeeAmount)
     {
         // checks
         (
@@ -324,41 +318,46 @@ contract ClaimService is
             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();
-            // TODO cleanup
-            // 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(

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";
@@ -97,7 +94,8 @@ contract PolicyService is
     /// @inheritdoc IPolicyService
     function createPolicy(
         NftId applicationNftId, // = policyNftId
-        Timestamp activateAt
+        Timestamp activateAt,
+        Amount maxPremiumAmount
     )
         external 
         virtual
@@ -152,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);
@@ -294,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) {
@@ -409,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

package/contracts/product/PolicyServiceLib.sol

@@ -24,8 +24,8 @@ library PolicyServiceLib {
 
         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.activatedAt > TimestampLib.blockTimestamp()) { return false; } // not yet active
-        if (info.expiredAt <= TimestampLib.blockTimestamp()) { return false; } // already expired
+        if (info.activatedAt > TimestampLib.current()) { return false; } // not yet active
+        if (info.expiredAt <= TimestampLib.current()) { return false; } // already expired
 
         return true;
     }
@@ -78,7 +78,7 @@ library PolicyServiceLib {
         if (expireAt.gtz()) {
             policyInfo.expiredAt = expireAt;
         } else {
-            policyInfo.expiredAt = TimestampLib.blockTimestamp();
+            policyInfo.expiredAt = TimestampLib.current();
         }
 
         return policyInfo;
@@ -96,7 +96,7 @@ library PolicyServiceLib {
         if (policyState != COLLATERALIZED()) { 
             revert IPolicyService.ErrorPolicyServicePolicyNotActive(policyNftId, policyState);
         } 
-        if (TimestampLib.blockTimestamp() < policyInfo.activatedAt) { 
+        if (TimestampLib.current() < policyInfo.activatedAt) { 
             revert IPolicyService.ErrorPolicyServicePolicyNotActive(policyNftId, policyState);
         } 
 
@@ -105,8 +105,8 @@ library PolicyServiceLib {
             revert IPolicyService.ErrorPolicyServicePolicyExpirationTooLate(policyNftId, policyInfo.expiredAt, newExpiredAt);
         }
 
-        if (newExpiredAt.gtz() && newExpiredAt < TimestampLib.blockTimestamp()) {
-            revert IPolicyService.ErrorPolicyServicePolicyExpirationTooEarly(policyNftId, TimestampLib.blockTimestamp(), newExpiredAt);
+        if (newExpiredAt.gtz() && newExpiredAt < TimestampLib.current()) {
+            revert IPolicyService.ErrorPolicyServicePolicyExpirationTooEarly(policyNftId, TimestampLib.current(), newExpiredAt);
         }
     }
 
@@ -130,7 +130,7 @@ library PolicyServiceLib {
         if (info.claimAmount == info.sumInsuredAmount) { return true; }
 
         // not closeable: not yet expired
-        if (TimestampLib.blockTimestamp() < info.expiredAt) { return false; }
+        if (TimestampLib.current() < info.expiredAt) { return false; }
 
         // all conditions to close the policy are met
         return true; 

package/contracts/product/PricingService.sol

@@ -1,34 +1,31 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {Amount, AmountLib} from "../type/Amount.sol";
-import {Seconds} from "../type/Seconds.sol";
-import {UFixed, UFixedLib} from "../type/UFixed.sol";
-import {ObjectType} from "../type/ObjectType.sol";
-import {NftId} from "../type/NftId.sol";
-import {Fee} from "../type/Fee.sol";
-import {ReferralId} from "../type/Referral.sol";
-import {RiskId} from "../type/RiskId.sol";
-import {PRODUCT, BUNDLE, DISTRIBUTION, PRICE} from "../type/ObjectType.sol";
-import {IRegistry} from "../registry/IRegistry.sol";
-
-import {IProductComponent} from "./IProductComponent.sol";
-
-import {IInstance} from "../instance/IInstance.sol";
-import {InstanceReader} from "../instance/InstanceReader.sol";
-import {IComponents} from "../instance/module/IComponents.sol";
-import {IPolicy} from "../instance/module/IPolicy.sol";
 import {IBundle} from "../instance/module/IBundle.sol";
+import {IComponents} from "../instance/module/IComponents.sol";
 import {IDistribution} from "../instance/module/IDistribution.sol";
-
-import {ComponentVerifyingService} from "../shared/ComponentVerifyingService.sol";
-
-import {IPricingService} from "./IPricingService.sol";
 import {IDistributionService} from "../distribution/IDistributionService.sol";
+import {IInstance} from "../instance/IInstance.sol";
+import {IPolicy} from "../instance/module/IPolicy.sol";
+import {IPricingService} from "./IPricingService.sol";
+import {IProductComponent} from "./IProductComponent.sol";
+import {IRegistry} from "../registry/IRegistry.sol";
+
+import {Amount} from "../type/Amount.sol";
+import {BUNDLE, DISTRIBUTION, PRICE, PRODUCT} from "../type/ObjectType.sol";
+import {ContractLib} from "../shared/ContractLib.sol";
+import {Fee} from "../type/Fee.sol";
+import {InstanceReader} from "../instance/InstanceReader.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";
+import {Service} from "../shared/Service.sol";
 
 
 contract PricingService is 
-    ComponentVerifyingService, 
+    Service, 
     IPricingService
 {
     IDistributionService internal _distributionService;
@@ -81,11 +78,11 @@ contract PricingService is
             // verify product
             (
                 IRegistry.ObjectInfo memory registryInfo, 
-                IInstance instance
-            ) = _getAndVerifyComponentInfo(productNftId, PRODUCT(), false);
+                address instanceAddress
+            ) = ContractLib.getInfoAndInstance(getRegistry(), productNftId, false);
 
             // get instance reader from local instance variable
-            reader = instance.getInstanceReader();
+            reader = IInstance(instanceAddress).getInstanceReader();
 
             NftId riskProductNftId = reader.getRiskInfo(riskId).productNftId;
             if (productNftId != riskProductNftId) {