@etherisc/gif-next 0.0.2-4be7d72-071 → 0.0.2-4c19d89-776

package/artifacts/contracts/type/RequestId.sol/RequestIdLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/62cd940a95893eed888bc959b4e88dfe.json"
+  "buildInfo": "../../../build-info/fe6349146d06341fb21f060b157460cc.json"
 }

package/artifacts/contracts/type/RiskId.sol/RiskIdLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/62cd940a95893eed888bc959b4e88dfe.json"
+  "buildInfo": "../../../build-info/fe6349146d06341fb21f060b157460cc.json"
 }

package/artifacts/contracts/type/RiskId.sol/RiskIdLib.json

@@ -144,9 +144,14 @@
     {
       "inputs": [
         {
-          "internalType": "string",
+          "internalType": "NftId",
+          "name": "productNftId",
+          "type": "uint96"
+        },
+        {
+          "internalType": "bytes32",
           "name": "risk",
-          "type": "string"
+          "type": "bytes32"
         }
       ],
       "name": "toRiskId",
@@ -174,8 +179,8 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x61048a610034600b8282823980515f1a607314602857634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe730000000000000000000000000000000000000000301460806040526004361061009b575f3560e01c806370a021ec1161006e57806370a021ec146101325780637bc32ecf146101555780638b0d9ff014610175578063b2e508a614610189578063bc1b392d1461019f575f80fd5b806301809eea1461009f5780632cf96bf9146100d05780634a7485ba146100fe57806355ee627514610111575b5f80fd5b6100b26100ad3660046102ab565b6101a5565b6040516001600160c01b031990911681526020015b60405180910390f35b6100eb6100de3660046102e3565b6001600160c01b03191690565b60405160ff1990911681526020016100c7565b6100b261010c366004610310565b6101cc565b61012461011f3660046102e3565b6101fb565b6040519081526020016100c7565b6101456101403660046103c3565b610292565b60405190151581526020016100c7565b6101456101633660046102e3565b5f6001600160c01b031982161561028c565b6101246101833660046102e3565b60c01c90565b6101456101973660046102e3565b60c01c151590565b5f6100b2565b80680100000000000000006101ba8260c01c90565b106101c7576101c76103f4565b919050565b5f816040516020016101de9190610408565b604051602081830303815290604052805190602001209050919050565b5f73__$4b9aaffa8d044614668dad578b824b8eee$__63f48016ce602c6001600160c01b031985166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af4158015610268573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061028c919061043d565b92915050565b5f6001600160c01b0319808416908316145b9392505050565b5f602082840312156102bb575f80fd5b813560ff19811681146102a4575f80fd5b80356001600160c01b0319811681146101c7575f80fd5b5f602082840312156102f3575f80fd5b6102a4826102cc565b634e487b7160e01b5f52604160045260245ffd5b5f60208284031215610320575f80fd5b813567ffffffffffffffff811115610336575f80fd5b8201601f81018413610346575f80fd5b803567ffffffffffffffff811115610360576103606102fc565b604051601f8201601f19908116603f0116810167ffffffffffffffff8111828210171561038f5761038f6102fc565b6040528181528282016020018610156103a6575f80fd5b816020840160208301375f91810160200191909152949350505050565b5f80604083850312156103d4575f80fd5b6103dd836102cc565b91506103eb602084016102cc565b90509250929050565b634e487b7160e01b5f52600160045260245ffd5b602081525f82518060208401528060208501604085015e5f604082850101526040601f19601f83011684010191505092915050565b5f6020828403121561044d575f80fd5b505191905056fea264697066735822122016c3a32f1eedf661caad27d57c5fd00e7e042a4d2c576c00dde60814aa418e3a64736f6c634300081a0033",
-  "deployedBytecode": "0x730000000000000000000000000000000000000000301460806040526004361061009b575f3560e01c806370a021ec1161006e57806370a021ec146101325780637bc32ecf146101555780638b0d9ff014610175578063b2e508a614610189578063bc1b392d1461019f575f80fd5b806301809eea1461009f5780632cf96bf9146100d05780634a7485ba146100fe57806355ee627514610111575b5f80fd5b6100b26100ad3660046102ab565b6101a5565b6040516001600160c01b031990911681526020015b60405180910390f35b6100eb6100de3660046102e3565b6001600160c01b03191690565b60405160ff1990911681526020016100c7565b6100b261010c366004610310565b6101cc565b61012461011f3660046102e3565b6101fb565b6040519081526020016100c7565b6101456101403660046103c3565b610292565b60405190151581526020016100c7565b6101456101633660046102e3565b5f6001600160c01b031982161561028c565b6101246101833660046102e3565b60c01c90565b6101456101973660046102e3565b60c01c151590565b5f6100b2565b80680100000000000000006101ba8260c01c90565b106101c7576101c76103f4565b919050565b5f816040516020016101de9190610408565b604051602081830303815290604052805190602001209050919050565b5f73__$4b9aaffa8d044614668dad578b824b8eee$__63f48016ce602c6001600160c01b031985166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af4158015610268573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061028c919061043d565b92915050565b5f6001600160c01b0319808416908316145b9392505050565b5f602082840312156102bb575f80fd5b813560ff19811681146102a4575f80fd5b80356001600160c01b0319811681146101c7575f80fd5b5f602082840312156102f3575f80fd5b6102a4826102cc565b634e487b7160e01b5f52604160045260245ffd5b5f60208284031215610320575f80fd5b813567ffffffffffffffff811115610336575f80fd5b8201601f81018413610346575f80fd5b803567ffffffffffffffff811115610360576103606102fc565b604051601f8201601f19908116603f0116810167ffffffffffffffff8111828210171561038f5761038f6102fc565b6040528181528282016020018610156103a6575f80fd5b816020840160208301375f91810160200191909152949350505050565b5f80604083850312156103d4575f80fd5b6103dd836102cc565b91506103eb602084016102cc565b90509250929050565b634e487b7160e01b5f52600160045260245ffd5b602081525f82518060208401528060208501604085015e5f604082850101526040601f19601f83011684010191505092915050565b5f6020828403121561044d575f80fd5b505191905056fea264697066735822122016c3a32f1eedf661caad27d57c5fd00e7e042a4d2c576c00dde60814aa418e3a64736f6c634300081a0033",
+  "bytecode": "0x6103da610034600b8282823980515f1a607314602857634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe730000000000000000000000000000000000000000301460806040526004361061009b575f3560e01c80637bc32ecf1161006e5780637bc32ecf146101425780638a3065c1146101555780638b0d9ff0146101a4578063b2e508a6146101b8578063bc1b392d146101ce575f80fd5b806301809eea1461009f5780632cf96bf9146100d057806355ee6275146100fe57806370a021ec1461011f575b5f80fd5b6100b26100ad3660046102bd565b6101d4565b6040516001600160c01b031990911681526020015b60405180910390f35b6100eb6100de3660046102f5565b6001600160c01b03191690565b60405160ff1990911681526020016100c7565b61011161010c3660046102f5565b6101fb565b6040519081526020016100c7565b61013261012d36600461030e565b610292565b60405190151581526020016100c7565b6101326101503660046102f5565b6102ab565b6100b261016336600461033f565b604080516bffffffffffffffffffffffff841660208201529081018290525f9060600160405160208183030381529060405280519060200120905092915050565b6101116101b23660046102f5565b60c01c90565b6101326101c63660046102f5565b60c01c151590565b5f6100b2565b80680100000000000000006101e98260c01c90565b106101f6576101f6610379565b919050565b5f73__$4b9aaffa8d044614668dad578b824b8eee$__63f48016ce602c6001600160c01b031985166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af4158015610268573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061028c919061038d565b92915050565b5f6001600160c01b0319808416908316145b9392505050565b5f6001600160c01b031982161561028c565b5f602082840312156102cd575f80fd5b813560ff19811681146102a4575f80fd5b80356001600160c01b0319811681146101f6575f80fd5b5f60208284031215610305575f80fd5b6102a4826102de565b5f806040838503121561031f575f80fd5b610328836102de565b9150610336602084016102de565b90509250929050565b5f8060408385031215610350575f80fd5b82356bffffffffffffffffffffffff8116811461036b575f80fd5b946020939093013593505050565b634e487b7160e01b5f52600160045260245ffd5b5f6020828403121561039d575f80fd5b505191905056fea2646970667358221220675dcb6c26090d8eed37201a05cb7130d14f0592ea21ac450da0c215cc4dba6364736f6c634300081a0033",
+  "deployedBytecode": "0x730000000000000000000000000000000000000000301460806040526004361061009b575f3560e01c80637bc32ecf1161006e5780637bc32ecf146101425780638a3065c1146101555780638b0d9ff0146101a4578063b2e508a6146101b8578063bc1b392d146101ce575f80fd5b806301809eea1461009f5780632cf96bf9146100d057806355ee6275146100fe57806370a021ec1461011f575b5f80fd5b6100b26100ad3660046102bd565b6101d4565b6040516001600160c01b031990911681526020015b60405180910390f35b6100eb6100de3660046102f5565b6001600160c01b03191690565b60405160ff1990911681526020016100c7565b61011161010c3660046102f5565b6101fb565b6040519081526020016100c7565b61013261012d36600461030e565b610292565b60405190151581526020016100c7565b6101326101503660046102f5565b6102ab565b6100b261016336600461033f565b604080516bffffffffffffffffffffffff841660208201529081018290525f9060600160405160208183030381529060405280519060200120905092915050565b6101116101b23660046102f5565b60c01c90565b6101326101c63660046102f5565b60c01c151590565b5f6100b2565b80680100000000000000006101e98260c01c90565b106101f6576101f6610379565b919050565b5f73__$4b9aaffa8d044614668dad578b824b8eee$__63f48016ce602c6001600160c01b031985166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af4158015610268573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061028c919061038d565b92915050565b5f6001600160c01b0319808416908316145b9392505050565b5f6001600160c01b031982161561028c565b5f602082840312156102cd575f80fd5b813560ff19811681146102a4575f80fd5b80356001600160c01b0319811681146101f6575f80fd5b5f60208284031215610305575f80fd5b6102a4826102de565b5f806040838503121561031f575f80fd5b610328836102de565b9150610336602084016102de565b90509250929050565b5f8060408385031215610350575f80fd5b82356bffffffffffffffffffffffff8116811461036b575f80fd5b946020939093013593505050565b634e487b7160e01b5f52600160045260245ffd5b5f6020828403121561039d575f80fd5b505191905056fea2646970667358221220675dcb6c26090d8eed37201a05cb7130d14f0592ea21ac450da0c215cc4dba6364736f6c634300081a0033",
   "linkReferences": {
     "contracts/type/Key32.sol": {
       "Key32Lib": [

package/artifacts/contracts/type/RoleId.sol/RoleIdLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/62cd940a95893eed888bc959b4e88dfe.json"
+  "buildInfo": "../../../build-info/fe6349146d06341fb21f060b157460cc.json"
 }

package/artifacts/contracts/type/Seconds.sol/SecondsLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/62cd940a95893eed888bc959b4e88dfe.json"
+  "buildInfo": "../../../build-info/fe6349146d06341fb21f060b157460cc.json"
 }

package/artifacts/contracts/type/Selector.sol/SelectorLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/62cd940a95893eed888bc959b4e88dfe.json"
+  "buildInfo": "../../../build-info/fe6349146d06341fb21f060b157460cc.json"
 }

package/artifacts/contracts/type/Selector.sol/SelectorSetLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/62cd940a95893eed888bc959b4e88dfe.json"
+  "buildInfo": "../../../build-info/fe6349146d06341fb21f060b157460cc.json"
 }

package/artifacts/contracts/type/StateId.sol/StateIdLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/62cd940a95893eed888bc959b4e88dfe.json"
+  "buildInfo": "../../../build-info/fe6349146d06341fb21f060b157460cc.json"
 }

package/artifacts/contracts/type/String.sol/StrLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/62cd940a95893eed888bc959b4e88dfe.json"
+  "buildInfo": "../../../build-info/fe6349146d06341fb21f060b157460cc.json"
 }

package/artifacts/contracts/type/Timestamp.sol/TimestampLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/62cd940a95893eed888bc959b4e88dfe.json"
+  "buildInfo": "../../../build-info/fe6349146d06341fb21f060b157460cc.json"
 }

package/artifacts/contracts/type/UFixed.sol/UFixedLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/62cd940a95893eed888bc959b4e88dfe.json"
+  "buildInfo": "../../../build-info/fe6349146d06341fb21f060b157460cc.json"
 }

package/artifacts/contracts/type/Version.sol/VersionLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/62cd940a95893eed888bc959b4e88dfe.json"
+  "buildInfo": "../../../build-info/fe6349146d06341fb21f060b157460cc.json"
 }

package/artifacts/contracts/type/Version.sol/VersionPartLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/62cd940a95893eed888bc959b4e88dfe.json"
+  "buildInfo": "../../../build-info/fe6349146d06341fb21f060b157460cc.json"
 }

package/artifacts/contracts/upgradeability/IVersionable.sol/IVersionable.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/62cd940a95893eed888bc959b4e88dfe.json"
+  "buildInfo": "../../../build-info/fe6349146d06341fb21f060b157460cc.json"
 }

package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/62cd940a95893eed888bc959b4e88dfe.json"
+  "buildInfo": "../../../build-info/fe6349146d06341fb21f060b157460cc.json"
 }

package/artifacts/contracts/upgradeability/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/62cd940a95893eed888bc959b4e88dfe.json"
+  "buildInfo": "../../../build-info/fe6349146d06341fb21f060b157460cc.json"
 }

package/artifacts/contracts/upgradeability/Versionable.sol/Versionable.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/62cd940a95893eed888bc959b4e88dfe.json"
+  "buildInfo": "../../../build-info/fe6349146d06341fb21f060b157460cc.json"
 }

package/contracts/examples/fire/FireProduct.sol

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

package/contracts/examples/unpermissioned/SimpleProduct.sol

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

package/contracts/product/IRiskService.sol

@@ -1,23 +1,20 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {IRisk} from "../instance/module/IRisk.sol";
 import {IService} from "../shared/IService.sol";
 
-import {NftId} from "../type/NftId.sol";
-import {ReferralId} from "../type/Referral.sol";
 import {RiskId} from "../type/RiskId.sol";
 import {StateId} from "../type/StateId.sol";
-import {Timestamp} from "../type/Timestamp.sol";
-import {UFixed} from "../type/UFixed.sol";
-import {Fee} from "../type/Fee.sol";
 
 interface IRiskService is IService {
 
+    /// @dev Create a new risk with the given id and provided data. 
+    /// 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(
-        RiskId riskId,
+        bytes32 id,
         bytes memory data
-    ) external;
+    ) external returns (RiskId riskId);
 
 
     function updateRisk(

package/contracts/product/Product.sol

@@ -3,21 +3,18 @@ pragma solidity ^0.8.20;
 
 import {Amount, AmountLib} from "../type/Amount.sol";
 import {ClaimId} from "../type/ClaimId.sol";
-import {IComponent} from "../shared/IComponent.sol";
-import {Fee, FeeLib} from "../type/Fee.sol";
-import {IRisk} from "../instance/module/IRisk.sol";
+import {Fee} from "../type/Fee.sol";
 import {IApplicationService} from "./IApplicationService.sol";
 import {IAuthorization} from "../authorization/IAuthorization.sol";
 import {IComponentService} from "../shared/IComponentService.sol";
 import {InstanceLinkedComponent} from "../shared/InstanceLinkedComponent.sol";
-import {IInstanceLinkedComponent} from "../shared/IInstanceLinkedComponent.sol";
 import {IPolicyService} from "./IPolicyService.sol";
 import {IRiskService} from "./IRiskService.sol";
 import {IClaimService} from "./IClaimService.sol";
 import {IPricingService} from "./IPricingService.sol";
 import {IProductComponent} from "./IProductComponent.sol";
-import {NftId, NftIdLib} from "../type/NftId.sol";
-import {ObjectType, COMPONENT, DISTRIBUTION, ORACLE, POOL, PRODUCT, BUNDLE, APPLICATION, POLICY, CLAIM, PRICE } from "../type/ObjectType.sol";
+import {NftId} from "../type/NftId.sol";
+import {COMPONENT, PRODUCT, BUNDLE, APPLICATION, POLICY, CLAIM, PRICE } from "../type/ObjectType.sol";
 import {PayoutId} from "../type/PayoutId.sol";
 import {COMPONENT, PRODUCT, APPLICATION, POLICY, CLAIM, PRICE, BUNDLE, RISK } from "../type/ObjectType.sol";
 import {ReferralId} from "../type/Referral.sol";
@@ -28,9 +25,6 @@ import {Timestamp} from "../type/Timestamp.sol";
 
 import {IPolicy} from "../instance/module/IPolicy.sol";
 import {IComponents} from "../instance/module/IComponents.sol";
-import {IDistributionComponent} from "../distribution/IDistributionComponent.sol";
-import {IOracleComponent} from "../oracle/IOracleComponent.sol";
-import {IPoolComponent} from "../pool/IPoolComponent.sol";
 
 abstract contract Product is
     InstanceLinkedComponent, 
@@ -189,13 +183,14 @@ abstract contract Product is
 
 
     function _createRisk(
-        RiskId id,
+        bytes32 id,
         bytes memory data
     )
         internal
         virtual
+        returns (RiskId riskId)
     {
-        _getProductStorage()._riskService.createRisk(
+        return _getProductStorage()._riskService.createRisk(
             id,
             data
         );
@@ -466,10 +461,6 @@ abstract contract Product is
             payoutId);
     }
 
-    function _toRiskId(string memory riskName) internal virtual pure returns (RiskId riskId) {
-        return RiskIdLib.toRiskId(riskName);
-    }
-
     function _getProductStorage() internal virtual pure returns (ProductStorage storage $) {
         assembly {
             $.slot := PRODUCT_STORAGE_LOCATION_V1

package/contracts/product/RiskService.sol

@@ -2,19 +2,16 @@
 pragma solidity ^0.8.20;
 
 import {IInstance} from "../instance/IInstance.sol";
-import {IInstanceService} from "../instance/IInstanceService.sol";
-import {IPoolService} from "../pool/PoolService.sol";
 import {IRegistry} from "../registry/IRegistry.sol";
-import {IRegistryService} from "../registry/IRegistryService.sol";
 import {IRisk} from "../instance/module/IRisk.sol";
 import {IRiskService} from "./IRiskService.sol";
 
 import {ContractLib} from "../shared/ContractLib.sol";
 import {InstanceReader} from "../instance/InstanceReader.sol";
-import {ObjectType, COMPONENT, INSTANCE, PRODUCT, POOL, POLICY, REGISTRY, RISK} from "../type/ObjectType.sol";
+import {ObjectType, COMPONENT, PRODUCT, RISK} from "../type/ObjectType.sol";
 import {ACTIVE, PAUSED, KEEP_STATE} from "../type/StateId.sol";
 import {NftId} from "../type/NftId.sol";
-import {RiskId} from "../type/RiskId.sol";
+import {RiskId, RiskIdLib} from "../type/RiskId.sol";
 import {StateId} from "../type/StateId.sol";
 import {RiskSet} from "../instance/RiskSet.sol";
 import {Service} from "../shared/Service.sol";
@@ -42,18 +39,20 @@ contract RiskService is
         _registerInterface(type(IRiskService).interfaceId);
     }
 
-
+    /// @inheritdoc IRiskService
     function createRisk(
-        RiskId riskId,
+        bytes32 id,
         bytes memory data
     )
         external 
         restricted()
+        returns (RiskId riskId)
     {
         // checks
         (NftId productNftId, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
 
         // effects
+        riskId = RiskIdLib.toRiskId(productNftId, id);
         IRisk.RiskInfo memory riskInfo = IRisk.RiskInfo({
             productNftId: productNftId, 
             createdAt: TimestampLib.blockTimestamp(),