@etherisc/gif-next 0.0.2-f1b01e0-214 → 0.0.2-f1e6957-384

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,

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,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) {

package/contracts/product/Product.sol

@@ -18,7 +18,7 @@ import {COMPONENT, PRODUCT, BUNDLE, APPLICATION, POLICY, CLAIM, PRICE } from "..
 import {PayoutId} from "../type/PayoutId.sol";
 import {COMPONENT, PRODUCT, APPLICATION, POLICY, CLAIM, PRICE, BUNDLE, RISK } from "../type/ObjectType.sol";
 import {ReferralId} from "../type/Referral.sol";
-import {RiskId, RiskIdLib} from "../type/RiskId.sol";
+import {RiskId} from "../type/RiskId.sol";
 import {Seconds} from "../type/Seconds.sol";
 import {StateId} from "../type/StateId.sol";
 import {Timestamp} from "../type/Timestamp.sol";
@@ -48,6 +48,7 @@ abstract contract Product is
     function registerComponent(address component)
         external
         virtual
+        restricted()
         onlyOwner()
         returns (NftId componentNftId)
     {
@@ -79,6 +80,7 @@ abstract contract Product is
     )
         public 
         view 
+        virtual
         override 
         onlyNftOfType(bundleNftId, BUNDLE())
         returns (Amount premiumAmount)
@@ -131,29 +133,27 @@ abstract contract Product is
     }
 
 
-    function _initializeProduct(
+    function __Product_init(
         address registry,
         NftId instanceNftId,
         string memory name,
         IComponents.ProductInfo memory productInfo,
         IComponents.FeeInfo memory feeInfo,
         IAuthorization authorization,
-        address initialOwner,
-        bytes memory componentData // writeonly data that will saved in the object info record of the registry
+        address initialOwner
     )
         internal
         virtual
         onlyInitializing()
     {
-        _initializeInstanceLinkedComponent(
+        __InstanceLinkedComponent_init(
             registry, 
             instanceNftId, 
             name, 
             PRODUCT(), 
             authorization, 
             productInfo.isInterceptingPolicyTransfers, 
-            initialOwner, 
-            componentData);
+            initialOwner);
 
         ProductStorage storage $ = _getProductStorage();
         $._productInfo = productInfo;
@@ -207,16 +207,27 @@ abstract contract Product is
         );
     }
 
-    function _updateRiskState(
+    function _setRiskLocked(
         RiskId id,
-        StateId state
+        bool locked
     )
         internal
         virtual
     {
-        _getProductStorage()._riskService.updateRiskState(
+        _getProductStorage()._riskService.setRiskLocked(
             id,
-            state
+            locked
+        );
+    }
+
+    function _closeRisk(
+        RiskId id
+    )
+        internal
+        virtual
+    {
+        _getProductStorage()._riskService.closeRisk(
+            id
         );
     }
 
@@ -247,9 +258,20 @@ abstract contract Product is
         );
     }
 
+    function _revoke(
+        NftId applicationNftId
+    )
+        internal
+        virtual
+    {
+        _getProductStorage()._applicationService.revoke(
+            applicationNftId);
+    }
+
     function _createPolicy(
         NftId applicationNftId,
-        Timestamp activateAt
+        Timestamp activateAt,
+        Amount maxPremiumAmount
     )
         internal
         virtual
@@ -257,7 +279,8 @@ abstract contract Product is
     {
         premiumAmount = _getProductStorage()._policyService.createPolicy(
             applicationNftId, 
-            activateAt);
+            activateAt,
+            maxPremiumAmount);
     }
 
     function _decline(
@@ -387,14 +410,14 @@ abstract contract Product is
             data);
     }
 
-    function _closeClaim(
+    function _cancelConfirmedClaim(
         NftId policyNftId,
         ClaimId claimId
     )
         internal
         virtual
     {
-        _getProductStorage()._claimService.close(
+        _getProductStorage()._claimService.cancelConfirmedClaim(
             policyNftId,
             claimId);
     }
@@ -441,8 +464,9 @@ abstract contract Product is
     )
         internal
         virtual
+        returns (Amount netPayoutAmount, Amount processingFeeAmount)
     {
-        _getProductStorage()._claimService.processPayout(
+        (netPayoutAmount, processingFeeAmount) = _getProductStorage()._claimService.processPayout(
             policyNftId,
             payoutId);
     }