@etherisc/gif-next 3.0.0-1c2086e-623 → 3.0.0-1cefa48-304

package/contracts/examples/fire/FireProduct.sol

@@ -248,7 +248,7 @@ contract FireProduct is
             return _riskMapping[cityName];
         }
         _cities.push(cityName);
-        risk = _createRisk("");
+        risk = _createRisk(bytes32(abi.encodePacked(cityName)), "");
         _riskMapping[cityName] = risk;
     }
 

package/contracts/examples/flight/FlightLib.sol

@@ -243,6 +243,8 @@ library FlightLib {
 
 
     function getFlightRisk(
+        InstanceReader reader,
+        NftId productNftId, 
         Str flightData,
         Timestamp departureTime, 
         string memory departureTimeLocal,
@@ -252,20 +254,28 @@ library FlightLib {
         public
         view
         returns (
+            RiskId riskId,
+            bool exists,
             FlightProduct.FlightRisk memory flightRisk
         )
     {
-        flightRisk = FlightProduct.FlightRisk({
-            flightData: flightData,
-            departureTime: departureTime,
-            departureTimeLocal: departureTimeLocal,
-            arrivalTime: arrivalTime,
-            arrivalTimeLocal: arrivalTimeLocal,
-            sumOfSumInsuredAmounts: AmountLib.toAmount(0),
-            status: bytes1(0),
-            delayMinutes: 0,
-            payoutOption: uint8(0),
-            statusUpdatedAt: TimestampLib.zero()});
+        riskId = getRiskId(productNftId, flightData);
+        (exists, flightRisk) = getFlightRisk(reader, productNftId, riskId, false);
+
+        // create new risk if not existing
+        if (!exists) {
+            flightRisk = FlightProduct.FlightRisk({
+                flightData: flightData,
+                departureTime: departureTime,
+                departureTimeLocal: departureTimeLocal,
+                arrivalTime: arrivalTime,
+                arrivalTimeLocal: arrivalTimeLocal,
+                sumOfSumInsuredAmounts: AmountLib.toAmount(0),
+                status: bytes1(0),
+                delayMinutes: 0,
+                payoutOption: uint8(0),
+                statusUpdatedAt: TimestampLib.zero()});
+        }
     }
 
 
@@ -296,6 +306,20 @@ library FlightLib {
         }
     }
 
+
+    function getRiskId(
+        NftId productNftId,
+        Str flightData
+    )
+        public
+        view 
+        returns (RiskId riskId)
+    {
+        bytes32 riskKey = getRiskKey(flightData);
+        riskId = getRiskId(productNftId, riskKey);
+    }
+
+
     function getRiskKey(
         Str flightData
     )
@@ -306,4 +330,8 @@ library FlightLib {
         return keccak256(abi.encode(flightData));
     }
 
+
+    function getRiskId(NftId productNftId, bytes32 riskKey) internal view returns (RiskId riskId) {
+        return RiskIdLib.toRiskId(productNftId, riskKey);
+    }
 }

package/contracts/examples/flight/FlightProduct.sol

@@ -67,7 +67,6 @@ contract FlightProduct is
     bool internal _testMode;
 
     mapping(RiskId riskId => RequestId requestId) internal _requests;
-    mapping(bytes32 encodedRisk => RiskId) internal _risks;
 
     // GIF V3 specifics
     NftId internal _defaultBundleNftId;
@@ -508,22 +507,20 @@ contract FlightProduct is
         returns (RiskId riskId)
     {
         bool exists;
-        FlightRisk memory flightRisk = FlightLib.getFlightRisk(
+        FlightRisk memory flightRisk;
+        (riskId, exists, flightRisk) = FlightLib.getFlightRisk(
+            _getInstanceReader(), 
+            getNftId(), 
             flightData, 
             departureTime, 
             departureTimeLocal,
             arrivalTime,
             arrivalTimeLocal);
 
-        bytes32 riskKey = FlightLib.getRiskKey(flightData);
-        exists = _risks[riskKey].gtz();
-
         // create risk, if new
         if (!exists) {
-            riskId = _createRisk(abi.encode(flightRisk));
-            _risks[riskKey] = riskId;
-        } else {
-            riskId = _risks[riskKey];
+            bytes32 riskKey = FlightLib.getRiskKey(flightData);
+            _createRisk(riskKey, abi.encode(flightRisk));
         }
 
         FlightLib.checkClusterRisk(

package/contracts/examples/unpermissioned/SimpleProduct.sol

@@ -81,9 +81,13 @@ contract SimpleProduct is
 
 
     function createRisk(
+        string memory id,
         bytes memory data
     ) public returns (RiskId) {
-        return _createRisk(data);
+        return _createRisk(
+            bytes32(abi.encodePacked(id)),
+            data
+        );
     }
 
     function updateRisk(

package/contracts/instance/ProductStore.sol

@@ -113,8 +113,7 @@ contract ProductStore is
     }
 
     //--- Risk --------------------------------------------------------------//
-    function createRisk(IRisk.RiskInfo memory info) external restricted() returns (RiskId riskId) {
-        riskId = _createNextRiskId();
+    function createRisk(RiskId riskId, IRisk.RiskInfo memory info) external restricted() {
         Key32 key = riskId.toKey32();
         _createMetadata(key);
         _risks[key] = info;

package/contracts/instance/base/ObjectCounter.sol

@@ -1,22 +1,20 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
+import {Blocknumber, BlocknumberLib} from "../../type/Blocknumber.sol";
 import {NftId} from "../../type/NftId.sol";
+import {Amount} from "../../type/Amount.sol";
 import {RequestId, RequestIdLib} from "../../type/RequestId.sol";
-import {RiskId, RiskIdLib} from "../../type/RiskId.sol";
 
 contract ObjectCounter {
 
-    uint64 private _riskCounter = 0;
+    // TODO refactor risk id
+    // mapping(NftId productNftId => uint64 risks) private _riskCounter;
+
     uint256 private _requestCounter = 0;
 
     function _createNextRequestId() internal returns (RequestId requestId) {
         _requestCounter++;
         requestId = RequestIdLib.toRequestId(_requestCounter);
     }
-
-    function _createNextRiskId() internal returns (RiskId riskId) {
-        _riskCounter++;
-        riskId = RiskIdLib.toRiskId(_riskCounter);
-    }
 }

package/contracts/product/IRiskService.sol

@@ -23,6 +23,7 @@ interface IRiskService is IService {
     /// The key of the risk derived from the risk id in comination with the product NftId. 
     /// Risk data is stored in the instance store. 
     function createRisk(
+        bytes32 id,
         bytes memory data
     ) external returns (RiskId riskId);
 

package/contracts/product/Product.sol

@@ -181,13 +181,17 @@ abstract contract Product is
 
 
     function _createRisk(
+        bytes32 id,
         bytes memory data
     )
         internal
         virtual
         returns (RiskId riskId)
     {
-        return _getProductStorage()._riskService.createRisk(data);
+        return _getProductStorage()._riskService.createRisk(
+            id,
+            data
+        );
     }
 
     function _updateRisk(

package/contracts/product/RiskService.sol

@@ -40,6 +40,7 @@ contract RiskService is
 
     /// @inheritdoc IRiskService
     function createRisk(
+        bytes32 id,
         bytes memory data
     )
         external 
@@ -51,12 +52,16 @@ contract RiskService is
         (NftId productNftId, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
 
         // effects
+        riskId = RiskIdLib.toRiskId(productNftId, id);
         IRisk.RiskInfo memory riskInfo = IRisk.RiskInfo({
             productNftId: productNftId, 
             createdAt: TimestampLib.current(),
             data: data});
 
-        riskId = instance.getProductStore().createRisk(riskInfo);
+        instance.getProductStore().createRisk(
+            riskId,
+            riskInfo
+        );
 
         // add risk to RiskSet
         RiskSet riskSet = instance.getRiskSet();

package/contracts/type/RiskId.sol

@@ -2,9 +2,10 @@
 pragma solidity ^0.8.20;
 
 import {Key32, KeyId, Key32Lib} from "./Key32.sol";
+import {NftId} from "./NftId.sol";
 import {RISK} from "./ObjectType.sol";
 
-type RiskId is uint64;
+type RiskId is bytes8;
 
 // type bindings
 using {
@@ -32,7 +33,7 @@ function neRiskId(RiskId a, RiskId b) pure returns (bool isDifferent) {
 
 library RiskIdLib {
     function zero() public pure returns (RiskId) {
-        return RiskId.wrap(uint64(0));
+        return RiskId.wrap(bytes8(0));
     }
 
     // @dev Converts a risk id into a uint256.
@@ -41,8 +42,8 @@ library RiskIdLib {
     }
 
     // @dev Converts a risk id string with a product NftId into a risk id.
-    function toRiskId(uint256 id) public pure returns (RiskId) {
-        return RiskId.wrap(uint64(id));
+    function toRiskId(NftId productNftId, bytes32 risk) public pure returns (RiskId) {
+        return RiskId.wrap(bytes8(keccak256(abi.encode(productNftId, risk))));
     }
 
     /// @dev Returns the key32 value for the specified risk id.
@@ -52,13 +53,12 @@ library RiskIdLib {
 
     /// @dev Returns the key id value for the specified nft id
     function toKeyId(RiskId id) public pure returns (KeyId keyId) {
-        return KeyId.wrap(bytes31(uint248(RiskId.unwrap(id))));
+        return KeyId.wrap(bytes31(RiskId.unwrap(id)));
     }
 
     function toRiskId(KeyId keyId) public pure returns (RiskId riskId) {
-        uint248 keyIdInt = uint248(bytes31(KeyId.unwrap(keyId)));
-        assert(keyIdInt < type(uint64).max);
-        return RiskId.wrap(uint64(keyIdInt));
+        riskId = RiskId.wrap(bytes8(KeyId.unwrap(keyId)));
+        assert(toInt(riskId) < 2**64);
     }
 
     function eq(RiskId a, RiskId b) public pure returns (bool isSame) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etherisc/gif-next",
-  "version": "3.0.0-1c2086e-623",
+  "version": "3.0.0-1cefa48-304",
   "description": "This is the repository for the next version of the Generic Insurance Framework (GIF) smart contracts. ",
   "main": "index.js",
   "scripts": {