@etherisc/gif-next 0.0.2-a3c2eef-755 → 0.0.2-a49c403-485

package/contracts/product/IProductComponent.sol

@@ -10,12 +10,9 @@ import {ReferralId} from "../type/Referral.sol";
 import {RiskId} from "../type/RiskId.sol";
 import {Seconds} from "../type/Seconds.sol";
 
-interface IProductComponent is IInstanceLinkedComponent {
-
-    function setFees(
-        Fee memory productFee,
-        Fee memory processingFee
-    ) external;
+interface IProductComponent is
+    IInstanceLinkedComponent
+{
 
     function calculatePremium(
         Amount sumInsuredAmount,
@@ -33,10 +30,11 @@ interface IProductComponent is IInstanceLinkedComponent {
         bytes memory applicationData
     ) external view returns (Amount netPremiumAmount);    
 
+    function getPoolNftId() external view returns (NftId poolNftId);
+    function getDistributionNftId() external view returns (NftId distributionNftId);
+
 
     /// @dev returns initial pool specific infos for this pool
     function getInitialProductInfo() external view returns (IComponents.ProductInfo memory info);
-
-    function getPoolNftId() external view returns (NftId poolNftId);
-    function getDistributionNftId() external view returns (NftId distributionNftId);
+    
 }

package/contracts/product/PolicyService.sol

@@ -1,26 +1,22 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
+import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
+
 import {IRegistry} from "../registry/IRegistry.sol";
 import {Product} from "./Product.sol";
 import {IComponents} from "../instance/module/IComponents.sol";
-import {IDistributionComponent} from "../distribution/IDistributionComponent.sol";
 import {IInstance} from "../instance/IInstance.sol";
 import {IPolicy} from "../instance/module/IPolicy.sol";
-import {IPoolComponent} from "../pool/IPoolComponent.sol";
-import {IRisk} from "../instance/module/IRisk.sol";
-import {IBundle} from "../instance/module/IBundle.sol";
 
 import {TokenHandler} from "../shared/TokenHandler.sol";
+import {TokenTransferLib} from "../shared/TokenTransferLib.sol";
 
 import {Amount, AmountLib} from "../type/Amount.sol";
-import {ClaimId, ClaimIdLib} from "../type/ClaimId.sol";
 import {Timestamp, TimestampLib, zeroTimestamp} from "../type/Timestamp.sol";
-import {UFixed, UFixedLib} from "../type/UFixed.sol";
 import {ObjectType, APPLICATION, COMPONENT, DISTRIBUTION, PRODUCT, POOL, POLICY, BUNDLE, CLAIM, PRICE} from "../type/ObjectType.sol";
-import {APPLIED, COLLATERALIZED, ACTIVE, KEEP_STATE, CLOSED, DECLINED, CONFIRMED} from "../type/StateId.sol";
+import {APPLIED, COLLATERALIZED, KEEP_STATE, CLOSED, DECLINED} from "../type/StateId.sol";
 import {NftId, NftIdLib} from "../type/NftId.sol";
-import {PayoutId, PayoutIdLib} from "../type/PayoutId.sol";
 import {ReferralId} from "../type/Referral.sol";
 import {StateId} from "../type/StateId.sol";
 import {VersionPart} from "../type/Version.sol";
@@ -36,8 +32,6 @@ import {InstanceStore} from "../instance/InstanceStore.sol";
 import {IPolicyService} from "./IPolicyService.sol";
 import {IPoolService} from "../pool/IPoolService.sol";
 import {IPricingService} from "./IPricingService.sol";
-import {IService} from "../shared/IService.sol";
-import {Service} from "../shared/Service.sol";
 
 contract PolicyService is
     ComponentVerifyingService, 
@@ -90,20 +84,43 @@ contract PolicyService is
         (, productInfo,) = _getAndVerifyActiveComponent(PRODUCT());
         product = Product(productInfo.objectAddress);
     }
-
+    
 
     function decline(
-        NftId policyNftId
+        NftId applicationNftId // = policyNftId
     )
         external
-        override
+        virtual override
     {
-        revert();
+        (NftId productNftId,, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
+        InstanceReader instanceReader = instance.getInstanceReader();
+
+        // check policy is in state applied
+        if (instanceReader.getPolicyState(applicationNftId) != APPLIED()) {
+            revert ErrorPolicyServicePolicyStateNotApplied(applicationNftId);
+        }
+
+        // check policy matches with calling product
+        IPolicy.PolicyInfo memory applicationInfo = instanceReader.getPolicyInfo(applicationNftId);
+        if(applicationInfo.productNftId != productNftId) {
+            revert ErrorPolicyServicePolicyProductMismatch(
+                applicationNftId, 
+                applicationInfo.productNftId, 
+                productNftId);
+        }
+        
+
+        // store updated policy info
+        instance.getInstanceStore().updatePolicyState(
+            applicationNftId, 
+            DECLINED());
+
+        emit LogPolicyServicePolicyDeclined(applicationNftId);
     }
 
     event LogDebug(uint idx, string message);
 
-    /// @dev underwites application which includes the locking of the required collateral from the pool.
+    /// @inheritdoc IPolicyService
     function collateralize(
         NftId applicationNftId, // = policyNftId
         bool requirePremiumPayment,
@@ -146,19 +163,20 @@ contract PolicyService is
 
         // optional activation of policy
         if(activateAt > zeroTimestamp()) {
-            newPolicyState = ACTIVE();
             applicationInfo.activatedAt = activateAt;
             applicationInfo.expiredAt = activateAt.addSeconds(applicationInfo.lifetime);
         }
 
-        // optional collection of premium
+        IPolicy.Premium memory premium;
+
+        // optional: calculate the premium and update counters for collection at the end of this function
         if(requirePremiumPayment) {
-            Amount premiumPaidAmount = _calculateAndCollectPremium(
+            premium = _calculateAndProcessPremium(
                 instance,
                 applicationNftId,
                 applicationInfo);
 
-            applicationInfo.premiumPaidAmount = premiumPaidAmount;
+            applicationInfo.premiumPaidAmount = AmountLib.toAmount(premium.premiumAmount);
         }
 
         // store updated policy info
@@ -170,9 +188,14 @@ contract PolicyService is
         // TODO add calling pool contract if it needs to validate application
 
         // TODO: add logging
-    }
 
+        // optional: transfer funds for premium 
+        if(requirePremiumPayment) {
+            _transferFunds(instanceReader, applicationNftId, applicationInfo.productNftId, premium);
+        }
+    }
 
+    /// @inheritdoc IPolicyService
     function collectPremium(
         NftId policyNftId, 
         Timestamp activateAt
@@ -186,8 +209,8 @@ contract PolicyService is
         StateId stateId = instanceReader.getPolicyState(policyNftId);
 
         // check policy is in state collateralized or active
-        if (!(stateId == COLLATERALIZED() || stateId == ACTIVE())) {
-            revert ErrorPolicyServicePolicyStateNotCollateralizedOrApplied(policyNftId);
+        if (!(stateId == COLLATERALIZED())) {
+            revert ErrorPolicyServicePolicyStateNotCollateralized(policyNftId);
         }
 
         IPolicy.PolicyInfo memory policyInfo = instanceReader.getPolicyInfo(policyNftId);
@@ -197,11 +220,14 @@ contract PolicyService is
             revert ErrorPolicyServicePremiumAlreadyPaid(policyNftId, policyInfo.premiumPaidAmount);
         }
 
-        policyInfo.premiumPaidAmount = _calculateAndCollectPremium(
+        // calculate premium
+        IPolicy.Premium memory premium = _calculateAndProcessPremium(
                 instance,
                 policyNftId,
                 policyInfo);
 
+        policyInfo.premiumPaidAmount = AmountLib.toAmount(premium.premiumAmount);
+
         instance.getInstanceStore().updatePolicy(policyNftId, policyInfo, KEEP_STATE());
 
         if(activateAt.gtz() && policyInfo.activatedAt.eqz()) {
@@ -209,8 +235,11 @@ contract PolicyService is
         }
 
         // TODO: add logging
+
+        _transferFunds(instanceReader, policyNftId, policyInfo.productNftId, premium);
     }
 
+    /// @inheritdoc IPolicyService
     function activate(NftId policyNftId, Timestamp activateAt) public override {
         // check caller is registered product
         (,, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
@@ -218,27 +247,67 @@ contract PolicyService is
 
         IPolicy.PolicyInfo memory policyInfo = instanceReader.getPolicyInfo(policyNftId);
 
-        require(
-            policyInfo.activatedAt.eqz(),
-            "ERROR:PRS-020:ALREADY_ACTIVATED");
+        if(! policyInfo.activatedAt.eqz()) {
+            revert ErrorPolicyServicePolicyAlreadyActivated(policyNftId);
+        }
 
         policyInfo.activatedAt = activateAt;
         policyInfo.expiredAt = activateAt.addSeconds(policyInfo.lifetime);
 
-        instance.getInstanceStore().updatePolicy(policyNftId, policyInfo, ACTIVE());
+        instance.getInstanceStore().updatePolicy(policyNftId, policyInfo, KEEP_STATE());
 
         // TODO: add logging
     }
 
-
+    /// @inheritdoc IPolicyService
     function expire(
-        NftId policyNftId
+        NftId policyNftId,
+        Timestamp expireAt
     )
         external
         override
-        // solhint-disable-next-line no-empty-blocks
+        virtual
+        returns (Timestamp)
     {
-        
+        (NftId productNftId,, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
+        InstanceReader instanceReader = instance.getInstanceReader();
+
+        // check policy matches with calling product
+        IPolicy.PolicyInfo memory policyInfo = instanceReader.getPolicyInfo(policyNftId);
+        if(policyInfo.productNftId != productNftId) {
+            revert ErrorPolicyServicePolicyProductMismatch(
+                policyNftId, 
+                policyInfo.productNftId, 
+                productNftId);
+        }
+
+        // check policy is in state applied or not active
+        if (instanceReader.getPolicyState(policyNftId) != COLLATERALIZED() || TimestampLib.blockTimestamp() < policyInfo.activatedAt) {
+            revert ErrorIPolicyServicePolicyNotActive(policyNftId, instanceReader.getPolicyState(policyNftId));
+        }
+
+
+        if (expireAt.eqz()) {
+            expireAt = TimestampLib.blockTimestamp();
+        }
+
+        // check preconditions
+        if (expireAt >= policyInfo.expiredAt) {
+            revert ErrorIPolicyServicePolicyExpirationTooLate(policyNftId, policyInfo.expiredAt, expireAt);
+        }
+        if (expireAt < TimestampLib.blockTimestamp()) {
+            revert ErrorIPolicyServicePolicyExpirationTooEarly(policyNftId, TimestampLib.blockTimestamp(), expireAt);
+        }
+        if (policyInfo.openClaimsCount > 0) {
+            revert ErrorIPolicyServiceOpenClaims(policyNftId, policyInfo.openClaimsCount);
+        }
+
+        policyInfo.expiredAt = expireAt;
+        instance.getInstanceStore().updatePolicy(policyNftId, policyInfo, KEEP_STATE());
+
+        emit LogPolicyServicePolicyExpirationUpdated(policyNftId, expireAt);
+
+        return expireAt;
     }
 
     function close(
@@ -257,7 +326,7 @@ contract PolicyService is
         }
 
         StateId state = instanceReader.getPolicyState(policyNftId);
-        if (state != ACTIVE()) {
+        if (state != COLLATERALIZED() || TimestampLib.blockTimestamp() < policyInfo.activatedAt) {
             revert ErrorIPolicyServicePolicyNotActive(policyNftId, state);
         }
 
@@ -286,7 +355,8 @@ contract PolicyService is
     }
 
 
-    function _calculateAndCollectPremium(
+    /// @dev calculates the premium and updates all counters in the other services
+    function _calculateAndProcessPremium(
         IInstance instance,
         NftId applicationNftId,
         IPolicy.PolicyInfo memory applicationInfo
@@ -294,13 +364,14 @@ contract PolicyService is
         internal
         virtual
         returns (
-            Amount premiumPaidAmount
+            IPolicy.Premium memory premium
         )
     {
         NftId productNftId = applicationInfo.productNftId;
+        InstanceReader instanceReader = instance.getInstanceReader();
 
         // calculate premium details
-        IPolicy.Premium memory premium = _pricingService.calculatePremium(
+        premium = _pricingService.calculatePremium(
             productNftId,
             applicationInfo.riskId,
             applicationInfo.sumInsuredAmount,
@@ -309,90 +380,63 @@ contract PolicyService is
             applicationInfo.bundleNftId,
             applicationInfo.referralId);
 
+        // ensure the calculated premium is not higher than the expected premium from the application
+        if (applicationInfo.premiumAmount.toInt() < premium.premiumAmount) {
+            revert ErrorPolicyServicePremiumHigherThanExpected(applicationInfo.premiumAmount.toInt(), premium.premiumAmount);
+        }
 
-        // update financials and transfer premium tokens
-        premiumPaidAmount = _processAndCollect(
-            instance, 
-            productNftId,
-            applicationNftId, 
-            applicationInfo.premiumAmount,
-            applicationInfo.bundleNftId,
-            applicationInfo.referralId,
-            premium);
-    }
-
-
-    function _processAndCollect(
-        IInstance instance,
-        NftId productNftId,
-        NftId policyNftId,
-        Amount premiumExpectedAmount,
-        NftId bundleNftId,
-        ReferralId referralId,
-        IPolicy.Premium memory premium
-    )
-        internal
-        virtual
-        returns (Amount premiumPaidAmount)
-    {
-        InstanceReader instanceReader = instance.getInstanceReader();
-        TokenHandler tokenHandler = instanceReader.getComponentInfo(productNftId).tokenHandler;
-        address policyHolder = getRegistry().ownerOf(policyNftId);
-        premiumPaidAmount = AmountLib.toAmount(premium.premiumAmount);
-
-        _checkPremiumBalanceAndAllowance(
-            tokenHandler, 
-            policyHolder, 
-            premiumExpectedAmount,
-            premiumPaidAmount);
+        // check if premium balance and allowance of policy holder is sufficient
+        {
+            TokenHandler tokenHandler = instanceReader.getComponentInfo(productNftId).tokenHandler;
+            address policyHolder = getRegistry().ownerOf(applicationNftId);
+        
+            _checkPremiumBalanceAndAllowance(
+                tokenHandler.getToken(), 
+                address(tokenHandler),
+                policyHolder, 
+                applicationInfo.premiumAmount,
+                AmountLib.toAmount(premium.premiumAmount));
+        }
 
-        _processSaleAndTransferFunds(
+        // update the counters
+        _processSale(
             instanceReader, 
             instance.getInstanceStore(), 
-            tokenHandler, 
-            policyHolder, 
             productNftId, 
-            bundleNftId, 
-            referralId, 
+            applicationInfo.bundleNftId, 
+            applicationInfo.referralId, 
             premium);
     }
 
-
+    /// @dev checks the balance and allowance of the policy holder
     function _checkPremiumBalanceAndAllowance(
-        TokenHandler tokenHandler, 
+        IERC20Metadata token,
+        address tokenHandlerAddress, 
         address policyHolder, 
         Amount premiumExpectedAmount,
-        Amount premiumPaidAmount
+        Amount premiumAmount
     )
         internal
         virtual
         view
     {
-        // TODO decide how to handle this properly
-        // not clear if this is the best way to handle this
-        if (premiumExpectedAmount < premiumPaidAmount) {
-            revert ErrorPolicyServicePremiumHigherThanExpected(premiumExpectedAmount, premiumPaidAmount);
-        }
-
-        uint256 premiumAmount = premiumPaidAmount.toInt();
-        uint256 balance = tokenHandler.getToken().balanceOf(policyHolder);
-        uint256 allowance = tokenHandler.getToken().allowance(policyHolder, address(tokenHandler));
+        uint256 premium = premiumAmount.toInt();
+        uint256 balance = token.balanceOf(policyHolder);
+        uint256 allowance = token.allowance(policyHolder, tokenHandlerAddress);
     
-        if (balance < premiumAmount) {
-            revert ErrorPolicyServiceBalanceInsufficient(policyHolder, premiumAmount, balance);
+        if (balance < premium) {
+            revert ErrorPolicyServiceBalanceInsufficient(policyHolder, premium, balance);
         }
 
-        if (allowance < premiumAmount) {
-            revert ErrorPolicyServiceAllowanceInsufficient(policyHolder, address(tokenHandler), premiumAmount, allowance);
+        if (allowance < premium) {
+            revert ErrorPolicyServiceAllowanceInsufficient(policyHolder, tokenHandlerAddress, premium, allowance);
         }
     }
 
-
-    function _processSaleAndTransferFunds(
+    /// @dev update counters by calling the involved services
+    function _processSale(
         InstanceReader instanceReader,
         InstanceStore instanceStore,
-        TokenHandler tokenHandler,
-        address policyHolder,
         NftId productNftId,
         NftId bundleNftId,
         ReferralId referralId,
@@ -426,11 +470,51 @@ contract PolicyService is
         _poolService.processSale(
             bundleNftId, 
             premium);
+    }
+
+    /// @dev transfer the premium to the wallets the premium is distributed to
+    function _transferFunds(
+        InstanceReader instanceReader,
+        NftId policyNftId,
+        NftId productNftId,
+        IPolicy.Premium memory premium
+    )
+        internal
+        virtual
+    {
+        TokenHandler tokenHandler = instanceReader.getComponentInfo(productNftId).tokenHandler;
+        address policyHolder = getRegistry().ownerOf(policyNftId);
 
-        // transfer premium amounts to target wallets
-        tokenHandler.transfer(policyHolder, productWallet, premium.productFeeAmount);
-        tokenHandler.transfer(policyHolder, distributionWallet, premium.distributionFeeAndCommissionAmount);
-        tokenHandler.transfer(policyHolder, poolWallet, premium.poolPremiumAndFeeAmount);
+        (
+            ,
+            address distributionWallet,
+            address poolWallet,
+            address productWallet
+        ) = _getDistributionNftAndWallets(
+            instanceReader, 
+            productNftId);
+
+        if (premium.productFeeAmount.gtz()) {
+            TokenTransferLib.collectTokens(
+                policyHolder,
+                productWallet,
+                premium.productFeeAmount,
+                tokenHandler);
+        }
+        if (premium.distributionFeeAndCommissionAmount.gtz()) {
+            TokenTransferLib.collectTokens(
+                policyHolder,
+                distributionWallet,
+                premium.distributionFeeAndCommissionAmount,
+                tokenHandler);
+        }
+        if (premium.poolPremiumAndFeeAmount.gtz()) {
+            TokenTransferLib.collectTokens(
+                policyHolder,
+                poolWallet,
+                premium.poolPremiumAndFeeAmount,
+                tokenHandler);
+        }
     }
 
 

package/contracts/product/PolicyServiceManager.sol

@@ -1,12 +1,9 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {IVersionable} from "../shared/IVersionable.sol";
-import {ProxyManager} from "../shared/ProxyManager.sol";
+import {IVersionable} from "../upgradeability/IVersionable.sol";
+import {ProxyManager} from "../upgradeability/ProxyManager.sol";
 import {PolicyService} from "./PolicyService.sol";
-import {Registry} from "../registry/Registry.sol";
-import {RegistryService} from "../registry/RegistryService.sol";
-import {VersionLib} from "../type/Version.sol";
 
 contract PolicyServiceManager is ProxyManager {
 

package/contracts/product/PricingServiceManager.sol

@@ -1,12 +1,9 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {IVersionable} from "../shared/IVersionable.sol";
-import {ProxyManager} from "../shared/ProxyManager.sol";
+import {IVersionable} from "../upgradeability/IVersionable.sol";
+import {ProxyManager} from "../upgradeability/ProxyManager.sol";
 import {PricingService} from "./PricingService.sol";
-import {Registry} from "../registry/Registry.sol";
-import {RegistryService} from "../registry/RegistryService.sol";
-import {REGISTRY} from "../type/ObjectType.sol";
 
 contract PricingServiceManager is ProxyManager {