@etherisc/gif-next 0.0.2-f29e479-370 → 0.0.2-f2df3e2-873
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 +78 -89
- package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +1 -1
- package/artifacts/contracts/components/Distribution.sol/Distribution.json +139 -140
- package/artifacts/contracts/components/IComponent.sol/IComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IComponent.sol/IComponent.json +156 -64
- package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.json +181 -112
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.json +353 -176
- package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.json +162 -138
- package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
- package/artifacts/contracts/components/Pool.sol/Pool.json +299 -245
- package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
- package/artifacts/contracts/components/Product.sol/Product.json +83 -162
- package/artifacts/contracts/instance/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.dbg.json +4 -0
- package/artifacts/contracts/instance/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.json +1206 -0
- package/artifacts/contracts/instance/BundleManager.sol/BundleManager.dbg.json +1 -1
- package/artifacts/contracts/instance/BundleManager.sol/BundleManager.json +64 -50
- package/artifacts/contracts/instance/Cloneable.sol/Cloneable.dbg.json +1 -1
- package/artifacts/contracts/instance/Cloneable.sol/Cloneable.json +5 -0
- package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstance.sol/IInstance.json +527 -400
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +175 -51
- package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
- package/artifacts/contracts/instance/Instance.sol/Instance.json +500 -612
- package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +472 -126
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +253 -236
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +305 -211
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +71 -23
- package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.dbg.json +1 -1
- package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.json +8 -13
- package/artifacts/contracts/instance/base/ComponentService.sol/ComponentService.dbg.json +1 -1
- package/artifacts/contracts/instance/base/ComponentService.sol/ComponentService.json +86 -31
- 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 +40 -10
- package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json +1 -1
- package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.json +36 -11
- package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IAccess.sol/IAccess.json +56 -73
- package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IComponents.sol/IComponents.dbg.json +4 -0
- package/artifacts/contracts/instance/module/IComponents.sol/IComponents.json +10 -0
- 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 +291 -100
- package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.json +46 -22
- package/artifacts/contracts/instance/service/BundleService.sol/BundleService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/BundleService.sol/BundleService.json +422 -252
- package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.json +78 -14
- package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.json +373 -87
- package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.json +55 -7
- package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +579 -123
- package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.json +71 -47
- package/artifacts/contracts/instance/service/IApplicationService.sol/IApplicationService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IApplicationService.sol/IApplicationService.json +200 -46
- package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.json +241 -188
- package/artifacts/contracts/instance/service/IClaimService.sol/IClaimService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IClaimService.sol/IClaimService.json +251 -58
- package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.json +444 -25
- package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.json +430 -76
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +511 -14
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +80 -14
- package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.json +544 -153
- package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.json +51 -27
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +562 -52
- package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.json +24 -12
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +115 -52
- package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.json +16 -12
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +15 -2
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +19 -0
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +0 -24
- package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
- package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.json +18 -0
- package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
- package/artifacts/contracts/registry/Registry.sol/Registry.json +31 -12
- 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 +18 -37
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +7 -7
- 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 +2 -2
- 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/IPolicyHolder.sol/IPolicyHolder.dbg.json +1 -1
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
- package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +1 -1
- package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
- package/artifacts/contracts/shared/IService.sol/IService.json +80 -14
- 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 +2 -2
- package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +1 -1
- package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +2 -2
- package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +1 -1
- package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +2 -2
- package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
- package/artifacts/contracts/shared/Registerable.sol/Registerable.json +3 -3
- package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +1 -1
- package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +2 -2
- package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
- package/artifacts/contracts/shared/Service.sol/Service.json +87 -16
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +2 -2
- package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
- package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +2 -2
- 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 +3 -3
- package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +1 -1
- package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.json +6 -6
- package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +1 -1
- package/artifacts/contracts/test/TestService.sol/TestService.json +102 -27
- 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/TestVersion.sol/TestVersion.json +2 -2
- package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json +1 -1
- package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.json +2 -2
- 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 +185 -0
- package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
- package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.json +2 -2
- 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 +40 -9
- 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 +17 -4
- 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 +23 -4
- 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 +4 -0
- package/artifacts/contracts/types/Seconds.sol/SecondsLib.json +124 -0
- 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 +38 -7
- package/artifacts/contracts/types/UFixed.sol/MathLib.dbg.json +1 -1
- package/artifacts/contracts/types/UFixed.sol/MathLib.json +2 -2
- package/artifacts/contracts/types/UFixed.sol/UFixedLib.dbg.json +1 -1
- package/artifacts/contracts/types/UFixed.sol/UFixedLib.json +2 -2
- package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +1 -1
- package/artifacts/contracts/types/Version.sol/VersionLib.json +2 -2
- package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +1 -1
- package/artifacts/contracts/types/Version.sol/VersionPartLib.json +2 -2
- package/contracts/components/Component.sol +99 -87
- package/contracts/components/Distribution.sol +18 -21
- package/contracts/components/IComponent.sol +40 -18
- package/contracts/components/IDistributionComponent.sol +1 -22
- package/contracts/components/IPoolComponent.sol +73 -47
- package/contracts/components/IProductComponent.sol +3 -2
- package/contracts/components/Pool.sol +178 -130
- package/contracts/components/Product.sol +157 -71
- package/contracts/instance/AccessManagerUpgradeableInitializeable.sol +13 -0
- package/contracts/instance/BundleManager.sol +10 -9
- package/contracts/instance/Cloneable.sol +7 -2
- package/contracts/instance/IInstance.sol +37 -27
- package/contracts/instance/IInstanceService.sol +18 -9
- package/contracts/instance/Instance.sol +117 -98
- package/contracts/instance/InstanceAccessManager.sol +388 -158
- package/contracts/instance/InstanceReader.sol +36 -12
- package/contracts/instance/InstanceService.sol +193 -191
- package/contracts/instance/ObjectManager.sol +6 -8
- package/contracts/instance/base/ComponentService.sol +17 -30
- package/contracts/instance/base/KeyValueStore.sol +13 -5
- package/contracts/instance/base/Lifecycle.sol +23 -6
- package/contracts/instance/module/IAccess.sol +21 -14
- package/contracts/instance/module/IBundle.sol +8 -5
- package/contracts/instance/module/IComponents.sol +41 -0
- package/contracts/instance/module/IDistribution.sol +2 -1
- package/contracts/instance/module/IPolicy.sol +37 -7
- package/contracts/instance/module/ISetup.sol +7 -22
- package/contracts/instance/service/ApplicationService.sol +137 -50
- package/contracts/instance/service/BundleService.sol +221 -83
- package/contracts/instance/service/ClaimService.sol +114 -26
- package/contracts/instance/service/DistributionService.sol +174 -118
- package/contracts/instance/service/IApplicationService.sol +9 -13
- package/contracts/instance/service/IBundleService.sol +68 -26
- package/contracts/instance/service/IClaimService.sol +46 -15
- package/contracts/instance/service/IDistributionService.sol +20 -4
- package/contracts/instance/service/IPolicyService.sol +69 -21
- package/contracts/instance/service/IPoolService.sol +82 -3
- package/contracts/instance/service/PolicyService.sol +297 -232
- package/contracts/instance/service/PoolService.sol +214 -20
- package/contracts/instance/service/ProductService.sol +31 -54
- package/contracts/registry/ChainNft.sol +8 -0
- package/contracts/registry/IRegistry.sol +2 -0
- package/contracts/registry/IRegistryService.sol +4 -3
- package/contracts/registry/ITransferInterceptor.sol +1 -0
- package/contracts/registry/Registry.sol +23 -20
- package/contracts/registry/RegistryService.sol +15 -16
- package/contracts/registry/ReleaseManager.sol +20 -18
- package/contracts/shared/IService.sol +4 -6
- package/contracts/shared/Registerable.sol +2 -2
- package/contracts/shared/Service.sol +21 -7
- package/contracts/shared/TokenHandler.sol +11 -5
- package/contracts/test/TestService.sol +1 -1
- package/contracts/types/Amount.sol +65 -0
- package/contracts/types/Blocknumber.sol +1 -0
- package/contracts/types/ClaimId.sol +25 -2
- package/contracts/types/Fee.sol +13 -5
- package/contracts/types/NftId.sol +8 -0
- package/contracts/types/ObjectType.sol +6 -5
- package/contracts/types/PayoutId.sol +33 -5
- package/contracts/types/Referral.sol +4 -0
- package/contracts/types/RoleId.sol +13 -6
- package/contracts/types/Seconds.sol +54 -0
- package/contracts/types/StateId.sol +7 -2
- package/contracts/types/Timestamp.sol +18 -13
- package/contracts/types/UFixed.sol +1 -0
- package/contracts/types/Version.sol +1 -0
- package/package.json +1 -1
@@ -24,18 +24,16 @@ contract ObjectManager is
|
|
24
24
|
IInstance internal _instance; // store instance address -> more flexible, instance may not be registered during ObjectManager initialization
|
25
25
|
|
26
26
|
/// @dev call to initialize MUST be made in the same transaction as cloning of the contract
|
27
|
-
function initialize(
|
28
|
-
|
29
|
-
address registry,
|
30
|
-
address instance
|
31
|
-
)
|
27
|
+
function initialize(address instanceAddress)
|
28
|
+
initializer
|
32
29
|
external
|
33
30
|
{
|
34
|
-
|
31
|
+
IInstance instance = IInstance(instanceAddress);
|
32
|
+
initialize(instance.authority(), instance.getRegistryAddress());
|
35
33
|
|
36
|
-
_instance =
|
34
|
+
_instance = instance;
|
37
35
|
|
38
|
-
emit LogObjectManagerInitialized(
|
36
|
+
emit LogObjectManagerInitialized(instanceAddress);
|
39
37
|
}
|
40
38
|
|
41
39
|
function getInstance() external view returns (IInstance) {
|
@@ -16,7 +16,6 @@ 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);
|
@@ -33,13 +32,15 @@ abstract contract ComponentService is Service {
|
|
33
32
|
// view functions
|
34
33
|
|
35
34
|
function getRegistryService() public view virtual returns (IRegistryService) {
|
36
|
-
|
37
|
-
return IRegistryService(service);
|
35
|
+
return IRegistryService(_getServiceAddress(REGISTRY()));
|
38
36
|
}
|
39
37
|
|
40
38
|
function getInstanceService() public view returns (InstanceService) {
|
41
|
-
|
42
|
-
|
39
|
+
return InstanceService(_getServiceAddress(INSTANCE()));
|
40
|
+
}
|
41
|
+
|
42
|
+
function _getServiceAddress(ObjectType domain) internal view returns (address) {
|
43
|
+
return getRegistry().getServiceAddress(domain, getVersion().toMajorPart());
|
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,40 @@ 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
|
-
owner,
|
92
|
-
requiredRole,
|
93
|
-
address(instance));
|
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
|
101
91
|
|
102
|
-
function _getInstance(NftId instanceNftId) internal view returns (IInstance) {
|
103
|
-
IRegistry.ObjectInfo memory instanceInfo = getRegistry().getObjectInfo(instanceNftId);
|
104
|
-
return IInstance(instanceInfo.objectAddress);
|
105
|
-
}
|
106
|
-
|
107
92
|
function _getAndVerifyComponentInfoAndInstance(
|
108
|
-
//address component,
|
109
93
|
ObjectType expectedType
|
110
94
|
)
|
111
95
|
internal
|
112
96
|
view
|
113
97
|
returns(
|
98
|
+
NftId nftId,
|
114
99
|
IRegistry.ObjectInfo memory info,
|
115
100
|
IInstance instance
|
116
101
|
)
|
117
102
|
{
|
118
103
|
IRegistry registry = getRegistry();
|
119
|
-
//TODO redundant check -> just check type
|
120
|
-
//NftId componentNftId = registry.getNftId(component);
|
121
|
-
//require(componentNftId.gtz(), "ERROR_COMPONENT_UNKNOWN");
|
122
104
|
|
123
105
|
info = registry.getObjectInfo(msg.sender);
|
124
106
|
require(info.objectType == expectedType, "OBJECT_TYPE_INVALID");
|
125
107
|
|
126
|
-
|
127
|
-
instance =
|
108
|
+
nftId = info.nftId;
|
109
|
+
instance = _getInstance(info.parentNftId);
|
128
110
|
|
129
|
-
|
130
|
-
if (accessManager.isTargetLocked(info.objectAddress)) {
|
111
|
+
if (instance.getInstanceAccessManager().isTargetLocked(info.objectAddress)) {
|
131
112
|
revert IAccess.ErrorIAccessTargetLocked(info.objectAddress);
|
132
113
|
}
|
133
114
|
}
|
115
|
+
|
116
|
+
function _getInstance(NftId instanceNftId) internal view returns (IInstance) {
|
117
|
+
return IInstance(
|
118
|
+
getRegistry().getObjectInfo(
|
119
|
+
instanceNftId).objectAddress);
|
120
|
+
}
|
134
121
|
}
|
@@ -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";
|
@@ -79,16 +79,21 @@ contract KeyValueStore is Lifecycle, IKeyValueStore {
|
|
79
79
|
// update data
|
80
80
|
_value[key32].data = data;
|
81
81
|
|
82
|
-
// update
|
82
|
+
// update state
|
83
|
+
if(state != KEEP_STATE()) {
|
84
|
+
metadata.state = state;
|
85
|
+
}
|
86
|
+
|
87
|
+
// update reest of metadata
|
83
88
|
address updatedBy = msg.sender;
|
84
89
|
Blocknumber lastUpdatedIn = metadata.updatedIn;
|
85
|
-
|
90
|
+
|
86
91
|
metadata.updatedBy = updatedBy;
|
87
92
|
metadata.updatedIn = blockBlocknumber();
|
88
93
|
|
89
94
|
// create log entries
|
90
95
|
// solhint-disable avoid-tx-origin
|
91
|
-
emit LogStateUpdated(key32.toObjectType(), key32.toKeyId(),
|
96
|
+
emit LogStateUpdated(key32.toObjectType(), key32.toKeyId(), stateOld, state, updatedBy, tx.origin, lastUpdatedIn);
|
92
97
|
emit LogInfoUpdated(key32.toObjectType(), key32.toKeyId(), state, updatedBy, tx.origin, lastUpdatedIn);
|
93
98
|
// solhing-enable
|
94
99
|
}
|
@@ -134,6 +139,9 @@ contract KeyValueStore is Lifecycle, IKeyValueStore {
|
|
134
139
|
StateId stateOld = metadata.state;
|
135
140
|
require(stateOld.gtz(), "ERROR:KVS-041:NOT_EXISTING");
|
136
141
|
|
142
|
+
// ensure state transistion is valid
|
143
|
+
checkTransition(metadata.objectType, stateOld, state);
|
144
|
+
|
137
145
|
// update metadata (and state)
|
138
146
|
address updatedBy = msg.sender;
|
139
147
|
Blocknumber lastUpdatedIn = metadata.updatedIn;
|
@@ -143,7 +151,7 @@ contract KeyValueStore is Lifecycle, IKeyValueStore {
|
|
143
151
|
|
144
152
|
// create log entry
|
145
153
|
// solhint-disable-next-line avoid-tx-origin
|
146
|
-
emit LogStateUpdated(key32.toObjectType(), key32.toKeyId(),
|
154
|
+
emit LogStateUpdated(key32.toObjectType(), key32.toKeyId(), stateOld, state, updatedBy, tx.origin, lastUpdatedIn);
|
147
155
|
}
|
148
156
|
|
149
157
|
function exists(Key32 key32) public view returns (bool) {
|
@@ -1,22 +1,31 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
2
|
pragma solidity ^0.8.20;
|
3
3
|
|
4
|
+
import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
|
5
|
+
|
4
6
|
import {NftId} from "../../types/NftId.sol";
|
5
|
-
import {ObjectType, COMPONENT, BUNDLE, POLICY, RISK} from "../../types/ObjectType.sol";
|
6
|
-
import {StateId, ACTIVE, PAUSED, ARCHIVED, CLOSED, APPLIED,
|
7
|
+
import {ObjectType, COMPONENT, BUNDLE, POLICY, RISK, CLAIM} from "../../types/ObjectType.sol";
|
8
|
+
import {StateId, ACTIVE, PAUSED, ARCHIVED, CLOSED, APPLIED, COLLATERALIZED, REVOKED, SUBMITTED, CONFIRMED, DECLINED} from "../../types/StateId.sol";
|
7
9
|
import {ILifecycle} from "./ILifecycle.sol";
|
8
10
|
|
9
|
-
contract Lifecycle is
|
11
|
+
contract Lifecycle is
|
12
|
+
Initializable,
|
13
|
+
ILifecycle
|
14
|
+
{
|
10
15
|
mapping(ObjectType objectType => StateId initialState)
|
11
16
|
private _initialState;
|
12
17
|
|
13
18
|
mapping(ObjectType objectType => mapping(StateId stateFrom => mapping(StateId stateTo => bool isValid)))
|
14
19
|
private _isValidTransition;
|
15
20
|
|
16
|
-
|
21
|
+
function initializeLifecycle()
|
22
|
+
public
|
23
|
+
onlyInitializing
|
24
|
+
{
|
17
25
|
_setupBundleLifecycle();
|
18
26
|
_setupComponentLifecycle();
|
19
27
|
_setupPolicyLifecycle();
|
28
|
+
_setupClaimLifecycle();
|
20
29
|
_setupRiskLifecycle();
|
21
30
|
}
|
22
31
|
|
@@ -78,6 +87,7 @@ contract Lifecycle is ILifecycle {
|
|
78
87
|
function _setupBundleLifecycle() internal {
|
79
88
|
_initialState[BUNDLE()] = ACTIVE();
|
80
89
|
_isValidTransition[BUNDLE()][ACTIVE()][PAUSED()] = true;
|
90
|
+
_isValidTransition[BUNDLE()][ACTIVE()][CLOSED()] = true;
|
81
91
|
_isValidTransition[BUNDLE()][PAUSED()][ACTIVE()] = true;
|
82
92
|
_isValidTransition[BUNDLE()][PAUSED()][CLOSED()] = true;
|
83
93
|
}
|
@@ -86,11 +96,18 @@ contract Lifecycle is ILifecycle {
|
|
86
96
|
_initialState[POLICY()] = APPLIED();
|
87
97
|
_isValidTransition[POLICY()][APPLIED()][REVOKED()] = true;
|
88
98
|
_isValidTransition[POLICY()][APPLIED()][DECLINED()] = true;
|
89
|
-
_isValidTransition[POLICY()][APPLIED()][
|
90
|
-
_isValidTransition[POLICY()][
|
99
|
+
_isValidTransition[POLICY()][APPLIED()][COLLATERALIZED()] = true;
|
100
|
+
_isValidTransition[POLICY()][COLLATERALIZED()][ACTIVE()] = true;
|
91
101
|
_isValidTransition[POLICY()][ACTIVE()][CLOSED()] = true;
|
92
102
|
}
|
93
103
|
|
104
|
+
function _setupClaimLifecycle() 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
|
+
|
94
111
|
function _setupRiskLifecycle() internal {
|
95
112
|
_initialState[RISK()] = ACTIVE();
|
96
113
|
_isValidTransition[RISK()][ACTIVE()][PAUSED()] = true;
|
@@ -8,40 +8,47 @@ import {Timestamp} from "../../types/Timestamp.sol";
|
|
8
8
|
|
9
9
|
interface IAccess {
|
10
10
|
|
11
|
+
enum Type {
|
12
|
+
NotInitialized,
|
13
|
+
Core,
|
14
|
+
Gif,
|
15
|
+
Custom
|
16
|
+
}
|
17
|
+
|
11
18
|
struct RoleInfo {
|
12
19
|
ShortString name;
|
13
|
-
|
14
|
-
bool isLocked;
|
20
|
+
Type rtype;
|
21
|
+
//bool isLocked;
|
22
|
+
RoleId admin;
|
15
23
|
Timestamp createdAt;
|
16
24
|
Timestamp updatedAt;
|
17
25
|
}
|
18
26
|
|
19
27
|
struct TargetInfo {
|
20
28
|
ShortString name;
|
21
|
-
|
29
|
+
Type ttype;
|
22
30
|
bool isLocked;
|
23
31
|
Timestamp createdAt;
|
24
32
|
Timestamp updatedAt;
|
25
33
|
}
|
26
34
|
|
27
|
-
error
|
35
|
+
error ErrorIAccessCallerIsNotRoleAdmin(address caller, RoleId roleId);
|
36
|
+
|
37
|
+
error ErrorIAccessRoleIdDoesNotExist(RoleId roleId);
|
28
38
|
error ErrorIAccessRoleIdTooBig(RoleId roleId);
|
29
39
|
error ErrorIAccessRoleIdTooSmall(RoleId roleId);
|
30
|
-
error
|
31
|
-
error ErrorIAccessRoleIdNotActive(RoleId roleId);
|
40
|
+
error ErrorIAccessRoleIdExists(RoleId roleId);
|
32
41
|
error ErrorIAccessRoleNameEmpty(RoleId roleId);
|
33
|
-
error
|
34
|
-
error
|
35
|
-
error ErrorIAccessRoleIsCustomIsImmutable(RoleId roleId, bool isCustom, bool isCustomExisting);
|
36
|
-
error ErrorIAccessGrantNonexstentRole(RoleId roleId);
|
37
|
-
error ErrorIAccessRevokeNonexstentRole(RoleId roleId);
|
38
|
-
error ErrorIAccessRenounceNonexstentRole(RoleId roleId);
|
42
|
+
error ErrorIAccessRoleNameExists(RoleId roleId, RoleId existingRoleId, ShortString name);
|
43
|
+
error ErrorIAccessRoleTypeInvalid(RoleId roleId, Type rtype);
|
39
44
|
|
40
45
|
error ErrorIAccessTargetAddressZero();
|
41
|
-
error ErrorIAccessTargetDoesNotExist(
|
42
|
-
error ErrorIAccessTargetAddressDoesNotExist(address target);
|
46
|
+
error ErrorIAccessTargetDoesNotExist(address target);
|
43
47
|
error ErrorIAccessTargetExists(address target, ShortString name);
|
48
|
+
error ErrorIAccessTargetTypeInvalid(address target, Type ttype);
|
44
49
|
error ErrorIAccessTargetNameEmpty(address target);
|
45
50
|
error ErrorIAccessTargetNameExists(address target, address existingTarget, ShortString name);
|
46
51
|
error ErrorIAccessTargetLocked(address target);
|
52
|
+
error ErrorIAccessTargetNotRegistered(address target);
|
53
|
+
error ErrorIAccessTargetAuthorityInvalid(address target, address targetAuthority);
|
47
54
|
}
|
@@ -1,20 +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";
|
7
|
+
import {Seconds} from "../../types/Seconds.sol";
|
6
8
|
import {Timestamp} from "../../types/Timestamp.sol";
|
7
9
|
|
8
10
|
interface IBundle {
|
11
|
+
|
9
12
|
struct BundleInfo {
|
10
13
|
NftId poolNftId;
|
11
14
|
Fee fee; // bundle fee on net premium amounts
|
12
15
|
bytes filter; // required conditions for applications to be considered for collateralization by this bundle
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
Timestamp expiredAt; // no new policies
|
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
|
19
|
+
Seconds lifetime;
|
20
|
+
Timestamp expiredAt; // no new policies starting with this timestamp
|
18
21
|
Timestamp closedAt; // no open policies, locked amount = 0
|
19
22
|
}
|
20
23
|
}
|
@@ -0,0 +1,41 @@
|
|
1
|
+
// SPDX-License-Identifier: Apache-2.0
|
2
|
+
pragma solidity ^0.8.20;
|
3
|
+
|
4
|
+
import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
|
5
|
+
|
6
|
+
import {Amount} from "../../types/Amount.sol";
|
7
|
+
import {Fee} from "../../types/Fee.sol";
|
8
|
+
import {NftId} from "../../types/NftId.sol";
|
9
|
+
import {RoleId} from "../../types/RoleId.sol";
|
10
|
+
import {TokenHandler} from "../../shared/TokenHandler.sol";
|
11
|
+
import {UFixed} from "../../types/UFixed.sol";
|
12
|
+
|
13
|
+
interface IComponents {
|
14
|
+
|
15
|
+
struct ComponentInfo {
|
16
|
+
string name; // component name (needs to be unique per instance)
|
17
|
+
IERC20Metadata token;
|
18
|
+
TokenHandler tokenHandler;
|
19
|
+
address wallet;
|
20
|
+
Amount balanceAmount; // calculated balance (may not necessarily match withg wallet balance)
|
21
|
+
Amount feeAmount; // accumulated fees belonging to component owner
|
22
|
+
bytes data; // will hold component type specific additional info (eg encoded pool info)
|
23
|
+
}
|
24
|
+
|
25
|
+
struct PoolInfo {
|
26
|
+
NftId productNftId; // the nft of the product this pool is linked to
|
27
|
+
RoleId bundleOwnerRole; // the required role for bundle owners
|
28
|
+
// TODO maxCapitalAmount -> maxBalanceAmount
|
29
|
+
uint256 maxCapitalAmount; // max capital amount allowed for pool
|
30
|
+
uint256 balanceAmount; // current pool balance (accounting view)
|
31
|
+
uint256 feeAmount; // accumulated fee amount
|
32
|
+
bool isInterceptingBundleTransfers; // intercepts nft transfers for bundles
|
33
|
+
bool isExternallyManaged; // funding bundles is restricted to book keeping, actual funds may be provided as needed to support payouts
|
34
|
+
bool isVerifyingApplications; // underwriting requires the pool component checks/confirms the applications
|
35
|
+
UFixed collateralizationLevel; // factor to calculate collateral for sum insurance (default 100%)
|
36
|
+
UFixed retentionLevel; // amount of collateral held in pool (default 100%)
|
37
|
+
Fee poolFee; // pool fee on net premium
|
38
|
+
Fee stakingFee; // pool fee on staked capital from investor
|
39
|
+
Fee performanceFee; // pool fee on profits from capital investors
|
40
|
+
}
|
41
|
+
}
|
@@ -1,14 +1,40 @@
|
|
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";
|
7
8
|
import {RiskId} from "../../types/RiskId.sol";
|
9
|
+
import {Seconds} from "../../types/Seconds.sol";
|
8
10
|
import {Timestamp} from "../../types/Timestamp.sol";
|
9
11
|
|
10
12
|
interface IPolicy {
|
11
13
|
|
14
|
+
struct Premium {
|
15
|
+
// this is the net premium calculated by the product
|
16
|
+
uint256 netPremiumAmount;
|
17
|
+
// fullPremium = netPremium + all fixed amounts + all variable amounts (excl commission and minDistribtuionOwnerFee variable part)
|
18
|
+
uint256 fullPremiumAmount;
|
19
|
+
// premium = fullPremium - discount
|
20
|
+
uint256 premiumAmount;
|
21
|
+
uint256 productFeeFixAmount;
|
22
|
+
uint256 poolFeeFixAmount;
|
23
|
+
uint256 bundleFeeFixAmount;
|
24
|
+
uint256 distributionFeeFixAmount;
|
25
|
+
uint256 productFeeVarAmount;
|
26
|
+
uint256 poolFeeVarAmount;
|
27
|
+
uint256 bundleFeeVarAmount;
|
28
|
+
uint256 distributionFeeVarAmount;
|
29
|
+
uint256 distributionOwnerFeeFixAmount;
|
30
|
+
// this is the remaining amount when the commission and discount are subtracted from the distribution fee variable part (must be at least the minDistributionOwnerFee)
|
31
|
+
uint256 distributionOwnerFeeVarAmount;
|
32
|
+
// this value is based on distributor type referenced in the referral
|
33
|
+
uint256 commissionAmount;
|
34
|
+
// this is based on referral used
|
35
|
+
uint256 discountAmount;
|
36
|
+
}
|
37
|
+
|
12
38
|
/// @dev policy data for the full policy lifecycle
|
13
39
|
struct PolicyInfo {
|
14
40
|
NftId productNftId;
|
@@ -17,13 +43,13 @@ interface IPolicy {
|
|
17
43
|
RiskId riskId;
|
18
44
|
uint256 sumInsuredAmount;
|
19
45
|
uint256 premiumAmount;
|
20
|
-
uint256 premiumPaidAmount;
|
21
|
-
|
46
|
+
uint256 premiumPaidAmount; // when lower than premium amount: max payout decreased accordingly
|
47
|
+
Seconds lifetime;
|
22
48
|
bytes applicationData;
|
23
49
|
bytes policyData;
|
24
50
|
uint16 claimsCount;
|
25
51
|
uint16 openClaimsCount;
|
26
|
-
|
52
|
+
Amount payoutAmount;
|
27
53
|
Timestamp activatedAt; // time of underwriting
|
28
54
|
Timestamp expiredAt; // no new claims (activatedAt + lifetime)
|
29
55
|
Timestamp closedAt; // no locked capital (or declinedAt)
|
@@ -31,16 +57,20 @@ interface IPolicy {
|
|
31
57
|
|
32
58
|
// claimId neeeds to be encoded policyNftId:claimId combination
|
33
59
|
struct ClaimInfo {
|
34
|
-
|
35
|
-
|
60
|
+
Amount claimAmount;
|
61
|
+
Amount paidAmount;
|
62
|
+
uint8 payoutsCount;
|
63
|
+
uint8 openPayoutsCount;
|
36
64
|
bytes data;
|
37
|
-
|
65
|
+
// TODO consider to add processData that may include information supporting confirm or decline
|
66
|
+
Timestamp closedAt; // payment of confirmed claim amount (or declinedAt)
|
38
67
|
}
|
39
68
|
|
40
69
|
// claimId neeeds to be encoded policyNftId:claimId combination
|
41
70
|
struct PayoutInfo {
|
42
71
|
ClaimId claimId;
|
43
|
-
|
72
|
+
Amount amount;
|
73
|
+
// TODO consider to add a beneficiary address that will be the receiver of the payout tokens
|
44
74
|
bytes data;
|
45
75
|
Timestamp paidAt; // payoment of confirmed claim amount (or declinedAt)
|
46
76
|
}
|
@@ -5,21 +5,19 @@ import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IER
|
|
5
5
|
|
6
6
|
import {Fee} from "../../types/Fee.sol";
|
7
7
|
import {NftId} from "../../types/NftId.sol";
|
8
|
-
import {
|
8
|
+
import {RoleId} from "../../types/RoleId.sol";
|
9
9
|
import {TokenHandler} from "../../shared/TokenHandler.sol";
|
10
|
+
import {UFixed} from "../../types/UFixed.sol";
|
10
11
|
|
11
12
|
interface ISetup {
|
13
|
+
|
12
14
|
struct ProductSetupInfo {
|
13
15
|
IERC20Metadata token;
|
14
16
|
TokenHandler tokenHandler;
|
15
17
|
NftId distributionNftId;
|
16
18
|
NftId poolNftId;
|
17
|
-
Fee distributionFee; // default distribution fee (no referral id)
|
18
19
|
Fee productFee; // product fee on net premium
|
19
|
-
Fee processingFee; // product fee on payout amounts
|
20
|
-
Fee poolFee; // pool fee on net premium
|
21
|
-
Fee stakingFee; // pool fee on staked capital from investor
|
22
|
-
Fee performanceFee; // pool fee on profits from capital investors
|
20
|
+
Fee processingFee; // product fee on payout amounts
|
23
21
|
bool isIntercepting; // intercepts nft transfers (for products)
|
24
22
|
address wallet;
|
25
23
|
}
|
@@ -27,22 +25,9 @@ interface ISetup {
|
|
27
25
|
struct DistributionSetupInfo {
|
28
26
|
NftId productNftId;
|
29
27
|
TokenHandler tokenHandler;
|
30
|
-
Fee
|
31
|
-
|
32
|
-
// TODO: add sum of distibution owner fees (excl commissions from distributors)
|
33
|
-
}
|
34
|
-
|
35
|
-
struct PoolSetupInfo {
|
36
|
-
NftId productNftId;
|
37
|
-
TokenHandler tokenHandler;
|
38
|
-
bool isInterceptingBundleTransfers; // intercepts nft transfers for bundles
|
39
|
-
bool isExternallyManaged; // funding bundles is restricted to book keeping, actual funds may be provided as needed to support payouts
|
40
|
-
bool isVerifyingApplications; // underwriting requires the pool component checks/confirms the applications
|
41
|
-
UFixed collateralizationLevel; // factor to calculate collateral for sum insurance (default 100%)
|
42
|
-
UFixed retentionLevel; // amount of collateral held in pool (default 100%)
|
43
|
-
Fee poolFee; // pool fee on net premium
|
44
|
-
Fee stakingFee; // pool fee on staked capital from investor
|
45
|
-
Fee performanceFee; // pool fee on profits from capital investors
|
28
|
+
Fee minDistributionOwnerFee;
|
29
|
+
Fee distributionFee; // recalculated whenever any fee on the product/pool/dist/disttype is changed
|
46
30
|
address wallet;
|
31
|
+
uint256 sumDistributionOwnerFees;
|
47
32
|
}
|
48
33
|
}
|