@etherisc/gif-next 0.0.2-ad36a6a-080 → 0.0.2-ad3cf8f-433

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";
@@ -10,15 +10,13 @@ import {IAuthorization} from "../../authorization/IAuthorization.sol";
 import {IPolicy} from "../../instance/module/IPolicy.sol";
 import {NftId} from "../../type/NftId.sol";
 import {PayoutId} from "../../type/PayoutId.sol";
+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);
@@ -43,15 +41,16 @@ contract FireProduct is
     }
 
     error ErrorFireProductCityUnknown(string cityName);
-    error ErrorFireProductTimestampTooEarly();
+    error ErrorFireProductTimestampInFuture();
     error ErrorFireProductFireAlreadyReported();
     error ErrorFireProductAlreadyClaimed();
-    error ErrorFireProductPolicyNotActive();
-    error ErrorFireProductPolicyNotYetActive(Timestamp activateAt);
-    error ErrorFireProductPolicyExpired(Timestamp expiredAt);
+    error ErrorFireProductPolicyNotActive(NftId policyNftId);
+    error ErrorFireProductPolicyNotYetActive(NftId policyNftId, Timestamp activateAt);
+    error ErrorFireProductPolicyExpired(NftId policyNftId, Timestamp expiredAt);
     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
@@ -159,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,
@@ -201,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,
@@ -213,7 +212,7 @@ contract FireProduct is
 
         return _createApplication(
             applicationOwner,
-            riskId,
+            risk,
             sumInsured,
             premiumAmount,
             lifetime,
@@ -227,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. 
@@ -298,8 +297,8 @@ contract FireProduct is
             revert ErrorFireProductCityUnknown(cityName);
         }
 
-        if (reportedAt < TimestampLib.blockTimestamp()) {
-            revert ErrorFireProductTimestampTooEarly();
+        if (reportedAt > TimestampLib.blockTimestamp()) {
+            revert ErrorFireProductTimestampInFuture();
         }
 
         if (! _fires[fireId].reportedAt.eqz()) {
@@ -324,15 +323,16 @@ contract FireProduct is
         public 
         restricted()
         onlyNftOwner(policyNftId)
+        onlyNftObjectType(policyNftId, POLICY())
         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, "");
@@ -343,35 +343,36 @@ 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();
-        }
-
-        Fire memory fire = _fires[fireId];
+        Fire memory theFire = _fires[fireId];
 
-        if (fire.reportedAt < policyInfo.activatedAt) {
-            revert ErrorFireProductPolicyNotYetActive(policyInfo.activatedAt);
+        // check fire is during policy lifetime
+        if (theFire.reportedAt < policyInfo.activatedAt) {
+            revert ErrorFireProductPolicyNotYetActive(policyNftId, policyInfo.activatedAt);
         }
 
-        if (fire.reportedAt > policyInfo.expiredAt) {
-            revert ErrorFireProductPolicyExpired(policyInfo.expiredAt);
+        if (theFire.reportedAt >= policyInfo.expiredAt) {
+            revert ErrorFireProductPolicyExpired(policyNftId, policyInfo.expiredAt);
         }
     }
 

package/contracts/product/ClaimService.sol

@@ -425,7 +425,7 @@ contract ClaimService is
         policyInfo.payoutAmount.add(amount);
         instance.getInstanceStore().updatePolicyClaims(policyNftId, policyInfo, KEEP_STATE());
 
-        emit LogClaimServicePayoutCreated(policyNftId, payoutId, amount);
+        emit LogClaimServicePayoutCreated(policyNftId, payoutId, amount, beneficiary);
     }
 
 

package/contracts/product/IClaimService.sol

@@ -26,8 +26,9 @@ interface IClaimService is
     event LogClaimServiceClaimRevoked(NftId policyNftId, ClaimId claimId);
     event LogClaimServiceClaimClosed(NftId policyNftId, ClaimId claimId);
 
-    event LogClaimServicePayoutCreated(NftId policyNftId, PayoutId payoutId, Amount amount);
+    event LogClaimServicePayoutCreated(NftId policyNftId, PayoutId payoutId, Amount amount, address beneficiary);
     event LogClaimServicePayoutProcessed(NftId policyNftId, PayoutId payoutId, Amount amount, address beneficiary, Amount netAmount, Amount processingFeeAmount);
+    error ErrorClaimServiceBeneficiarySet(NftId policyNftId, PayoutId payoutId, address beneficiary);
 
     error ErrorClaimServicePolicyProductMismatch(NftId policyNftId, NftId expectedProduct, NftId actualProduct);
     error ErrorClaimServicePolicyNotOpen(NftId policyNftId);

package/contracts/registry/IRegistry.sol

@@ -65,9 +65,6 @@ interface IRegistry is IERC165 {
         StateId state;
         VersionPart version;
         bytes32 salt;
-        address[] addresses;
-        string[] names;
-        ObjectType[] domains;
         IServiceAuthorization auth;
         Timestamp activatedAt;
         Timestamp disabledAt;

package/contracts/registry/RegistryAdmin.sol

@@ -115,21 +115,6 @@ contract RegistryAdmin is
             address(service)); 
     }
 
-    function revokeServiceRole(
-        IService service,
-        ObjectType domain, 
-        VersionPart version
-    )
-        external
-        restricted()
-    {
-        _revokeRoleFromAccount(
-            RoleIdLib.roleForTypeAndVersion(
-                domain, 
-                version), 
-            address(service));
-    }
-
     function grantServiceRoleForAllVersions(IService service, ObjectType domain)
         external
         restricted()
@@ -139,13 +124,11 @@ contract RegistryAdmin is
             address(service)); 
     }
 
-    function revokeServiceRoleForAllVersions(IService service, ObjectType domain)
+    function setServiceLocked(IService service, bool locked)
         external
         restricted()
     {
-        _revokeRoleFromAccount(
-            RoleIdLib.roleForTypeAndAllVersions(domain), 
-            address(service));
+        _setTargetClosed(address(service), locked);
     }
 
     /*function transferAdmin(address to)
@@ -188,6 +171,8 @@ contract RegistryAdmin is
             true,
             false);
 
+        _setTargetClosed(address(service), true);
+
         // create service role
         RoleId serviceRoleId = RoleIdLib.roleForTypeAndVersion(
             serviceDomain, 
@@ -330,12 +315,11 @@ contract RegistryAdmin is
                 name: RELEASE_REGISTRY_ROLE_NAME}));
 
         FunctionInfo[] memory functions;
-        functions = new FunctionInfo[](5);
+        functions = new FunctionInfo[](4);
         functions[0] = toFunction(RegistryAdmin.authorizeService.selector, "authorizeService");
         functions[1] = toFunction(RegistryAdmin.grantServiceRoleForAllVersions.selector, "grantServiceRoleForAllVersions");
-        functions[2] = toFunction(RegistryAdmin.revokeServiceRoleForAllVersions.selector, "revokeServiceRoleForAllVersions");
-        functions[3] = toFunction(RegistryAdmin.grantServiceRole.selector, "grantServiceRole");
-        functions[4] = toFunction(RegistryAdmin.revokeServiceRole.selector, "revokeServiceRole");
+        functions[2] = toFunction(RegistryAdmin.grantServiceRole.selector, "grantServiceRole");
+        functions[3] = toFunction(RegistryAdmin.setServiceLocked.selector, "setServiceLocked");
         _authorizeTargetFunctions(address(this), releaseRegistryRoleId, functions);
 
         _grantRoleToAccount(releaseRegistryRoleId, _releaseRegistry);

package/contracts/registry/ReleaseLifecycle.sol

@@ -2,7 +2,7 @@
 pragma solidity ^0.8.20;
 
 import {RELEASE} from "../type/ObjectType.sol";
-import {SCHEDULED, DEPLOYING, ACTIVE, PAUSED, CLOSED/*, FREE*/} from "../type/StateId.sol";
+import {SCHEDULED, DEPLOYING, DEPLOYED, SKIPPED, ACTIVE, PAUSED, CLOSED} from "../type/StateId.sol";
 import {Lifecycle} from "../shared/Lifecycle.sol";
 
 contract ReleaseLifecycle is
@@ -18,9 +18,12 @@ contract ReleaseLifecycle is
     {
         setInitialState(RELEASE(), SCHEDULED());
 
+        setStateTransition(RELEASE(), SCHEDULED(), SKIPPED());
         setStateTransition(RELEASE(), SCHEDULED(), DEPLOYING());
-        setStateTransition(RELEASE(), DEPLOYING(), DEPLOYING());
-        setStateTransition(RELEASE(), DEPLOYING(), ACTIVE());
+        setStateTransition(RELEASE(), DEPLOYING(), SKIPPED());
+        setStateTransition(RELEASE(), DEPLOYING(), DEPLOYED());
+        setStateTransition(RELEASE(), DEPLOYED(), SKIPPED());
+        setStateTransition(RELEASE(), DEPLOYED(), ACTIVE());
         setStateTransition(RELEASE(), ACTIVE(), PAUSED());
         setStateTransition(RELEASE(), PAUSED(), ACTIVE());
     }