@etherisc/gif-next 0.0.2-750c7cb-311 → 0.0.2-758fb77-627

package/contracts/product/PolicyService.sol

@@ -14,7 +14,7 @@ import {TokenHandler} from "../shared/TokenHandler.sol";
 import {Amount, AmountLib} from "../type/Amount.sol";
 import {Timestamp, TimestampLib, zeroTimestamp} from "../type/Timestamp.sol";
 import {ObjectType, APPLICATION, COMPONENT, DISTRIBUTION, PRODUCT, POOL, POLICY, BUNDLE, CLAIM, PRICE} from "../type/ObjectType.sol";
-import {APPLIED, COLLATERALIZED, KEEP_STATE, CLOSED, DECLINED} from "../type/StateId.sol";
+import {APPLIED, COLLATERALIZED, KEEP_STATE, CLOSED, DECLINED, PAID} from "../type/StateId.sol";
 import {NftId, NftIdLib} from "../type/NftId.sol";
 import {ReferralId} from "../type/Referral.sol";
 import {StateId} from "../type/StateId.sol";
@@ -47,8 +47,6 @@ contract PolicyService is
     IPoolService internal _poolService;
     IPricingService internal _pricingService;
 
-    event LogProductServiceSender(address sender);
-
     function _initialize(
         address owner, 
         bytes memory data
@@ -63,7 +61,7 @@ contract PolicyService is
             address authority
         ) = abi.decode(data, (address, address, address));
 
-        initializeService(registryAddress, authority, owner);
+        _initializeService(registryAddress, authority, owner);
 
         VersionPart majorVersion = getVersion().toMajorPart();
         _applicationService = IApplicationService(getRegistry().getServiceAddress(APPLICATION(), majorVersion));
@@ -74,17 +72,10 @@ contract PolicyService is
         _distributionService = IDistributionService(getRegistry().getServiceAddress(DISTRIBUTION(), majorVersion));
         _pricingService = IPricingService(getRegistry().getServiceAddress(PRICE(), majorVersion));
 
-        registerInterface(type(IPolicyService).interfaceId);
+        _registerInterface(type(IPolicyService).interfaceId);
     }
 
 
-    function _getAndVerifyInstanceAndProduct() internal view returns (Product product) {
-        IRegistry.ObjectInfo memory productInfo;
-        (, productInfo,) = _getAndVerifyActiveComponent(PRODUCT());
-        product = Product(productInfo.objectAddress);
-    }
-    
-
     function decline(
         NftId applicationNftId // = policyNftId
     )
@@ -117,12 +108,10 @@ contract PolicyService is
         emit LogPolicyServicePolicyDeclined(applicationNftId);
     }
 
-    event LogDebug(uint idx, string message);
 
     /// @inheritdoc IPolicyService
-    function collateralize(
+    function createPolicy(
         NftId applicationNftId, // = policyNftId
-        bool requirePremiumPayment,
         Timestamp activateAt
     )
         external 
@@ -146,13 +135,8 @@ contract PolicyService is
                 productNftId);
         }
         
-        StateId newPolicyState = COLLATERALIZED();
-
         // actual collateralizaion
-        (
-            Amount localCollateralAmount,
-            Amount totalCollateralAmount
-        ) = _poolService.lockCollateral(
+        _poolService.lockCollateral(
             instance,
             address(instanceReader.getComponentInfo(productNftId).token),
             productNftId,
@@ -162,38 +146,48 @@ contract PolicyService is
 
         // optional activation of policy
         if(activateAt > zeroTimestamp()) {
-            applicationInfo.activatedAt = activateAt;
-            applicationInfo.expiredAt = activateAt.addSeconds(applicationInfo.lifetime);
-        }
-
-        IPolicy.Premium memory premium;
-
-        // optional: calculate the premium and update counters for collection at the end of this function
-        if(requirePremiumPayment) {
-            premium = _calculateAndProcessPremium(
-                instance,
-                applicationNftId,
-                applicationInfo);
-
-            applicationInfo.premiumPaidAmount = AmountLib.toAmount(premium.premiumAmount);
+            applicationInfo = _activate(
+                applicationNftId, 
+                applicationInfo, 
+                activateAt);
         }
 
-        // store updated policy info
+        // update policy and set state to collateralized
         instance.getInstanceStore().updatePolicy(
             applicationNftId, 
             applicationInfo, 
-            newPolicyState);
+            COLLATERALIZED());
+
+        // calculate and store premium
+        IPolicy.PremiumInfo memory premium = _pricingService.calculatePremium(
+            productNftId,
+            applicationInfo.riskId,
+            applicationInfo.sumInsuredAmount,
+            applicationInfo.lifetime,
+            applicationInfo.applicationData,
+            applicationInfo.bundleNftId,
+            applicationInfo.referralId);
+
+        instance.getInstanceStore().createPremium(
+            applicationNftId,
+            premium);
 
+        // update referral counter 
+        {
+            IComponents.ProductInfo memory productInfo = instanceReader.getProductInfo(productNftId);
+            _distributionService.processReferral(
+                productInfo.distributionNftId, 
+                applicationInfo.referralId);
+        }
+        
         // 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);
-        }
+        // TODO: add callback IPolicyHolder.policyActivated() if applicable
     }
 
+
     /// @inheritdoc IPolicyService
     function collectPremium(
         NftId policyNftId, 
@@ -212,30 +206,33 @@ contract PolicyService is
             revert ErrorPolicyServicePolicyStateNotCollateralized(policyNftId);
         }
 
-        IPolicy.PolicyInfo memory policyInfo = instanceReader.getPolicyInfo(policyNftId);
-
         // check if premium is already collected
-        if (policyInfo.premiumPaidAmount.gtz()) {
-            revert ErrorPolicyServicePremiumAlreadyPaid(policyNftId, policyInfo.premiumPaidAmount);
+        if (instanceReader.getPremiumInfoState(policyNftId) == PAID()) {
+            revert ErrorPolicyServicePremiumAlreadyPaid(policyNftId);
         }
 
-        // calculate premium
-        IPolicy.Premium memory premium = _calculateAndProcessPremium(
-                instance,
-                policyNftId,
-                policyInfo);
+        IPolicy.PolicyInfo memory policyInfo = instanceReader.getPolicyInfo(policyNftId);
+        IPolicy.PremiumInfo memory premium = instanceReader.getPremiumInfo(policyNftId); 
+        
+        _processPremium(
+            instance,
+            policyNftId,
+            policyInfo,
+            premium);
 
-        policyInfo.premiumPaidAmount = AmountLib.toAmount(premium.premiumAmount);
+        // optionally activate policy
+        if(activateAt.gtz()) {
+            policyInfo = _activate(policyNftId, policyInfo, activateAt);
+        }
 
         instance.getInstanceStore().updatePolicy(policyNftId, policyInfo, KEEP_STATE());
-
-        if(activateAt.gtz() && policyInfo.activatedAt.eqz()) {
-            activate(policyNftId, activateAt);
-        }
+        instance.getInstanceStore().updatePremiumState(policyNftId, PAID());
 
         // TODO: add logging
 
         _transferFunds(instanceReader, policyNftId, policyInfo.productNftId, premium);
+
+        // TODO: add callback IPolicyHolder.policyActivated() if applicable
     }
 
     /// @inheritdoc IPolicyService
@@ -245,19 +242,16 @@ contract PolicyService is
         InstanceReader instanceReader = instance.getInstanceReader();
 
         IPolicy.PolicyInfo memory policyInfo = instanceReader.getPolicyInfo(policyNftId);
-
-        if(! policyInfo.activatedAt.eqz()) {
-            revert ErrorPolicyServicePolicyAlreadyActivated(policyNftId);
-        }
-
-        policyInfo.activatedAt = activateAt;
-        policyInfo.expiredAt = activateAt.addSeconds(policyInfo.lifetime);
+        policyInfo = _activate(policyNftId, policyInfo, activateAt);
 
         instance.getInstanceStore().updatePolicy(policyNftId, policyInfo, KEEP_STATE());
 
         // TODO: add logging
+
+        // TODO: add callback IPolicyHolder.policyActivated() if applicable
     }
 
+
     /// @inheritdoc IPolicyService
     function expire(
         NftId policyNftId,
@@ -266,7 +260,7 @@ contract PolicyService is
         external
         override
         virtual
-        returns (Timestamp)
+        returns (Timestamp expiredAt)
     {
         (NftId productNftId,, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
         InstanceReader instanceReader = instance.getInstanceReader();
@@ -286,28 +280,32 @@ contract PolicyService is
             revert ErrorPolicyServicePolicyNotActive(policyNftId, policyState);
         }
 
-        // set expiryAt to current block timestamp if not set
-        if (expireAt.eqz()) {
-            expireAt = TimestampLib.blockTimestamp();
+        // set return value to provided timestamp
+        expiredAt = expireAt;
+
+        // update expiredAt to current block timestamp if not set
+        if (expiredAt.eqz()) {
+            expiredAt = TimestampLib.blockTimestamp();
         }
 
-        // check expiryAt represents a valid expiry time
-        if (expireAt >= policyInfo.expiredAt) {
+        // check expiredAt represents a valid expiry time
+        if (expiredAt >= policyInfo.expiredAt) {
             revert ErrorPolicyServicePolicyExpirationTooLate(policyNftId, policyInfo.expiredAt, expireAt);
         }
-        if (expireAt < TimestampLib.blockTimestamp()) {
+        if (expiredAt < TimestampLib.blockTimestamp()) {
             revert ErrorPolicyServicePolicyExpirationTooEarly(policyNftId, TimestampLib.blockTimestamp(), expireAt);
         }
 
-        // update policyInfo with new expiryAt timestamp
-        policyInfo.expiredAt = expireAt;
+        // update policyInfo with new expiredAt timestamp
+        policyInfo.expiredAt = expiredAt;
         instance.getInstanceStore().updatePolicy(policyNftId, policyInfo, KEEP_STATE());
 
-        emit LogPolicyServicePolicyExpirationUpdated(policyNftId, expireAt);
+        emit LogPolicyServicePolicyExpirationUpdated(policyNftId, expiredAt);
 
-        return expireAt;
+        // TODO: add callback IPolicyHolder.policyExpired() if applicable
     }
 
+
     function close(
         NftId policyNftId
     )
@@ -335,8 +333,9 @@ contract PolicyService is
         }
 
         // TODO consider to allow for underpaid premiums (with the effects of reducing max payouts accordingly)
-        if (!(policyInfo.premiumAmount == policyInfo.premiumPaidAmount)) {
-            revert ErrorPolicyServicePremiumNotFullyPaid(policyNftId, policyInfo.premiumAmount, policyInfo.premiumPaidAmount);
+        // TODO consider to remove requirement for fully paid premiums altogether
+        if (! instanceReader.getPremiumInfoState(policyNftId).eq(PAID())) {
+            revert ErrorPolicyServicePremiumNotPaid(policyNftId, policyInfo.premiumAmount);
         }
 
         // release (remaining) collateral that was blocked by policy
@@ -346,69 +345,39 @@ contract PolicyService is
             policyNftId, 
             policyInfo);
 
+        // 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());
-    }
-
 
-    /// @dev checks that policy has been collateralized and has been activated.
-    /// does not check if policy has been expired or closed.
-    function _policyHasBeenActivated(
-        StateId policyState,
-        IPolicy.PolicyInfo memory policyInfo
-    )
-        internal
-        view
-        returns (bool)
-    {
-        if (policyState != COLLATERALIZED()) { return false; } 
-        if (TimestampLib.blockTimestamp() < policyInfo.activatedAt) { return false; } 
-        return true;
+        // TODO add logging
     }
 
 
     /// @dev calculates the premium and updates all counters in the other services
-    function _calculateAndProcessPremium(
+    function _processPremium(
         IInstance instance,
         NftId applicationNftId,
-        IPolicy.PolicyInfo memory applicationInfo
+        IPolicy.PolicyInfo memory applicationInfo,
+        IPolicy.PremiumInfo memory premium
     )
         internal
         virtual
-        returns (
-            IPolicy.Premium memory premium
-        )
     {
         NftId productNftId = applicationInfo.productNftId;
         InstanceReader instanceReader = instance.getInstanceReader();
 
-        // calculate premium details
-        premium = _pricingService.calculatePremium(
-            productNftId,
-            applicationInfo.riskId,
-            applicationInfo.sumInsuredAmount,
-            applicationInfo.lifetime,
-            applicationInfo.applicationData,
-            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);
-        }
-
         // check if premium balance and allowance of policy holder is sufficient
         {
-            TokenHandler tokenHandler = instanceReader.getComponentInfo(productNftId).tokenHandler;
+            TokenHandler tokenHandler = _getTokenHandler(instanceReader, productNftId);
             address policyHolder = getRegistry().ownerOf(applicationNftId);
         
             _checkPremiumBalanceAndAllowance(
                 tokenHandler.getToken(), 
                 address(tokenHandler),
                 policyHolder, 
-                applicationInfo.premiumAmount,
-                AmountLib.toAmount(premium.premiumAmount));
+                premium.premiumAmount);
         }
 
         // update the counters
@@ -421,29 +390,30 @@ contract PolicyService is
             premium);
     }
 
-    /// @dev checks the balance and allowance of the policy holder
-    function _checkPremiumBalanceAndAllowance(
-        IERC20Metadata token,
-        address tokenHandlerAddress, 
-        address policyHolder, 
-        Amount premiumExpectedAmount,
-        Amount premiumAmount
+    function _activate(
+        NftId policyNftId, 
+        IPolicy.PolicyInfo memory policyInfo,
+        Timestamp activateAt
     )
         internal
         virtual
-        view
+        view 
+        returns (IPolicy.PolicyInfo memory)
     {
-        uint256 premium = premiumAmount.toInt();
-        uint256 balance = token.balanceOf(policyHolder);
-        uint256 allowance = token.allowance(policyHolder, tokenHandlerAddress);
-    
-        if (balance < premium) {
-            revert ErrorPolicyServiceBalanceInsufficient(policyHolder, premium, balance);
+        // fail if policy has already been activated and activateAt is different
+        if(! policyInfo.activatedAt.eqz() && activateAt != policyInfo.activatedAt) {
+            revert ErrorPolicyServicePolicyAlreadyActivated(policyNftId);
         }
 
-        if (allowance < premium) {
-            revert ErrorPolicyServiceAllowanceInsufficient(policyHolder, tokenHandlerAddress, premium, allowance);
+        // 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
@@ -453,17 +423,12 @@ contract PolicyService is
         NftId productNftId,
         NftId bundleNftId,
         ReferralId referralId,
-        IPolicy.Premium memory premium
+        IPolicy.PremiumInfo memory premium
     )
         internal
         virtual
     {
-        (
-            NftId distributionNftId,
-            address distributionWallet,
-            address poolWallet,
-            address productWallet
-        ) = _getDistributionNftAndWallets(
+        (NftId distributionNftId, , , ) = _getDistributionNftAndWallets(
             instanceReader, 
             productNftId);
 
@@ -471,7 +436,7 @@ contract PolicyService is
         _componentService.increaseProductFees(
             instanceStore, 
             productNftId, 
-            AmountLib.toAmount(premium.productFeeVarAmount + premium.productFeeFixAmount));
+            premium.productFeeVarAmount + premium.productFeeFixAmount);
 
         // update distribution fees and distributor commission and pool fees 
         _distributionService.processSale(
@@ -485,21 +450,22 @@ contract PolicyService is
             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
+        IPolicy.PremiumInfo memory premium
     )
         internal
         virtual
     {
-        TokenHandler tokenHandler = instanceReader.getComponentInfo(productNftId).tokenHandler;
+        TokenHandler tokenHandler = _getTokenHandler(instanceReader, productNftId);
         address policyHolder = getRegistry().ownerOf(policyNftId);
 
         (
-            NftId distributionNftId,
+            ,
             address distributionWallet,
             address poolWallet,
             address productWallet
@@ -507,15 +473,59 @@ contract PolicyService is
             instanceReader, 
             productNftId);
 
-        // TODO: centralize token handling (issue #471)
-        // transfer premium amounts to target wallets
-        tokenHandler.transfer(policyHolder, productWallet, premium.productFeeAmount);
-        tokenHandler.transfer(policyHolder, distributionWallet, premium.distributionFeeAndCommissionAmount);
-        tokenHandler.transfer(policyHolder, poolWallet, premium.poolPremiumAndFeeAmount);
+        tokenHandler.collectTokensToThreeRecipients(
+            policyHolder,
+            productWallet,
+            premium.productFeeAmount,
+            distributionWallet,
+            premium.distributionFeeAndCommissionAmount,
+            poolWallet,
+            premium.poolPremiumAndFeeAmount);
     }
 
 
-    function _getTokenHandlerAndProductWallet(
+    /// @dev checks that policy has been collateralized and has been activated.
+    /// does not check if policy has been expired or closed.
+    function _policyHasBeenActivated(
+        StateId policyState,
+        IPolicy.PolicyInfo memory policyInfo
+    )
+        internal
+        view
+        returns (bool)
+    {
+        if (policyState != COLLATERALIZED()) { return false; } 
+        if (TimestampLib.blockTimestamp() < policyInfo.activatedAt) { return false; } 
+        return true;
+    }
+
+
+    /// @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 _getTokenHandler(
         InstanceReader instanceReader,
         NftId productNftId
     )
@@ -550,6 +560,13 @@ contract PolicyService is
     }
 
 
+    function _getAndVerifyInstanceAndProduct() internal view returns (Product product) {
+        IRegistry.ObjectInfo memory productInfo;
+        (, productInfo,) = _getAndVerifyActiveComponent(PRODUCT());
+        product = Product(productInfo.objectAddress);
+    }
+
+
     function _getDomain() internal pure override returns(ObjectType) {
         return POLICY();
     }