@etherisc/gif-next 0.0.2-de0a1d3-009 → 0.0.2-def25d4-556

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 (384) hide show
  1. package/README.md +148 -26
  2. package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.dbg.json +1 -1
  3. package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.json +176 -23
  4. package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +1 -1
  5. package/artifacts/contracts/components/Distribution.sol/Distribution.json +308 -43
  6. package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.dbg.json +1 -1
  7. package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.json +129 -23
  8. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
  9. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.json +36 -172
  10. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
  11. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.json +0 -238
  12. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +1 -1
  13. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.json +0 -213
  14. package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
  15. package/artifacts/contracts/components/Pool.sol/Pool.json +308 -96
  16. package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
  17. package/artifacts/contracts/components/Product.sol/Product.json +409 -78
  18. package/artifacts/contracts/experiment/cloning/Cloner.sol/Cloner.dbg.json +4 -0
  19. package/artifacts/contracts/experiment/cloning/Cloner.sol/Cloner.json +66 -0
  20. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock1.dbg.json +4 -0
  21. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock1.json +24 -0
  22. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock2.dbg.json +4 -0
  23. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock2.json +42 -0
  24. package/artifacts/contracts/experiment/errors/Require.sol/Require.dbg.json +1 -1
  25. package/artifacts/contracts/experiment/errors/Revert.sol/Revert.dbg.json +1 -1
  26. package/artifacts/contracts/experiment/inheritance/A.sol/A.dbg.json +1 -1
  27. package/artifacts/contracts/experiment/inheritance/A.sol/AShared.dbg.json +1 -1
  28. package/artifacts/contracts/experiment/inheritance/B.sol/B.dbg.json +1 -1
  29. package/artifacts/contracts/experiment/inheritance/C.sol/C.dbg.json +1 -1
  30. package/artifacts/contracts/experiment/inheritance/IA.sol/IA.dbg.json +1 -1
  31. package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.dbg.json +1 -1
  32. package/artifacts/contracts/experiment/inheritance/IB.sol/IB.dbg.json +1 -1
  33. package/artifacts/contracts/experiment/inheritance/IC.sol/IC.dbg.json +1 -1
  34. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.dbg.json +1 -1
  35. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.json +2 -2
  36. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.dbg.json +1 -1
  37. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.dbg.json +1 -1
  38. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.dbg.json +1 -1
  39. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.json +2 -2
  40. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.dbg.json +1 -1
  41. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.json +2 -2
  42. package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.dbg.json +1 -1
  43. package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.dbg.json +1 -1
  44. package/artifacts/contracts/instance/AccessManagedSimple.sol/AccessManagedSimple.dbg.json +4 -0
  45. package/artifacts/contracts/instance/AccessManagedSimple.sol/AccessManagedSimple.json +101 -0
  46. package/artifacts/contracts/instance/AccessManagerSimple.sol/AccessManagerSimple.dbg.json +4 -0
  47. package/artifacts/contracts/instance/AccessManagerSimple.sol/AccessManagerSimple.json +1132 -0
  48. package/artifacts/contracts/instance/IAccessManagerSimple.sol/IAccessManagerSimple.dbg.json +4 -0
  49. package/artifacts/contracts/instance/IAccessManagerSimple.sol/IAccessManagerSimple.json +1082 -0
  50. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  51. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +180 -1784
  52. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +4 -0
  53. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +480 -0
  54. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  55. package/artifacts/contracts/instance/Instance.sol/Instance.json +2243 -1199
  56. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +4 -0
  57. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +917 -0
  58. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +4 -0
  59. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +1283 -0
  60. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +4 -0
  61. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +851 -0
  62. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +4 -0
  63. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +472 -0
  64. package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.dbg.json +1 -1
  65. package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.json +149 -50
  66. package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.dbg.json +1 -1
  67. package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.json +1 -1
  68. package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
  69. package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.json +27 -158
  70. package/artifacts/contracts/instance/base/ILifecycle.sol/ILifecycle.dbg.json +1 -1
  71. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
  72. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.json +37 -245
  73. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json +1 -1
  74. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.json +2 -2
  75. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +4 -0
  76. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.json +211 -0
  77. package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +4 -0
  78. package/artifacts/contracts/instance/module/{bundle/IBundle.sol → IBundle.sol}/IBundle.json +1 -1
  79. package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +4 -0
  80. package/artifacts/contracts/instance/module/{distribution/IDistribution.sol → IDistribution.sol}/IDistribution.json +1 -1
  81. package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +4 -0
  82. package/artifacts/contracts/instance/module/{policy/IPolicy.sol → IPolicy.sol}/IPolicy.json +1 -1
  83. package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +4 -0
  84. package/artifacts/contracts/instance/module/{risk/IRisk.sol → IRisk.sol}/IRisk.json +1 -1
  85. package/artifacts/contracts/instance/module/ISetup.sol/ISetup.dbg.json +4 -0
  86. package/artifacts/contracts/instance/{base/ModuleBase.sol/ModuleBase.json → module/ISetup.sol/ISetup.json} +2 -2
  87. package/artifacts/contracts/instance/module/ITreasury.sol/ITreasury.dbg.json +4 -0
  88. package/artifacts/contracts/instance/module/{treasury/ITreasury.sol → ITreasury.sol}/ITreasury.json +1 -1
  89. package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.dbg.json +1 -1
  90. package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.json +295 -86
  91. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +1 -1
  92. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +210 -60
  93. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +4 -0
  94. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.json +436 -0
  95. package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.dbg.json +1 -1
  96. package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.json +123 -62
  97. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +1 -1
  98. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.json +120 -40
  99. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +1 -1
  100. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +120 -40
  101. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +1 -1
  102. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +120 -40
  103. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  104. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +186 -12
  105. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  106. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +485 -37
  107. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +4 -0
  108. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +853 -0
  109. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +4 -0
  110. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.json +34 -0
  111. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  112. package/artifacts/contracts/registry/Registry.sol/Registry.json +597 -122
  113. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +4 -0
  114. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +1237 -0
  115. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +4 -0
  116. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +525 -0
  117. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +4 -0
  118. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +410 -0
  119. package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.dbg.json +4 -0
  120. package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.json +107 -0
  121. package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +1 -1
  122. package/artifacts/contracts/shared/ERC165.sol/ERC165.json +2 -2
  123. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +4 -0
  124. package/artifacts/contracts/{instance/module/component/ComponentModule.sol/ComponentModule.json → shared/INftOwnable.sol/INftOwnable.json} +67 -57
  125. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  126. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +117 -37
  127. package/artifacts/contracts/shared/IService.sol/IService.dbg.json +4 -0
  128. package/artifacts/contracts/{instance/base/ServiceBase.sol/ServiceBase.json → shared/IService.sol/IService.json} +116 -82
  129. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +1 -1
  130. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.json +2 -2
  131. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +4 -0
  132. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +158 -0
  133. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +4 -0
  134. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +349 -0
  135. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  136. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +190 -37
  137. package/artifacts/contracts/shared/RegisterableUpgradable.sol/RegisterableUpgradable.dbg.json +4 -0
  138. package/artifacts/contracts/{instance/base/IService.sol/IService.json → shared/RegisterableUpgradable.sol/RegisterableUpgradable.json} +174 -73
  139. package/artifacts/contracts/shared/Service.sol/Service.dbg.json +4 -0
  140. package/artifacts/contracts/{instance/base/InstanceBase.sol/InstanceBase.json → shared/Service.sol/Service.json} +151 -146
  141. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +4 -0
  142. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +96 -0
  143. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +4 -0
  144. package/artifacts/contracts/shared/{Proxy.sol/ProxyWithProxyAdminGetter.json → UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json} +4 -4
  145. package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +1 -1
  146. package/artifacts/contracts/shared/Versionable.sol/Versionable.json +4 -27
  147. package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json +1 -1
  148. package/artifacts/contracts/test/TestFee.sol/TestFee.json +4 -4
  149. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json +1 -1
  150. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +204 -36
  151. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +1 -1
  152. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.json +14 -14
  153. package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +1 -1
  154. package/artifacts/contracts/test/TestService.sol/TestService.json +203 -69
  155. package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json +1 -1
  156. package/artifacts/contracts/test/TestToken.sol/TestUsdc.json +91 -53
  157. package/artifacts/contracts/test/TestVersion.sol/TestVersion.dbg.json +1 -1
  158. package/artifacts/contracts/test/TestVersion.sol/TestVersion.json +2 -2
  159. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json +1 -1
  160. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.json +29 -36
  161. package/artifacts/contracts/test/Usdc.sol/USDC.dbg.json +1 -1
  162. package/artifacts/contracts/test/Usdc.sol/USDC.json +91 -53
  163. package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.dbg.json +1 -1
  164. package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
  165. package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +1 -1
  166. package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.dbg.json +4 -0
  167. package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.json +104 -0
  168. package/artifacts/contracts/types/Fee.sol/FeeLib.dbg.json +1 -1
  169. package/artifacts/contracts/types/Fee.sol/FeeLib.json +4 -4
  170. package/artifacts/contracts/types/Key32.sol/Key32Lib.dbg.json +1 -1
  171. package/artifacts/contracts/types/Key32.sol/Key32Lib.json +31 -17
  172. package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +1 -1
  173. package/artifacts/contracts/types/NftId.sol/NftIdLib.json +2 -2
  174. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
  175. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.json +2 -2
  176. package/artifacts/contracts/types/NumberId.sol/NumberIdLib.dbg.json +4 -0
  177. package/artifacts/contracts/types/NumberId.sol/NumberIdLib.json +100 -0
  178. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
  179. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.json +2 -2
  180. package/artifacts/contracts/types/Referral.sol/ReferralLib.dbg.json +4 -0
  181. package/artifacts/contracts/types/Referral.sol/ReferralLib.json +123 -0
  182. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.dbg.json +1 -1
  183. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.json +2 -2
  184. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.dbg.json +1 -1
  185. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.json +134 -8
  186. package/artifacts/contracts/types/StateId.sol/StateIdLib.dbg.json +1 -1
  187. package/artifacts/contracts/types/StateId.sol/StateIdLib.json +2 -2
  188. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json +1 -1
  189. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.json +15 -2
  190. package/artifacts/contracts/types/UFixed.sol/MathLib.dbg.json +4 -0
  191. package/artifacts/contracts/types/UFixed.sol/MathLib.json +10 -0
  192. package/artifacts/contracts/types/UFixed.sol/UFixedLib.dbg.json +4 -0
  193. package/artifacts/contracts/types/UFixed.sol/{UFixedMathLib.json → UFixedLib.json} +3 -3
  194. package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +1 -1
  195. package/artifacts/contracts/types/Version.sol/VersionLib.json +2 -2
  196. package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +1 -1
  197. package/artifacts/contracts/types/Version.sol/VersionPartLib.json +22 -3
  198. package/contracts/components/BaseComponent.sol +26 -29
  199. package/contracts/components/Distribution.sol +52 -18
  200. package/contracts/components/IBaseComponent.sol +9 -3
  201. package/contracts/components/IDistributionComponent.sol +5 -6
  202. package/contracts/components/IPoolComponent.sol +2 -11
  203. package/contracts/components/IProductComponent.sol +4 -7
  204. package/contracts/components/Pool.sol +99 -76
  205. package/contracts/components/Product.sol +111 -41
  206. package/contracts/experiment/cloning/Cloner.sol +47 -0
  207. package/contracts/instance/AccessManagedSimple.sol +115 -0
  208. package/contracts/instance/AccessManagerSimple.sol +692 -0
  209. package/contracts/instance/IAccessManagerSimple.sol +391 -0
  210. package/contracts/instance/IInstance.sol +24 -45
  211. package/contracts/instance/IInstanceService.sol +30 -0
  212. package/contracts/instance/Instance.sol +427 -58
  213. package/contracts/instance/InstanceAccessManager.sol +288 -0
  214. package/contracts/instance/InstanceReader.sol +290 -0
  215. package/contracts/instance/InstanceService.sol +170 -0
  216. package/contracts/instance/InstanceServiceManager.sol +56 -0
  217. package/contracts/instance/base/ComponentServiceBase.sol +12 -13
  218. package/contracts/instance/base/IInstanceBase.sol +3 -2
  219. package/contracts/instance/base/IKeyValueStore.sol +13 -14
  220. package/contracts/instance/base/ILifecycle.sol +3 -3
  221. package/contracts/instance/base/KeyValueStore.sol +49 -38
  222. package/contracts/instance/base/Lifecycle.sol +1 -1
  223. package/contracts/instance/module/IAccess.sol +38 -0
  224. package/contracts/instance/module/IBundle.sol +19 -0
  225. package/contracts/instance/module/IDistribution.sol +39 -0
  226. package/contracts/instance/module/IPolicy.sol +45 -0
  227. package/contracts/instance/module/IRisk.sol +11 -0
  228. package/contracts/instance/module/ISetup.sol +43 -0
  229. package/contracts/instance/module/ITreasury.sol +23 -0
  230. package/contracts/instance/service/ComponentOwnerService.sol +232 -72
  231. package/contracts/instance/service/DistributionService.sol +66 -20
  232. package/contracts/instance/service/DistributionServiceManager.sol +53 -0
  233. package/contracts/instance/service/IComponentOwnerService.sol +1 -3
  234. package/contracts/instance/service/IDistributionService.sol +1 -1
  235. package/contracts/instance/service/IPoolService.sol +1 -1
  236. package/contracts/instance/service/IProductService.sol +3 -3
  237. package/contracts/registry/ChainNft.sol +80 -37
  238. package/contracts/registry/IRegistry.sol +62 -25
  239. package/contracts/registry/IRegistryService.sol +33 -0
  240. package/contracts/registry/ITransferInterceptor.sol +6 -0
  241. package/contracts/registry/Registry.sol +374 -266
  242. package/contracts/registry/RegistryService.sol +399 -0
  243. package/contracts/registry/RegistryServiceManager.sol +80 -0
  244. package/contracts/registry/TokenRegistry.sol +111 -0
  245. package/contracts/shared/ContractDeployerLib.sol +72 -0
  246. package/contracts/shared/ERC165.sol +6 -2
  247. package/contracts/shared/INftOwnable.sol +22 -0
  248. package/contracts/shared/IRegisterable.sol +8 -15
  249. package/contracts/{instance/base → shared}/IService.sol +3 -3
  250. package/contracts/shared/IVersionable.sol +40 -9
  251. package/contracts/shared/NftOwnable.sol +136 -0
  252. package/contracts/shared/ProxyManager.sol +94 -0
  253. package/contracts/shared/Registerable.sol +63 -59
  254. package/contracts/shared/RegisterableUpgradable.sol +16 -0
  255. package/contracts/shared/Service.sol +54 -0
  256. package/contracts/shared/TokenHandler.sol +27 -0
  257. package/contracts/shared/UpgradableProxyWithAdmin.sol +16 -0
  258. package/contracts/shared/Versionable.sol +110 -62
  259. package/contracts/test/TestFee.sol +2 -2
  260. package/contracts/test/TestRegisterable.sol +5 -6
  261. package/contracts/test/TestRoleId.sol +1 -1
  262. package/contracts/test/TestService.sol +5 -13
  263. package/contracts/types/DistributorType.sol +55 -0
  264. package/contracts/types/Fee.sol +3 -3
  265. package/contracts/types/Key32.sol +8 -3
  266. package/contracts/types/NumberId.sol +52 -0
  267. package/contracts/types/ObjectType.sol +35 -14
  268. package/contracts/types/Referral.sol +85 -0
  269. package/contracts/types/RoleId.sol +59 -9
  270. package/contracts/types/StateId.sol +5 -1
  271. package/contracts/types/Timestamp.sol +7 -3
  272. package/contracts/types/UFixed.sol +128 -12
  273. package/contracts/types/Version.sol +5 -1
  274. package/package.json +4 -3
  275. package/artifacts/contracts/instance/IInstanceLinked.sol/IInstanceLinked.dbg.json +0 -4
  276. package/artifacts/contracts/instance/IInstanceLinked.sol/IInstanceLinked.json +0 -24
  277. package/artifacts/contracts/instance/base/IService.sol/IService.dbg.json +0 -4
  278. package/artifacts/contracts/instance/base/InstanceBase.sol/InstanceBase.dbg.json +0 -4
  279. package/artifacts/contracts/instance/base/ModuleBase.sol/ModuleBase.dbg.json +0 -4
  280. package/artifacts/contracts/instance/base/ServiceBase.sol/ServiceBase.dbg.json +0 -4
  281. package/artifacts/contracts/instance/module/access/Access.sol/AccessModule.dbg.json +0 -4
  282. package/artifacts/contracts/instance/module/access/Access.sol/AccessModule.json +0 -333
  283. package/artifacts/contracts/instance/module/access/IAccess.sol/IAccess.dbg.json +0 -4
  284. package/artifacts/contracts/instance/module/access/IAccess.sol/IAccess.json +0 -10
  285. package/artifacts/contracts/instance/module/access/IAccess.sol/IAccessModule.dbg.json +0 -4
  286. package/artifacts/contracts/instance/module/access/IAccess.sol/IAccessModule.json +0 -333
  287. package/artifacts/contracts/instance/module/bundle/BundleModule.sol/BundleModule.dbg.json +0 -4
  288. package/artifacts/contracts/instance/module/bundle/BundleModule.sol/BundleModule.json +0 -297
  289. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundle.dbg.json +0 -4
  290. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundleModule.dbg.json +0 -4
  291. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundleModule.json +0 -297
  292. package/artifacts/contracts/instance/module/component/ComponentModule.sol/ComponentModule.dbg.json +0 -4
  293. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponent.dbg.json +0 -4
  294. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponent.json +0 -10
  295. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponentModule.dbg.json +0 -4
  296. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponentModule.json +0 -117
  297. package/artifacts/contracts/instance/module/distribution/DistributionModule.sol/DistributionModule.dbg.json +0 -4
  298. package/artifacts/contracts/instance/module/distribution/DistributionModule.sol/DistributionModule.json +0 -10
  299. package/artifacts/contracts/instance/module/distribution/IDistribution.sol/IDistribution.dbg.json +0 -4
  300. package/artifacts/contracts/instance/module/distribution/IDistribution.sol/IDistributionModule.dbg.json +0 -4
  301. package/artifacts/contracts/instance/module/distribution/IDistribution.sol/IDistributionModule.json +0 -10
  302. package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicy.dbg.json +0 -4
  303. package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicyModule.dbg.json +0 -4
  304. package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicyModule.json +0 -284
  305. package/artifacts/contracts/instance/module/policy/PolicyModule.sol/PolicyModule.dbg.json +0 -4
  306. package/artifacts/contracts/instance/module/policy/PolicyModule.sol/PolicyModule.json +0 -284
  307. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPool.dbg.json +0 -4
  308. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPool.json +0 -10
  309. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPoolModule.dbg.json +0 -4
  310. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPoolModule.json +0 -144
  311. package/artifacts/contracts/instance/module/pool/PoolModule.sol/PoolModule.dbg.json +0 -4
  312. package/artifacts/contracts/instance/module/pool/PoolModule.sol/PoolModule.json +0 -144
  313. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRisk.dbg.json +0 -4
  314. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRiskModule.dbg.json +0 -4
  315. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRiskModule.json +0 -113
  316. package/artifacts/contracts/instance/module/risk/RiskModule.sol/RiskModule.dbg.json +0 -4
  317. package/artifacts/contracts/instance/module/risk/RiskModule.sol/RiskModule.json +0 -131
  318. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasury.dbg.json +0 -4
  319. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasuryModule.dbg.json +0 -4
  320. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasuryModule.json +0 -511
  321. package/artifacts/contracts/instance/module/treasury/TokenHandler.sol/TokenHandler.dbg.json +0 -4
  322. package/artifacts/contracts/instance/module/treasury/TokenHandler.sol/TokenHandler.json +0 -76
  323. package/artifacts/contracts/instance/module/treasury/TreasuryModule.sol/TreasuryModule.dbg.json +0 -4
  324. package/artifacts/contracts/instance/module/treasury/TreasuryModule.sol/TreasuryModule.json +0 -511
  325. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +0 -4
  326. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +0 -630
  327. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +0 -4
  328. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +0 -945
  329. package/artifacts/contracts/registry/IChainNft.sol/IChainNft.dbg.json +0 -4
  330. package/artifacts/contracts/registry/IChainNft.sol/IChainNft.json +0 -452
  331. package/artifacts/contracts/registry/IRegistryLinked.sol/IRegistryLinked.dbg.json +0 -4
  332. package/artifacts/contracts/registry/IRegistryLinked.sol/IRegistryLinked.json +0 -24
  333. package/artifacts/contracts/registry/RegistryUpgradeable.sol/RegistryUpgradeable.dbg.json +0 -4
  334. package/artifacts/contracts/registry/RegistryUpgradeable.sol/RegistryUpgradeable.json +0 -724
  335. package/artifacts/contracts/shared/IOwnable.sol/IOwnable.dbg.json +0 -4
  336. package/artifacts/contracts/shared/IOwnable.sol/IOwnable.json +0 -24
  337. package/artifacts/contracts/shared/Proxy.sol/ProxyDeployer.dbg.json +0 -4
  338. package/artifacts/contracts/shared/Proxy.sol/ProxyDeployer.json +0 -248
  339. package/artifacts/contracts/shared/Proxy.sol/ProxyWithProxyAdminGetter.dbg.json +0 -4
  340. package/artifacts/contracts/shared/VersionableUpgradeable.sol/VersionableUpgradeable.dbg.json +0 -4
  341. package/artifacts/contracts/shared/VersionableUpgradeable.sol/VersionableUpgradeable.json +0 -228
  342. package/artifacts/contracts/test/TestDistribution.sol/TestDistribution.dbg.json +0 -4
  343. package/artifacts/contracts/test/TestDistribution.sol/TestDistribution.json +0 -405
  344. package/artifacts/contracts/test/TestPool.sol/TestPool.dbg.json +0 -4
  345. package/artifacts/contracts/test/TestPool.sol/TestPool.json +0 -578
  346. package/artifacts/contracts/test/TestProduct.sol/TestProduct.dbg.json +0 -4
  347. package/artifacts/contracts/test/TestProduct.sol/TestProduct.json +0 -575
  348. package/artifacts/contracts/types/ReferralId.sol/ReferralIdLib.dbg.json +0 -4
  349. package/artifacts/contracts/types/ReferralId.sol/ReferralIdLib.json +0 -99
  350. package/artifacts/contracts/types/UFixed.sol/UFixedMathLib.dbg.json +0 -4
  351. package/contracts/experiment/statemachine/README.md +0 -112
  352. package/contracts/instance/IInstanceLinked.sol +0 -8
  353. package/contracts/instance/base/InstanceBase.sol +0 -91
  354. package/contracts/instance/base/ModuleBase.sol +0 -57
  355. package/contracts/instance/base/ServiceBase.sol +0 -37
  356. package/contracts/instance/module/access/Access.sol +0 -149
  357. package/contracts/instance/module/access/IAccess.sol +0 -53
  358. package/contracts/instance/module/bundle/BundleModule.sol +0 -134
  359. package/contracts/instance/module/bundle/IBundle.sol +0 -53
  360. package/contracts/instance/module/component/ComponentModule.sol +0 -70
  361. package/contracts/instance/module/component/IComponent.sol +0 -28
  362. package/contracts/instance/module/distribution/DistributionModule.sol +0 -17
  363. package/contracts/instance/module/distribution/IDistribution.sol +0 -10
  364. package/contracts/instance/module/policy/IPolicy.sol +0 -63
  365. package/contracts/instance/module/policy/PolicyModule.sol +0 -91
  366. package/contracts/instance/module/pool/IPoolModule.sol +0 -40
  367. package/contracts/instance/module/pool/PoolModule.sol +0 -90
  368. package/contracts/instance/module/risk/IRisk.sol +0 -26
  369. package/contracts/instance/module/risk/RiskModule.sol +0 -62
  370. package/contracts/instance/module/treasury/ITreasury.sol +0 -82
  371. package/contracts/instance/module/treasury/TokenHandler.sol +0 -48
  372. package/contracts/instance/module/treasury/TreasuryModule.sol +0 -138
  373. package/contracts/instance/service/PoolService.sol +0 -149
  374. package/contracts/instance/service/ProductService.sol +0 -509
  375. package/contracts/registry/IChainNft.sol +0 -21
  376. package/contracts/registry/IRegistryLinked.sol +0 -8
  377. package/contracts/registry/RegistryUpgradeable.sol +0 -473
  378. package/contracts/shared/IOwnable.sol +0 -6
  379. package/contracts/shared/Proxy.sol +0 -94
  380. package/contracts/shared/VersionableUpgradeable.sol +0 -133
  381. package/contracts/test/TestDistribution.sol +0 -21
  382. package/contracts/test/TestPool.sol +0 -25
  383. package/contracts/test/TestProduct.sol +0 -72
  384. package/contracts/types/ReferralId.sol +0 -48
@@ -0,0 +1,11 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ pragma solidity ^0.8.20;
3
+
4
+ import {NftId} from "../../types/NftId.sol";
5
+
6
+ interface IRisk {
7
+ struct RiskInfo {
8
+ NftId productNftId;
9
+ bytes data;
10
+ }
11
+ }
@@ -0,0 +1,43 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ pragma solidity ^0.8.20;
3
+
4
+ import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
5
+
6
+ import {Fee} from "../../types/Fee.sol";
7
+ import {NftId} from "../../types/NftId.sol";
8
+ import {UFixed} from "../../types/UFixed.sol";
9
+ import {TokenHandler} from "../../shared/TokenHandler.sol";
10
+
11
+ interface ISetup {
12
+ struct ProductSetupInfo {
13
+ IERC20Metadata token;
14
+ TokenHandler tokenHandler;
15
+ NftId distributionNftId;
16
+ NftId poolNftId;
17
+ Fee distributionFee; // default distribution fee (no referral id)
18
+ Fee productFee; // product fee on net premium
19
+ Fee processingFee; // product fee on payout amounts
20
+ Fee poolFee; // pool fee on net premium
21
+ Fee stakingFee; // pool fee on staked capital from investor
22
+ Fee performanceFee; // pool fee on profits from capital investors
23
+ }
24
+
25
+ struct DistributionSetupInfo {
26
+ NftId productNftId;
27
+ TokenHandler tokenHandler;
28
+ Fee distributionFee; // default distribution fee (no referral id)
29
+ bool isIntercepting; // intercepts nft transfers (for distributors)
30
+ address wallet;
31
+ }
32
+
33
+ struct PoolSetupInfo {
34
+ NftId productNftId;
35
+ TokenHandler tokenHandler;
36
+ UFixed collateralizationLevel;
37
+ Fee poolFee; // pool fee on net premium
38
+ Fee stakingFee; // pool fee on staked capital from investor
39
+ Fee performanceFee; // pool fee on profits from capital investors
40
+ bool isIntercepting; // intercepts nft transfers (for bundles)
41
+ address wallet;
42
+ }
43
+ }
@@ -0,0 +1,23 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ pragma solidity ^0.8.20;
3
+
4
+ import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
5
+
6
+ import {Fee} from "../../types/Fee.sol";
7
+ import {NftId} from "../../types/NftId.sol";
8
+ import {TokenHandler} from "../../shared/TokenHandler.sol";
9
+
10
+ interface ITreasury {
11
+ struct TreasuryInfo {
12
+ IERC20Metadata token;
13
+ TokenHandler tokenHandler;
14
+ NftId distributionNftId;
15
+ NftId poolNftId;
16
+ Fee distributionFee; // default distribution fee (no referral id)
17
+ Fee productFee; // product fee on net premium
18
+ Fee processingFee; // product fee on payout amounts
19
+ Fee poolFee; // pool fee on net premium
20
+ Fee stakingFee; // pool fee on staked capital from investor
21
+ Fee performanceFee; // pool fee on profits from capital investors
22
+ }
23
+ }
@@ -1,14 +1,14 @@
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 {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
5
5
 
6
6
  import {IRegistry} from "../../registry/IRegistry.sol";
7
7
  import {IInstance} from "../IInstance.sol";
8
8
 
9
- import {ITreasuryModule} from "../module/treasury/ITreasury.sol";
10
- import {TreasuryModule} from "../module/treasury/TreasuryModule.sol";
11
- import {IComponent, IComponentModule} from "../module/component/IComponent.sol";
9
+ import {ITreasury} from "../module/ITreasury.sol";
10
+ // import {TreasuryModule} from "../module/TreasuryModule.sol";
11
+ import {ISetup} from "../module/ISetup.sol";
12
12
  import {IBaseComponent} from "../../components/IBaseComponent.sol";
13
13
  import {IPoolComponent} from "../../components/IPoolComponent.sol";
14
14
  import {IKeyValueStore} from "../../instance/base/IKeyValueStore.sol";
@@ -16,51 +16,59 @@ import {IVersionable} from "../../shared/IVersionable.sol";
16
16
  import {Versionable} from "../../shared/Versionable.sol";
17
17
 
18
18
  import {RoleId, PRODUCT_OWNER_ROLE, POOL_OWNER_ROLE, DISTRIBUTION_OWNER_ROLE, ORACLE_OWNER_ROLE} from "../../types/RoleId.sol";
19
- import {ObjectType, COMPONENT, PRODUCT, ORACLE, POOL, DISTRIBUTION} from "../../types/ObjectType.sol";
19
+ import {ObjectType, TOKEN, COMPONENT, PRODUCT, ORACLE, POOL, DISTRIBUTION} from "../../types/ObjectType.sol";
20
20
  import {StateId, ACTIVE, PAUSED} from "../../types/StateId.sol";
21
21
  import {Key32} from "../../types/Key32.sol";
22
22
  import {NftId, NftIdLib, zeroNftId} from "../../types/NftId.sol";
23
23
  import {Fee} from "../../types/Fee.sol";
24
24
  import {Version, VersionLib} from "../../types/Version.sol";
25
+ import {UFixed, UFixedLib} from "../../types/UFixed.sol";
25
26
 
26
27
  import {IDistributionComponent} from "../../components/IDistributionComponent.sol";
27
28
  import {IPoolComponent} from "../../components/IPoolComponent.sol";
28
29
  import {IProductComponent} from "../../components/IProductComponent.sol";
29
- import {ServiceBase} from "../base/ServiceBase.sol";
30
+ import {IService} from "../../shared/IService.sol";
30
31
  import {IComponentOwnerService} from "./IComponentOwnerService.sol";
32
+ import {Service} from "../../shared/Service.sol";
33
+ // import {IPool, IPoolModule} from "../module/IPoolModule.sol";
34
+
35
+ import {IRegistryService} from "../../registry/IRegistryService.sol";
31
36
 
32
37
  contract ComponentOwnerService is
33
- ServiceBase,
38
+ Service,
34
39
  IComponentOwnerService
35
40
  {
36
41
  using NftIdLib for NftId;
37
42
 
43
+ error MissingTypeRole();
44
+ error WalletIsZero();
45
+ error InvalidToken();
46
+ error InvalidPool();
47
+ error InvalidDistribution();
48
+ error InvalidPoolsInstance();
49
+ error InvalidDistributionsInstance();
50
+
51
+ error CollateralizationLevelIsZero();
52
+
38
53
  string public constant NAME = "ComponentOwnerService";
39
54
 
40
55
  modifier onlyRegisteredComponent(IBaseComponent component) {
41
- NftId nftId = _registry.getNftId(address(component));
56
+ NftId nftId = getRegistry().getNftId(address(component));
42
57
  require(nftId.gtz(), "ERROR:COS-001:COMPONENT_UNKNOWN");
43
58
  _;
44
59
  }
45
60
 
46
61
  constructor(
47
62
  address registry,
48
- NftId registryNftId
49
- ) ServiceBase(registry, registryNftId) // solhint-disable-next-line no-empty-blocks
50
- {
51
-
52
- }
53
-
54
- function getVersion()
55
- public
56
- pure
57
- virtual override (IVersionable, Versionable)
58
- returns(Version)
63
+ NftId registryNftId,
64
+ address initialOwner
65
+ )
59
66
  {
60
- return VersionLib.toVersion(3,0,0);
67
+ _initializeService(registry, initialOwner);
68
+ _registerInterface(type(IComponentOwnerService).interfaceId);
61
69
  }
62
70
 
63
- function getName() external pure override returns(string memory name) {
71
+ function getName() public pure override(IService, Service) returns(string memory name) {
64
72
  return NAME;
65
73
  }
66
74
 
@@ -81,58 +89,92 @@ contract ComponentOwnerService is
81
89
  }
82
90
  }
83
91
 
84
- function register(
85
- IBaseComponent component
86
- ) external override returns (NftId nftId) {
87
- address initialOwner = component.getOwner();
88
- require(
89
- msg.sender == address(component),
90
- "ERROR:COS-003:NOT_COMPONENT"
92
+ function getRegistryService() public view virtual returns (IRegistryService) {
93
+ address service = getRegistry().getServiceAddress("RegistryService", getMajorVersion());
94
+ return IRegistryService(service);
95
+ }
96
+
97
+ function registerProduct(
98
+ IBaseComponent product
99
+ ) external returns (NftId nftId) {
100
+
101
+ // TODO some info parameters from component and from register may differ -> getObjectInfo() after registration?
102
+ (
103
+ IRegistry.ObjectInfo memory info,
104
+ bytes memory data
105
+ ) = getRegistryService().registerProduct(
106
+ product,
107
+ msg.sender);
108
+
109
+ NftId instanceNftId = info.parentNftId;
110
+ address instanceAddress = getRegistry().getObjectInfo(instanceNftId).objectAddress;
111
+ IInstance instance = IInstance(instanceAddress);
112
+
113
+ RoleId typeRole = getRoleForType(PRODUCT());
114
+ // TODO refactor to use access manager infra
115
+ // if(instance.hasRole(typeRole, msg.sender) == false) {
116
+ // revert MissingTypeRole();
117
+ // }
118
+
119
+ _registerProduct(
120
+ info.nftId,
121
+ instanceNftId,
122
+ instance,
123
+ data
91
124
  );
125
+ }
92
126
 
93
- IInstance instance = component.getInstance();
94
- ObjectType objectType = component.getType();
95
- RoleId typeRole = getRoleForType(objectType);
96
- require(
97
- instance.hasRole(typeRole, initialOwner),
98
- "ERROR:CMP-004:TYPE_ROLE_MISSING"
127
+ function registerPool(
128
+ IBaseComponent pool
129
+ ) external returns (NftId nftId) {
130
+
131
+ // TODO some info parameters from component and from register may differ -> getObjectInfo() after registration?
132
+ (
133
+ IRegistry.ObjectInfo memory info,
134
+ bytes memory data
135
+ ) = getRegistryService().registerPool(
136
+ pool,
137
+ msg.sender);
138
+
139
+ NftId instanceNftId = info.parentNftId;
140
+ address instanceAddress = getRegistry().getObjectInfo(instanceNftId).objectAddress;
141
+ IInstance instance = IInstance(instanceAddress);
142
+
143
+ RoleId typeRole = getRoleForType(POOL());
144
+ // TODO refactor to use access manager infra
145
+ // if(instance.hasRole(typeRole, msg.sender) == false) {
146
+ // revert MissingTypeRole();
147
+ // }
148
+
149
+ _registerPool(
150
+ info.nftId,
151
+ instanceNftId,
152
+ instance,
153
+ data
99
154
  );
155
+ }
100
156
 
101
- nftId = _registry.register(address(component));
102
- IERC20Metadata token = component.getToken();
103
-
104
- instance.registerComponent(
105
- nftId,
106
- token,
107
- component.getWallet());
108
-
109
- // component type specific registration actions
110
- if (component.getType() == PRODUCT()) {
111
- IProductComponent product = IProductComponent(address(component));
112
-
113
- NftId poolNftId = product.getPoolNftId();
114
- require(poolNftId.gtz(), "ERROR:CMP-005:POOL_UNKNOWN");
115
- IPoolComponent pool = IPoolComponent(_registry.getObjectInfo(poolNftId).objectAddress);
116
-
117
- NftId distributionNftId = product.getDistributionNftId();
118
- IDistributionComponent distribution = IDistributionComponent(_registry.getObjectInfo(distributionNftId).objectAddress);
119
-
120
- // register with tresury
121
- instance.registerProductSetup(
122
- product,
123
- pool,
124
- distribution
125
- );
126
- } else if (component.getType() == POOL()) {
127
- IPoolComponent pool = IPoolComponent(address(component));
128
-
129
- // register with pool
130
- instance.registerPool(
131
- nftId,
132
- pool.isVerifying(),
133
- pool.getCollateralizationLevel());
134
- }
135
- // TODO add compensation
157
+ function registerDistribution(
158
+ IBaseComponent distribution
159
+ ) external returns (NftId nftId) {
160
+
161
+ // TODO some info parameters from component and from register may differ -> getObjectInfo() after registration?
162
+ (
163
+ IRegistry.ObjectInfo memory info,
164
+ bytes memory data
165
+ ) = getRegistryService().registerDistribution(
166
+ distribution,
167
+ msg.sender);
168
+
169
+ NftId instanceNftId = info.parentNftId;
170
+ address instanceAddress = getRegistry().getObjectInfo(instanceNftId).objectAddress;
171
+ IInstance instance = IInstance(instanceAddress);
172
+
173
+ RoleId typeRole = getRoleForType(DISTRIBUTION());
174
+ // TODO refactor to use access manager infra
175
+ // if(instance.hasRole(typeRole, msg.sender) == false) {
176
+ // revert MissingTypeRole();
177
+ // }
136
178
  }
137
179
 
138
180
  function lock(
@@ -142,7 +184,7 @@ contract ComponentOwnerService is
142
184
  IInstance instance = component.getInstance();
143
185
  NftId nftId = component.getNftId();
144
186
  Key32 key = nftId.toKey32(COMPONENT());
145
- instance.updateState(key, PAUSED());
187
+ // instance.updateState(key, PAUSED());
146
188
  }
147
189
 
148
190
  function unlock(
@@ -152,6 +194,124 @@ contract ComponentOwnerService is
152
194
  IInstance instance = component.getInstance();
153
195
  NftId nftId = component.getNftId();
154
196
  Key32 key = nftId.toKey32(COMPONENT());
155
- instance.updateState(key, ACTIVE());
197
+ // instance.updateState(key, ACTIVE());
198
+ }
199
+
200
+ // Internals
201
+
202
+ function _registerProduct(
203
+ NftId nftId,
204
+ NftId instanceNftId,
205
+ IInstance instance,
206
+ bytes memory data
207
+ )
208
+ internal
209
+ {
210
+ // TODO change treasury info to product setup info
211
+ (ISetup.ProductSetupInfo memory info) = abi.decode(data, (ISetup.ProductSetupInfo));
212
+ // (
213
+ // ITreasury.TreasuryInfo memory info,
214
+ // address wallet
215
+ // ) = abi.decode(data, (ITreasury.TreasuryInfo, address));
216
+
217
+ // IRegistry _registry = getRegistry();
218
+
219
+ // if(wallet == address(0)) {
220
+ // revert WalletIsZero();
221
+ // }
222
+
223
+ // IRegistry.ObjectInfo memory tokenInfo = _registry.getObjectInfo(address(info.token));
224
+
225
+ // if(tokenInfo.objectType != TOKEN()) {
226
+ // revert InvalidToken();
227
+ // }
228
+
229
+ // IRegistry.ObjectInfo memory poolInfo = _registry.getObjectInfo(info.poolNftId);
230
+
231
+ // if(poolInfo.objectType != POOL()) {
232
+ // revert InvalidPool();
233
+ // }
234
+
235
+ // if(poolInfo.parentNftId != instanceNftId) {
236
+ // revert InvalidPoolsInstance();
237
+ // }
238
+ // // TODO pool have the same token
239
+ // //ITreasury.PoolSetup memory poolSetup = instance.getPoolSetup(info.poolNftId);
240
+ // //require(tokenInfo.objectAddress == address(poolSetup.token), "ERROR:COS-018:PRODUCT_POOL_TOKEN_MISMATCH");
241
+ // // TODO pool is not linked
242
+
243
+ // IRegistry.ObjectInfo memory distributionInfo = _registry.getObjectInfo(info.distributionNftId);
244
+
245
+ // if(distributionInfo.objectType != DISTRIBUTION()) {
246
+ // revert InvalidDistribution();
247
+ // }
248
+
249
+ // if(distributionInfo.parentNftId != instanceNftId) {
250
+ // revert InvalidDistributionsInstance();
251
+ // }
252
+ // // TODO distribution have the same token
253
+ // // TODO distribution is not linked
254
+
255
+ // // component module
256
+ // instance.registerComponent(
257
+ // nftId,
258
+ // info.token,
259
+ // wallet // TODO move wallet into TreasuryInfo?
260
+ // );
261
+
262
+ // treasury module
263
+ instance.createProductSetup(
264
+ nftId,
265
+ info
266
+ );
267
+ }
268
+
269
+ function _registerPool(
270
+ NftId nftId,
271
+ NftId instanceNftId,
272
+ IInstance instance,
273
+ bytes memory data
274
+ )
275
+ internal
276
+ {
277
+ (
278
+ ISetup.PoolSetupInfo memory info,
279
+ address wallet,
280
+ IERC20Metadata token,
281
+ /*poolFee*/,
282
+ /*stakingFee*/,
283
+ /*performanceFee*/
284
+ ) = abi.decode(data, (ISetup.PoolSetupInfo, address, IERC20Metadata, Fee, Fee, Fee));
285
+
286
+ IRegistry _registry = getRegistry();
287
+
288
+ if(wallet == address(0)) {
289
+ revert WalletIsZero();
290
+ }
291
+
292
+ ObjectType tokenType = _registry.getObjectInfo(address(token)).objectType;
293
+
294
+ if(tokenType != TOKEN()) {
295
+ revert InvalidToken();
296
+ }
297
+
298
+ if(UFixedLib.eqz(info.collateralizationLevel)) {
299
+ revert CollateralizationLevelIsZero();
300
+ }
301
+
302
+ // TODO add more validations
303
+
304
+ // // component module
305
+ // instance.registerComponent(
306
+ // nftId,
307
+ // token,
308
+ // wallet
309
+ // );
310
+
311
+ // pool module
312
+ instance.createPoolSetup(
313
+ nftId,
314
+ info
315
+ );
156
316
  }
157
- }
317
+ }
@@ -2,58 +2,104 @@
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
- import {ITreasury} from "../../instance/module/treasury/ITreasury.sol";
7
+ import {InstanceReader} from "../../instance/InstanceReader.sol";
8
+ import {ISetup} from "../../instance/module/ISetup.sol";
9
+ import {ITreasury} from "../../instance/module/ITreasury.sol";
7
10
 
8
- import {NftId} from "../../types/NftId.sol";
11
+ import {NftId, NftIdLib} from "../../types/NftId.sol";
9
12
  import {Fee} from "../../types/Fee.sol";
13
+ import {DISTRIBUTION_OWNER_ROLE} from "../../types/RoleId.sol";
14
+ import {KEEP_STATE} from "../../types/StateId.sol";
10
15
  import {DISTRIBUTION} from "../../types/ObjectType.sol";
11
16
  import {Version, VersionLib} from "../../types/Version.sol";
12
17
 
13
18
  import {IVersionable} from "../../shared/IVersionable.sol";
14
19
  import {Versionable} from "../../shared/Versionable.sol";
15
20
 
21
+ import {IService} from "../../shared/IService.sol";
22
+ import {Service} from "../../shared/Service.sol";
16
23
  import {ComponentServiceBase} from "../base/ComponentServiceBase.sol";
17
24
  import {IDistributionService} from "./IDistributionService.sol";
25
+ import {Distribution} from "../../components/Distribution.sol";
26
+ import {InstanceService} from "../InstanceService.sol";
27
+ import {Instance} from "../Instance.sol";
28
+ import {INftOwnable} from "../../shared/INftOwnable.sol";
29
+
30
+ string constant DISTRIBUTION_SERVICE_NAME = "DistributionService";
18
31
 
19
32
  contract DistributionService is
20
33
  ComponentServiceBase,
21
34
  IDistributionService
22
35
  {
36
+ using NftIdLib for NftId;
37
+
23
38
  string public constant NAME = "DistributionService";
24
39
 
25
- constructor(
26
- address registry,
27
- NftId registryNftId
28
- ) ComponentServiceBase(registry, registryNftId) // solhint-disable-next-line no-empty-blocks
40
+ address internal _registryAddress;
41
+ InstanceService internal _instanceService;
42
+
43
+ function _initialize(
44
+ address owner,
45
+ bytes memory data
46
+ )
47
+ internal
48
+ initializer
49
+ virtual override
29
50
  {
51
+ address initialOwner = address(0);
52
+ (_registryAddress, initialOwner) = abi.decode(data, (address, address));
53
+
54
+ IRegistry registry = IRegistry(_registryAddress);
55
+ _instanceService = InstanceService(registry.getServiceAddress("InstanceService", getMajorVersion()));
56
+
57
+ _initializeService(_registryAddress, initialOwner);
58
+
59
+ _registerInterface(type(IService).interfaceId);
30
60
  _registerInterface(type(IDistributionService).interfaceId);
31
61
  }
32
62
 
33
- function getVersion()
34
- public
35
- pure
36
- virtual override (IVersionable, Versionable)
37
- returns(Version)
38
- {
39
- return VersionLib.toVersion(3,0,0);
40
- }
41
63
 
42
- function getName() external pure override returns(string memory name) {
64
+ function getName() public pure override(IService, Service) returns(string memory name) {
43
65
  return NAME;
44
66
  }
45
67
 
68
+ function register(address distributionComponentAddress)
69
+ external
70
+ returns (NftId distributionNftId)
71
+ {
72
+ address componentOwner = msg.sender;
73
+ Distribution distribution = Distribution(distributionComponentAddress);
74
+ IInstance instance = distribution.getInstance();
75
+ INftOwnable nftOwnable = INftOwnable(address(instance));
76
+
77
+ require(_instanceService.hasRole(componentOwner, DISTRIBUTION_OWNER_ROLE(), nftOwnable.getNftId()), "ERROR:DIS-001:NOT_DISTRIBUTION_OWNER");
78
+
79
+ IRegistryService registryService = getRegistryService();
80
+ (IRegistry.ObjectInfo memory distributionObjInfo, ) = registryService.registerDistribution(
81
+ distribution,
82
+ componentOwner
83
+ );
84
+ distributionNftId = distributionObjInfo.nftId;
85
+
86
+ ISetup.DistributionSetupInfo memory initialSetup = distribution.getInitialSetupInfo();
87
+ instance.createDistributionSetup(distributionNftId, initialSetup);
88
+ }
89
+
46
90
  function setFees(
47
91
  Fee memory distributionFee
48
92
  )
49
93
  external
50
94
  override
51
95
  {
52
- (IRegistry.ObjectInfo memory distributionInfo, IInstance instance) = _getAndVerifyComponentInfoAndInstance(DISTRIBUTION());
96
+ (IRegistry.ObjectInfo memory info , IInstance instance) = _getAndVerifyComponentInfoAndInstance(DISTRIBUTION());
97
+ InstanceReader instanceReader = instance.getInstanceReader();
98
+ NftId distributionNftId = info.nftId;
53
99
 
54
- NftId productNftId = instance.getProductNftId(distributionInfo.nftId);
55
- ITreasury.TreasuryInfo memory treasuryInfo = instance.getTreasuryInfo(productNftId);
56
- treasuryInfo.distributionFee = distributionFee;
57
- instance.setTreasuryInfo(productNftId, treasuryInfo);
100
+ ISetup.DistributionSetupInfo memory distSetupInfo = instanceReader.getDistributionSetupInfo(distributionNftId);
101
+ distSetupInfo.distributionFee = distributionFee;
102
+
103
+ instance.updateDistributionSetup(distributionNftId, distSetupInfo, KEEP_STATE());
58
104
  }
59
105
  }
@@ -0,0 +1,53 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ pragma solidity ^0.8.20;
3
+
4
+ import {IVersionable} from "../../shared/IVersionable.sol";
5
+ import {ProxyManager} from "../../shared/ProxyManager.sol";
6
+ import {DistributionService} from "./DistributionService.sol";
7
+ import {Registry} from "../../registry/Registry.sol";
8
+ import {RegistryService} from "../../registry/RegistryService.sol";
9
+ import {VersionLib} from "../../types/Version.sol";
10
+
11
+ contract DistributionServiceManager is ProxyManager {
12
+
13
+ DistributionService private _distributionService;
14
+
15
+ /// @dev initializes proxy manager with distribution service implementation and deploys instance
16
+ constructor(
17
+ address registryAddress
18
+ )
19
+ ProxyManager()
20
+ {
21
+ DistributionService distSrv = new DistributionService();
22
+ bytes memory data = abi.encode(registryAddress, address(this));
23
+ IVersionable versionable = deploy(
24
+ address(distSrv),
25
+ data);
26
+
27
+ _distributionService = DistributionService(address(versionable));
28
+
29
+ Registry registry = Registry(registryAddress);
30
+ address registryServiceAddress = registry.getServiceAddress("RegistryService", VersionLib.toVersion(3, 0, 0).toMajorPart());
31
+ RegistryService registryService = RegistryService(registryServiceAddress);
32
+
33
+ registryService.registerService(_distributionService);
34
+
35
+ // link ownership of instance service manager ot nft owner of instance service
36
+ _linkToNftOwnable(
37
+ address(registryAddress),
38
+ address(_distributionService));
39
+
40
+ // implies that after this constructor call only upgrade functionality is available
41
+ _isDeployed = true;
42
+ }
43
+
44
+ //--- view functions ----------------------------------------------------//
45
+ function getDistributionService()
46
+ external
47
+ view
48
+ returns (DistributionService distributionService)
49
+ {
50
+ return _distributionService;
51
+ }
52
+
53
+ }
@@ -5,13 +5,11 @@ import {NftId} from "../../types/NftId.sol";
5
5
  import {ObjectType} from "../../types/ObjectType.sol";
6
6
  import {RoleId} from "../../types/RoleId.sol";
7
7
  import {IBaseComponent} from "../../components/IBaseComponent.sol";
8
- import {IService} from "../base/IService.sol";
8
+ import {IService} from "../../shared/IService.sol";
9
9
 
10
10
  // TODO rename to registry service
11
11
  interface IComponentOwnerService is IService {
12
12
 
13
- function register(IBaseComponent component) external returns(NftId componentNftId);
14
-
15
13
  // TODO move to product/pool services
16
14
  function lock(IBaseComponent component) external;
17
15
 
@@ -3,7 +3,7 @@ pragma solidity ^0.8.19;
3
3
 
4
4
  import {NftId} from "../../types/NftId.sol";
5
5
  import {Fee} from "../../types/Fee.sol";
6
- import {IService} from "../base/IService.sol";
6
+ import {IService} from "../../shared/IService.sol";
7
7
 
8
8
  interface IDistributionService is IService {
9
9
  function setFees(
@@ -3,7 +3,7 @@ pragma solidity ^0.8.19;
3
3
 
4
4
  import {NftId} from "../../types/NftId.sol";
5
5
  import {Fee} from "../../types/Fee.sol";
6
- import {IService} from "../base/IService.sol";
6
+ import {IService} from "../../shared/IService.sol";
7
7
 
8
8
  interface IPoolService is IService {
9
9
  function setFees(