@etherisc/gif-next 0.0.2-f752d2a-551 → 0.0.2-f7b8c9f-436

Sign up to get free protection for your applications and to get access to all the features.
Files changed (282) hide show
  1. package/README.md +71 -0
  2. package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.dbg.json +1 -1
  3. package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.json +166 -39
  4. package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +4 -0
  5. package/artifacts/contracts/components/Distribution.sol/Distribution.json +557 -0
  6. package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.dbg.json +1 -1
  7. package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.json +119 -39
  8. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +4 -0
  9. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.json +177 -0
  10. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
  11. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.json +108 -156
  12. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +1 -1
  13. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.json +67 -139
  14. package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
  15. package/artifacts/contracts/components/Pool.sol/Pool.json +417 -88
  16. package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
  17. package/artifacts/contracts/components/Product.sol/Product.json +360 -51
  18. package/artifacts/contracts/experiment/errors/Require.sol/Require.dbg.json +1 -1
  19. package/artifacts/contracts/experiment/errors/Revert.sol/Revert.dbg.json +1 -1
  20. package/artifacts/contracts/experiment/inheritance/A.sol/A.dbg.json +1 -1
  21. package/artifacts/contracts/experiment/inheritance/A.sol/AShared.dbg.json +1 -1
  22. package/artifacts/contracts/experiment/inheritance/B.sol/B.dbg.json +1 -1
  23. package/artifacts/contracts/experiment/inheritance/C.sol/C.dbg.json +1 -1
  24. package/artifacts/contracts/experiment/inheritance/IA.sol/IA.dbg.json +1 -1
  25. package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.dbg.json +1 -1
  26. package/artifacts/contracts/experiment/inheritance/IB.sol/IB.dbg.json +1 -1
  27. package/artifacts/contracts/experiment/inheritance/IC.sol/IC.dbg.json +1 -1
  28. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.dbg.json +1 -1
  29. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.json +2 -2
  30. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.dbg.json +1 -1
  31. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.dbg.json +1 -1
  32. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.dbg.json +1 -1
  33. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.dbg.json +1 -1
  34. package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.dbg.json +1 -1
  35. package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.dbg.json +1 -1
  36. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  37. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +913 -530
  38. package/artifacts/contracts/instance/IInstanceLinked.sol/IInstanceLinked.dbg.json +1 -1
  39. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  40. package/artifacts/contracts/instance/Instance.sol/Instance.json +1043 -556
  41. package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.dbg.json +1 -1
  42. package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.json +224 -43
  43. package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.dbg.json +1 -1
  44. package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.json +51 -1
  45. package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
  46. package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.json +49 -0
  47. package/artifacts/contracts/instance/base/ILifecycle.sol/ILifecycle.dbg.json +1 -1
  48. package/artifacts/contracts/instance/base/IService.sol/IService.dbg.json +1 -1
  49. package/artifacts/contracts/instance/base/IService.sol/IService.json +174 -53
  50. package/artifacts/contracts/instance/base/InstanceBase.sol/InstanceBase.dbg.json +1 -1
  51. package/artifacts/contracts/instance/base/InstanceBase.sol/InstanceBase.json +263 -45
  52. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
  53. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.json +41 -23
  54. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json +1 -1
  55. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.json +4 -4
  56. package/artifacts/contracts/instance/base/ModuleBase.sol/ModuleBase.dbg.json +1 -1
  57. package/artifacts/contracts/instance/base/ServiceBase.sol/ServiceBase.dbg.json +1 -1
  58. package/artifacts/contracts/instance/base/ServiceBase.sol/ServiceBase.json +220 -52
  59. package/artifacts/contracts/instance/module/access/Access.sol/AccessModule.dbg.json +1 -1
  60. package/artifacts/contracts/instance/module/access/IAccess.sol/IAccess.dbg.json +1 -1
  61. package/artifacts/contracts/instance/module/access/IAccess.sol/IAccessModule.dbg.json +1 -1
  62. package/artifacts/contracts/instance/module/bundle/BundleModule.sol/BundleModule.dbg.json +1 -1
  63. package/artifacts/contracts/instance/module/bundle/BundleModule.sol/BundleModule.json +55 -54
  64. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundle.dbg.json +1 -1
  65. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundleModule.dbg.json +1 -1
  66. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundleModule.json +56 -55
  67. package/artifacts/contracts/instance/module/component/ComponentModule.sol/ComponentModule.dbg.json +1 -1
  68. package/artifacts/contracts/instance/module/component/ComponentModule.sol/ComponentModule.json +22 -93
  69. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponent.dbg.json +1 -1
  70. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponentModule.dbg.json +1 -1
  71. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponentModule.json +22 -93
  72. package/artifacts/contracts/instance/module/distribution/DistributionModule.sol/DistributionModule.dbg.json +4 -0
  73. package/artifacts/contracts/instance/module/distribution/DistributionModule.sol/DistributionModule.json +10 -0
  74. package/artifacts/contracts/instance/module/distribution/IDistribution.sol/IDistribution.dbg.json +4 -0
  75. package/artifacts/contracts/instance/module/{compensation/ICompensation.sol/ICompensation.json → distribution/IDistribution.sol/IDistribution.json} +2 -2
  76. package/artifacts/contracts/instance/module/distribution/IDistribution.sol/IDistributionModule.dbg.json +4 -0
  77. package/artifacts/contracts/instance/module/{compensation/ICompensation.sol/ICompensationModule.json → distribution/IDistribution.sol/IDistributionModule.json} +2 -2
  78. package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicy.dbg.json +1 -1
  79. package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicyModule.dbg.json +1 -1
  80. package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicyModule.json +61 -51
  81. package/artifacts/contracts/instance/module/policy/PolicyModule.sol/PolicyModule.dbg.json +1 -1
  82. package/artifacts/contracts/instance/module/policy/PolicyModule.sol/PolicyModule.json +61 -51
  83. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPool.dbg.json +1 -1
  84. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPoolModule.dbg.json +1 -1
  85. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPoolModule.json +29 -14
  86. package/artifacts/contracts/instance/module/pool/PoolModule.sol/PoolModule.dbg.json +1 -1
  87. package/artifacts/contracts/instance/module/pool/PoolModule.sol/PoolModule.json +28 -13
  88. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRisk.dbg.json +1 -1
  89. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRiskModule.dbg.json +1 -1
  90. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRiskModule.json +104 -1
  91. package/artifacts/contracts/instance/module/risk/RiskModule.sol/RiskModule.dbg.json +1 -1
  92. package/artifacts/contracts/instance/module/risk/RiskModule.sol/RiskModule.json +126 -5
  93. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasury.dbg.json +1 -1
  94. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasuryModule.dbg.json +1 -1
  95. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasuryModule.json +326 -221
  96. package/artifacts/contracts/instance/module/treasury/TokenHandler.sol/TokenHandler.dbg.json +1 -1
  97. package/artifacts/contracts/instance/module/treasury/TokenHandler.sol/TokenHandler.json +2 -2
  98. package/artifacts/contracts/instance/module/treasury/TreasuryModule.sol/TreasuryModule.dbg.json +1 -1
  99. package/artifacts/contracts/instance/module/treasury/TreasuryModule.sol/TreasuryModule.json +326 -221
  100. package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.dbg.json +1 -1
  101. package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.json +350 -79
  102. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +4 -0
  103. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +630 -0
  104. package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.dbg.json +1 -1
  105. package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.json +176 -74
  106. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +4 -0
  107. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.json +446 -0
  108. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +1 -1
  109. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +235 -50
  110. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +1 -1
  111. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +325 -51
  112. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +1 -1
  113. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +335 -53
  114. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +1 -1
  115. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +466 -71
  116. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  117. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +141 -12
  118. package/artifacts/contracts/registry/IChainNft.sol/IChainNft.dbg.json +1 -1
  119. package/artifacts/contracts/registry/IChainNft.sol/IChainNft.json +5 -0
  120. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  121. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +298 -39
  122. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +4 -0
  123. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +745 -0
  124. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +4 -0
  125. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.json +34 -0
  126. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  127. package/artifacts/contracts/registry/Registry.sol/Registry.json +489 -120
  128. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +4 -0
  129. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +997 -0
  130. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +4 -0
  131. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +468 -0
  132. package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.dbg.json +4 -0
  133. package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.json +107 -0
  134. package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +1 -1
  135. package/artifacts/contracts/shared/ERC165.sol/ERC165.json +2 -2
  136. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +4 -0
  137. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.json +127 -0
  138. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  139. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +117 -37
  140. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +1 -1
  141. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.json +55 -14
  142. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +4 -0
  143. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +158 -0
  144. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +4 -0
  145. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +349 -0
  146. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  147. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +190 -37
  148. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +4 -0
  149. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +129 -0
  150. package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +1 -1
  151. package/artifacts/contracts/shared/Versionable.sol/Versionable.json +78 -14
  152. package/artifacts/contracts/test/TestDistribution.sol/TestDistribution.dbg.json +4 -0
  153. package/artifacts/contracts/test/TestDistribution.sol/TestDistribution.json +557 -0
  154. package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json +1 -1
  155. package/artifacts/contracts/test/TestFee.sol/TestFee.json +2 -2
  156. package/artifacts/contracts/test/TestPool.sol/TestPool.dbg.json +1 -1
  157. package/artifacts/contracts/test/TestPool.sol/TestPool.json +417 -88
  158. package/artifacts/contracts/test/TestProduct.sol/TestProduct.dbg.json +1 -1
  159. package/artifacts/contracts/test/TestProduct.sol/TestProduct.json +407 -56
  160. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json +1 -1
  161. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +204 -36
  162. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +1 -1
  163. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.json +2 -2
  164. package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +1 -1
  165. package/artifacts/contracts/test/TestService.sol/TestService.json +267 -62
  166. package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json +1 -1
  167. package/artifacts/contracts/test/TestVersion.sol/TestVersion.dbg.json +1 -1
  168. package/artifacts/contracts/test/TestVersion.sol/TestVersion.json +2 -2
  169. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json +1 -1
  170. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.json +89 -25
  171. package/artifacts/contracts/test/Usdc.sol/USDC.dbg.json +1 -1
  172. package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.dbg.json +1 -1
  173. package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
  174. package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +1 -1
  175. package/artifacts/contracts/types/Fee.sol/FeeLib.dbg.json +1 -1
  176. package/artifacts/contracts/types/Fee.sol/FeeLib.json +50 -11
  177. package/artifacts/contracts/types/Key32.sol/Key32Lib.dbg.json +1 -1
  178. package/artifacts/contracts/types/Key32.sol/Key32Lib.json +2 -2
  179. package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +1 -1
  180. package/artifacts/contracts/types/NftId.sol/NftIdLib.json +2 -2
  181. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
  182. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.json +2 -2
  183. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
  184. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.json +2 -2
  185. package/artifacts/contracts/types/ReferralId.sol/ReferralIdLib.dbg.json +4 -0
  186. package/artifacts/contracts/types/ReferralId.sol/ReferralIdLib.json +99 -0
  187. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.dbg.json +4 -0
  188. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.json +86 -0
  189. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.dbg.json +1 -1
  190. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.json +2 -2
  191. package/artifacts/contracts/types/StateId.sol/StateIdLib.dbg.json +1 -1
  192. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json +1 -1
  193. package/artifacts/contracts/types/UFixed.sol/UFixedMathLib.dbg.json +1 -1
  194. package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +1 -1
  195. package/artifacts/contracts/types/Version.sol/VersionLib.json +40 -2
  196. package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +1 -1
  197. package/artifacts/contracts/types/Version.sol/VersionPartLib.json +2 -2
  198. package/contracts/components/BaseComponent.sol +12 -21
  199. package/contracts/components/Distribution.sol +155 -0
  200. package/contracts/components/IBaseComponent.sol +2 -2
  201. package/contracts/components/IDistributionComponent.sol +46 -0
  202. package/contracts/components/IPoolComponent.sol +15 -8
  203. package/contracts/components/IProductComponent.sol +26 -8
  204. package/contracts/components/Pool.sol +99 -27
  205. package/contracts/components/Product.sol +204 -22
  206. package/contracts/instance/IInstance.sol +12 -10
  207. package/contracts/instance/Instance.sol +28 -9
  208. package/contracts/instance/base/ComponentServiceBase.sol +13 -6
  209. package/contracts/instance/base/IInstanceBase.sol +11 -2
  210. package/contracts/instance/base/IKeyValueStore.sol +4 -3
  211. package/contracts/instance/base/InstanceBase.sol +19 -10
  212. package/contracts/instance/base/KeyValueStore.sol +12 -7
  213. package/contracts/instance/base/Lifecycle.sol +15 -10
  214. package/contracts/instance/base/ModuleBase.sol +22 -17
  215. package/contracts/instance/base/ServiceBase.sol +20 -13
  216. package/contracts/instance/module/access/Access.sol +3 -3
  217. package/contracts/instance/module/bundle/BundleModule.sol +10 -12
  218. package/contracts/instance/module/bundle/IBundle.sol +6 -11
  219. package/contracts/instance/module/component/ComponentModule.sol +34 -58
  220. package/contracts/instance/module/component/IComponent.sol +7 -32
  221. package/contracts/instance/module/distribution/DistributionModule.sol +17 -0
  222. package/contracts/instance/module/distribution/IDistribution.sol +10 -0
  223. package/contracts/instance/module/policy/IPolicy.sol +13 -10
  224. package/contracts/instance/module/policy/PolicyModule.sol +35 -20
  225. package/contracts/instance/module/pool/IPoolModule.sol +4 -4
  226. package/contracts/instance/module/pool/PoolModule.sol +23 -15
  227. package/contracts/instance/module/risk/IRisk.sol +18 -2
  228. package/contracts/instance/module/risk/RiskModule.sol +56 -2
  229. package/contracts/instance/module/treasury/ITreasury.sol +32 -51
  230. package/contracts/instance/module/treasury/TokenHandler.sol +2 -2
  231. package/contracts/instance/module/treasury/TreasuryModule.sol +68 -89
  232. package/contracts/instance/service/ComponentOwnerService.sol +200 -95
  233. package/contracts/instance/service/DistributionService.sol +54 -0
  234. package/contracts/instance/service/IComponentOwnerService.sol +0 -2
  235. package/contracts/instance/service/IDistributionService.sol +12 -0
  236. package/contracts/instance/service/IPoolService.sol +7 -0
  237. package/contracts/instance/service/IProductService.sol +56 -7
  238. package/contracts/instance/service/PoolService.sol +49 -23
  239. package/contracts/instance/service/ProductService.sol +248 -92
  240. package/contracts/registry/ChainNft.sol +43 -15
  241. package/contracts/registry/IChainNft.sol +3 -2
  242. package/contracts/registry/IRegistry.sol +42 -26
  243. package/contracts/registry/IRegistryService.sol +29 -0
  244. package/contracts/registry/ITransferInterceptor.sol +6 -0
  245. package/contracts/registry/Registry.sol +384 -274
  246. package/contracts/registry/RegistryService.sol +368 -0
  247. package/contracts/registry/RegistryServiceManager.sol +43 -0
  248. package/contracts/shared/ContractDeployerLib.sol +72 -0
  249. package/contracts/shared/ERC165.sol +1 -1
  250. package/contracts/shared/INftOwnable.sol +22 -0
  251. package/contracts/shared/IRegisterable.sol +9 -16
  252. package/contracts/shared/IVersionable.sol +55 -11
  253. package/contracts/shared/NftOwnable.sol +136 -0
  254. package/contracts/shared/ProxyManager.sol +94 -0
  255. package/contracts/shared/Registerable.sol +62 -59
  256. package/contracts/shared/UpgradableProxyWithAdmin.sol +16 -0
  257. package/contracts/shared/Versionable.sol +112 -54
  258. package/contracts/test/TestDistribution.sol +22 -0
  259. package/contracts/test/TestPool.sol +7 -2
  260. package/contracts/test/TestProduct.sol +37 -7
  261. package/contracts/test/TestRegisterable.sol +5 -6
  262. package/contracts/test/TestService.sol +5 -11
  263. package/contracts/types/Fee.sol +8 -3
  264. package/contracts/types/ObjectType.sol +24 -8
  265. package/contracts/types/ReferralId.sol +48 -0
  266. package/contracts/types/RiskId.sol +43 -0
  267. package/contracts/types/RoleId.sol +2 -2
  268. package/contracts/types/Version.sol +9 -0
  269. package/package.json +1 -1
  270. package/artifacts/contracts/instance/module/compensation/CompensationModule.sol/CompensationModule.dbg.json +0 -4
  271. package/artifacts/contracts/instance/module/compensation/CompensationModule.sol/CompensationModule.json +0 -10
  272. package/artifacts/contracts/instance/module/compensation/ICompensation.sol/ICompensation.dbg.json +0 -4
  273. package/artifacts/contracts/instance/module/compensation/ICompensation.sol/ICompensationModule.dbg.json +0 -4
  274. package/artifacts/contracts/registry/IRegistryLinked.sol/IRegistryLinked.dbg.json +0 -4
  275. package/artifacts/contracts/registry/IRegistryLinked.sol/IRegistryLinked.json +0 -24
  276. package/artifacts/contracts/shared/IOwnable.sol/IOwnable.dbg.json +0 -4
  277. package/artifacts/contracts/shared/IOwnable.sol/IOwnable.json +0 -24
  278. package/contracts/experiment/statemachine/README.md +0 -112
  279. package/contracts/instance/module/compensation/CompensationModule.sol +0 -8
  280. package/contracts/instance/module/compensation/ICompensation.sol +0 -10
  281. package/contracts/registry/IRegistryLinked.sol +0 -8
  282. package/contracts/shared/IOwnable.sol +0 -6
@@ -1,5 +1,5 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
- pragma solidity ^0.8.19;
2
+ pragma solidity ^0.8.20;
3
3
 
4
4
  import {ObjectType, POOL} from "../types/ObjectType.sol";
5
5
  import {IProductService} from "../instance/service/IProductService.sol";
@@ -10,11 +10,22 @@ import {UFixed} from "../types/UFixed.sol";
10
10
  import {IPoolComponent} from "./IPoolComponent.sol";
11
11
  import {BaseComponent} from "./BaseComponent.sol";
12
12
 
13
+ import {IRegistry} from "../registry/IRegistry.sol";
14
+ import {IPool} from "../instance/module/pool/IPoolModule.sol";
15
+ import {ITreasury} from "../instance/module/treasury/ITreasury.sol";
16
+
17
+ import {IRegisterable} from "../shared/IRegisterable.sol";
18
+ import {Registerable} from "../shared/Registerable.sol";
19
+
13
20
  contract Pool is BaseComponent, IPoolComponent {
14
21
 
15
22
  bool internal _isVerifying;
16
23
  UFixed internal _collateralizationLevel;
17
24
 
25
+ Fee internal _initialPoolFee;
26
+ Fee internal _initialStakingFee;
27
+ Fee internal _initialPerformanceFee;
28
+
18
29
  // may be used to interact with instance by derived contracts
19
30
  IPoolService internal _poolService;
20
31
 
@@ -40,20 +51,31 @@ contract Pool is BaseComponent, IPoolComponent {
40
51
  NftId instanceNftId,
41
52
  // TODO refactor into tokenNftId
42
53
  address token,
54
+ bool isInterceptor,
43
55
  bool verifying,
44
- UFixed collateralizationLevel
56
+ UFixed collateralizationLevel,
57
+ Fee memory poolFee,
58
+ Fee memory stakingFee,
59
+ Fee memory performanceFee,
60
+ address initialOwner
45
61
  )
46
- BaseComponent(registry, instanceNftId, token)
62
+ BaseComponent(registry, instanceNftId, token, POOL(), isInterceptor, initialOwner)
47
63
  {
48
64
  _isVerifying = verifying;
49
65
  // TODO add validation
50
66
  _collateralizationLevel = collateralizationLevel;
67
+ _initialPoolFee = poolFee;
68
+ _initialStakingFee = stakingFee;
69
+ _initialPerformanceFee = performanceFee;
51
70
 
52
71
  _poolService = _instance.getPoolService();
53
72
  _productService = _instance.getProductService();
73
+
74
+ _registerInterface(type(IPoolComponent).interfaceId);
54
75
  }
55
76
 
56
77
  function createBundle(
78
+ Fee memory fee,
57
79
  uint256 initialAmount,
58
80
  uint256 lifetime,
59
81
  bytes memory filter
@@ -65,6 +87,7 @@ contract Pool is BaseComponent, IPoolComponent {
65
87
  address owner = msg.sender;
66
88
  bundleNftId = _poolService.createBundle(
67
89
  owner,
90
+ fee,
68
91
  initialAmount,
69
92
  lifetime,
70
93
  filter
@@ -115,6 +138,77 @@ contract Pool is BaseComponent, IPoolComponent {
115
138
  return _collateralizationLevel;
116
139
  }
117
140
 
141
+ function setFees(
142
+ Fee memory poolFee,
143
+ Fee memory stakingFee,
144
+ Fee memory performanceFee
145
+ )
146
+ external
147
+ onlyOwner
148
+ override
149
+ {
150
+ _poolService.setFees(poolFee, stakingFee, performanceFee);
151
+ }
152
+
153
+ function setBundleFee(
154
+ NftId bundleNftId,
155
+ Fee memory fee
156
+ )
157
+ external
158
+ override
159
+ // TODO add onlyBundleOwner
160
+ {
161
+ _poolService.setBundleFee(bundleNftId, fee);
162
+ }
163
+ // TODO delete, call instance instead
164
+ function getFees()
165
+ external
166
+ view
167
+ override
168
+ returns (Fee memory, Fee memory, Fee memory)
169
+ {
170
+ NftId productNftId = _instance.getProductNftId(getNftId());
171
+ //if (_instance.hasTreasuryInfo(productNftId)) {
172
+ ITreasury.TreasuryInfo memory info = _instance.getTreasuryInfo(productNftId);
173
+ return (info.poolFee, info.stakingFee, info.performanceFee);
174
+ //} else {
175
+ // return (_initialPoolFee, _initialStakingFee, _initialPerformanceFee);
176
+ //}
177
+ }
178
+
179
+ // from IRegisterable
180
+
181
+ // TODO used only once, occupies space
182
+ // TODO do not use super
183
+ function getInitialInfo()
184
+ public
185
+ view
186
+ override (IRegisterable, Registerable)
187
+ returns (IRegistry.ObjectInfo memory, bytes memory)
188
+ {
189
+ (
190
+ IRegistry.ObjectInfo memory info,
191
+ bytes memory data
192
+ ) = super.getInitialInfo();
193
+
194
+ return (
195
+ info,
196
+ abi.encode(
197
+ IPool.PoolInfo(
198
+ _isVerifying,
199
+ _collateralizationLevel
200
+ ),
201
+ _wallet,
202
+ _token,
203
+ _initialPoolFee,
204
+ _initialStakingFee,
205
+ _initialPerformanceFee
206
+ )
207
+ );
208
+ }
209
+
210
+ // Internals
211
+
118
212
  function _underwrite(
119
213
  NftId policyNftId,
120
214
  bytes memory policyData,
@@ -133,6 +227,7 @@ contract Pool is BaseComponent, IPoolComponent {
133
227
 
134
228
  function _createBundle(
135
229
  address bundleOwner,
230
+ Fee memory fee,
136
231
  uint256 amount,
137
232
  uint256 lifetime,
138
233
  bytes calldata filter
@@ -142,33 +237,10 @@ contract Pool is BaseComponent, IPoolComponent {
142
237
  {
143
238
  bundleNftId = _poolService.createBundle(
144
239
  bundleOwner,
240
+ fee,
145
241
  amount,
146
242
  lifetime,
147
243
  filter
148
244
  );
149
245
  }
150
-
151
- // from pool component
152
- function getStakingFee()
153
- external
154
- view
155
- override
156
- returns (Fee memory stakingFee)
157
- {
158
- return _instance.getPoolSetup(getNftId()).stakingFee;
159
- }
160
-
161
- function getPerformanceFee()
162
- external
163
- view
164
- override
165
- returns (Fee memory performanceFee)
166
- {
167
- return _instance.getPoolSetup(getNftId()).performanceFee;
168
- }
169
-
170
- // from registerable
171
- function getType() public pure override returns (ObjectType) {
172
- return POOL();
173
- }
174
246
  }
@@ -1,42 +1,157 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
2
  pragma solidity ^0.8.19;
3
3
 
4
+ import {IERC20Metadata} from "@openzeppelin5/contracts/token/ERC20/extensions/IERC20Metadata.sol";
5
+
6
+ import {IRisk} from "../instance/module/risk/IRisk.sol";
7
+ import {ITreasury} from "../instance/module/treasury/ITreasury.sol";
4
8
  import {IProductService} from "../instance/service/IProductService.sol";
5
9
  import {IProductComponent} from "./IProductComponent.sol";
6
- import {NftId} from "../types/NftId.sol";
10
+ import {NftId, zeroNftId} from "../types/NftId.sol";
7
11
  import {ObjectType, PRODUCT} from "../types/ObjectType.sol";
12
+ import {ReferralId} from "../types/ReferralId.sol";
13
+ import {RiskId, RiskIdLib} from "../types/RiskId.sol";
14
+ import {StateId} from "../types/StateId.sol";
8
15
  import {Timestamp} from "../types/Timestamp.sol";
9
- import {Fee} from "../types/Fee.sol";
16
+ import {Fee, FeeLib} from "../types/Fee.sol";
10
17
  import {BaseComponent} from "./BaseComponent.sol";
11
18
 
19
+ import {IRegistry} from "../registry/IRegistry.sol";
20
+ import {IRegisterable} from "../shared/IRegisterable.sol";
21
+ import {Registerable} from "../shared/Registerable.sol";
22
+
23
+ import {IPool} from "../instance/module/pool/IPoolModule.sol";
24
+ import {Pool} from "../components/Pool.sol";
25
+
12
26
  contract Product is BaseComponent, IProductComponent {
13
- IProductService private _productService;
14
- address private _pool;
27
+ IProductService internal _productService;
28
+ Pool internal _pool;
29
+ address internal _distribution;
30
+ Fee internal _initialProductFee;
31
+ Fee internal _initialProcessingFee;
32
+
33
+ NftId internal _poolNftId;
34
+ NftId internal _distributionNftId;
15
35
 
16
36
  constructor(
17
37
  address registry,
18
38
  NftId instanceNftid,
19
39
  address token,
20
- address pool
21
- ) BaseComponent(registry, instanceNftid, token) {
40
+ bool isInterceptor,
41
+ address pool,
42
+ address distribution,
43
+ Fee memory productFee,
44
+ Fee memory processingFee,
45
+ address initialOwner
46
+ ) BaseComponent(registry, instanceNftid, token, PRODUCT(), isInterceptor, initialOwner) {
22
47
  // TODO add validation
23
48
  _productService = _instance.getProductService();
24
- _pool = pool;
49
+ _pool = Pool(pool);
50
+ _distribution = distribution;
51
+ _initialProductFee = productFee;
52
+ _initialProcessingFee = processingFee;
53
+
54
+ _poolNftId = getRegistry().getNftId(address(_pool));
55
+ _distributionNftId = getRegistry().getNftId(_distribution);
56
+
57
+ _registerInterface(type(IProductComponent).interfaceId);
58
+ }
59
+
60
+
61
+ function calculatePremium(
62
+ uint256 sumInsuredAmount,
63
+ RiskId riskId,
64
+ uint256 lifetime,
65
+ bytes memory applicationData,
66
+ ReferralId referralId,
67
+ NftId bundleNftId
68
+ )
69
+ external
70
+ view
71
+ override
72
+ returns (uint256 premiumAmount)
73
+ {
74
+ (premiumAmount,,,,) = _productService.calculatePremium(
75
+ riskId,
76
+ sumInsuredAmount,
77
+ lifetime,
78
+ applicationData,
79
+ bundleNftId,
80
+ referralId
81
+ );
82
+ }
83
+
84
+
85
+ function calculateNetPremium(
86
+ uint256 sumInsuredAmount,
87
+ RiskId riskId,
88
+ uint256 lifetime,
89
+ bytes memory applicationData
90
+ )
91
+ external
92
+ view
93
+ virtual override
94
+ returns (uint256 netPremiumAmount)
95
+ {
96
+ // default 10% of sum insured
97
+ return sumInsuredAmount / 10;
98
+ }
99
+
100
+ function _toRiskId(string memory riskName) internal pure returns (RiskId riskId) {
101
+ return RiskIdLib.toRiskId(riskName);
102
+ }
103
+
104
+ function _createRisk(
105
+ RiskId id,
106
+ bytes memory data
107
+ ) internal {
108
+ _productService.createRisk(
109
+ id,
110
+ data
111
+ );
112
+ }
113
+
114
+ function _setRiskInfo(
115
+ RiskId id,
116
+ IRisk.RiskInfo memory info
117
+ ) internal {
118
+ _productService.setRiskInfo(
119
+ id,
120
+ info
121
+ );
122
+ }
123
+
124
+ function _updateRiskState(
125
+ RiskId id,
126
+ StateId state
127
+ ) internal {
128
+ _productService.updateRiskState(
129
+ id,
130
+ state
131
+ );
132
+ }
133
+
134
+ function _getRiskInfo(RiskId id) internal view returns (IRisk.RiskInfo memory info) {
135
+ return _instance.getRiskInfo(id);
25
136
  }
26
137
 
27
138
  function _createApplication(
28
139
  address applicationOwner,
140
+ RiskId riskId,
29
141
  uint256 sumInsuredAmount,
30
- uint256 premiumAmount,
31
142
  uint256 lifetime,
32
- NftId bundleNftId
143
+ bytes memory applicationData,
144
+ NftId bundleNftId,
145
+ ReferralId referralId
33
146
  ) internal returns (NftId nftId) {
34
147
  nftId = _productService.createApplication(
35
148
  applicationOwner,
149
+ riskId,
36
150
  sumInsuredAmount,
37
- premiumAmount,
38
151
  lifetime,
39
- bundleNftId
152
+ applicationData,
153
+ bundleNftId,
154
+ referralId
40
155
  );
41
156
  }
42
157
 
@@ -76,29 +191,38 @@ contract Product is BaseComponent, IProductComponent {
76
191
  }
77
192
 
78
193
  function getPoolNftId() external view override returns (NftId poolNftId) {
79
- return _registry.getNftId(_pool);
194
+ return getRegistry().getNftId(address(_pool));
195
+ }
196
+
197
+ function getDistributionNftId() external view override returns (NftId distributionNftId) {
198
+ return getRegistry().getNftId(_distribution);
80
199
  }
81
200
 
82
201
  // from product component
83
202
  function setFees(
84
- Fee memory policyFee,
203
+ Fee memory productFee,
85
204
  Fee memory processingFee
86
205
  )
87
206
  external
88
207
  onlyOwner
89
208
  override
90
209
  {
91
- _productService.setFees(policyFee, processingFee);
210
+ _productService.setFees(productFee, processingFee);
92
211
  }
93
212
 
94
-
95
- function getPolicyFee()
213
+ // TODO delete, call instance intead
214
+ function getProductFee()
96
215
  external
97
216
  view
98
217
  override
99
- returns (Fee memory policyFee)
218
+ returns (Fee memory productFee)
100
219
  {
101
- return _instance.getProductSetup(getNftId()).policyFee;
220
+ NftId productNftId = getNftId();
221
+ if (_instance.hasTreasuryInfo(productNftId)) {
222
+ return _instance.getTreasuryInfo(productNftId).productFee;
223
+ } else {
224
+ return _initialProductFee;
225
+ }
102
226
  }
103
227
 
104
228
  function getProcessingFee()
@@ -107,11 +231,69 @@ contract Product is BaseComponent, IProductComponent {
107
231
  override
108
232
  returns (Fee memory processingFee)
109
233
  {
110
- return _instance.getProductSetup(getNftId()).processingFee;
234
+ NftId productNftId = getNftId();
235
+ if (_instance.hasTreasuryInfo(productNftId)) {
236
+ return _instance.getTreasuryInfo(productNftId).processingFee;
237
+ } else {
238
+ return _initialProcessingFee;
239
+ }
111
240
  }
112
241
 
113
- // from registerable
114
- function getType() public pure override returns (ObjectType) {
115
- return PRODUCT();
242
+ // from IRegisterable
243
+
244
+ // TODO used only once, occupies space
245
+ function getInitialInfo()
246
+ public
247
+ view
248
+ override (IRegisterable, Registerable)
249
+ returns (IRegistry.ObjectInfo memory, bytes memory)
250
+ {
251
+ // from Registerable
252
+ (
253
+ IRegistry.ObjectInfo memory productInfo,
254
+ bytes memory data
255
+ ) = super.getInitialInfo();
256
+
257
+ // TODO read pool & distribution fees
258
+ // 1) from pool -> the only option -> pool must be registered first?
259
+ // 2) from instance -> all fees are set into instance at product registration which is ongoing here
260
+ // checks are done in registryProduct() where THIS function is called
261
+ //require(getRegistry().getObjectInfo(_poolNftId).objectType == POOL(), "POOL_NOT_REGISTERED");
262
+ //require(getRegistry().getObjectInfo(_distributionNftId).objectType == DISTRIBUTION(), "DISTRIBUTION_NOT_REGISTERED");
263
+
264
+ // from PoolComponent
265
+ (
266
+ IRegistry.ObjectInfo memory poolInfo,
267
+ bytes memory poolData
268
+ ) = _pool.getInitialInfo();
269
+
270
+ (
271
+ /*IPool.PoolInfo memory info*/,
272
+ /*address wallet*/,
273
+ /*IERC20Metadata token*/,
274
+ Fee memory initialPoolFee,
275
+ Fee memory initialStakingFee,
276
+ Fee memory initialPerformanceFee
277
+ ) = abi.decode(poolData, (IPool.PoolInfo, address, IERC20Metadata, Fee, Fee, Fee));
278
+
279
+ // TODO from DistributionComponent
280
+
281
+ return (
282
+ productInfo,
283
+ abi.encode(
284
+ ITreasury.TreasuryInfo(
285
+ _poolNftId,
286
+ _distributionNftId,
287
+ _token,
288
+ _initialProductFee,
289
+ _initialProcessingFee,
290
+ initialPoolFee,
291
+ initialStakingFee,
292
+ initialPerformanceFee,
293
+ FeeLib.zeroFee()//_instance.getDistributionFee(_distributionNftId)
294
+ ),
295
+ _wallet
296
+ )
297
+ );
116
298
  }
117
299
  }
@@ -1,16 +1,16 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
2
  pragma solidity ^0.8.19;
3
3
 
4
- import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
4
+ import {IERC165} from "@openzeppelin5/contracts/utils/introspection/IERC165.sol";
5
5
 
6
+ import {INftOwnable} from "../shared/INftOwnable.sol";
6
7
  import {IVersionable} from "../shared/IVersionable.sol";
7
8
  import {IRegisterable} from "../shared/IRegisterable.sol";
8
- import {IOwnable} from "../shared/IOwnable.sol";
9
9
  import {RoleId} from "../types/RoleId.sol";
10
10
 
11
11
  import {IAccessModule} from "./module/access/IAccess.sol";
12
12
  import {IBundleModule} from "./module/bundle/IBundle.sol";
13
- import {ICompensationModule} from "./module/compensation/ICompensation.sol";
13
+ import {IDistributionModule} from "./module/distribution/IDistribution.sol";
14
14
  import {IComponentModule} from "./module/component/IComponent.sol";
15
15
  import {IPolicyModule} from "./module/policy/IPolicy.sol";
16
16
  import {IPoolModule} from "./module/pool/IPoolModule.sol";
@@ -18,9 +18,10 @@ import {IRiskModule} from "./module/risk/IRisk.sol";
18
18
  import {ITreasuryModule} from "./module/treasury/ITreasury.sol";
19
19
 
20
20
  import {IKeyValueStore} from "./base/IKeyValueStore.sol";
21
- import {IRegistry, IRegistryLinked} from "../registry/IRegistryLinked.sol";
21
+ import {IRegistry} from "../registry/IRegistry.sol";
22
22
 
23
23
  import {IComponentOwnerService} from "./service/IComponentOwnerService.sol";
24
+ import {IDistributionService} from "./service/IDistributionService.sol";
24
25
  import {IProductService} from "./service/IProductService.sol";
25
26
  import {IPoolService} from "./service/IPoolService.sol";
26
27
  import {IInstanceBase} from "./base/IInstanceBase.sol";
@@ -33,19 +34,20 @@ interface IInstance is
33
34
  IAccessModule,
34
35
  IPolicyModule,
35
36
  IPoolModule,
37
+ IRiskModule,
36
38
  IBundleModule,
37
39
  IComponentModule,
38
40
  ITreasuryModule,
39
- ICompensationModule,
41
+ IDistributionModule,
40
42
  IInstanceBase
41
43
  {
42
- function getRegistry() external view override (IBundleModule, IComponentModule, IPolicyModule, IRegisterable) returns (IRegistry registry);
43
- function getOwner() external view override (IOwnable, IAccessModule) returns(address owner);
44
+ function getRegistry() external view override (INftOwnable) returns (IRegistry registry);
45
+ function getOwner() external view override (IAccessModule, INftOwnable) returns(address owner);
44
46
 
45
- function hasRole(RoleId role, address member) external view override (IAccessModule, IComponentModule) returns (bool hasRole);
47
+ function getKeyValueStore() external view override (IInstanceBase) returns (IKeyValueStore keyValueStore);
46
48
 
47
- function getKeyValueStore() external view override (IBundleModule, IInstanceBase) returns (IKeyValueStore keyValueStore);
48
- function getComponentOwnerService() external view override (IInstanceBase, IComponentModule) returns(IComponentOwnerService);
49
+ function getComponentOwnerService() external view override (IInstanceBase, IComponentModule, IPoolModule, ITreasuryModule) returns(IComponentOwnerService);
50
+ function getDistributionService() external view override returns(IDistributionService);
49
51
  function getProductService() external view override (IInstanceBase, IBundleModule, IPolicyModule) returns(IProductService);
50
52
  function getPoolService() external view override (IInstanceBase, IBundleModule, IPoolModule) returns(IPoolService);
51
53
 
@@ -2,12 +2,14 @@
2
2
  pragma solidity ^0.8.19;
3
3
 
4
4
  import {NftId} from "../types/NftId.sol";
5
+ import {INftOwnable} from "../shared/INftOwnable.sol";
6
+ import {NftOwnable} from "../shared/NftOwnable.sol";
5
7
  import {RoleId} from "../types/RoleId.sol";
6
8
 
7
9
  import {InstanceBase} from "./base/InstanceBase.sol";
8
10
  import {AccessModule} from "./module/access/Access.sol";
9
- import {CompensationModule} from "./module/compensation/CompensationModule.sol";
10
11
  import {ComponentModule} from "./module/component/ComponentModule.sol";
12
+ import {DistributionModule} from "./module/distribution/DistributionModule.sol";
11
13
  import {PolicyModule} from "./module/policy/PolicyModule.sol";
12
14
  import {PoolModule} from "./module/pool/PoolModule.sol";
13
15
  import {RiskModule} from "./module/risk/RiskModule.sol";
@@ -22,8 +24,10 @@ import {IComponentModule} from "./module/component/IComponent.sol";
22
24
  import {IPoolModule} from "./module/pool/IPoolModule.sol";
23
25
  import {IPolicyModule} from "./module/policy/IPolicy.sol";
24
26
  import {IInstanceBase} from "./base/IInstanceBase.sol";
27
+ import {ITreasuryModule} from "./module/treasury/ITreasury.sol";
25
28
 
26
29
  import {IComponentOwnerService} from "./service/IComponentOwnerService.sol";
30
+ import {IDistributionService} from "./service/IDistributionService.sol";
27
31
  import {IProductService} from "./service/IProductService.sol";
28
32
  import {IPoolService} from "./service/IPoolService.sol";
29
33
 
@@ -34,7 +38,7 @@ contract Instance is
34
38
  AccessModule,
35
39
  BundleModule,
36
40
  ComponentModule,
37
- CompensationModule,
41
+ DistributionModule,
38
42
  PolicyModule,
39
43
  PoolModule,
40
44
  RiskModule,
@@ -42,27 +46,42 @@ contract Instance is
42
46
  {
43
47
  constructor(
44
48
  address registry,
45
- NftId registryNftId
49
+ NftId registryNftId,
50
+ address initialOwner
46
51
  )
47
- InstanceBase(registry, registryNftId)
52
+ InstanceBase(registry, registryNftId, initialOwner)
48
53
  AccessModule()
49
54
  BundleModule()
55
+ DistributionModule()
50
56
  ComponentModule()
51
57
  PolicyModule()
52
58
  PoolModule()
53
59
  TreasuryModule()
54
60
  {
55
61
  initializeBundleModule(_keyValueStore);
62
+ initializeComponentModule(_keyValueStore);
63
+ initializeDistributionModule(_keyValueStore);
64
+ initializePolicyModule(_keyValueStore);
65
+ initializePoolModule(_keyValueStore);
66
+ initializeRiskModule(_keyValueStore);
56
67
  }
57
68
 
58
- function getRegistry() public view override (Registerable, IBundleModule, IComponentModule, IPolicyModule) returns (IRegistry registry) { return super.getRegistry(); }
59
- function getKeyValueStore() public view override (InstanceBase, IBundleModule) returns (IKeyValueStore keyValueStore) { return super.getKeyValueStore(); }
69
+ modifier onlyComponentOwnerService() override (ComponentModule, PoolModule, TreasuryModule) {
70
+ require(
71
+ msg.sender == address(this.getComponentOwnerService()),
72
+ "ERROR:CMP-001:NOT_REGISTRY_SERVICE"
73
+ );
74
+ _;
75
+ }
76
+
77
+ function getRegistry() public view override (INftOwnable, NftOwnable) returns (IRegistry registry) { return super.getRegistry(); }
60
78
 
61
- function hasRole(RoleId role, address member) public view override (AccessModule, IComponentModule) returns (bool) { return super.hasRole(role, member); }
79
+ function getKeyValueStore() public view override (InstanceBase) returns (IKeyValueStore keyValueStore) { return super.getKeyValueStore(); }
62
80
 
63
- function getComponentOwnerService() external view override (IComponentModule, IInstanceBase) returns(IComponentOwnerService service) { return _componentOwnerService; }
81
+ function getComponentOwnerService() external view override (IInstanceBase, IComponentModule, ITreasuryModule, IPoolModule) returns(IComponentOwnerService service) { return _componentOwnerService; }
82
+ function getDistributionService() external view override (IInstanceBase) returns(IDistributionService service) { return _distributionService; }
64
83
  function getProductService() external view override (IBundleModule, IPolicyModule, IInstanceBase) returns(IProductService service) { return _productService; }
65
84
  function getPoolService() external view override (IBundleModule, IPoolModule, IInstanceBase) returns(IPoolService service) { return _poolService; }
66
85
 
67
- function getOwner() public view override (IAccessModule, Registerable) returns(address owner) { return super.getOwner(); }
86
+ function getOwner() public view override (IAccessModule, INftOwnable, NftOwnable) returns(address owner) { return super.getOwner(); }
68
87
  }
@@ -2,21 +2,23 @@
2
2
  pragma solidity ^0.8.19;
3
3
 
4
4
  import {IRegistry} from "../../registry/IRegistry.sol";
5
+ import {IRegistryService} from "../../registry/IRegistryService.sol";
5
6
  import {IInstance} from "../../instance/IInstance.sol";
6
7
  import {ObjectType, INSTANCE, PRODUCT, POOL} from "../../types/ObjectType.sol";
7
8
  import {NftId, NftIdLib} from "../../types/NftId.sol";
8
9
 
9
10
  import {ServiceBase} from "./ServiceBase.sol";
11
+ import {Version, VersionPart, VersionLib} from "../../types/Version.sol";
10
12
 
11
13
  abstract contract ComponentServiceBase is ServiceBase {
12
14
 
13
15
  constructor(
14
16
  address registry,
15
- NftId registryNftId
17
+ NftId registryNftId,
18
+ address initialOwner
16
19
  )
17
- ServiceBase(registry, registryNftId)
18
- // solhint-disable-next-line no-empty-blocks
19
20
  {
21
+ _initializeServiceBase(registry, registryNftId, initialOwner);
20
22
  }
21
23
 
22
24
 
@@ -30,13 +32,18 @@ abstract contract ComponentServiceBase is ServiceBase {
30
32
  IInstance instance
31
33
  )
32
34
  {
33
- NftId componentNftId = _registry.getNftId(msg.sender);
35
+ NftId componentNftId = getRegistry().getNftId(msg.sender);
34
36
  require(componentNftId.gtz(), "ERROR_COMPONENT_UNKNOWN");
35
37
 
36
- info = _registry.getObjectInfo(componentNftId);
38
+ info = getRegistry().getObjectInfo(componentNftId);
37
39
  require(info.objectType == objectType, "OBJECT_TYPE_INVALID");
38
40
 
39
- address instanceAddress = _registry.getObjectInfo(info.parentNftId).objectAddress;
41
+ address instanceAddress = getRegistry().getObjectInfo(info.parentNftId).objectAddress;
40
42
  instance = IInstance(instanceAddress);
41
43
  }
44
+
45
+ function getRegistryService() public view virtual returns (IRegistryService) {
46
+ address service = getRegistry().getServiceAddress("RegistryService", getMajorVersion());
47
+ return IRegistryService(service);
48
+ }
42
49
  }