@etherisc/gif-next 0.0.2-b2e620f-736 → 0.0.2-b37fa8b-169

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
@@ -85,7 +83,7 @@ contract PolicyService is
 
         // effects
         // store updated policy info
-        instance.getInstanceStore().updatePolicyState(
+        instance.getProductStore().updatePolicyState(
             applicationNftId, 
             DECLINED());
 
@@ -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,11 +128,11 @@ 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
-        instance.getInstanceStore().updatePolicy(
+        instance.getProductStore().updatePolicy(
             applicationNftId, 
             applicationInfo, 
             COLLATERALIZED());
@@ -150,8 +150,15 @@ contract PolicyService is
             bundleNftId,
             applicationInfo.referralId);
 
-        premiumAmount = premium.fullPremiumAmount;
-        instance.getInstanceStore().createPremium(
+        if (premium.premiumAmount > maxPremiumAmount) {
+            revert LogPolicyServiceMaxPremiumAmountExceeded(
+                applicationNftId, 
+                maxPremiumAmount, 
+                premium.premiumAmount);
+        }
+
+        premiumAmount = premium.premiumAmount;
+        instance.getProductStore().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,11 +240,11 @@ 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());
-        instance.getInstanceStore().updatePremiumState(policyNftId, PAID());
+        instance.getProductStore().updatePolicy(policyNftId, policyInfo, KEEP_STATE());
+        instance.getProductStore().updatePremiumState(policyNftId, PAID());
 
         // log premium collection before interactions with token
         emit LogPolicyServicePolicyPremiumCollected(policyNftId, premium.premiumAmount);
@@ -250,6 +258,7 @@ contract PolicyService is
     function activate(NftId policyNftId, Timestamp activateAt)
         external
         virtual
+        restricted()
         nonReentrant()
     {
         // checks
@@ -259,8 +268,8 @@ contract PolicyService is
         ) = _getAndVerifyCallerForPolicy(policyNftId);
 
         // effects
-        policyInfo = _activate(policyNftId, policyInfo, activateAt);
-        instance.getInstanceStore().updatePolicy(policyNftId, policyInfo, KEEP_STATE());
+        policyInfo = PolicyServiceLib.activate(policyNftId, policyInfo, activateAt);
+        instance.getProductStore().updatePolicy(policyNftId, policyInfo, KEEP_STATE());
 
         // log policy activation before interactions with policy holder
         emit LogPolicyServicePolicyActivated(policyNftId, activateAt);
@@ -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) {
@@ -299,7 +309,7 @@ contract PolicyService is
 
         // effects
         policyInfo.activatedAt = newActivateAt;
-        instance.getInstanceStore().updatePolicy(policyNftId, policyInfo, KEEP_STATE());
+        instance.getProductStore().updatePolicy(policyNftId, policyInfo, KEEP_STATE());
 
         // log policy activation before interactions with policy holder
         emit LogPolicyServicePolicyActivatedUpdated(policyNftId, newActivateAt);
@@ -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,8 +414,8 @@ 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();
-        instance.getInstanceStore().updatePolicy(policyNftId, policyInfo, CLOSED());
+        policyInfo.closedAt = TimestampLib.current();
+        instance.getProductStore().updatePolicy(policyNftId, policyInfo, CLOSED());
 
         // unlink policy from risk and bundle
         NftId poolNftId = getRegistry().getParentNftId(bundleNftId);
@@ -412,6 +425,7 @@ contract PolicyService is
         emit LogPolicyServicePolicyClosed(policyNftId);
     }
 
+
     /// @dev shared functionality for expire() and policyExpire().
     function _expire(
         IInstance instance,
@@ -422,20 +436,13 @@ 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());
+        instance.getProductStore().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,
@@ -544,33 +525,6 @@ contract PolicyService is
             tokenHandler.pushToken(poolWallet, premium.poolPremiumAndFeeAmount);
         }
     }
-
-    // TODO cleanup
-    /// @dev checks the balance and allowance of the policy holder
-    // function _checkPremiumBalanceAndAllowance(
-    //     IERC20Metadata token,
-    //     address tokenHandlerAddress, 
-    //     address policyHolder, 
-    //     Amount premiumAmount
-    // )
-    //     internal
-    //     virtual
-    //     view
-    // {
-    //     uint256 premium = premiumAmount.toInt();
-    //     uint256 balance = token.balanceOf(policyHolder);
-    //     uint256 allowance = token.allowance(policyHolder, tokenHandlerAddress);
-    
-    //     if (balance < premium) {
-    //         revert ErrorPolicyServiceBalanceInsufficient(policyHolder, premium, balance);
-    //     }
-
-    //     if (allowance < premium) {
-    //         revert ErrorPolicyServiceAllowanceInsufficient(policyHolder, tokenHandlerAddress, premium, allowance);
-    //     }
-    // }
-
-
     function _policyHolderPolicyActivated(
         NftId policyNftId,
         Timestamp activateAt
@@ -629,22 +583,6 @@ contract PolicyService is
     }
 
 
-    // TODO cleanup
-    // function _getTokenHandler(
-    //     InstanceReader instanceReader,
-    //     NftId productNftId
-    // )
-    //     internal 
-    //     virtual
-    //     view 
-    //     returns (
-    //         TokenHandler tokenHandler
-    //     )
-    // {
-    //     tokenHandler = instanceReader.getTokenHandler(productNftId).tokenHandler;
-    // }
-
-
     function _getDistributionNftAndWallets(
         InstanceReader instanceReader,
         NftId productNftId
@@ -688,7 +626,7 @@ contract PolicyService is
             PRODUCT(), // caller must be product
             true); // only active caller
 
-        productNftId = productInfo.nftId;
+        productNftId = productInfo.nftId; // calling product nft id
         instance = IInstance(instanceAddress);
         policyInfo = instance.getInstanceReader().getPolicyInfo(policyNftId);
 

package/contracts/product/PolicyServiceLib.sol

@@ -10,19 +10,93 @@ import {Timestamp, TimestampLib} from "../type/Timestamp.sol";
 
 library PolicyServiceLib {
 
+    function policyIsActive(InstanceReader instanceReader, NftId policyNftId)
+        external 
+        view
+        returns (bool isActive)
+    {
+        // policy not collateralized
+        if (instanceReader.getPolicyState(policyNftId) != COLLATERALIZED()) {
+            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.activatedAt > TimestampLib.current()) { return false; } // not yet active
+        if (info.expiredAt <= TimestampLib.current()) { return false; } // already expired
+
+        return true;
+    }
+
+    function activate(
+        NftId policyNftId, 
+        IPolicy.PolicyInfo memory policyInfo,
+        Timestamp activateAt
+    )
+        external
+        pure 
+        returns (IPolicy.PolicyInfo memory)
+    {
+        // fail if policy has already been activated and activateAt is different
+        if(! policyInfo.activatedAt.eqz() && activateAt != policyInfo.activatedAt) {
+            revert IPolicyService.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;
+    }
+
+    function expire(
+        InstanceReader instanceReader,
+        NftId policyNftId,
+        IPolicy.PolicyInfo memory policyInfo,
+        Timestamp expireAt
+    )
+        external
+        view
+        returns (IPolicy.PolicyInfo memory)
+    {
+        StateId policyState = instanceReader.getPolicyState(policyNftId);
+
+        checkExpiration(
+            expireAt,
+            policyNftId,
+            policyState,
+            policyInfo);
+
+        // effects
+        // update policyInfo with new expiredAt timestamp
+        if (expireAt.gtz()) {
+            policyInfo.expiredAt = expireAt;
+        } else {
+            policyInfo.expiredAt = TimestampLib.current();
+        }
+
+        return policyInfo;
+    }
+
     function checkExpiration(
         Timestamp newExpiredAt,
         NftId policyNftId,
         StateId policyState,
         IPolicy.PolicyInfo memory policyInfo
     )
-        external 
+        public 
         view
     {
         if (policyState != COLLATERALIZED()) { 
             revert IPolicyService.ErrorPolicyServicePolicyNotActive(policyNftId, policyState);
         } 
-        if (TimestampLib.blockTimestamp() < policyInfo.activatedAt) { 
+        if (TimestampLib.current() < policyInfo.activatedAt) { 
             revert IPolicyService.ErrorPolicyServicePolicyNotActive(policyNftId, policyState);
         } 
 
@@ -31,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);
         }
     }
 
@@ -56,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,16 @@ 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) {
+                revert ErrorPricingServiceRiskProductMismatch(riskId, riskProductNftId, productNftId);
+            }
 
             // calculate net premium
             netPremiumAmount = IProductComponent(registryInfo.objectAddress).calculateNetPremium(
@@ -140,7 +142,7 @@ contract PricingService is
                 revert ErrorPricingServiceTargetWalletAmountsMismatch();
             }
 
-            if (premium.distributionOwnerFeeFixAmount.toInt() < feeInfo.minDistributionOwnerFee.fixedFee) {
+            if (premium.distributionOwnerFeeFixAmount < feeInfo.minDistributionOwnerFee.fixedFee) {
                 revert ErrorPricingServiceFeeCalculationMismatch( 
                     premium.distributionFeeFixAmount,
                     premium.distributionFeeVarAmount,
@@ -180,19 +182,19 @@ contract PricingService is
         premium.netPremiumAmount = netPremiumAmount;
         premium.fullPremiumAmount = netPremiumAmount;
 
-        Amount t = AmountLib.toAmount(feeInfo.productFee.fixedFee);
+        Amount t = feeInfo.productFee.fixedFee;
         premium.productFeeFixAmount = t;
         premium.fullPremiumAmount = premium.fullPremiumAmount + t;
 
-        t = AmountLib.toAmount(feeInfo.poolFee.fixedFee);
+        t = feeInfo.poolFee.fixedFee;
         premium.poolFeeFixAmount = t;
         premium.fullPremiumAmount = premium.fullPremiumAmount + t;
 
-        t = AmountLib.toAmount(bundleInfo.fee.fixedFee);
+        t = bundleInfo.fee.fixedFee;
         premium.bundleFeeFixAmount = t;
         premium.fullPremiumAmount = premium.fullPremiumAmount + t;
 
-        t = AmountLib.toAmount(feeInfo.distributionFee.fixedFee);
+        t = feeInfo.distributionFee.fixedFee;
         premium.distributionFeeFixAmount = t;
         premium.fullPremiumAmount = premium.fullPremiumAmount + t;
     }
@@ -262,7 +264,7 @@ contract PricingService is
             Amount commissionAmount = premium.netPremiumAmount.multiplyWith(distributorTypeInfo.commissionPercentage);
             premium.commissionAmount = commissionAmount;
             premium.discountAmount = premium.fullPremiumAmount.multiplyWith(referralInfo.discountPercentage);
-            premium.distributionOwnerFeeFixAmount = AmountLib.toAmount(minDistributionOwnerFee.fixedFee);
+            premium.distributionOwnerFeeFixAmount = minDistributionOwnerFee.fixedFee;
             premium.distributionOwnerFeeVarAmount = premium.distributionFeeVarAmount - commissionAmount - premium.discountAmount;
             premium.premiumAmount = premium.fullPremiumAmount - premium.discountAmount;
         }