@etherisc/gif-next 0.0.2-f13fd28-503 → 0.0.2-f15b559-661

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/b6c3e721e77d8e820800264aa4641b8c.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/b6c3e721e77d8e820800264aa4641b8c.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/b6c3e721e77d8e820800264aa4641b8c.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/b6c3e721e77d8e820800264aa4641b8c.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/b6c3e721e77d8e820800264aa4641b8c.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/b6c3e721e77d8e820800264aa4641b8c.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/b6c3e721e77d8e820800264aa4641b8c.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/b6c3e721e77d8e820800264aa4641b8c.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/b6c3e721e77d8e820800264aa4641b8c.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/b6c3e721e77d8e820800264aa4641b8c.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/b6c3e721e77d8e820800264aa4641b8c.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/b6c3e721e77d8e820800264aa4641b8c.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/b6c3e721e77d8e820800264aa4641b8c.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/b6c3e721e77d8e820800264aa4641b8c.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/b6c3e721e77d8e820800264aa4641b8c.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/b6c3e721e77d8e820800264aa4641b8c.json"
+  "buildInfo": "../../../build-info/fe6349146d06341fb21f060b157460cc.json"
 }

package/contracts/distribution/BasicDistribution.sol

@@ -1,15 +1,17 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
+import {IAuthorization} from "../authorization/IAuthorization.sol";
+
 import {Distribution} from "./Distribution.sol";
+import {DistributorType} from "../type/DistributorType.sol";
 import {DISTRIBUTOR} from "../type/ObjectType.sol";
-import {IAuthorization} from "../authorization/IAuthorization.sol";
+import {Fee} from "../type/Fee.sol";
 import {NftId} from "../type/NftId.sol";
 import {ReferralId} from "../type/Referral.sol";
-import {Fee} from "../type/Fee.sol";
-import {UFixed} from "../type/UFixed.sol";
-import {DistributorType} from "../type/DistributorType.sol";
+import {Seconds} from "../type/Seconds.sol";
 import {Timestamp} from "../type/Timestamp.sol";
+import {UFixed} from "../type/UFixed.sol";
 
 
 contract BasicDistribution is
@@ -37,7 +39,7 @@ contract BasicDistribution is
         UFixed maxDiscountPercentage,
         UFixed commissionPercentage,
         uint32 maxReferralCount,
-        uint32 maxReferralLifetime,
+        Seconds maxReferralLifetime,
         bool allowSelfReferrals,
         bool allowRenewals,
         bytes memory data

package/contracts/distribution/Distribution.sol

@@ -1,19 +1,21 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {Amount} from "../type/Amount.sol";
-import {COMPONENT, DISTRIBUTION, DISTRIBUTOR} from "../type/ObjectType.sol";
 import {IAuthorization} from "../authorization/IAuthorization.sol";
+import {IComponentService} from "../shared/IComponentService.sol";
+import {IDistributionComponent} from "./IDistributionComponent.sol";
 import {IDistributionService} from "./IDistributionService.sol";
+
+import {Amount} from "../type/Amount.sol";
+import {COMPONENT, DISTRIBUTION, DISTRIBUTOR} from "../type/ObjectType.sol";
+import {DistributorType} from "../type/DistributorType.sol";
+import {Fee} from "../type/Fee.sol";
 import {NftId, NftIdLib} from "../type/NftId.sol";
 import {ReferralId, ReferralStatus, ReferralLib} from "../type/Referral.sol";
-import {Fee} from "../type/Fee.sol";
 import {InstanceLinkedComponent} from "../shared/InstanceLinkedComponent.sol";
-import {IComponentService} from "../shared/IComponentService.sol";
-import {IDistributionComponent} from "./IDistributionComponent.sol";
-import {UFixed} from "../type/UFixed.sol";
-import {DistributorType} from "../type/DistributorType.sol";
+import {Seconds} from "../type/Seconds.sol";
 import {Timestamp} from "../type/Timestamp.sol";
+import {UFixed} from "../type/UFixed.sol";
 
 
 abstract contract Distribution is
@@ -180,7 +182,7 @@ abstract contract Distribution is
         UFixed maxDiscountPercentage,
         UFixed commissionPercentage,
         uint32 maxReferralCount,
-        uint32 maxReferralLifetime,
+        Seconds maxReferralLifetime,
         bool allowSelfReferrals,
         bool allowRenewals,
         bytes memory data

package/contracts/distribution/DistributionService.sol

@@ -2,27 +2,28 @@
 pragma solidity ^0.8.20;
 
 import {IAccountingService} from "../accounting/IAccountingService.sol";
-import {IRegistry} from "../registry/IRegistry.sol";
-import {IInstance} from "../instance/IInstance.sol";
 import {IComponentService} from "../shared/IComponentService.sol";
+import {IDistribution} from "../instance/module/IDistribution.sol";
+import {IDistributionService} from "./IDistributionService.sol";
+import {IInstance} from "../instance/IInstance.sol";
 import {IInstanceService} from "../instance/IInstanceService.sol";
+import {IRegistry} from "../registry/IRegistry.sol";
 import {IRegistryService} from "../registry/IRegistryService.sol";
-import {InstanceReader} from "../instance/InstanceReader.sol";
 import {IComponents} from "../instance/module/IComponents.sol";
 import {IPolicy} from "../instance/module/IPolicy.sol";
 
 import {Amount, AmountLib} from "../type/Amount.sol";
+import {ComponentVerifyingService} from "../shared/ComponentVerifyingService.sol";
+import {DistributorType, DistributorTypeLib} from "../type/DistributorType.sol";
 import {NftId, NftIdLib} from "../type/NftId.sol";
 import {KEEP_STATE} from "../type/StateId.sol";
 import {ObjectType, ACCOUNTING, COMPONENT, DISTRIBUTION, INSTANCE, DISTRIBUTION, DISTRIBUTOR, REGISTRY} from "../type/ObjectType.sol";
-import {ComponentVerifyingService} from "../shared/ComponentVerifyingService.sol";
-import {IDistributionService} from "./IDistributionService.sol";
-import {UFixed} from "../type/UFixed.sol";
-import {DistributorType, DistributorTypeLib} from "../type/DistributorType.sol";
+import {InstanceReader} from "../instance/InstanceReader.sol";
+import {InstanceStore} from "../instance/InstanceStore.sol";
 import {ReferralId, ReferralLib} from "../type/Referral.sol";
+import {Seconds} from "../type/Seconds.sol";
 import {Timestamp, TimestampLib} from "../type/Timestamp.sol";
-import {IDistribution} from "../instance/module/IDistribution.sol";
-import {InstanceStore} from "../instance/InstanceStore.sol";
+import {UFixed} from "../type/UFixed.sol";
 
 
 contract DistributionService is
@@ -64,7 +65,7 @@ contract DistributionService is
         UFixed maxDiscountPercentage,
         UFixed commissionPercentage,
         uint32 maxReferralCount,
-        uint32 maxReferralLifetime,
+        Seconds maxReferralLifetime,
         bool allowSelfReferrals,
         bool allowRenewals,
         bytes memory data
@@ -171,10 +172,10 @@ contract DistributionService is
         (NftId distributionNftId,, IInstance instance) = _getAndVerifyActiveComponent(DISTRIBUTION());
 
         if (bytes(code).length == 0) {
-            revert ErrorIDistributionServiceInvalidReferral(code);
+            revert ErrorDistributionServiceInvalidReferral(code);
         }
         if (expiryAt.eqz() || expiryAt.lte(TimestampLib.blockTimestamp())) {
-            revert ErrorIDistributionServiceExpirationInvalid(expiryAt);
+            revert ErrorDistributionServiceExpirationInvalid(expiryAt);
         }
 
         {
@@ -183,16 +184,16 @@ contract DistributionService is
             IDistribution.DistributorTypeInfo memory distributorTypeData = instanceReader.getDistributorTypeInfo(distributorType);
 
             if (distributorTypeData.maxReferralCount < maxReferrals) {
-                revert ErrorIDistributionServiceMaxReferralsExceeded(distributorTypeData.maxReferralCount);
+                revert ErrorDistributionServiceMaxReferralsExceeded(distributorTypeData.maxReferralCount);
             }
             if (distributorTypeData.minDiscountPercentage > discountPercentage) {
-                revert ErrorIDistributionServiceDiscountTooLow(distributorTypeData.minDiscountPercentage.toInt(), discountPercentage.toInt());
+                revert ErrorDistributionServiceDiscountTooLow(distributorTypeData.minDiscountPercentage.toInt(), discountPercentage.toInt());
             }
             if (distributorTypeData.maxDiscountPercentage < discountPercentage) {
-                revert ErrorIDistributionServiceDiscountTooHigh(distributorTypeData.maxDiscountPercentage.toInt(), discountPercentage.toInt());
+                revert ErrorDistributionServiceDiscountTooHigh(distributorTypeData.maxDiscountPercentage.toInt(), discountPercentage.toInt());
             }
-            if (expiryAt.toInt() - TimestampLib.blockTimestamp().toInt() > distributorTypeData.maxReferralLifetime) {
-                revert ErrorIDistributionServiceExpiryTooLong(distributorTypeData.maxReferralLifetime, expiryAt.toInt());
+            if (expiryAt.toInt() - TimestampLib.blockTimestamp().toInt() > distributorTypeData.maxReferralLifetime.toInt()) {
+                revert ErrorDistributionServiceExpiryTooLong(distributorTypeData.maxReferralLifetime, expiryAt);
             }
         }
 

package/contracts/distribution/IDistributionService.sol

@@ -8,30 +8,31 @@ import {IService} from "../shared/IService.sol";
 import {UFixed} from "../type/UFixed.sol";
 import {DistributorType} from "../type/DistributorType.sol";
 import {ReferralId} from "../type/Referral.sol";
+import {Seconds} from "../type/Seconds.sol";
 import {Timestamp} from "../type/Timestamp.sol";
 
 
 interface IDistributionService is IService {
 
     error ErrorDistributionServiceCallerNotRegistered(address caller);
-    error ErrorIDistributionServiceParentNftIdNotInstance(NftId nftId, NftId parentNftId);
-    error ErrorIDistributionServiceCallerNotDistributor(address caller);
-    error ErrorIDistributionServiceInvalidReferralId(ReferralId referralId);
-    error ErrorIDistributionServiceMaxReferralsExceeded(uint256 maxReferrals);
-    error ErrorIDistributionServiceDiscountTooLow(uint256 minDiscountPercentage, uint256 discountPercentage);
-    error ErrorIDistributionServiceDiscountTooHigh(uint256 maxDiscountPercentage, uint256 discountPercentage);
-    error ErrorIDistributionServiceExpiryTooLong(uint256 maxReferralLifetime, uint256 expiryAt);
-    error ErrorIDistributionServiceInvalidReferral(string code);
-    error ErrorIDistributionServiceExpirationInvalid(Timestamp expiryAt);
-    error ErrorIDistributionServiceCommissionTooHigh(uint256 commissionPercentage, uint256 maxCommissionPercentage);
-    error ErrorIDistributionServiceMinFeeTooHigh(uint256 minFee, uint256 limit);
+    error ErrorDistributionServiceParentNftIdNotInstance(NftId nftId, NftId parentNftId);
+    error ErrorDistributionServiceCallerNotDistributor(address caller);
+    error ErrorDistributionServiceInvalidReferralId(ReferralId referralId);
+    error ErrorDistributionServiceMaxReferralsExceeded(uint256 maxReferrals);
+    error ErrorDistributionServiceDiscountTooLow(uint256 minDiscountPercentage, uint256 discountPercentage);
+    error ErrorDistributionServiceDiscountTooHigh(uint256 maxDiscountPercentage, uint256 discountPercentage);
+    error ErrorDistributionServiceExpiryTooLong(Seconds maxReferralLifetime, Timestamp expiryAt);
+    error ErrorDistributionServiceInvalidReferral(string code);
+    error ErrorDistributionServiceExpirationInvalid(Timestamp expiryAt);
+    error ErrorDistributionServiceCommissionTooHigh(uint256 commissionPercentage, uint256 maxCommissionPercentage);
+    error ErrorDistributionServiceMinFeeTooHigh(uint256 minFee, uint256 limit);
 
     error ErrorDistributionServiceCommissionWithdrawAmountExceedsLimit(Amount amount, Amount limit);
     
     error ErrorDistributionServiceVariableFeesTooHight(uint256 maxDiscountPercentage, uint256 limit);
     error ErrorDistributionServiceMaxDiscountTooHigh(uint256 maxDiscountPercentage, uint256 limit);
 
-    error ErrorIDistributionServiceReferralInvalid(NftId distributionNftId, ReferralId referralId);
+    error ErrorDistributionServiceReferralInvalid(NftId distributionNftId, ReferralId referralId);
     error ErrorDistributionServiceInvalidFeeTransferred(Amount transferredDistributionFeeAmount, Amount expectedDistributionFeeAmount);
 
     event LogDistributionServiceCommissionWithdrawn(NftId distributorNftId, address recipient, address tokenAddress, Amount amount);
@@ -42,7 +43,7 @@ interface IDistributionService is IService {
         UFixed maxDiscountPercentage,
         UFixed commissionPercentage,
         uint32 maxReferralCount,
-        uint32 maxReferralLifetime,
+        Seconds maxReferralLifetime,
         bool allowSelfReferrals,
         bool allowRenewals,
         bytes memory data

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/examples/unpermissioned/SimpleProductAuthorization.sol

@@ -0,0 +1,28 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.20;
+
+import {BasicProductAuthorization} from "../../product/BasicProductAuthorization.sol";
+import {IAccess} from "../../authorization/IAccess.sol";
+import {PUBLIC_ROLE} from "../../type/RoleId.sol";
+import {SimpleProduct} from "./SimpleProduct.sol";
+
+contract SimpleProductAuthorization
+    is BasicProductAuthorization
+{
+    constructor(string memory componentName)
+        BasicProductAuthorization(componentName)
+    {}
+
+    function _setupTargetAuthorizations()
+        internal
+        virtual override
+    {
+        super._setupTargetAuthorizations();
+
+        // authorize public role (open access to any account, only allows to lock target)
+        IAccess.FunctionInfo[] storage functions;
+        functions = _authorizeForTarget(getMainTargetName(), PUBLIC_ROLE());
+        _authorize(functions, SimpleProduct.approveTokenHandler.selector, "approveTokenHandler");
+        _authorize(functions, SimpleProduct.setWallet.selector, "setWallet");
+    }
+}

package/contracts/instance/IInstance.sol

@@ -59,7 +59,7 @@ interface IInstance is
 
     // get products
     function products() external view returns (uint256 productCount);
-    function getProductNftid(uint256 idx) external view returns (NftId productNftId);
+    function getProductNftId(uint256 idx) external view returns (NftId productNftId);
 
     // get supporting contracts
     function getInstanceReader() external view returns (InstanceReader);

package/contracts/instance/Instance.sol

@@ -219,7 +219,7 @@ contract Instance is
         return _products.length;
     }
 
-    function getProductNftid(uint256 idx) external view returns (NftId productNftId) {
+    function getProductNftId(uint256 idx) external view returns (NftId productNftId) {
         return _products[idx];
     }
 

package/contracts/instance/InstanceAdmin.sol

@@ -137,19 +137,7 @@ contract InstanceAdmin is
 
         // create other roles
         IAuthorization authorization = component.getAuthorization();
-        _createRoles(authorization);
-
-        // TODO cleanup
-        // FunctionInfo[] memory functions = new FunctionInfo[](2);
-        // functions[0] = toFunction(TokenHandler.pullToken.selector, "pullToken");
-        // functions[1] = toFunction(TokenHandler.pushToken.selector, "pushToken");
-
-        // // FIXME: make this a bit nicer and work with IAuthorization. Use a specific role, not public - access to TokenHandler must be restricted
-        // _authorizeTargetFunctions(
-        //     address(component.getTokenHandler()),
-        //     getPublicRole(),
-        //     functions);
-        
+        _createRoles(authorization);        
         _createTargetAuthorizations(authorization);
     }
 
@@ -215,7 +203,14 @@ contract InstanceAdmin is
         _setTargetClosed(target, locked);
     }
 
-
+    /// @dev Returns the number of components that have been registered with this instance.   
+    function components() 
+        external 
+        view 
+        returns (uint64)
+    {
+        return _components;
+    }
 
     /// @dev Returns the instance authorization specification used to set up this instance admin.
     function getInstanceAuthorization()

package/contracts/instance/InstanceReader.sol

@@ -88,6 +88,18 @@ contract InstanceReader {
         return _instance;
     }
 
+    function components() public view returns (uint256 componentCount) {
+        return _instance.getInstanceAdmin().components();
+    }
+
+    function products() public view returns (uint256 productCount) {
+        return _instance.products();
+    }
+
+    function getProductNftId(uint256 idx) public view returns (NftId productNftId) {
+        return _instance.getProductNftId(idx);
+    }
+
     // module specific functions
 
     function getPolicyInfo(NftId policyNftId)

package/contracts/instance/module/IDistribution.sol

@@ -4,6 +4,7 @@ pragma solidity ^0.8.20;
 import {Amount} from "../../type/Amount.sol";
 import {DistributorType} from "../../type/DistributorType.sol";
 import {NftId} from "../../type/NftId.sol";
+import {Seconds} from "../../type/Seconds.sol";
 import {Timestamp} from "../../type/Timestamp.sol";
 import {UFixed} from "../../type/UFixed.sol";
 
@@ -15,7 +16,7 @@ interface IDistribution {
         UFixed maxDiscountPercentage;
         UFixed commissionPercentage;
         uint32 maxReferralCount;
-        uint32 maxReferralLifetime;
+        Seconds maxReferralLifetime;
         bool allowSelfReferrals;
         bool allowRenewals;
         bytes 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/PolicyService.sol

@@ -545,30 +545,21 @@ contract PolicyService is
         }
     }
 
-    // TODO cleanup
-    /// @dev checks the balance and allowance of the policy holder
-    // function _checkPremiumBalanceAndAllowance(
-    //     IERC20Metadata token,
-    //     address tokenHandlerAddress, 
-    //     address policyHolder, 
-    //     Amount premiumAmount
-    // )
-    //     internal
-    //     virtual
-    //     view
-    // {
-    //     uint256 premium = premiumAmount.toInt();
-    //     uint256 balance = token.balanceOf(policyHolder);
-    //     uint256 allowance = token.allowance(policyHolder, tokenHandlerAddress);
-    
-    //     if (balance < premium) {
-    //         revert ErrorPolicyServiceBalanceInsufficient(policyHolder, premium, balance);
-    //     }
-
-    //     if (allowance < premium) {
-    //         revert ErrorPolicyServiceAllowanceInsufficient(policyHolder, tokenHandlerAddress, premium, allowance);
-    //     }
-    // }
+
+    /// @dev checks that policy has been collateralized and has been activated.
+    /// does not check if policy has been expired or closed.
+    function _policyHasBeenActivated(
+        StateId policyState,
+        IPolicy.PolicyInfo memory policyInfo
+    )
+        internal
+        view
+        returns (bool)
+    {
+        if (policyState != COLLATERALIZED()) { return false; } 
+        if (TimestampLib.blockTimestamp() < policyInfo.activatedAt) { return false; } 
+        return true;
+    }
 
 
     function _policyHolderPolicyActivated(
@@ -629,22 +620,6 @@ contract PolicyService is
     }
 
 
-    // TODO cleanup
-    // function _getTokenHandler(
-    //     InstanceReader instanceReader,
-    //     NftId productNftId
-    // )
-    //     internal 
-    //     virtual
-    //     view 
-    //     returns (
-    //         TokenHandler tokenHandler
-    //     )
-    // {
-    //     tokenHandler = instanceReader.getTokenHandler(productNftId).tokenHandler;
-    // }
-
-
     function _getDistributionNftAndWallets(
         InstanceReader instanceReader,
         NftId productNftId
@@ -688,7 +663,7 @@ contract PolicyService is
             PRODUCT(), // caller must be product
             true); // only active caller
 
-        productNftId = productInfo.nftId;
+        productNftId = productInfo.nftId; // calling product nft id
         instance = IInstance(instanceAddress);
         policyInfo = instance.getInstanceReader().getPolicyInfo(policyNftId);