@etherisc/gif-next 0.0.2-704b918-802 → 0.0.2-70b1050-183

package/contracts/examples/fire/FireProduct.sol

@@ -35,9 +35,7 @@ function ONE_YEAR() pure returns (Seconds) {
 contract FireProduct is 
     BasicProduct
 {
-    error ErrorFireProductCityUnknown(string cityName);
-
-    string[] private _cities;
+    string[] _cities;
     // map from city name to the RiskId
     mapping(string cityName => RiskId risk) private _riskMapping;
 
@@ -105,7 +103,7 @@ contract FireProduct is
         restricted()
     {
         if (_riskMapping[cityName].eqz()) {
-            revert ErrorFireProductCityUnknown(cityName);
+            revert(); // TODO: custom error
         }
 
         _updateRiskState(
@@ -121,7 +119,7 @@ contract FireProduct is
         restricted()
     {
         if (_riskMapping[cityName].eqz()) {
-            revert ErrorFireProductCityUnknown(cityName);
+            revert(); // TODO: custom error
         }
 
         _updateRiskState(
@@ -142,7 +140,7 @@ contract FireProduct is
     {
         RiskId riskId = _riskMapping[cityName];
         if (riskId.eqz()) {
-            revert ErrorFireProductCityUnknown(cityName);
+            revert(); // TODO: custom error
         }
         premiumAmount = calculatePremium( 
             sumInsured,
@@ -219,17 +217,17 @@ contract FireProduct is
         _riskMapping[cityName] = riskId;
     }
 
-    /// @dev Calling this method will lock the sum insured amount in the pool and activate the policy at the given time. 
-    /// It will also collect the tokens payment for the premium. An approval with the correct amount towards the TokenHandler of the product is therefor required. 
     function createPolicy(
-        NftId policyNftId,
+        NftId applicationNftId,
+        bool requirePremiumPayment,
         Timestamp activateAt
-    ) 
-        public 
-        restricted()
-    {
-        _createPolicy(policyNftId, activateAt);
-        _collectPremium(policyNftId, activateAt);
+    ) public {
+        // TODO: implement createPolicy
+
+        // _createPolicy(applicationNftId, activateAt);
+        // if (requirePremiumPayment == true) {
+        //     _collectPremium(applicationNftId, activateAt);
+        // }
     }
 
     function decline(

package/contracts/examples/fire/FireProductAuthorization.sol

@@ -4,7 +4,7 @@ pragma solidity ^0.8.20;
 import {BasicProductAuthorization} from "../../product/BasicProductAuthorization.sol";
 import {FireProduct} from "./FireProduct.sol";
 import {IAccess} from "../../../contracts/authorization/IAccess.sol";
-import {PRODUCT_OWNER_ROLE, PUBLIC_ROLE} from "../../../contracts/type/RoleId.sol";
+import {PUBLIC_ROLE} from "../../../contracts/type/RoleId.sol";
 
 
 contract FireProductAuthorization
@@ -25,9 +25,6 @@ contract FireProductAuthorization
         // authorize public role (open access to any account, only allows to lock target)
         functions = _authorizeForTarget(getTargetName(), PUBLIC_ROLE());
         _authorize(functions, FireProduct.createApplication.selector, "createApplication");
-
-        functions = _authorizeForTarget(getTargetName(), PRODUCT_OWNER_ROLE());
-        _authorize(functions, FireProduct.createPolicy.selector, "createPolicy");
     }
 
 }

package/contracts/product/PolicyService.sol

@@ -178,12 +178,9 @@ contract PolicyService is
         // update referral counter 
         {
             IComponents.ProductInfo memory productInfo = instanceReader.getProductInfo(productNftId);
-
-            if (! productInfo.distributionNftId.eqz()) { // only call distribution service if a distribution component is connected to the product    
-                _distributionService.processReferral(
-                    productInfo.distributionNftId, 
-                    applicationInfo.referralId);
-            }
+            _distributionService.processReferral(
+                productInfo.distributionNftId, 
+                applicationInfo.referralId);
         }
 
         // log policy creation before interactions with token and policy holder
@@ -456,12 +453,10 @@ contract PolicyService is
             premium.productFeeVarAmount + premium.productFeeFixAmount);
 
         // update distribution fees and distributor commission and pool fees 
-        if (!distributionNftId.eqz()) { // only call distribution service if a distribution component is connected to the product
-            _distributionService.processSale(
-                distributionNftId, 
-                referralId, 
-                premium);
-        }
+        _distributionService.processSale(
+            distributionNftId, 
+            referralId, 
+            premium);
 
         // update pool and bundle fees 
         _poolService.processSale(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etherisc/gif-next",
-  "version": "0.0.2-704b918-802",
+  "version": "0.0.2-70b1050-183",
   "description": "This is the repository for the next version of the Generic Insurance Framework (GIF) smart contracts. ",
   "main": "index.js",
   "scripts": {