@etherisc/gif-next 0.0.2-a6faeb6-912 → 0.0.2-a7954cc-097
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.dbg.json +1 -1
- package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.json +29 -0
- package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +1 -1
- package/artifacts/contracts/components/Distribution.sol/Distribution.json +33 -102
- package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.json +29 -0
- package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +1 -1
- package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
- package/artifacts/contracts/components/Pool.sol/Pool.json +33 -130
- package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
- package/artifacts/contracts/components/Product.sol/Product.json +33 -113
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Cloner.dbg.json +1 -1
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock1.dbg.json +1 -1
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock2.dbg.json +1 -1
- package/artifacts/contracts/experiment/errors/Require.sol/Require.dbg.json +1 -1
- package/artifacts/contracts/experiment/errors/Revert.sol/Revert.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/A.sol/A.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/A.sol/AShared.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/B.sol/B.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/C.sol/C.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/IA.sol/IA.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/IB.sol/IB.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/IC.sol/IC.dbg.json +1 -1
- package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.dbg.json +1 -1
- package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.dbg.json +1 -1
- package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.dbg.json +1 -1
- package/artifacts/contracts/experiment/statemachine/SM.sol/SM.dbg.json +1 -1
- package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.dbg.json +1 -1
- package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.dbg.json +1 -1
- package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.dbg.json +1 -1
- package/artifacts/contracts/instance/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.dbg.json +1 -1
- 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 +39 -0
- package/artifacts/contracts/instance/IInstanceBase.sol/IInstanceBase.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +88 -14
- package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
- package/artifacts/contracts/instance/Instance.sol/Instance.json +92 -600
- package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +221 -114
- package/artifacts/contracts/instance/InstanceBase.sol/InstanceBase.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceBase.sol/InstanceBase.json +2 -2
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +2 -2
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +129 -189
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +26 -98
- 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/ComponentServiceBase.sol/ComponentServiceBase.dbg.json +1 -1
- package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.json +24 -32
- package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.dbg.json +1 -1
- 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/Lifecycle.sol/Lifecycle.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IAccess.sol/IAccess.json +59 -16
- package/artifacts/contracts/instance/module/IBundle.sol/IBundle.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/BundleService.sol/BundleService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/BundleService.sol/BundleService.json +945 -0
- package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.json +432 -0
- package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.json +39 -52
- package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +49 -72
- package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.json +13 -37
- package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.json +669 -0
- package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.json +13 -13
- package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.json +13 -13
- package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.json +664 -0
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +12 -241
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +17 -241
- package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.json +993 -0
- package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.json +464 -0
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +32 -354
- package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.json +13 -57
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +40 -410
- package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.json +13 -81
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +2 -2
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +132 -133
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +94 -65
- 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 +145 -227
- package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.dbg.json +4 -0
- package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.json +285 -0
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +30 -128
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +38 -104
- package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.dbg.json +4 -0
- package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.json +546 -0
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +14 -27
- 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/IRegisterable.sol/IRegisterable.dbg.json +1 -1
- package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
- package/artifacts/contracts/shared/IService.sol/IService.json +13 -13
- 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/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 +2 -2
- package/artifacts/contracts/shared/RegisterableUpgradable.sol/RegisterableUpgradable.dbg.json +1 -1
- package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
- package/artifacts/contracts/shared/Service.sol/Service.json +13 -13
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
- 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/TestRegisterable.sol/TestRegisterable.dbg.json +1 -1
- package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +2 -2
- 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 +31 -31
- 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/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
- package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.dbg.json +1 -1
- package/artifacts/contracts/types/Fee.sol/FeeLib.dbg.json +1 -1
- package/artifacts/contracts/types/Key32.sol/Key32Lib.dbg.json +1 -1
- package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
- 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/Referral.sol/ReferralLib.dbg.json +1 -1
- package/artifacts/contracts/types/RiskId.sol/RiskIdLib.dbg.json +1 -1
- 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/StateId.sol/StateIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json +1 -1
- 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/BaseComponent.sol +35 -8
- package/contracts/components/Distribution.sol +1 -1
- package/contracts/components/IBaseComponent.sol +3 -0
- package/contracts/components/Pool.sol +10 -6
- package/contracts/components/Product.sol +9 -6
- package/contracts/instance/IInstance.sol +6 -0
- package/contracts/instance/IInstanceService.sol +9 -3
- package/contracts/instance/Instance.sol +24 -202
- package/contracts/instance/InstanceAccessManager.sol +92 -77
- package/contracts/instance/InstanceService.sol +154 -57
- package/contracts/instance/InstanceServiceManager.sol +5 -8
- package/contracts/instance/base/ComponentServiceBase.sol +32 -84
- package/contracts/instance/module/IAccess.sol +27 -17
- package/contracts/instance/service/BundleService.sol +260 -0
- package/contracts/instance/service/BundleServiceManager.sol +51 -0
- package/contracts/instance/service/ComponentOwnerService.sol +4 -6
- package/contracts/instance/service/DistributionService.sol +45 -20
- package/contracts/instance/service/DistributionServiceManager.sol +6 -9
- package/contracts/instance/service/IBundleService.sol +45 -0
- package/contracts/instance/service/IPolicyService.sol +87 -0
- package/contracts/instance/service/IPoolService.sol +2 -33
- package/contracts/instance/service/IProductService.sol +2 -72
- package/contracts/instance/service/PolicyService.sol +503 -0
- package/contracts/instance/service/PolicyServiceManager.sol +54 -0
- package/contracts/instance/service/PoolService.sol +43 -206
- package/contracts/instance/service/PoolServiceManager.sol +5 -8
- package/contracts/instance/service/ProductService.sol +56 -456
- package/contracts/registry/ChainNft.sol +1 -1
- package/contracts/registry/IRegistry.sol +26 -16
- package/contracts/registry/IRegistryService.sol +13 -5
- package/contracts/registry/Registry.sol +149 -201
- package/contracts/registry/RegistryAccessManager.sol +210 -0
- package/contracts/registry/RegistryService.sol +48 -83
- package/contracts/registry/RegistryServiceManager.sol +18 -36
- package/contracts/registry/ReleaseManager.sol +348 -0
- package/contracts/registry/TokenRegistry.sol +5 -6
- package/contracts/shared/IService.sol +2 -1
- package/contracts/shared/ProxyManager.sol +1 -1
- package/contracts/shared/Service.sol +10 -7
- package/contracts/test/TestService.sol +3 -2
- package/contracts/types/RoleId.sol +10 -10
- package/package.json +1 -1
- package/artifacts/contracts/instance/IAccessManagerSimple.sol/IAccessManagerSimple.dbg.json +0 -4
- package/artifacts/contracts/instance/IAccessManagerSimple.sol/IAccessManagerSimple.json +0 -1082
- package/contracts/instance/IAccessManagerSimple.sol +0 -391
@@ -4,6 +4,7 @@ pragma solidity ^0.8.19;
|
|
4
4
|
import {IRegistry} from "../../registry/IRegistry.sol";
|
5
5
|
import {IProductComponent} from "../../components/IProductComponent.sol";
|
6
6
|
import {Product} from "../../components/Product.sol";
|
7
|
+
import {IBaseComponent} from "../../components/IBaseComponent.sol";
|
7
8
|
import {IPoolComponent} from "../../components/IPoolComponent.sol";
|
8
9
|
import {IDistributionComponent} from "../../components/IDistributionComponent.sol";
|
9
10
|
import {IInstance} from "../IInstance.sol";
|
@@ -22,7 +23,7 @@ import {Versionable} from "../../shared/Versionable.sol";
|
|
22
23
|
import {Timestamp, zeroTimestamp} from "../../types/Timestamp.sol";
|
23
24
|
import {UFixed, UFixedLib} from "../../types/UFixed.sol";
|
24
25
|
import {Blocknumber, blockNumber} from "../../types/Blocknumber.sol";
|
25
|
-
import {ObjectType,
|
26
|
+
import {ObjectType, PRODUCT, POOL, POLICY} from "../../types/ObjectType.sol";
|
26
27
|
import {APPLIED, UNDERWRITTEN, ACTIVE, KEEP_STATE} from "../../types/StateId.sol";
|
27
28
|
import {NftId, NftIdLib, zeroNftId} from "../../types/NftId.sol";
|
28
29
|
import {Fee, FeeLib} from "../../types/Fee.sol";
|
@@ -30,6 +31,7 @@ import {ReferralId} from "../../types/Referral.sol";
|
|
30
31
|
import {RiskId} from "../../types/RiskId.sol";
|
31
32
|
import {StateId} from "../../types/StateId.sol";
|
32
33
|
import {Version, VersionLib} from "../../types/Version.sol";
|
34
|
+
import {RoleId, PRODUCT_OWNER_ROLE} from "../../types/RoleId.sol";
|
33
35
|
|
34
36
|
import {IService} from "../../shared/IService.sol";
|
35
37
|
import {Service} from "../../shared/Service.sol";
|
@@ -37,17 +39,11 @@ import {ComponentServiceBase} from "../base/ComponentServiceBase.sol";
|
|
37
39
|
import {IProductService} from "./IProductService.sol";
|
38
40
|
import {InstanceReader} from "../InstanceReader.sol";
|
39
41
|
import {IPoolService} from "./PoolService.sol";
|
40
|
-
import {POOL_SERVICE_NAME} from "./PoolService.sol";
|
41
|
-
|
42
|
-
string constant PRODUCT_SERVICE_NAME = "ProductService";
|
43
42
|
|
44
43
|
// TODO or name this ProtectionService to have Product be something more generic (loan, savings account, ...)
|
45
44
|
contract ProductService is ComponentServiceBase, IProductService {
|
46
45
|
using NftIdLib for NftId;
|
47
46
|
|
48
|
-
string public constant NAME = "ProductService";
|
49
|
-
|
50
|
-
address internal _registryAddress;
|
51
47
|
IPoolService internal _poolService;
|
52
48
|
|
53
49
|
event LogProductServiceSender(address sender);
|
@@ -60,28 +56,58 @@ contract ProductService is ComponentServiceBase, IProductService {
|
|
60
56
|
initializer
|
61
57
|
virtual override
|
62
58
|
{
|
63
|
-
address
|
64
|
-
|
59
|
+
address registryAddress;
|
60
|
+
address initialOwner;
|
61
|
+
(registryAddress, initialOwner) = abi.decode(data, (address, address));
|
65
62
|
|
66
|
-
_initializeService(
|
63
|
+
_initializeService(registryAddress, owner);
|
67
64
|
|
68
|
-
_poolService = IPoolService(_registry.getServiceAddress(
|
65
|
+
_poolService = IPoolService(_registry.getServiceAddress(POOL(), getMajorVersion()));
|
69
66
|
|
70
|
-
_registerInterface(type(IService).interfaceId);
|
71
67
|
_registerInterface(type(IProductService).interfaceId);
|
72
68
|
}
|
73
69
|
|
74
70
|
|
75
|
-
function
|
76
|
-
return
|
71
|
+
function getDomain() public pure override(IService, Service) returns(ObjectType) {
|
72
|
+
return PRODUCT();
|
73
|
+
}
|
74
|
+
|
75
|
+
function register(address productAddress)
|
76
|
+
external
|
77
|
+
returns(NftId productNftId)
|
78
|
+
{
|
79
|
+
address productOwner = msg.sender;
|
80
|
+
IBaseComponent product = IBaseComponent(productAddress);
|
81
|
+
|
82
|
+
IRegistry.ObjectInfo memory info;
|
83
|
+
bytes memory data;
|
84
|
+
(info, data) = getRegistryService().registerProduct(product, productOwner);
|
85
|
+
|
86
|
+
IInstance instance = _getInstance(info.parentNftId);
|
87
|
+
bool hasRole = getInstanceService().hasRole(
|
88
|
+
productOwner,
|
89
|
+
PRODUCT_OWNER_ROLE(),
|
90
|
+
address(instance));
|
91
|
+
|
92
|
+
if(!hasRole) {
|
93
|
+
revert ExpectedRoleMissing(PRODUCT_OWNER_ROLE(), productOwner);
|
94
|
+
}
|
95
|
+
|
96
|
+
productNftId = info.nftId;
|
97
|
+
ISetup.ProductSetupInfo memory initialSetup = _decodeAndVerifyProductSetup(data);
|
98
|
+
instance.createProductSetup(productNftId, initialSetup);
|
99
|
+
|
100
|
+
getInstanceService().createTarget(_getInstanceNftId(info), productAddress, product.getName());
|
77
101
|
}
|
78
102
|
|
79
|
-
function
|
80
|
-
|
81
|
-
|
103
|
+
function _decodeAndVerifyProductSetup(bytes memory data) internal returns(ISetup.ProductSetupInfo memory setup)
|
104
|
+
{
|
105
|
+
setup = abi.decode(
|
106
|
+
data,
|
82
107
|
(ISetup.ProductSetupInfo)
|
83
108
|
);
|
84
|
-
|
109
|
+
|
110
|
+
// TODO add checks if applicable
|
85
111
|
}
|
86
112
|
|
87
113
|
function setFees(
|
@@ -89,13 +115,18 @@ contract ProductService is ComponentServiceBase, IProductService {
|
|
89
115
|
Fee memory processingFee
|
90
116
|
)
|
91
117
|
external
|
92
|
-
override
|
93
118
|
{
|
94
|
-
|
119
|
+
// TODO check args
|
120
|
+
|
121
|
+
(
|
122
|
+
IRegistry.ObjectInfo memory productInfo,
|
123
|
+
IInstance instance
|
124
|
+
) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
|
125
|
+
|
95
126
|
InstanceReader instanceReader = instance.getInstanceReader();
|
96
127
|
NftId productNftId = productInfo.nftId;
|
97
|
-
|
98
128
|
ISetup.ProductSetupInfo memory productSetupInfo = instanceReader.getProductSetupInfo(productNftId);
|
129
|
+
|
99
130
|
productSetupInfo.productFee = productFee;
|
100
131
|
productSetupInfo.processingFee = processingFee;
|
101
132
|
|
@@ -106,7 +137,10 @@ contract ProductService is ComponentServiceBase, IProductService {
|
|
106
137
|
RiskId riskId,
|
107
138
|
bytes memory data
|
108
139
|
) external override {
|
109
|
-
(
|
140
|
+
(
|
141
|
+
IRegistry.ObjectInfo memory productInfo,
|
142
|
+
IInstance instance
|
143
|
+
) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
|
110
144
|
NftId productNftId = productInfo.nftId;
|
111
145
|
IRisk.RiskInfo memory riskInfo = IRisk.RiskInfo(productNftId, data);
|
112
146
|
instance.createRisk(
|
@@ -133,438 +167,4 @@ contract ProductService is ComponentServiceBase, IProductService {
|
|
133
167
|
(, IInstance instance) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
|
134
168
|
instance.updateRiskState(riskId, state);
|
135
169
|
}
|
136
|
-
|
137
|
-
function _getAndVerifyInstanceAndProduct() internal view returns (Product product) {
|
138
|
-
IRegistry.ObjectInfo memory productInfo;
|
139
|
-
(productInfo,) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
|
140
|
-
product = Product(productInfo.objectAddress);
|
141
|
-
}
|
142
|
-
|
143
|
-
function calculatePremium(
|
144
|
-
RiskId riskId,
|
145
|
-
uint256 sumInsuredAmount,
|
146
|
-
uint256 lifetime,
|
147
|
-
bytes memory applicationData,
|
148
|
-
NftId bundleNftId,
|
149
|
-
ReferralId referralId
|
150
|
-
)
|
151
|
-
public
|
152
|
-
view
|
153
|
-
override
|
154
|
-
returns (
|
155
|
-
uint256 premiumAmount,
|
156
|
-
uint256 productFeeAmount,
|
157
|
-
uint256 poolFeeAmount,
|
158
|
-
uint256 bundleFeeAmount,
|
159
|
-
uint256 distributionFeeAmount
|
160
|
-
)
|
161
|
-
{
|
162
|
-
Product product = _getAndVerifyInstanceAndProduct();
|
163
|
-
uint256 netPremiumAmount = product.calculateNetPremium(
|
164
|
-
sumInsuredAmount,
|
165
|
-
riskId,
|
166
|
-
lifetime,
|
167
|
-
applicationData
|
168
|
-
);
|
169
|
-
|
170
|
-
(
|
171
|
-
productFeeAmount,
|
172
|
-
poolFeeAmount,
|
173
|
-
bundleFeeAmount,
|
174
|
-
distributionFeeAmount
|
175
|
-
) = _calculateFeeAmounts(
|
176
|
-
netPremiumAmount,
|
177
|
-
product,
|
178
|
-
bundleNftId,
|
179
|
-
referralId
|
180
|
-
);
|
181
|
-
|
182
|
-
premiumAmount = netPremiumAmount + productFeeAmount;
|
183
|
-
premiumAmount += poolFeeAmount + bundleFeeAmount;
|
184
|
-
premiumAmount += distributionFeeAmount;
|
185
|
-
}
|
186
|
-
|
187
|
-
function _calculateFeeAmounts(
|
188
|
-
uint256 netPremiumAmount,
|
189
|
-
Product product,
|
190
|
-
NftId bundleNftId,
|
191
|
-
ReferralId referralId
|
192
|
-
)
|
193
|
-
internal
|
194
|
-
view
|
195
|
-
returns (
|
196
|
-
uint256 productFeeAmount,
|
197
|
-
uint256 poolFeeAmount,
|
198
|
-
uint256 bundleFeeAmount,
|
199
|
-
uint256 distributionFeeAmount
|
200
|
-
)
|
201
|
-
{
|
202
|
-
InstanceReader instanceReader;
|
203
|
-
{
|
204
|
-
IInstance instance = product.getInstance();
|
205
|
-
instanceReader = instance.getInstanceReader();
|
206
|
-
}
|
207
|
-
|
208
|
-
NftId poolNftId = product.getPoolNftId();
|
209
|
-
IBundle.BundleInfo memory bundleInfo = instanceReader.getBundleInfo(bundleNftId);
|
210
|
-
require(bundleInfo.poolNftId == poolNftId,"ERROR:PRS-035:BUNDLE_POOL_MISMATCH");
|
211
|
-
|
212
|
-
{
|
213
|
-
ISetup.ProductSetupInfo memory productSetupInfo = instanceReader.getProductSetupInfo(product.getProductNftId());
|
214
|
-
(productFeeAmount,) = FeeLib.calculateFee(productSetupInfo.productFee, netPremiumAmount);
|
215
|
-
}
|
216
|
-
{
|
217
|
-
ISetup.PoolSetupInfo memory poolSetupInfo = instanceReader.getPoolSetupInfo(poolNftId);
|
218
|
-
(poolFeeAmount,) = FeeLib.calculateFee(poolSetupInfo.poolFee, netPremiumAmount);
|
219
|
-
}
|
220
|
-
{
|
221
|
-
NftId distributionNftId = product.getDistributionNftId();
|
222
|
-
ISetup.DistributionSetupInfo memory distributionSetupInfo = instanceReader.getDistributionSetupInfo(distributionNftId);
|
223
|
-
(distributionFeeAmount,) = FeeLib.calculateFee(distributionSetupInfo.distributionFee, netPremiumAmount);
|
224
|
-
}
|
225
|
-
|
226
|
-
(bundleFeeAmount,) = FeeLib.calculateFee(bundleInfo.fee, netPremiumAmount);
|
227
|
-
}
|
228
|
-
|
229
|
-
|
230
|
-
function createApplication(
|
231
|
-
address applicationOwner,
|
232
|
-
RiskId riskId,
|
233
|
-
uint256 sumInsuredAmount,
|
234
|
-
uint256 lifetime,
|
235
|
-
bytes memory applicationData,
|
236
|
-
NftId bundleNftId,
|
237
|
-
ReferralId referralId
|
238
|
-
) external override returns (NftId policyNftId) {
|
239
|
-
(IRegistry.ObjectInfo memory productInfo, IInstance instance) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
|
240
|
-
// TODO add validations (see create bundle in pool service)
|
241
|
-
|
242
|
-
policyNftId = getRegistryService().registerPolicy(
|
243
|
-
IRegistry.ObjectInfo(
|
244
|
-
zeroNftId(),
|
245
|
-
productInfo.nftId,
|
246
|
-
POLICY(),
|
247
|
-
false, // intercepting property for policies is defined on product
|
248
|
-
address(0),
|
249
|
-
applicationOwner,
|
250
|
-
""
|
251
|
-
)
|
252
|
-
);
|
253
|
-
|
254
|
-
(uint256 premiumAmount,,,,) = calculatePremium(
|
255
|
-
riskId,
|
256
|
-
sumInsuredAmount,
|
257
|
-
lifetime,
|
258
|
-
applicationData,
|
259
|
-
bundleNftId,
|
260
|
-
referralId
|
261
|
-
);
|
262
|
-
|
263
|
-
IPolicy.PolicyInfo memory policyInfo = IPolicy.PolicyInfo(
|
264
|
-
productInfo.nftId,
|
265
|
-
bundleNftId,
|
266
|
-
referralId,
|
267
|
-
riskId,
|
268
|
-
sumInsuredAmount,
|
269
|
-
premiumAmount,
|
270
|
-
0,
|
271
|
-
lifetime,
|
272
|
-
applicationData,
|
273
|
-
"",
|
274
|
-
0,
|
275
|
-
0,
|
276
|
-
0,
|
277
|
-
zeroTimestamp(),
|
278
|
-
zeroTimestamp(),
|
279
|
-
zeroTimestamp()
|
280
|
-
);
|
281
|
-
|
282
|
-
instance.createPolicy(policyNftId, policyInfo);
|
283
|
-
instance.updatePolicyState(policyNftId, APPLIED());
|
284
|
-
|
285
|
-
// TODO add logging
|
286
|
-
}
|
287
|
-
|
288
|
-
function _getAndVerifyUnderwritingSetup(
|
289
|
-
IInstance instance,
|
290
|
-
InstanceReader instanceReader,
|
291
|
-
IPolicy.PolicyInfo memory policyInfo,
|
292
|
-
ISetup.ProductSetupInfo memory productSetupInfo
|
293
|
-
)
|
294
|
-
internal
|
295
|
-
view
|
296
|
-
returns (
|
297
|
-
NftId bundleNftId,
|
298
|
-
IBundle.BundleInfo memory bundleInfo,
|
299
|
-
uint256 collateralAmount
|
300
|
-
)
|
301
|
-
{
|
302
|
-
// check match between policy and bundle (via pool)
|
303
|
-
bundleNftId = policyInfo.bundleNftId;
|
304
|
-
bundleInfo = instanceReader.getBundleInfo(bundleNftId);
|
305
|
-
require(bundleInfo.poolNftId == productSetupInfo.poolNftId, "POLICY_BUNDLE_MISMATCH");
|
306
|
-
|
307
|
-
// calculate required collateral
|
308
|
-
NftId poolNftId = productSetupInfo.poolNftId;
|
309
|
-
ISetup.PoolSetupInfo memory poolInfo = instanceReader.getPoolSetupInfo(poolNftId);
|
310
|
-
|
311
|
-
// obtain remaining return values
|
312
|
-
collateralAmount = calculateRequiredCollateral(poolInfo.collateralizationLevel, policyInfo.sumInsuredAmount);
|
313
|
-
}
|
314
|
-
|
315
|
-
function _lockCollateralInBundle(
|
316
|
-
IInstance instance,
|
317
|
-
NftId bundleNftId,
|
318
|
-
IBundle.BundleInfo memory bundleInfo,
|
319
|
-
NftId policyNftId,
|
320
|
-
uint256 collateralAmount
|
321
|
-
)
|
322
|
-
internal
|
323
|
-
returns (IBundle.BundleInfo memory)
|
324
|
-
{
|
325
|
-
bundleInfo.lockedAmount += collateralAmount;
|
326
|
-
// TODO: track policy associated to bundle in bundlemanager (tbd) and how much is locked for it
|
327
|
-
return bundleInfo;
|
328
|
-
}
|
329
|
-
|
330
|
-
function _underwriteByPool(
|
331
|
-
NftId poolNftId,
|
332
|
-
NftId policyNftId,
|
333
|
-
IPolicy.PolicyInfo memory policyInfo,
|
334
|
-
bytes memory bundleFilter,
|
335
|
-
uint256 collateralAmount
|
336
|
-
)
|
337
|
-
internal
|
338
|
-
{
|
339
|
-
address poolAddress = getRegistry().getObjectInfo(poolNftId).objectAddress;
|
340
|
-
IPoolComponent pool = IPoolComponent(poolAddress);
|
341
|
-
pool.underwrite(
|
342
|
-
policyNftId,
|
343
|
-
policyInfo.applicationData,
|
344
|
-
bundleFilter,
|
345
|
-
collateralAmount);
|
346
|
-
}
|
347
|
-
|
348
|
-
|
349
|
-
function revoke(
|
350
|
-
NftId policyNftId
|
351
|
-
)
|
352
|
-
external
|
353
|
-
override
|
354
|
-
{
|
355
|
-
require(false, "ERROR:PRS-234:NOT_YET_IMPLEMENTED");
|
356
|
-
}
|
357
|
-
|
358
|
-
|
359
|
-
function underwrite(
|
360
|
-
NftId policyNftId,
|
361
|
-
bool requirePremiumPayment,
|
362
|
-
Timestamp activateAt
|
363
|
-
)
|
364
|
-
external
|
365
|
-
override
|
366
|
-
{
|
367
|
-
// check caller is registered product
|
368
|
-
(
|
369
|
-
IRegistry.ObjectInfo memory productInfo,
|
370
|
-
IInstance instance
|
371
|
-
) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
|
372
|
-
InstanceReader instanceReader = instance.getInstanceReader();
|
373
|
-
|
374
|
-
// check match between policy and calling product
|
375
|
-
NftId productNftId = productInfo.nftId;
|
376
|
-
IPolicy.PolicyInfo memory policyInfo = instanceReader.getPolicyInfo(policyNftId);
|
377
|
-
require(policyInfo.productNftId == productNftId, "POLICY_PRODUCT_MISMATCH");
|
378
|
-
require(instanceReader.getPolicyState(policyNftId) == APPLIED(), "ERROR:PRS-021:STATE_NOT_APPLIED");
|
379
|
-
|
380
|
-
NftId bundleNftId;
|
381
|
-
IBundle.BundleInfo memory bundleInfo;
|
382
|
-
uint256 collateralAmount;
|
383
|
-
uint256 netPremiumAmount = 0; // > 0 if immediate premium payment
|
384
|
-
{
|
385
|
-
ISetup.ProductSetupInfo memory productSetupInfo = instanceReader.getProductSetupInfo(productNftId);
|
386
|
-
IBundle.BundleInfo memory bundleInfo;
|
387
|
-
|
388
|
-
(
|
389
|
-
bundleNftId,
|
390
|
-
bundleInfo,
|
391
|
-
collateralAmount
|
392
|
-
) = _getAndVerifyUnderwritingSetup(
|
393
|
-
instance,
|
394
|
-
instanceReader,
|
395
|
-
policyInfo,
|
396
|
-
productSetupInfo
|
397
|
-
);
|
398
|
-
}
|
399
|
-
|
400
|
-
|
401
|
-
// lock bundle collateral
|
402
|
-
bundleInfo = _lockCollateralInBundle(
|
403
|
-
instance,
|
404
|
-
bundleNftId,
|
405
|
-
bundleInfo,
|
406
|
-
policyNftId,
|
407
|
-
collateralAmount);
|
408
|
-
|
409
|
-
// lock bundle collateral
|
410
|
-
bundleInfo = _lockCollateralInBundle(
|
411
|
-
instance,
|
412
|
-
bundleNftId,
|
413
|
-
bundleInfo,
|
414
|
-
policyNftId,
|
415
|
-
collateralAmount);
|
416
|
-
StateId newPolicyState = UNDERWRITTEN();
|
417
|
-
|
418
|
-
// optional activation of policy
|
419
|
-
if(activateAt > zeroTimestamp()) {
|
420
|
-
newPolicyState = ACTIVE();
|
421
|
-
policyInfo.activatedAt = activateAt;
|
422
|
-
policyInfo.expiredAt = activateAt.addSeconds(policyInfo.lifetime);
|
423
|
-
}
|
424
|
-
|
425
|
-
// optional collection of premium
|
426
|
-
if(requirePremiumPayment) {
|
427
|
-
netPremiumAmount = _processPremiumByTreasury(
|
428
|
-
instance,
|
429
|
-
productInfo.nftId,
|
430
|
-
policyNftId,
|
431
|
-
policyInfo.premiumAmount);
|
432
|
-
|
433
|
-
policyInfo.premiumPaidAmount += policyInfo.premiumAmount;
|
434
|
-
}
|
435
|
-
|
436
|
-
_poolService.underwritePolicy(instance, policyNftId, bundleNftId, collateralAmount, netPremiumAmount);
|
437
|
-
instance.updatePolicy(policyNftId, policyInfo, newPolicyState);
|
438
|
-
|
439
|
-
// involve pool if necessary
|
440
|
-
{
|
441
|
-
ISetup.PoolSetupInfo memory poolInfo = instanceReader.getPoolSetupInfo(bundleInfo.poolNftId);
|
442
|
-
|
443
|
-
if(poolInfo.isConfirmingApplication) {
|
444
|
-
_underwriteByPool(
|
445
|
-
bundleInfo.poolNftId,
|
446
|
-
policyNftId,
|
447
|
-
policyInfo,
|
448
|
-
bundleInfo.filter,
|
449
|
-
collateralAmount
|
450
|
-
);
|
451
|
-
}
|
452
|
-
}
|
453
|
-
|
454
|
-
// TODO add logging
|
455
|
-
}
|
456
|
-
|
457
|
-
function calculateRequiredCollateral(UFixed collateralizationLevel, uint256 sumInsuredAmount) public pure override returns(uint256 collateralAmount) {
|
458
|
-
UFixed sumInsuredUFixed = UFixedLib.toUFixed(sumInsuredAmount);
|
459
|
-
UFixed collateralUFixed = collateralizationLevel * sumInsuredUFixed;
|
460
|
-
return collateralUFixed.toInt();
|
461
|
-
}
|
462
|
-
|
463
|
-
function collectPremium(NftId policyNftId, Timestamp activateAt) external override {
|
464
|
-
// check caller is registered product
|
465
|
-
(IRegistry.ObjectInfo memory productInfo, IInstance instance) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
|
466
|
-
InstanceReader instanceReader = instance.getInstanceReader();
|
467
|
-
|
468
|
-
// TODO: check if not paid
|
469
|
-
// TODO: transfer premium
|
470
|
-
// TODO: optionally activate
|
471
|
-
|
472
|
-
// // perform actual token transfers (this code is probably not complete)
|
473
|
-
// IPolicy.PolicyInfo memory policyInfo = instanceReader.getPolicyInfo(policyNftId);
|
474
|
-
|
475
|
-
// uint256 premiumAmount = policyInfo.premiumAmount;
|
476
|
-
// _processPremiumByTreasury(instance, productInfo.nftId, policyNftId, premiumAmount);
|
477
|
-
|
478
|
-
// // policy level book keeping for premium paid
|
479
|
-
// policyInfo.premiumPaidAmount += premiumAmount;
|
480
|
-
|
481
|
-
// instance.updatePolicy(policyNftId, policyInfo, KEEP_STATE());
|
482
|
-
|
483
|
-
// // optional activation of policy
|
484
|
-
// if(activateAt > zeroTimestamp()) {
|
485
|
-
// activate(policyNftId, activateAt);
|
486
|
-
// }
|
487
|
-
|
488
|
-
// TODO add logging
|
489
|
-
}
|
490
|
-
|
491
|
-
function activate(NftId policyNftId, Timestamp activateAt) public override {
|
492
|
-
// check caller is registered product
|
493
|
-
(, IInstance instance) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
|
494
|
-
InstanceReader instanceReader = instance.getInstanceReader();
|
495
|
-
|
496
|
-
IPolicy.PolicyInfo memory policyInfo = instanceReader.getPolicyInfo(policyNftId);
|
497
|
-
|
498
|
-
require(
|
499
|
-
policyInfo.activatedAt.eqz(),
|
500
|
-
"ERROR:PRS-020:ALREADY_ACTIVATED");
|
501
|
-
|
502
|
-
policyInfo.activatedAt = activateAt;
|
503
|
-
policyInfo.expiredAt = activateAt.addSeconds(policyInfo.lifetime);
|
504
|
-
|
505
|
-
instance.updatePolicy(policyNftId, policyInfo, ACTIVE());
|
506
|
-
|
507
|
-
// TODO add logging
|
508
|
-
}
|
509
|
-
|
510
|
-
function close(
|
511
|
-
NftId policyNftId
|
512
|
-
) external override // solhint-disable-next-line no-empty-blocks
|
513
|
-
{
|
514
|
-
|
515
|
-
}
|
516
|
-
|
517
|
-
function _getPoolNftId(
|
518
|
-
IInstance instance,
|
519
|
-
NftId productNftId
|
520
|
-
)
|
521
|
-
internal
|
522
|
-
view
|
523
|
-
returns (NftId poolNftid)
|
524
|
-
{
|
525
|
-
InstanceReader instanceReader = instance.getInstanceReader();
|
526
|
-
ISetup.ProductSetupInfo memory productSetupInfo = instanceReader.getProductSetupInfo(productNftId);
|
527
|
-
return productSetupInfo.poolNftId;
|
528
|
-
}
|
529
|
-
|
530
|
-
|
531
|
-
function _processPremiumByTreasury(
|
532
|
-
IInstance instance,
|
533
|
-
NftId productNftId,
|
534
|
-
NftId policyNftId,
|
535
|
-
uint256 premiumAmount
|
536
|
-
)
|
537
|
-
internal
|
538
|
-
returns (uint256 netPremiumAmount)
|
539
|
-
{
|
540
|
-
// process token transfer(s)
|
541
|
-
if(premiumAmount > 0) {
|
542
|
-
ISetup.ProductSetupInfo memory productSetupInfo = instance.getInstanceReader().getProductSetupInfo(productNftId);
|
543
|
-
TokenHandler tokenHandler = productSetupInfo.tokenHandler;
|
544
|
-
address policyOwner = getRegistry().ownerOf(policyNftId);
|
545
|
-
ISetup.PoolSetupInfo memory poolSetupInfo = instance.getInstanceReader().getPoolSetupInfo(productSetupInfo.poolNftId);
|
546
|
-
address poolWallet = poolSetupInfo.wallet;
|
547
|
-
netPremiumAmount = premiumAmount;
|
548
|
-
Fee memory productFee = productSetupInfo.productFee;
|
549
|
-
|
550
|
-
if (FeeLib.feeIsZero(productFee)) {
|
551
|
-
tokenHandler.transfer(
|
552
|
-
policyOwner,
|
553
|
-
poolWallet,
|
554
|
-
premiumAmount
|
555
|
-
);
|
556
|
-
} else {
|
557
|
-
(uint256 productFeeAmount, uint256 netAmount) = FeeLib.calculateFee(productSetupInfo.productFee, netPremiumAmount);
|
558
|
-
address productWallet = productSetupInfo.wallet;
|
559
|
-
if (tokenHandler.getToken().allowance(policyOwner, address(tokenHandler)) < premiumAmount) {
|
560
|
-
revert ErrorIProductServiceInsufficientAllowance(policyOwner, address(tokenHandler), premiumAmount);
|
561
|
-
}
|
562
|
-
tokenHandler.transfer(policyOwner, productWallet, productFeeAmount);
|
563
|
-
tokenHandler.transfer(policyOwner, poolWallet, netAmount);
|
564
|
-
netPremiumAmount = netAmount;
|
565
|
-
}
|
566
|
-
}
|
567
|
-
|
568
|
-
// TODO add logging
|
569
|
-
}
|
570
170
|
}
|
@@ -7,25 +7,25 @@ import {ChainNft} from "./ChainNft.sol";
|
|
7
7
|
import {NftId} from "../types/NftId.sol";
|
8
8
|
import {ObjectType} from "../types/ObjectType.sol";
|
9
9
|
import {VersionPart} from "../types/Version.sol";
|
10
|
+
import {Timestamp} from "../types/Timestamp.sol";
|
10
11
|
|
11
12
|
interface IRegistry is IERC165 {
|
12
13
|
|
13
|
-
event
|
14
|
-
event
|
15
|
-
event LogRegistration(ObjectInfo info);
|
16
|
-
event LogServiceNameRegistration(string serviceName, VersionPart majorVersion);
|
17
|
-
|
18
|
-
// setMajorVersion()
|
19
|
-
error NotOwner(address account);
|
20
|
-
error MajorVersionMaxIncreaseInvalid(VersionPart newMajorVersionMax, VersionPart existingMaxMajorVersion);
|
14
|
+
event LogRegistration(NftId nftId, NftId parentNftId, ObjectType objectType, bool isInterceptor, address objectAddress, address initialOwner);
|
15
|
+
event LogServiceRegistration(VersionPart majorVersion, ObjectType domain);
|
21
16
|
|
22
17
|
// register()
|
23
|
-
error
|
18
|
+
error CallerNotRegistryService();
|
19
|
+
error ServiceRegistration();
|
20
|
+
|
21
|
+
// registerService()
|
22
|
+
error CallerNotReleaseManager();
|
23
|
+
error ServiceAlreadyRegistered(address service);
|
24
|
+
|
25
|
+
// _register()
|
24
26
|
error ZeroParentAddress();
|
25
27
|
error InvalidTypesCombination(ObjectType objectType, ObjectType parentType);
|
26
28
|
error ContractAlreadyRegistered(address objectAddress);
|
27
|
-
error InvalidServiceVersion(VersionPart majorVersion);
|
28
|
-
error ServiceNameAlreadyRegistered(string name, VersionPart majorVersion);
|
29
29
|
|
30
30
|
struct ObjectInfo {
|
31
31
|
NftId nftId;
|
@@ -38,7 +38,17 @@ interface IRegistry is IERC165 {
|
|
38
38
|
}// TODO delete nftId and initialOwner(if not used) from struct
|
39
39
|
// TODO strong disagree, keep nftId there (lets keep get object info return object consistent)
|
40
40
|
|
41
|
-
|
41
|
+
struct ReleaseInfo {
|
42
|
+
ObjectType[] domains;
|
43
|
+
Timestamp createdAt;
|
44
|
+
//Timestamp updatedAt;
|
45
|
+
}
|
46
|
+
|
47
|
+
function registerService(
|
48
|
+
ObjectInfo memory serviceInfo,
|
49
|
+
VersionPart serviceVersion,
|
50
|
+
ObjectType serviceDomain
|
51
|
+
) external returns(NftId nftId);
|
42
52
|
|
43
53
|
function register(ObjectInfo memory info) external returns (NftId nftId);
|
44
54
|
|
@@ -48,6 +58,8 @@ interface IRegistry is IERC165 {
|
|
48
58
|
|
49
59
|
function getMajorVersion() external view returns (VersionPart);
|
50
60
|
|
61
|
+
function getReleaseInfo(VersionPart version) external view returns (ReleaseInfo memory);
|
62
|
+
|
51
63
|
function getObjectCount() external view returns (uint256);
|
52
64
|
|
53
65
|
function getNftId() external view returns (NftId nftId);
|
@@ -68,11 +80,9 @@ interface IRegistry is IERC165 {
|
|
68
80
|
|
69
81
|
function isRegisteredService(address contractAddress) external view returns (bool);
|
70
82
|
|
71
|
-
function getServiceName(NftId nftId) external view returns (string memory name);
|
72
|
-
|
73
83
|
function getServiceAddress(
|
74
|
-
|
75
|
-
VersionPart
|
84
|
+
ObjectType serviceDomain,
|
85
|
+
VersionPart releaseVersion
|
76
86
|
) external view returns (address serviceAddress);
|
77
87
|
|
78
88
|
function getChainNft() external view returns (ChainNft);
|