@etherisc/gif-next 0.0.2-f30e0eb-805 → 0.0.2-f398177-971
Sign up to get free protection for your applications and to get access to all the features.
- package/README.md +6 -83
- package/artifacts/contracts/components/Component.sol/Component.dbg.json +1 -1
- package/artifacts/contracts/components/Component.sol/Component.json +47 -6
- package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +1 -1
- package/artifacts/contracts/components/Distribution.sol/Distribution.json +70 -13
- package/artifacts/contracts/components/IComponent.sol/IComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IComponent.sol/IComponent.json +137 -6
- package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.json +144 -13
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.json +161 -20
- package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.json +151 -20
- package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
- package/artifacts/contracts/components/Pool.sol/Pool.json +71 -20
- package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
- package/artifacts/contracts/components/Product.sol/Product.json +62 -21
- package/artifacts/contracts/instance/BundleManager.sol/BundleManager.dbg.json +1 -1
- package/artifacts/contracts/instance/BundleManager.sol/BundleManager.json +2 -2
- package/artifacts/contracts/instance/Cloneable.sol/Cloneable.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstance.sol/IInstance.json +310 -2004
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +101 -52
- package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
- package/artifacts/contracts/instance/Instance.sol/Instance.json +425 -2757
- package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +95 -58
- package/artifacts/contracts/instance/InstanceAuthorizationsLib.sol/InstanceAuthorizationsLib.dbg.json +4 -0
- package/artifacts/contracts/instance/InstanceAuthorizationsLib.sol/InstanceAuthorizationsLib.json +124 -0
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +348 -58
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +153 -207
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +38 -83
- package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.dbg.json +4 -0
- package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.json +2788 -0
- package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.dbg.json +1 -1
- package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.json +2 -2
- package/artifacts/contracts/instance/base/ComponentService.sol/ComponentService.dbg.json +1 -1
- package/artifacts/contracts/instance/base/ComponentService.sol/ComponentService.json +113 -34
- package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
- package/artifacts/contracts/instance/base/ILifecycle.sol/ILifecycle.dbg.json +1 -1
- package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
- package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.json +8 -8
- package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json +1 -1
- package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.json +6 -6
- package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IAccess.sol/IAccess.json +6 -6
- package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IComponents.sol/IComponents.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +1 -1
- package/artifacts/contracts/instance/module/ISetup.sol/ISetup.dbg.json +1 -1
- package/artifacts/contracts/instance/module/ITreasury.sol/ITreasury.dbg.json +1 -1
- package/artifacts/contracts/instance/service/ApplicationService.sol/ApplicationService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/ApplicationService.sol/ApplicationService.json +186 -236
- package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.json +38 -55
- package/artifacts/contracts/instance/service/BundleService.sol/BundleService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/BundleService.sol/BundleService.json +377 -182
- package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.json +74 -39
- package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.json +713 -83
- package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.json +147 -32
- package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +266 -442
- package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.json +82 -107
- package/artifacts/contracts/instance/service/IApplicationService.sol/IApplicationService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IApplicationService.sol/IApplicationService.json +111 -174
- package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.json +233 -128
- package/artifacts/contracts/instance/service/IClaimService.sol/IClaimService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IClaimService.sol/IClaimService.json +385 -51
- package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.json +109 -282
- package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.json +210 -99
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +682 -33
- package/artifacts/contracts/instance/service/IPricingService.sol/IPricingService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/IPricingService.sol/IPricingService.json +510 -0
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +85 -27
- package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.json +420 -160
- package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.json +104 -53
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +880 -82
- package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.json +90 -39
- package/artifacts/contracts/instance/service/PricingService.sol/PricingService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/PricingService.sol/PricingService.json +1004 -0
- package/artifacts/contracts/instance/service/PricingServiceManager.sol/PricingServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/PricingServiceManager.sol/PricingServiceManager.json +688 -0
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +144 -57
- package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.json +28 -37
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +5 -37
- package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
- package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
- package/artifacts/contracts/registry/Registry.sol/Registry.json +2 -2
- package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.json +2 -2
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +22 -49
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +21 -34
- package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.dbg.json +1 -1
- package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.json +23 -11
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +10 -23
- package/artifacts/contracts/shared/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.dbg.json +4 -0
- package/artifacts/contracts/{instance → shared}/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.json +3 -3
- package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.dbg.json +1 -1
- package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +1 -1
- package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
- package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.json +0 -13
- package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +1 -1
- package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.json +69 -9
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +0 -13
- package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +1 -1
- package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.json +0 -13
- package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
- package/artifacts/contracts/shared/IService.sol/IService.json +85 -27
- package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +1 -1
- package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
- package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +6 -19
- package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +1 -1
- package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +80 -26
- package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +1 -1
- package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +14 -27
- package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
- package/artifacts/contracts/shared/Registerable.sol/Registerable.json +6 -19
- package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +1 -1
- package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +2 -15
- package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
- package/artifacts/contracts/shared/Service.sol/Service.json +91 -28
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +24 -6
- package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
- package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +1 -1
- package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json +1 -1
- package/artifacts/contracts/test/TestFee.sol/TestFee.json +2 -2
- package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json +1 -1
- package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +6 -19
- package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +1 -1
- package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.json +2 -2
- package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +1 -1
- package/artifacts/contracts/test/TestService.sol/TestService.json +106 -39
- package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json +1 -1
- package/artifacts/contracts/test/TestVersion.sol/TestVersion.dbg.json +1 -1
- package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json +1 -1
- package/artifacts/contracts/test/Usdc.sol/USDC.dbg.json +1 -1
- package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.dbg.json +1 -1
- package/artifacts/contracts/types/Amount.sol/AmountLib.dbg.json +4 -0
- package/artifacts/contracts/types/Amount.sol/AmountLib.json +281 -0
- package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
- package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/ClaimId.sol/ClaimIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/ClaimId.sol/ClaimIdLib.json +83 -4
- package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.dbg.json +1 -1
- package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.json +2 -2
- package/artifacts/contracts/types/Fee.sol/FeeLib.dbg.json +1 -1
- package/artifacts/contracts/types/Fee.sol/FeeLib.json +74 -19
- package/artifacts/contracts/types/Key32.sol/Key32Lib.dbg.json +1 -1
- package/artifacts/contracts/types/Key32.sol/Key32Lib.json +2 -2
- package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/NftId.sol/NftIdLib.json +2 -2
- package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
- package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.json +2 -2
- package/artifacts/contracts/types/NumberId.sol/NumberIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
- package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.json +2 -2
- package/artifacts/contracts/types/PayoutId.sol/PayoutIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/PayoutId.sol/PayoutIdLib.json +116 -7
- package/artifacts/contracts/types/Referral.sol/ReferralLib.dbg.json +1 -1
- package/artifacts/contracts/types/Referral.sol/ReferralLib.json +2 -2
- package/artifacts/contracts/types/RiskId.sol/RiskIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/RiskId.sol/RiskIdLib.json +2 -2
- package/artifacts/contracts/types/RoleId.sol/RoleIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/RoleId.sol/RoleIdLib.json +2 -2
- package/artifacts/contracts/types/Seconds.sol/SecondsLib.dbg.json +1 -1
- package/artifacts/contracts/types/StateId.sol/StateIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/StateId.sol/StateIdLib.json +2 -2
- package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json +1 -1
- package/artifacts/contracts/types/Timestamp.sol/TimestampLib.json +17 -4
- package/artifacts/contracts/types/UFixed.sol/MathLib.dbg.json +1 -1
- package/artifacts/contracts/types/UFixed.sol/UFixedLib.dbg.json +1 -1
- package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +1 -1
- package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +1 -1
- package/contracts/components/Component.sol +25 -4
- package/contracts/components/Distribution.sol +11 -6
- package/contracts/components/IComponent.sol +19 -3
- package/contracts/components/IPoolComponent.sol +8 -7
- package/contracts/components/IProductComponent.sol +5 -4
- package/contracts/components/Pool.sol +17 -14
- package/contracts/components/Product.sol +144 -62
- package/contracts/instance/BundleManager.sol +3 -4
- package/contracts/instance/IInstance.sol +32 -53
- package/contracts/instance/IInstanceService.sol +15 -14
- package/contracts/instance/Instance.sol +107 -205
- package/contracts/instance/InstanceAccessManager.sol +44 -25
- package/contracts/instance/InstanceAuthorizationsLib.sol +308 -0
- package/contracts/instance/InstanceReader.sol +85 -7
- package/contracts/instance/InstanceService.sol +102 -289
- package/contracts/instance/InstanceStore.sol +212 -0
- package/contracts/instance/ObjectManager.sol +1 -1
- package/contracts/instance/base/ComponentService.sol +53 -39
- package/contracts/instance/base/KeyValueStore.sol +8 -34
- package/contracts/instance/base/Lifecycle.sol +15 -4
- package/contracts/instance/module/IAccess.sol +2 -2
- package/contracts/instance/module/IBundle.sol +6 -4
- package/contracts/instance/module/IComponents.sol +7 -1
- package/contracts/instance/module/IDistribution.sol +3 -2
- package/contracts/instance/module/IPolicy.sol +13 -8
- package/contracts/instance/service/ApplicationService.sol +62 -226
- package/contracts/instance/service/BundleService.sol +172 -126
- package/contracts/instance/service/ClaimService.sol +318 -32
- package/contracts/instance/service/DistributionService.sol +71 -190
- package/contracts/instance/service/IApplicationService.sol +8 -28
- package/contracts/instance/service/IBundleService.sol +82 -26
- package/contracts/instance/service/IClaimService.sol +52 -23
- package/contracts/instance/service/IDistributionService.sol +11 -22
- package/contracts/instance/service/IPolicyService.sol +24 -16
- package/contracts/instance/service/IPoolService.sol +82 -3
- package/contracts/instance/service/IPricingService.sol +37 -0
- package/contracts/instance/service/PolicyService.sol +152 -179
- package/contracts/instance/service/PoolService.sol +239 -56
- package/contracts/instance/service/PricingService.sol +275 -0
- package/contracts/instance/service/PricingServiceManager.sol +51 -0
- package/contracts/instance/service/ProductService.sol +27 -58
- package/contracts/registry/IRegistryService.sol +2 -3
- package/contracts/registry/RegistryService.sol +24 -21
- package/contracts/registry/ReleaseManager.sol +20 -18
- package/contracts/shared/IPolicyHolder.sol +23 -9
- package/contracts/shared/IRegistryLinked.sol +0 -1
- package/contracts/shared/IService.sol +6 -6
- package/contracts/shared/NftOwnable.sol +0 -2
- package/contracts/shared/PolicyHolder.sol +30 -17
- package/contracts/shared/Registerable.sol +10 -9
- package/contracts/shared/RegistryLinked.sol +0 -5
- package/contracts/shared/Service.sol +21 -7
- package/contracts/shared/TokenHandler.sol +4 -2
- package/contracts/test/TestService.sol +1 -1
- package/contracts/types/Amount.sol +109 -0
- package/contracts/types/ClaimId.sol +25 -2
- package/contracts/types/Fee.sol +16 -8
- package/contracts/types/ObjectType.sol +9 -5
- package/contracts/types/PayoutId.sol +33 -5
- package/contracts/types/StateId.sol +6 -2
- package/contracts/types/Timestamp.sol +5 -0
- package/package.json +1 -1
- package/artifacts/contracts/instance/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.dbg.json +0 -4
- /package/contracts/{instance → shared}/AccessManagerUpgradeableInitializeable.sol +0 -0
@@ -0,0 +1,212 @@
|
|
1
|
+
// SPDX-License-Identifier: Apache-2.0
|
2
|
+
pragma solidity ^0.8.20;
|
3
|
+
|
4
|
+
import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";
|
5
|
+
|
6
|
+
import {Key32, KeyId, Key32Lib} from "../types/Key32.sol";
|
7
|
+
import {NftId} from "../types/NftId.sol";
|
8
|
+
import {ClaimId} from "../types/ClaimId.sol";
|
9
|
+
import {NumberId} from "../types/NumberId.sol";
|
10
|
+
import {ObjectType, BUNDLE, DISTRIBUTION, INSTANCE, POLICY, POOL, ROLE, PRODUCT, TARGET, COMPONENT, DISTRIBUTOR, DISTRIBUTOR_TYPE} from "../types/ObjectType.sol";
|
11
|
+
import {RiskId, RiskIdLib} from "../types/RiskId.sol";
|
12
|
+
import {RoleId, RoleIdLib, INSTANCE_ROLE, INSTANCE_OWNER_ROLE} from "../types/RoleId.sol";
|
13
|
+
import {StateId, ACTIVE} from "../types/StateId.sol";
|
14
|
+
import {TimestampLib} from "../types/Timestamp.sol";
|
15
|
+
import {VersionPart, VersionPartLib} from "../types/Version.sol";
|
16
|
+
import {ReferralId} from "../types/Referral.sol";
|
17
|
+
import {DistributorType} from "../types/DistributorType.sol";
|
18
|
+
import {PayoutId} from "../types/PayoutId.sol";
|
19
|
+
|
20
|
+
import {IInstance} from "./IInstance.sol";
|
21
|
+
import {KeyValueStore} from "./base/KeyValueStore.sol";
|
22
|
+
import {IKeyValueStore} from "./base/KeyValueStore.sol";
|
23
|
+
|
24
|
+
import {IBundle} from "./module/IBundle.sol";
|
25
|
+
import {IComponents} from "./module/IComponents.sol";
|
26
|
+
import {IDistribution} from "./module/IDistribution.sol";
|
27
|
+
import {IPolicy} from "./module/IPolicy.sol";
|
28
|
+
import {IRisk} from "./module/IRisk.sol";
|
29
|
+
import {ISetup} from "./module/ISetup.sol";
|
30
|
+
|
31
|
+
|
32
|
+
// TODO combine with instance reader?
|
33
|
+
contract InstanceStore is AccessManagedUpgradeable, KeyValueStore
|
34
|
+
{
|
35
|
+
function initialize(address instance)
|
36
|
+
public
|
37
|
+
initializer()
|
38
|
+
{
|
39
|
+
address authority = IInstance(instance).authority();
|
40
|
+
__AccessManaged_init(authority);
|
41
|
+
initializeLifecycle();
|
42
|
+
}
|
43
|
+
|
44
|
+
//--- ProductSetup ------------------------------------------------------//
|
45
|
+
function createProductSetup(NftId productNftId, ISetup.ProductSetupInfo memory setup) external restricted() {
|
46
|
+
create(_toNftKey32(productNftId, PRODUCT()), abi.encode(setup));
|
47
|
+
}
|
48
|
+
|
49
|
+
function updateProductSetup(NftId productNftId, ISetup.ProductSetupInfo memory setup, StateId newState) external restricted() {
|
50
|
+
update(_toNftKey32(productNftId, PRODUCT()), abi.encode(setup), newState);
|
51
|
+
}
|
52
|
+
|
53
|
+
function updateProductSetupState(NftId productNftId, StateId newState) external restricted() {
|
54
|
+
updateState(_toNftKey32(productNftId, PRODUCT()), newState);
|
55
|
+
}
|
56
|
+
|
57
|
+
//--- DistributionSetup ------------------------------------------------------//
|
58
|
+
function createDistributionSetup(NftId distributionNftId, ISetup.DistributionSetupInfo memory setup) external restricted() {
|
59
|
+
create(_toNftKey32(distributionNftId, DISTRIBUTION()), abi.encode(setup));
|
60
|
+
}
|
61
|
+
|
62
|
+
function updateDistributionSetup(NftId distributionNftId, ISetup.DistributionSetupInfo memory setup, StateId newState) external restricted() {
|
63
|
+
update(_toNftKey32(distributionNftId, DISTRIBUTION()), abi.encode(setup), newState);
|
64
|
+
}
|
65
|
+
|
66
|
+
function updateDistributionSetupState(NftId distributionNftId, StateId newState) external restricted() {
|
67
|
+
updateState(_toNftKey32(distributionNftId, DISTRIBUTION()), newState);
|
68
|
+
}
|
69
|
+
|
70
|
+
//--- PoolSetup ------------------------------------------------------//
|
71
|
+
function createPoolSetup(NftId poolNftId, IComponents.ComponentInfo memory info) external restricted() {
|
72
|
+
create(_toNftKey32(poolNftId, POOL()), abi.encode(info));
|
73
|
+
}
|
74
|
+
|
75
|
+
function updatePoolSetup(NftId poolNftId, IComponents.ComponentInfo memory info, StateId newState) external restricted() {
|
76
|
+
update(_toNftKey32(poolNftId, POOL()), abi.encode(info), newState);
|
77
|
+
}
|
78
|
+
|
79
|
+
function updatePoolSetupState(NftId poolNftId, StateId newState) external restricted() {
|
80
|
+
updateState(_toNftKey32(poolNftId, POOL()), newState);
|
81
|
+
}
|
82
|
+
|
83
|
+
//--- DistributorType -------------------------------------------------------//
|
84
|
+
function createDistributorType(DistributorType distributorType, IDistribution.DistributorTypeInfo memory info) external restricted() {
|
85
|
+
create(distributorType.toKey32(), abi.encode(info));
|
86
|
+
}
|
87
|
+
|
88
|
+
function updateDistributorType(DistributorType distributorType, IDistribution.DistributorTypeInfo memory info, StateId newState) external restricted() {
|
89
|
+
update(distributorType.toKey32(), abi.encode(info), newState);
|
90
|
+
}
|
91
|
+
|
92
|
+
function updateDistributorTypeState(DistributorType distributorType, StateId newState) external restricted() {
|
93
|
+
updateState(distributorType.toKey32(), newState);
|
94
|
+
}
|
95
|
+
|
96
|
+
//--- Distributor -------------------------------------------------------//
|
97
|
+
function createDistributor(NftId distributorNftId, IDistribution.DistributorInfo memory info) external restricted() {
|
98
|
+
create(_toNftKey32(distributorNftId, DISTRIBUTOR()), abi.encode(info));
|
99
|
+
}
|
100
|
+
|
101
|
+
function updateDistributor(NftId distributorNftId, IDistribution.DistributorInfo memory info, StateId newState) external restricted() {
|
102
|
+
update(_toNftKey32(distributorNftId, DISTRIBUTOR()), abi.encode(info), newState);
|
103
|
+
}
|
104
|
+
|
105
|
+
function updateDistributorState(NftId distributorNftId, StateId newState) external restricted() {
|
106
|
+
updateState(_toNftKey32(distributorNftId, DISTRIBUTOR()), newState);
|
107
|
+
}
|
108
|
+
|
109
|
+
//--- Referral ----------------------------------------------------------//
|
110
|
+
function createReferral(ReferralId referralId, IDistribution.ReferralInfo memory referralInfo) external restricted() {
|
111
|
+
create(referralId.toKey32(), abi.encode(referralInfo));
|
112
|
+
}
|
113
|
+
|
114
|
+
function updateReferral(ReferralId referralId, IDistribution.ReferralInfo memory referralInfo, StateId newState) external restricted() {
|
115
|
+
update(referralId.toKey32(), abi.encode(referralInfo), newState);
|
116
|
+
}
|
117
|
+
|
118
|
+
function updateReferralState(ReferralId referralId, StateId newState) external restricted() {
|
119
|
+
updateState(referralId.toKey32(), newState);
|
120
|
+
}
|
121
|
+
|
122
|
+
//--- Bundle ------------------------------------------------------------//
|
123
|
+
function createBundle(NftId bundleNftId, IBundle.BundleInfo memory bundle) external restricted() {
|
124
|
+
create(_toNftKey32(bundleNftId, BUNDLE()), abi.encode(bundle));
|
125
|
+
}
|
126
|
+
|
127
|
+
function updateBundle(NftId bundleNftId, IBundle.BundleInfo memory bundle, StateId newState) external restricted() {
|
128
|
+
update(_toNftKey32(bundleNftId, BUNDLE()), abi.encode(bundle), newState);
|
129
|
+
}
|
130
|
+
|
131
|
+
function updateBundleState(NftId bundleNftId, StateId newState) external restricted() {
|
132
|
+
updateState(_toNftKey32(bundleNftId, BUNDLE()), newState);
|
133
|
+
}
|
134
|
+
|
135
|
+
//--- Risk --------------------------------------------------------------//
|
136
|
+
function createRisk(RiskId riskId, IRisk.RiskInfo memory risk) external restricted() {
|
137
|
+
create(riskId.toKey32(), abi.encode(risk));
|
138
|
+
}
|
139
|
+
|
140
|
+
function updateRisk(RiskId riskId, IRisk.RiskInfo memory risk, StateId newState) external restricted() {
|
141
|
+
update(riskId.toKey32(), abi.encode(risk), newState);
|
142
|
+
}
|
143
|
+
|
144
|
+
function updateRiskState(RiskId riskId, StateId newState) external restricted() {
|
145
|
+
updateState(riskId.toKey32(), newState);
|
146
|
+
}
|
147
|
+
|
148
|
+
//--- Application (Policy) ----------------------------------------------//
|
149
|
+
function createApplication(NftId applicationNftId, IPolicy.PolicyInfo memory policy) external restricted() {
|
150
|
+
create(_toNftKey32(applicationNftId, POLICY()), abi.encode(policy));
|
151
|
+
}
|
152
|
+
|
153
|
+
function updateApplication(NftId applicationNftId, IPolicy.PolicyInfo memory policy, StateId newState) external restricted() {
|
154
|
+
update(_toNftKey32(applicationNftId, POLICY()), abi.encode(policy), newState);
|
155
|
+
}
|
156
|
+
|
157
|
+
function updateApplicationState(NftId applicationNftId, StateId newState) external restricted() {
|
158
|
+
updateState(_toNftKey32(applicationNftId, POLICY()), newState);
|
159
|
+
}
|
160
|
+
|
161
|
+
//--- Policy ------------------------------------------------------------//
|
162
|
+
function updatePolicy(NftId policyNftId, IPolicy.PolicyInfo memory policy, StateId newState) external restricted() {
|
163
|
+
update(_toNftKey32(policyNftId, POLICY()), abi.encode(policy), newState);
|
164
|
+
}
|
165
|
+
|
166
|
+
function updatePolicyClaims(NftId policyNftId, IPolicy.PolicyInfo memory policy, StateId newState) external restricted() {
|
167
|
+
update(_toNftKey32(policyNftId, POLICY()), abi.encode(policy), newState);
|
168
|
+
}
|
169
|
+
|
170
|
+
function updatePolicyState(NftId policyNftId, StateId newState) external restricted() {
|
171
|
+
updateState(_toNftKey32(policyNftId, POLICY()), newState);
|
172
|
+
}
|
173
|
+
|
174
|
+
//--- Claim -------------------------------------------------------------//
|
175
|
+
function createClaim(NftId policyNftId, ClaimId claimId, IPolicy.ClaimInfo memory claim) external restricted() {
|
176
|
+
create(_toClaimKey32(policyNftId, claimId), abi.encode(claim));
|
177
|
+
}
|
178
|
+
|
179
|
+
function updateClaim(NftId policyNftId, ClaimId claimId, IPolicy.ClaimInfo memory claim, StateId newState) external restricted() {
|
180
|
+
update(_toClaimKey32(policyNftId, claimId), abi.encode(claim), newState);
|
181
|
+
}
|
182
|
+
|
183
|
+
function updateClaimState(NftId policyNftId, ClaimId claimId, StateId newState) external restricted() {
|
184
|
+
updateState(_toClaimKey32(policyNftId, claimId), newState);
|
185
|
+
}
|
186
|
+
|
187
|
+
//--- Payout ------------------------------------------------------------//
|
188
|
+
function createPayout(NftId policyNftId, PayoutId payoutId, IPolicy.PayoutInfo memory payout) external restricted() {
|
189
|
+
create(_toPayoutKey32(policyNftId, payoutId), abi.encode(payout));
|
190
|
+
}
|
191
|
+
|
192
|
+
function updatePayout(NftId policyNftId, PayoutId payoutId, IPolicy.PayoutInfo memory payout, StateId newState) external restricted() {
|
193
|
+
update(_toPayoutKey32(policyNftId, payoutId), abi.encode(payout), newState);
|
194
|
+
}
|
195
|
+
|
196
|
+
function updatePayoutState(NftId policyNftId, PayoutId payoutId, StateId newState) external restricted() {
|
197
|
+
updateState(_toPayoutKey32(policyNftId, payoutId), newState);
|
198
|
+
}
|
199
|
+
|
200
|
+
//--- internal view/pure functions --------------------------------------//
|
201
|
+
function _toNftKey32(NftId nftId, ObjectType objectType) private pure returns (Key32) {
|
202
|
+
return nftId.toKey32(objectType);
|
203
|
+
}
|
204
|
+
|
205
|
+
function _toClaimKey32(NftId policyNftId, ClaimId claimId) private pure returns (Key32) {
|
206
|
+
return claimId.toKey32(policyNftId);
|
207
|
+
}
|
208
|
+
|
209
|
+
function _toPayoutKey32(NftId policyNftId, PayoutId payoutId) private pure returns (Key32) {
|
210
|
+
return payoutId.toKey32(policyNftId);
|
211
|
+
}
|
212
|
+
}
|
@@ -29,7 +29,7 @@ contract ObjectManager is
|
|
29
29
|
external
|
30
30
|
{
|
31
31
|
IInstance instance = IInstance(instanceAddress);
|
32
|
-
initialize(instance.authority(), instance.
|
32
|
+
initialize(instance.authority(), address(instance.getRegistry()));
|
33
33
|
|
34
34
|
_instance = instance;
|
35
35
|
|
@@ -16,30 +16,31 @@ import {InstanceAccessManager} from "../InstanceAccessManager.sol";
|
|
16
16
|
|
17
17
|
abstract contract ComponentService is Service {
|
18
18
|
|
19
|
-
error ErrorComponentServiceAlreadyRegistered(address component, NftId nftId);
|
20
19
|
error ErrorComponentServiceNotComponent(address component);
|
21
20
|
error ErrorComponentServiceInvalidType(address component, ObjectType requiredType, ObjectType componentType);
|
22
21
|
error ErrorComponentServiceSenderNotOwner(address component, address initialOwner, address sender);
|
23
22
|
error ErrorComponentServiceExpectedRoleMissing(NftId instanceNftId, RoleId requiredRole, address sender);
|
24
23
|
error ErrorComponentServiceComponentLocked(address component);
|
24
|
+
error ErrorComponentServiceSenderNotService(address sender);
|
25
|
+
error ErrorComponentServiceComponentTypeInvalid(address component, ObjectType expectedType, ObjectType foundType);
|
25
26
|
|
26
27
|
/// @dev modifier to check if caller is a registered service
|
27
28
|
modifier onlyService() {
|
28
29
|
address caller = msg.sender;
|
29
|
-
|
30
|
+
if(!getRegistry().isRegisteredService(caller)) {
|
31
|
+
revert ErrorComponentServiceSenderNotService(caller);
|
32
|
+
}
|
30
33
|
_;
|
31
34
|
}
|
32
35
|
|
33
36
|
// view functions
|
34
37
|
|
35
38
|
function getRegistryService() public view virtual returns (IRegistryService) {
|
36
|
-
|
37
|
-
return IRegistryService(service);
|
39
|
+
return IRegistryService(_getServiceAddress(REGISTRY()));
|
38
40
|
}
|
39
41
|
|
40
42
|
function getInstanceService() public view returns (InstanceService) {
|
41
|
-
|
42
|
-
return InstanceService(service);
|
43
|
+
return InstanceService(_getServiceAddress(INSTANCE()));
|
43
44
|
}
|
44
45
|
|
45
46
|
// internal functions
|
@@ -60,12 +61,6 @@ abstract contract ComponentService is Service {
|
|
60
61
|
// component may only be registerd by initial owner of component
|
61
62
|
owner = msg.sender;
|
62
63
|
|
63
|
-
// check component has not already been registerd
|
64
|
-
NftId compoentNftId = getRegistry().getNftId(componentAddress);
|
65
|
-
if(compoentNftId.gtz()) {
|
66
|
-
revert ErrorComponentServiceAlreadyRegistered(componentAddress, compoentNftId);
|
67
|
-
}
|
68
|
-
|
69
64
|
// check this is a component
|
70
65
|
component = IComponent(componentAddress);
|
71
66
|
if(!component.supportsInterface(type(IComponent).interfaceId)) {
|
@@ -87,48 +82,67 @@ abstract contract ComponentService is Service {
|
|
87
82
|
// check instance has assigned required role to owner
|
88
83
|
instanceNftId = componentInfo.parentNftId;
|
89
84
|
instance = _getInstance(instanceNftId);
|
90
|
-
|
91
|
-
bool hasRole = accessManager.hasRole(
|
92
|
-
requiredRole,
|
93
|
-
owner);
|
94
|
-
|
95
|
-
if(!hasRole) {
|
85
|
+
if(!instance.getInstanceAccessManager().hasRole(requiredRole, owner)) {
|
96
86
|
revert ErrorComponentServiceExpectedRoleMissing(instanceNftId, requiredRole, owner);
|
97
87
|
}
|
98
88
|
}
|
99
89
|
|
100
90
|
// internal view functions
|
91
|
+
function _getAndVerifyCallingComponentAndInstance(
|
92
|
+
ObjectType expectedType // assume always of `component` type
|
93
|
+
)
|
94
|
+
internal
|
95
|
+
view
|
96
|
+
returns(
|
97
|
+
NftId componentNftId,
|
98
|
+
IRegistry.ObjectInfo memory componentInfo,
|
99
|
+
IInstance instance
|
100
|
+
)
|
101
|
+
{
|
102
|
+
componentNftId = getRegistry().getNftId(msg.sender);
|
103
|
+
(componentInfo, instance) = _getAndVerifyComponentInfoAndInstance(componentNftId, expectedType);
|
101
104
|
|
102
|
-
|
103
|
-
|
104
|
-
|
105
|
+
// locked component can not call services
|
106
|
+
if (instance.getInstanceAccessManager().isTargetLocked(componentInfo.objectAddress)) {
|
107
|
+
revert IAccess.ErrorIAccessTargetLocked(componentInfo.objectAddress);
|
108
|
+
}
|
105
109
|
}
|
106
110
|
|
107
111
|
function _getAndVerifyComponentInfoAndInstance(
|
108
|
-
|
109
|
-
ObjectType expectedType
|
112
|
+
NftId componentNftId,
|
113
|
+
ObjectType expectedType // assume always of `component` type
|
110
114
|
)
|
111
115
|
internal
|
112
116
|
view
|
113
117
|
returns(
|
114
|
-
IRegistry.ObjectInfo memory
|
118
|
+
IRegistry.ObjectInfo memory componentInfo,
|
115
119
|
IInstance instance
|
116
120
|
)
|
117
121
|
{
|
118
|
-
|
119
|
-
|
120
|
-
|
121
|
-
|
122
|
-
|
123
|
-
|
124
|
-
require(info.objectType == expectedType, "OBJECT_TYPE_INVALID");
|
125
|
-
|
126
|
-
address instanceAddress = registry.getObjectInfo(info.parentNftId).objectAddress;
|
127
|
-
instance = IInstance(instanceAddress);
|
128
|
-
|
129
|
-
InstanceAccessManager accessManager = instance.getInstanceAccessManager();
|
130
|
-
if (accessManager.isTargetLocked(info.objectAddress)) {
|
131
|
-
revert IAccess.ErrorIAccessTargetLocked(info.objectAddress);
|
122
|
+
componentInfo = getRegistry().getObjectInfo(componentNftId);
|
123
|
+
if(componentInfo.objectType != expectedType) {
|
124
|
+
revert ErrorComponentServiceComponentTypeInvalid(
|
125
|
+
componentInfo.objectAddress,
|
126
|
+
expectedType,
|
127
|
+
componentInfo.objectType);
|
132
128
|
}
|
129
|
+
|
130
|
+
instance = _getInstance(componentInfo.parentNftId);
|
131
|
+
}
|
132
|
+
// assume componentNftId is always of `instance` type
|
133
|
+
function _getInstance(NftId instanceNftId) internal view returns (IInstance) {
|
134
|
+
return IInstance(
|
135
|
+
getRegistry().getObjectInfo(
|
136
|
+
instanceNftId).objectAddress);
|
137
|
+
}
|
138
|
+
// assume componentNftId is always of `component` type
|
139
|
+
/*function _getInstanceForComponent(NftId componentNftId) internal view returns (IInstance) {
|
140
|
+
NftId instanceNftId = getRegistry().getObjectInfo(componentNftId).parentNftId;
|
141
|
+
address instanceAddress = getRegistry().getObjectInfo(instanceNftId).objectAddress;
|
142
|
+
return IInstance(instanceAddress);
|
143
|
+
}*/
|
144
|
+
|
145
|
+
function _getServiceAddress(ObjectType domain) internal view returns (address) {
|
146
|
+
return getRegistry().getServiceAddress(domain, getVersion().toMajorPart());
|
133
147
|
}
|
134
|
-
}
|
148
|
+
}
|
@@ -5,7 +5,7 @@ import {Blocknumber, blockBlocknumber, zeroBlocknumber} from "../../types/Blockn
|
|
5
5
|
import {Key32, KeyId, Key32Lib} from "../../types/Key32.sol";
|
6
6
|
import {NftId} from "../../types/NftId.sol";
|
7
7
|
import {ObjectType} from "../../types/ObjectType.sol";
|
8
|
-
import {StateId, ACTIVE} from "../../types/StateId.sol";
|
8
|
+
import {StateId, ACTIVE, KEEP_STATE} from "../../types/StateId.sol";
|
9
9
|
import {Timestamp, TimestampLib} from "../../types/Timestamp.sol";
|
10
10
|
|
11
11
|
import {Lifecycle} from "./Lifecycle.sol";
|
@@ -20,15 +20,6 @@ contract KeyValueStore is Lifecycle, IKeyValueStore {
|
|
20
20
|
bytes memory data
|
21
21
|
)
|
22
22
|
internal
|
23
|
-
{
|
24
|
-
_create(key32, data);
|
25
|
-
}
|
26
|
-
|
27
|
-
function _create(
|
28
|
-
Key32 key32,
|
29
|
-
bytes memory data
|
30
|
-
)
|
31
|
-
internal
|
32
23
|
{
|
33
24
|
ObjectType objectType = key32.toObjectType();
|
34
25
|
require(objectType.gtz(), "ERROR:KVS-010:TYPE_UNDEFINED");
|
@@ -60,16 +51,6 @@ contract KeyValueStore is Lifecycle, IKeyValueStore {
|
|
60
51
|
StateId state
|
61
52
|
)
|
62
53
|
internal
|
63
|
-
{
|
64
|
-
_update(key32, data, state);
|
65
|
-
}
|
66
|
-
|
67
|
-
function _update(
|
68
|
-
Key32 key32,
|
69
|
-
bytes memory data,
|
70
|
-
StateId state
|
71
|
-
)
|
72
|
-
internal
|
73
54
|
{
|
74
55
|
require(state.gtz(), "ERROR:KVS-020:STATE_UNDEFINED");
|
75
56
|
Metadata storage metadata = _value[key32].metadata;
|
@@ -79,10 +60,15 @@ contract KeyValueStore is Lifecycle, IKeyValueStore {
|
|
79
60
|
// update data
|
80
61
|
_value[key32].data = data;
|
81
62
|
|
82
|
-
// update
|
63
|
+
// update state
|
64
|
+
if(state != KEEP_STATE()) {
|
65
|
+
metadata.state = state;
|
66
|
+
}
|
67
|
+
|
68
|
+
// update reest of metadata
|
83
69
|
address updatedBy = msg.sender;
|
84
70
|
Blocknumber lastUpdatedIn = metadata.updatedIn;
|
85
|
-
|
71
|
+
|
86
72
|
metadata.updatedBy = updatedBy;
|
87
73
|
metadata.updatedIn = blockBlocknumber();
|
88
74
|
|
@@ -95,12 +81,6 @@ contract KeyValueStore is Lifecycle, IKeyValueStore {
|
|
95
81
|
|
96
82
|
function updateData(Key32 key32, bytes memory data)
|
97
83
|
internal
|
98
|
-
{
|
99
|
-
_updateData(key32, data);
|
100
|
-
}
|
101
|
-
|
102
|
-
function _updateData(Key32 key32, bytes memory data)
|
103
|
-
internal
|
104
84
|
{
|
105
85
|
Metadata storage metadata = _value[key32].metadata;
|
106
86
|
StateId state = metadata.state;
|
@@ -122,12 +102,6 @@ contract KeyValueStore is Lifecycle, IKeyValueStore {
|
|
122
102
|
|
123
103
|
function updateState(Key32 key32, StateId state)
|
124
104
|
internal
|
125
|
-
{
|
126
|
-
_updateState(key32, state);
|
127
|
-
}
|
128
|
-
|
129
|
-
function _updateState(Key32 key32, StateId state)
|
130
|
-
internal
|
131
105
|
{
|
132
106
|
require(state.gtz(), "ERROR:KVS-040:STATE_UNDEFINED");
|
133
107
|
Metadata storage metadata = _value[key32].metadata;
|
@@ -4,8 +4,8 @@ pragma solidity ^0.8.20;
|
|
4
4
|
import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
|
5
5
|
|
6
6
|
import {NftId} from "../../types/NftId.sol";
|
7
|
-
import {ObjectType, COMPONENT, BUNDLE, POLICY, RISK} from "../../types/ObjectType.sol";
|
8
|
-
import {StateId, ACTIVE, PAUSED, ARCHIVED, CLOSED, APPLIED,
|
7
|
+
import {ObjectType, COMPONENT, BUNDLE, POLICY, RISK, CLAIM, PAYOUT} from "../../types/ObjectType.sol";
|
8
|
+
import {StateId, ACTIVE, PAUSED, ARCHIVED, CLOSED, APPLIED, COLLATERALIZED, REVOKED, SUBMITTED, CONFIRMED, DECLINED, EXPECTED, PAID} from "../../types/StateId.sol";
|
9
9
|
import {ILifecycle} from "./ILifecycle.sol";
|
10
10
|
|
11
11
|
contract Lifecycle is
|
@@ -25,6 +25,7 @@ contract Lifecycle is
|
|
25
25
|
_setupBundleLifecycle();
|
26
26
|
_setupComponentLifecycle();
|
27
27
|
_setupPolicyLifecycle();
|
28
|
+
_setupClaimAndPayoutLifecycle();
|
28
29
|
_setupRiskLifecycle();
|
29
30
|
}
|
30
31
|
|
@@ -95,11 +96,21 @@ contract Lifecycle is
|
|
95
96
|
_initialState[POLICY()] = APPLIED();
|
96
97
|
_isValidTransition[POLICY()][APPLIED()][REVOKED()] = true;
|
97
98
|
_isValidTransition[POLICY()][APPLIED()][DECLINED()] = true;
|
98
|
-
_isValidTransition[POLICY()][APPLIED()][
|
99
|
-
_isValidTransition[POLICY()][
|
99
|
+
_isValidTransition[POLICY()][APPLIED()][COLLATERALIZED()] = true;
|
100
|
+
_isValidTransition[POLICY()][COLLATERALIZED()][ACTIVE()] = true;
|
100
101
|
_isValidTransition[POLICY()][ACTIVE()][CLOSED()] = true;
|
101
102
|
}
|
102
103
|
|
104
|
+
function _setupClaimAndPayoutLifecycle() internal {
|
105
|
+
_initialState[CLAIM()] = SUBMITTED();
|
106
|
+
_isValidTransition[CLAIM()][SUBMITTED()][CONFIRMED()] = true;
|
107
|
+
_isValidTransition[CLAIM()][SUBMITTED()][DECLINED()] = true;
|
108
|
+
_isValidTransition[CLAIM()][CONFIRMED()][CLOSED()] = true;
|
109
|
+
|
110
|
+
_initialState[PAYOUT()] = EXPECTED();
|
111
|
+
_isValidTransition[PAYOUT()][EXPECTED()][PAID()] = true;
|
112
|
+
}
|
113
|
+
|
103
114
|
function _setupRiskLifecycle() internal {
|
104
115
|
_initialState[RISK()] = ACTIVE();
|
105
116
|
_isValidTransition[RISK()][ACTIVE()][PAUSED()] = true;
|
@@ -43,9 +43,9 @@ interface IAccess {
|
|
43
43
|
error ErrorIAccessRoleTypeInvalid(RoleId roleId, Type rtype);
|
44
44
|
|
45
45
|
error ErrorIAccessTargetAddressZero();
|
46
|
-
error ErrorIAccessTargetDoesNotExist(
|
46
|
+
error ErrorIAccessTargetDoesNotExist(address target);
|
47
47
|
error ErrorIAccessTargetExists(address target, ShortString name);
|
48
|
-
error ErrorIAccessTargetTypeInvalid(
|
48
|
+
error ErrorIAccessTargetTypeInvalid(address target, Type ttype);
|
49
49
|
error ErrorIAccessTargetNameEmpty(address target);
|
50
50
|
error ErrorIAccessTargetNameExists(address target, address existingTarget, ShortString name);
|
51
51
|
error ErrorIAccessTargetLocked(address target);
|
@@ -1,21 +1,23 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
2
|
pragma solidity ^0.8.20;
|
3
3
|
|
4
|
+
import {Amount} from "../../types/Amount.sol";
|
4
5
|
import {NftId} from "../../types/NftId.sol";
|
5
6
|
import {Fee} from "../../types/Fee.sol";
|
6
7
|
import {Seconds} from "../../types/Seconds.sol";
|
7
8
|
import {Timestamp} from "../../types/Timestamp.sol";
|
8
9
|
|
9
10
|
interface IBundle {
|
11
|
+
|
10
12
|
struct BundleInfo {
|
11
13
|
NftId poolNftId;
|
12
14
|
Fee fee; // bundle fee on net premium amounts
|
13
15
|
bytes filter; // required conditions for applications to be considered for collateralization by this bundle
|
14
|
-
|
15
|
-
|
16
|
-
|
16
|
+
Amount capitalAmount; // net stakings + net premiums - payouts
|
17
|
+
Amount lockedAmount; // capital amount linked to collateralizaion of non-closed policies (<= capital amount)
|
18
|
+
Amount feeAmount; // accumulated fee amount
|
17
19
|
Seconds lifetime;
|
18
|
-
Timestamp expiredAt; // no new policies
|
20
|
+
Timestamp expiredAt; // no new policies starting with this timestamp
|
19
21
|
Timestamp closedAt; // no open policies, locked amount = 0
|
20
22
|
}
|
21
23
|
}
|
@@ -3,6 +3,7 @@ pragma solidity ^0.8.20;
|
|
3
3
|
|
4
4
|
import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
|
5
5
|
|
6
|
+
import {Amount} from "../../types/Amount.sol";
|
6
7
|
import {Fee} from "../../types/Fee.sol";
|
7
8
|
import {NftId} from "../../types/NftId.sol";
|
8
9
|
import {RoleId} from "../../types/RoleId.sol";
|
@@ -16,13 +17,18 @@ interface IComponents {
|
|
16
17
|
IERC20Metadata token;
|
17
18
|
TokenHandler tokenHandler;
|
18
19
|
address wallet;
|
20
|
+
Amount balanceAmount; // calculated balance (may not necessarily match withg wallet balance)
|
21
|
+
Amount feeAmount; // accumulated fees belonging to component owner
|
19
22
|
bytes data; // will hold component type specific additional info (eg encoded pool info)
|
20
23
|
}
|
21
24
|
|
22
25
|
struct PoolInfo {
|
23
26
|
NftId productNftId; // the nft of the product this pool is linked to
|
24
27
|
RoleId bundleOwnerRole; // the required role for bundle owners
|
25
|
-
|
28
|
+
// TODO maxCapitalAmount -> maxBalanceAmount
|
29
|
+
Amount maxCapitalAmount; // max capital amount allowed for pool
|
30
|
+
Amount balanceAmount; // current pool balance (accounting view)
|
31
|
+
Amount feeAmount; // accumulated fee amount
|
26
32
|
bool isInterceptingBundleTransfers; // intercepts nft transfers for bundles
|
27
33
|
bool isExternallyManaged; // funding bundles is restricted to book keeping, actual funds may be provided as needed to support payouts
|
28
34
|
bool isVerifyingApplications; // underwriting requires the pool component checks/confirms the applications
|
@@ -1,6 +1,7 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
2
|
pragma solidity ^0.8.20;
|
3
3
|
|
4
|
+
import {Amount} from "../../types/Amount.sol";
|
4
5
|
import {DistributorType} from "../../types/DistributorType.sol";
|
5
6
|
import {NftId} from "../../types/NftId.sol";
|
6
7
|
import {Timestamp} from "../../types/Timestamp.sol";
|
@@ -24,8 +25,8 @@ interface IDistribution {
|
|
24
25
|
DistributorType distributorType;
|
25
26
|
bool active;
|
26
27
|
bytes data;
|
27
|
-
|
28
|
-
|
28
|
+
Amount commissionAmount;
|
29
|
+
uint32 numPoliciesSold;
|
29
30
|
}
|
30
31
|
|
31
32
|
struct ReferralInfo {
|
@@ -1,6 +1,7 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
2
|
pragma solidity ^0.8.20;
|
3
3
|
|
4
|
+
import {Amount} from "../../types/Amount.sol";
|
4
5
|
import {NftId} from "../../types/NftId.sol";
|
5
6
|
import {ClaimId} from "../../types/ClaimId.sol";
|
6
7
|
import {ReferralId} from "../../types/Referral.sol";
|
@@ -40,15 +41,16 @@ interface IPolicy {
|
|
40
41
|
NftId bundleNftId;
|
41
42
|
ReferralId referralId;
|
42
43
|
RiskId riskId;
|
43
|
-
|
44
|
-
|
45
|
-
|
44
|
+
Amount sumInsuredAmount;
|
45
|
+
Amount premiumAmount;
|
46
|
+
Amount premiumPaidAmount; // when lower than premium amount: max payout decreased accordingly
|
46
47
|
Seconds lifetime;
|
47
48
|
bytes applicationData;
|
48
49
|
bytes policyData;
|
49
50
|
uint16 claimsCount;
|
50
51
|
uint16 openClaimsCount;
|
51
|
-
|
52
|
+
Amount claimAmount; // sum of confirmed claim amounts (max = sum insured amount)
|
53
|
+
Amount payoutAmount; // sum of payouts (max = sum confirmed claim amountst)
|
52
54
|
Timestamp activatedAt; // time of underwriting
|
53
55
|
Timestamp expiredAt; // no new claims (activatedAt + lifetime)
|
54
56
|
Timestamp closedAt; // no locked capital (or declinedAt)
|
@@ -56,16 +58,19 @@ interface IPolicy {
|
|
56
58
|
|
57
59
|
// claimId neeeds to be encoded policyNftId:claimId combination
|
58
60
|
struct ClaimInfo {
|
59
|
-
|
60
|
-
|
61
|
+
Amount claimAmount;
|
62
|
+
Amount paidAmount;
|
63
|
+
uint8 payoutsCount;
|
64
|
+
uint8 openPayoutsCount;
|
61
65
|
bytes data;
|
62
|
-
|
66
|
+
// TODO consider to add processData that may include information supporting confirm or decline
|
67
|
+
Timestamp closedAt; // payment of confirmed claim amount (or declinedAt)
|
63
68
|
}
|
64
69
|
|
65
70
|
// claimId neeeds to be encoded policyNftId:claimId combination
|
66
71
|
struct PayoutInfo {
|
67
72
|
ClaimId claimId;
|
68
|
-
|
73
|
+
Amount amount;
|
69
74
|
bytes data;
|
70
75
|
Timestamp paidAt; // payoment of confirmed claim amount (or declinedAt)
|
71
76
|
}
|