@etherisc/gif-next 0.0.2-e510b92-393 → 0.0.2-e545d2c-624

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.
Files changed (231) hide show
  1. package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.dbg.json +1 -1
  2. package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.json +29 -0
  3. package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +1 -1
  4. package/artifacts/contracts/components/Distribution.sol/Distribution.json +33 -102
  5. package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.dbg.json +1 -1
  6. package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.json +29 -0
  7. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
  8. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
  9. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +1 -1
  10. package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
  11. package/artifacts/contracts/components/Pool.sol/Pool.json +33 -130
  12. package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
  13. package/artifacts/contracts/components/Product.sol/Product.json +33 -113
  14. package/artifacts/contracts/experiment/cloning/Cloner.sol/Cloner.dbg.json +1 -1
  15. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock1.dbg.json +1 -1
  16. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock2.dbg.json +1 -1
  17. package/artifacts/contracts/experiment/errors/Require.sol/Require.dbg.json +1 -1
  18. package/artifacts/contracts/experiment/errors/Revert.sol/Revert.dbg.json +1 -1
  19. package/artifacts/contracts/experiment/inheritance/A.sol/A.dbg.json +1 -1
  20. package/artifacts/contracts/experiment/inheritance/A.sol/AShared.dbg.json +1 -1
  21. package/artifacts/contracts/experiment/inheritance/B.sol/B.dbg.json +1 -1
  22. package/artifacts/contracts/experiment/inheritance/C.sol/C.dbg.json +1 -1
  23. package/artifacts/contracts/experiment/inheritance/IA.sol/IA.dbg.json +1 -1
  24. package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.dbg.json +1 -1
  25. package/artifacts/contracts/experiment/inheritance/IB.sol/IB.dbg.json +1 -1
  26. package/artifacts/contracts/experiment/inheritance/IC.sol/IC.dbg.json +1 -1
  27. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.dbg.json +1 -1
  28. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.dbg.json +1 -1
  29. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.dbg.json +1 -1
  30. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.dbg.json +1 -1
  31. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.dbg.json +1 -1
  32. package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.dbg.json +1 -1
  33. package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.dbg.json +1 -1
  34. package/artifacts/contracts/instance/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.dbg.json +4 -0
  35. package/artifacts/contracts/instance/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.json +1206 -0
  36. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.dbg.json +1 -1
  37. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.json +45 -32
  38. package/artifacts/contracts/instance/Cloneable.sol/Cloneable.dbg.json +1 -1
  39. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  40. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +116 -0
  41. package/artifacts/contracts/instance/IInstanceBase.sol/IInstanceBase.dbg.json +4 -0
  42. package/artifacts/contracts/instance/IInstanceBase.sol/IInstanceBase.json +448 -0
  43. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
  44. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +99 -14
  45. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  46. package/artifacts/contracts/instance/Instance.sol/Instance.json +79 -665
  47. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +1 -1
  48. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +244 -114
  49. package/artifacts/contracts/instance/InstanceBase.sol/InstanceBase.dbg.json +4 -0
  50. package/artifacts/contracts/instance/InstanceBase.sol/InstanceBase.json +763 -0
  51. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
  52. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +2 -2
  53. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
  54. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +166 -173
  55. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
  56. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +26 -78
  57. package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.dbg.json +1 -1
  58. package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.json +15 -2
  59. package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.dbg.json +1 -1
  60. package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.json +24 -32
  61. package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.dbg.json +1 -1
  62. package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
  63. package/artifacts/contracts/instance/base/ILifecycle.sol/ILifecycle.dbg.json +1 -1
  64. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
  65. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json +1 -1
  66. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +1 -1
  67. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.json +59 -16
  68. package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
  69. package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +1 -1
  70. package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +1 -1
  71. package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +1 -1
  72. package/artifacts/contracts/instance/module/ISetup.sol/ISetup.dbg.json +1 -1
  73. package/artifacts/contracts/instance/module/ITreasury.sol/ITreasury.dbg.json +1 -1
  74. package/artifacts/contracts/instance/service/BundleService.sol/BundleService.dbg.json +4 -0
  75. package/artifacts/contracts/instance/service/BundleService.sol/BundleService.json +1031 -0
  76. package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.dbg.json +4 -0
  77. package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.json +436 -0
  78. package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.dbg.json +1 -1
  79. package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.json +39 -52
  80. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +1 -1
  81. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +49 -72
  82. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
  83. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.json +13 -37
  84. package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.dbg.json +4 -0
  85. package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.json +720 -0
  86. package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.dbg.json +1 -1
  87. package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.json +13 -13
  88. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +1 -1
  89. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.json +13 -13
  90. package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.dbg.json +4 -0
  91. package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.json +771 -0
  92. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +1 -1
  93. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +12 -241
  94. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +1 -1
  95. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +17 -241
  96. package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.dbg.json +4 -0
  97. package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.json +1156 -0
  98. package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +4 -0
  99. package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.json +492 -0
  100. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +1 -1
  101. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +32 -354
  102. package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
  103. package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.json +13 -57
  104. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +1 -1
  105. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +40 -410
  106. package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.dbg.json +1 -1
  107. package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.json +13 -81
  108. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  109. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +2 -2
  110. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  111. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +132 -133
  112. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
  113. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +94 -65
  114. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
  115. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  116. package/artifacts/contracts/registry/Registry.sol/Registry.json +145 -227
  117. package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.dbg.json +4 -0
  118. package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.json +285 -0
  119. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
  120. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +30 -128
  121. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
  122. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +38 -104
  123. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.dbg.json +4 -0
  124. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.json +530 -0
  125. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
  126. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +14 -27
  127. package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.dbg.json +1 -1
  128. package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +1 -1
  129. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
  130. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  131. package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
  132. package/artifacts/contracts/shared/IService.sol/IService.json +13 -13
  133. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +1 -1
  134. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
  135. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +2 -2
  136. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +1 -1
  137. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +2 -2
  138. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  139. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +2 -2
  140. package/artifacts/contracts/shared/RegisterableUpgradable.sol/RegisterableUpgradable.dbg.json +1 -1
  141. package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
  142. package/artifacts/contracts/shared/Service.sol/Service.json +13 -13
  143. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
  144. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
  145. package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +1 -1
  146. package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json +1 -1
  147. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json +1 -1
  148. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +2 -2
  149. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +1 -1
  150. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.json +2 -2
  151. package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +1 -1
  152. package/artifacts/contracts/test/TestService.sol/TestService.json +31 -31
  153. package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json +1 -1
  154. package/artifacts/contracts/test/TestVersion.sol/TestVersion.dbg.json +1 -1
  155. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json +1 -1
  156. package/artifacts/contracts/test/Usdc.sol/USDC.dbg.json +1 -1
  157. package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.dbg.json +1 -1
  158. package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
  159. package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +1 -1
  160. package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.dbg.json +1 -1
  161. package/artifacts/contracts/types/Fee.sol/FeeLib.dbg.json +1 -1
  162. package/artifacts/contracts/types/Key32.sol/Key32Lib.dbg.json +1 -1
  163. package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +1 -1
  164. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
  165. package/artifacts/contracts/types/NumberId.sol/NumberIdLib.dbg.json +1 -1
  166. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
  167. package/artifacts/contracts/types/Referral.sol/ReferralLib.dbg.json +1 -1
  168. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.dbg.json +1 -1
  169. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.dbg.json +1 -1
  170. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.json +2 -2
  171. package/artifacts/contracts/types/StateId.sol/StateIdLib.dbg.json +1 -1
  172. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json +1 -1
  173. package/artifacts/contracts/types/UFixed.sol/MathLib.dbg.json +1 -1
  174. package/artifacts/contracts/types/UFixed.sol/UFixedLib.dbg.json +1 -1
  175. package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +1 -1
  176. package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +1 -1
  177. package/contracts/components/BaseComponent.sol +35 -8
  178. package/contracts/components/Distribution.sol +2 -1
  179. package/contracts/components/IBaseComponent.sol +3 -0
  180. package/contracts/components/Pool.sol +11 -6
  181. package/contracts/components/Product.sol +22 -10
  182. package/contracts/instance/AccessManagerUpgradeableInitializeable.sol +23 -0
  183. package/contracts/instance/IInstance.sol +7 -1
  184. package/contracts/instance/IInstanceBase.sol +26 -0
  185. package/contracts/instance/IInstanceService.sol +10 -2
  186. package/contracts/instance/Instance.sol +32 -214
  187. package/contracts/instance/InstanceAccessManager.sol +93 -78
  188. package/contracts/instance/InstanceBase.sol +41 -0
  189. package/contracts/instance/InstanceService.sol +228 -115
  190. package/contracts/instance/InstanceServiceManager.sol +5 -8
  191. package/contracts/instance/ObjectManager.sol +7 -1
  192. package/contracts/instance/base/ComponentServiceBase.sol +29 -87
  193. package/contracts/instance/module/IAccess.sol +27 -17
  194. package/contracts/instance/service/BundleService.sol +294 -0
  195. package/contracts/instance/service/BundleServiceManager.sol +51 -0
  196. package/contracts/instance/service/ComponentOwnerService.sol +4 -6
  197. package/contracts/instance/service/DistributionService.sol +53 -21
  198. package/contracts/instance/service/DistributionServiceManager.sol +6 -9
  199. package/contracts/instance/service/IBundleService.sol +44 -0
  200. package/contracts/instance/service/IPolicyService.sol +94 -0
  201. package/contracts/instance/service/IPoolService.sol +2 -33
  202. package/contracts/instance/service/IProductService.sol +2 -72
  203. package/contracts/instance/service/PolicyService.sol +539 -0
  204. package/contracts/instance/service/PolicyServiceManager.sol +54 -0
  205. package/contracts/instance/service/PoolService.sol +65 -207
  206. package/contracts/instance/service/PoolServiceManager.sol +5 -8
  207. package/contracts/instance/service/ProductService.sol +100 -457
  208. package/contracts/registry/ChainNft.sol +1 -1
  209. package/contracts/registry/IRegistry.sol +26 -16
  210. package/contracts/registry/IRegistryService.sol +13 -5
  211. package/contracts/registry/Registry.sol +149 -201
  212. package/contracts/registry/RegistryAccessManager.sol +210 -0
  213. package/contracts/registry/RegistryService.sol +50 -88
  214. package/contracts/registry/RegistryServiceManager.sol +18 -36
  215. package/contracts/registry/ReleaseManager.sol +342 -0
  216. package/contracts/registry/TokenRegistry.sol +5 -6
  217. package/contracts/shared/IService.sol +2 -1
  218. package/contracts/shared/ProxyManager.sol +1 -1
  219. package/contracts/shared/Service.sol +10 -7
  220. package/contracts/test/TestService.sol +3 -2
  221. package/contracts/types/RoleId.sol +10 -10
  222. package/package.json +1 -1
  223. package/artifacts/contracts/instance/AccessManagedSimple.sol/AccessManagedSimple.dbg.json +0 -4
  224. package/artifacts/contracts/instance/AccessManagedSimple.sol/AccessManagedSimple.json +0 -101
  225. package/artifacts/contracts/instance/AccessManagerSimple.sol/AccessManagerSimple.dbg.json +0 -4
  226. package/artifacts/contracts/instance/AccessManagerSimple.sol/AccessManagerSimple.json +0 -1132
  227. package/artifacts/contracts/instance/IAccessManagerSimple.sol/IAccessManagerSimple.dbg.json +0 -4
  228. package/artifacts/contracts/instance/IAccessManagerSimple.sol/IAccessManagerSimple.json +0 -1082
  229. package/contracts/instance/AccessManagedSimple.sol +0 -115
  230. package/contracts/instance/AccessManagerSimple.sol +0 -692
  231. 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, INSTANCE, PRODUCT, POLICY} from "../../types/ObjectType.sol";
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,101 @@ contract ProductService is ComponentServiceBase, IProductService {
60
56
  initializer
61
57
  virtual override
62
58
  {
63
- address initialOwner = address(0);
64
- (_registryAddress, initialOwner) = abi.decode(data, (address, address));
59
+ address registryAddress;
60
+ address initialOwner;
61
+ (registryAddress, initialOwner) = abi.decode(data, (address, address));
65
62
 
66
- _initializeService(_registryAddress, owner);
63
+ _initializeService(registryAddress, owner);
67
64
 
68
- _poolService = IPoolService(_registry.getServiceAddress(POOL_SERVICE_NAME, getMajorVersion()));
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 getName() public pure override(IService, Service) returns(string memory name) {
76
- return NAME;
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
+ NftId instanceNftId = info.parentNftId;
87
+ IInstance instance = _getInstance(instanceNftId);
88
+ bool hasRole = getInstanceService().hasRole(
89
+ productOwner,
90
+ PRODUCT_OWNER_ROLE(),
91
+ address(instance));
92
+
93
+ if(!hasRole) {
94
+ revert ExpectedRoleMissing(PRODUCT_OWNER_ROLE(), productOwner);
95
+ }
96
+
97
+ productNftId = info.nftId;
98
+ string memory productName;
99
+ ISetup.ProductSetupInfo memory initialSetup;
100
+ (productName, initialSetup) = _decodeAndVerifyProductData(data);
101
+
102
+ instance.createProductSetup(productNftId, initialSetup);
103
+
104
+ getInstanceService().createTarget(instanceNftId, productAddress, productName);
105
+
106
+ product.linkToRegisteredNftId();
77
107
  }
78
108
 
79
- function _finalizeComponentRegistration(NftId componentNftId, bytes memory initialObjData, IInstance instance) internal override {
80
- ISetup.ProductSetupInfo memory initialSetup = abi.decode(
81
- initialObjData,
82
- (ISetup.ProductSetupInfo)
109
+ function _decodeAndVerifyProductData(bytes memory data)
110
+ internal
111
+ returns(string memory name, ISetup.ProductSetupInfo memory setup)
112
+ {
113
+ (name, setup) = abi.decode(
114
+ data,
115
+ (string, ISetup.ProductSetupInfo)
83
116
  );
84
- instance.createProductSetup(componentNftId, initialSetup);
117
+
118
+ // TODO add checks
119
+ // if(wallet == address(0)) {
120
+ // revert WalletIsZero();
121
+ // }
122
+
123
+ // IRegistry.ObjectInfo memory tokenInfo = _registry.getObjectInfo(address(info.token));
124
+
125
+ // if(tokenInfo.objectType != TOKEN()) {
126
+ // revert InvalidToken();
127
+ // }
128
+
129
+ // IRegistry.ObjectInfo memory poolInfo = _registry.getObjectInfo(info.poolNftId);
130
+
131
+ // if(poolInfo.objectType != POOL()) {
132
+ // revert InvalidPool();
133
+ // }
134
+
135
+ // if(poolInfo.parentNftId != instanceNftId) {
136
+ // revert InvalidPoolsInstance();
137
+ // }
138
+ // // TODO pool have the same token
139
+ // //ITreasury.PoolSetup memory poolSetup = instance.getPoolSetup(info.poolNftId);
140
+ // //require(tokenInfo.objectAddress == address(poolSetup.token), "ERROR:COS-018:PRODUCT_POOL_TOKEN_MISMATCH");
141
+ // // TODO pool is not linked
142
+
143
+ // IRegistry.ObjectInfo memory distributionInfo = _registry.getObjectInfo(info.distributionNftId);
144
+
145
+ // if(distributionInfo.objectType != DISTRIBUTION()) {
146
+ // revert InvalidDistribution();
147
+ // }
148
+
149
+ // if(distributionInfo.parentNftId != instanceNftId) {
150
+ // revert InvalidDistributionsInstance();
151
+ // }
152
+ // // TODO distribution have the same token
153
+ // // TODO distribution is not linked
85
154
  }
86
155
 
87
156
  function setFees(
@@ -89,13 +158,18 @@ contract ProductService is ComponentServiceBase, IProductService {
89
158
  Fee memory processingFee
90
159
  )
91
160
  external
92
- override
93
161
  {
94
- (IRegistry.ObjectInfo memory productInfo, IInstance instance) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
162
+ // TODO check args
163
+
164
+ (
165
+ IRegistry.ObjectInfo memory productInfo,
166
+ IInstance instance
167
+ ) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
168
+
95
169
  InstanceReader instanceReader = instance.getInstanceReader();
96
170
  NftId productNftId = productInfo.nftId;
97
-
98
171
  ISetup.ProductSetupInfo memory productSetupInfo = instanceReader.getProductSetupInfo(productNftId);
172
+
99
173
  productSetupInfo.productFee = productFee;
100
174
  productSetupInfo.processingFee = processingFee;
101
175
 
@@ -106,7 +180,10 @@ contract ProductService is ComponentServiceBase, IProductService {
106
180
  RiskId riskId,
107
181
  bytes memory data
108
182
  ) external override {
109
- (IRegistry.ObjectInfo memory productInfo, IInstance instance) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
183
+ (
184
+ IRegistry.ObjectInfo memory productInfo,
185
+ IInstance instance
186
+ ) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
110
187
  NftId productNftId = productInfo.nftId;
111
188
  IRisk.RiskInfo memory riskInfo = IRisk.RiskInfo(productNftId, data);
112
189
  instance.createRisk(
@@ -133,438 +210,4 @@ contract ProductService is ComponentServiceBase, IProductService {
133
210
  (, IInstance instance) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
134
211
  instance.updateRiskState(riskId, state);
135
212
  }
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
213
  }
@@ -59,7 +59,7 @@ contract ChainNft is ERC721Enumerable {
59
59
  }
60
60
 
61
61
  _chainIdMultiplier = 10 ** _chainIdDigits;
62
- _idNext = 4;
62
+ _idNext = 3;
63
63
  }
64
64
 
65
65
  /**