@etherisc/gif-next 0.0.2-9306579-093 → 0.0.2-93a7619-595

package/contracts/examples/fire/FireProduct.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {ACTIVE, COLLATERALIZED, PAUSED} from "../../type/StateId.sol";
+import {ACTIVE, PAUSED} from "../../type/StateId.sol";
 import {Amount, AmountLib} from "../../type/Amount.sol";
 import {BasicProduct} from "../../product/BasicProduct.sol";
 import {ClaimId} from "../../type/ClaimId.sol";
@@ -14,12 +14,9 @@ import {POLICY} from "../../type/ObjectType.sol";
 import {ReferralLib} from "../../type/Referral.sol";
 import {RiskId, RiskIdLib} from "../../type/RiskId.sol";
 import {Seconds} from "../../type/Seconds.sol";
-import {StateId} from "../../type/StateId.sol";
 import {Timestamp, TimestampLib} from "../../type/Timestamp.sol";
 import {UFixed, UFixedLib} from "../../type/UFixed.sol";
 
-uint64 constant SPECIAL_ROLE_INT = 11111;
-
 // solhint-disable-next-line func-name-mixedcase
 function HALF_YEAR() pure returns (Seconds) {
     return Seconds.wrap(180 * 86400);
@@ -53,6 +50,7 @@ contract FireProduct is
     error ErrorFireProductUnknownDamageLevel(DamageLevel damageLevel);
     error ErrorFireProductFireUnknown(uint256 fireId);
     error ErrorFireProductNotPolicyOwner(NftId nftId, address owner);
+    error ErrorFireProductFireNotInCoveredCity(uint256 fireId, string cityName);
 
     string[] private _cities;
     // map from city name to the RiskId
@@ -160,13 +158,13 @@ contract FireProduct is
         view
         returns (Amount premiumAmount)
     {
-        RiskId riskId = _riskMapping[cityName];
-        if (riskId.eqz()) {
+        RiskId risk = _riskMapping[cityName];
+        if (risk.eqz()) {
             revert ErrorFireProductCityUnknown(cityName);
         }
         premiumAmount = calculatePremium( 
             sumInsured,
-            riskId,
+            risk,
             lifetime,
             "",
             bundleNftId,
@@ -202,11 +200,11 @@ contract FireProduct is
         returns (NftId policyNftId)
     {
         address applicationOwner = msg.sender;
-        RiskId riskId = initializeCity(cityName);
+        RiskId risk = initializeCity(cityName);
 
         Amount premiumAmount = calculatePremium(
             sumInsured,
-            riskId,
+            risk,
             lifetime,
             "",
             bundleNftId,
@@ -214,7 +212,7 @@ contract FireProduct is
 
         return _createApplication(
             applicationOwner,
-            riskId,
+            risk,
             sumInsured,
             premiumAmount,
             lifetime,
@@ -228,15 +226,15 @@ contract FireProduct is
         string memory cityName
     ) 
         public
-        returns (RiskId riskId) 
+        returns (RiskId risk) 
     {
         if (! _riskMapping[cityName].eqz()) {
             return _riskMapping[cityName];
         }
         _cities.push(cityName);
-        riskId = RiskIdLib.toRiskId(cityName);
-        _createRisk(riskId, "");
-        _riskMapping[cityName] = riskId;
+        risk = RiskIdLib.toRiskId(cityName);
+        _createRisk(risk, "");
+        _riskMapping[cityName] = risk;
     }
 
     /// @dev Calling this method will lock the sum insured amount in the pool and activate the policy at the given time. 
@@ -329,12 +327,12 @@ contract FireProduct is
         returns (ClaimId claimId, PayoutId payoutId) 
     {
         IPolicy.PolicyInfo memory policyInfo = _getInstanceReader().getPolicyInfo(policyNftId);
-        _checkClaimConditions(policyNftId, fireId, policyInfo);
+        _checkClaimConditions(policyNftId, policyInfo, fireId);
         
-        Fire memory fire = _fires[fireId];
+        Fire memory theFire = _fires[fireId];
         _claimed[fireId][policyNftId] = true;
 
-        Amount claimAmount = _getClaimAmount(policyNftId, policyInfo.sumInsuredAmount, fire.damageLevel);
+        Amount claimAmount = _getClaimAmount(policyNftId, policyInfo.sumInsuredAmount, theFire.damageLevel);
         
         claimId = _submitClaim(policyNftId, claimAmount, abi.encodePacked(fireId));
         _confirmClaim(policyNftId, claimId, claimAmount, "");
@@ -345,34 +343,35 @@ contract FireProduct is
 
     function _checkClaimConditions(
         NftId policyNftId,
-        uint256 fireId,
-        IPolicy.PolicyInfo memory policyInfo
+        IPolicy.PolicyInfo memory policyInfo,
+        uint256 fireId
     ) 
         internal
+        view
     {
         // check fire exists
         if (_fires[fireId].reportedAt.eqz()) {
             revert ErrorFireProductFireUnknown(fireId);
         }
 
+        // check fire is in same city as policy coverage
+        if (_riskMapping[_fires[fireId].cityName] != policyInfo.riskId) {
+            revert ErrorFireProductFireNotInCoveredCity(fireId, _fires[fireId].cityName);
+        }
+
         // check policy has not been claimed yet for this fire
         if (_claimed[fireId][policyNftId]) {
             revert ErrorFireProductAlreadyClaimed();
         }
 
-        StateId policyState = _getInstanceReader().getPolicyState(policyNftId);
-        
-        if (! policyState.eq(COLLATERALIZED())) {
-            revert ErrorFireProductPolicyNotActive(policyNftId);
-        }
-
-        Fire memory fire = _fires[fireId];
+        Fire memory theFire = _fires[fireId];
 
-        if (fire.reportedAt < policyInfo.activatedAt) {
+        // check fire is during policy lifetime
+        if (theFire.reportedAt < policyInfo.activatedAt) {
             revert ErrorFireProductPolicyNotYetActive(policyNftId, policyInfo.activatedAt);
         }
 
-        if (fire.reportedAt > policyInfo.expiredAt) {
+        if (theFire.reportedAt >= policyInfo.expiredAt) {
             revert ErrorFireProductPolicyExpired(policyNftId, policyInfo.expiredAt);
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etherisc/gif-next",
-  "version": "0.0.2-9306579-093",
+  "version": "0.0.2-93a7619-595",
   "description": "This is the repository for the next version of the Generic Insurance Framework (GIF) smart contracts. ",
   "main": "index.js",
   "scripts": {
@@ -49,6 +49,7 @@
     "abi-coder": "^5.0.0",
     "antlr4ng": "^3.0.4",
     "ethers": "^6.7.1",
+    "ethers-decode-error": "^2.1.3",
     "solidity-docgen": "^0.6.0-beta.36",
     "winston": "^3.10.0"
   }