@etherisc/gif-next 0.0.2-e46206a-486 → 0.0.2-e59218b-293

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 (309) hide show
  1. package/README.md +4 -0
  2. package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.dbg.json +1 -1
  3. package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.json +26 -0
  4. package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +1 -1
  5. package/artifacts/contracts/components/Distribution.sol/Distribution.json +94 -33
  6. package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.dbg.json +1 -1
  7. package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.json +26 -0
  8. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
  9. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.json +0 -25
  10. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
  11. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.json +0 -59
  12. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +1 -1
  13. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.json +0 -50
  14. package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
  15. package/artifacts/contracts/components/Pool.sol/Pool.json +131 -65
  16. package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
  17. package/artifacts/contracts/components/Product.sol/Product.json +168 -58
  18. package/artifacts/contracts/experiment/cloning/Cloner.sol/Cloner.dbg.json +1 -1
  19. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock1.dbg.json +1 -1
  20. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock2.dbg.json +1 -1
  21. package/artifacts/contracts/experiment/errors/Require.sol/Require.dbg.json +1 -1
  22. package/artifacts/contracts/experiment/errors/Revert.sol/Revert.dbg.json +1 -1
  23. package/artifacts/contracts/experiment/inheritance/A.sol/A.dbg.json +1 -1
  24. package/artifacts/contracts/experiment/inheritance/A.sol/AShared.dbg.json +1 -1
  25. package/artifacts/contracts/experiment/inheritance/B.sol/B.dbg.json +1 -1
  26. package/artifacts/contracts/experiment/inheritance/C.sol/C.dbg.json +1 -1
  27. package/artifacts/contracts/experiment/inheritance/IA.sol/IA.dbg.json +1 -1
  28. package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.dbg.json +1 -1
  29. package/artifacts/contracts/experiment/inheritance/IB.sol/IB.dbg.json +1 -1
  30. package/artifacts/contracts/experiment/inheritance/IC.sol/IC.dbg.json +1 -1
  31. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.dbg.json +1 -1
  32. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.json +2 -2
  33. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.dbg.json +1 -1
  34. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.dbg.json +1 -1
  35. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.dbg.json +1 -1
  36. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.json +2 -2
  37. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.dbg.json +1 -1
  38. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.json +2 -2
  39. package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.dbg.json +1 -1
  40. package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.dbg.json +1 -1
  41. package/artifacts/contracts/instance/AccessManagedSimple.sol/AccessManagedSimple.dbg.json +4 -0
  42. package/artifacts/contracts/instance/AccessManagedSimple.sol/AccessManagedSimple.json +101 -0
  43. package/artifacts/contracts/instance/AccessManagerSimple.sol/AccessManagerSimple.dbg.json +4 -0
  44. package/artifacts/contracts/instance/AccessManagerSimple.sol/AccessManagerSimple.json +1132 -0
  45. package/artifacts/contracts/instance/IAccessManagerSimple.sol/IAccessManagerSimple.dbg.json +4 -0
  46. package/artifacts/contracts/instance/IAccessManagerSimple.sol/IAccessManagerSimple.json +1082 -0
  47. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  48. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +745 -1020
  49. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +4 -0
  50. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +480 -0
  51. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  52. package/artifacts/contracts/instance/Instance.sol/Instance.json +2238 -1030
  53. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +4 -0
  54. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +917 -0
  55. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +4 -0
  56. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +1412 -0
  57. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +4 -0
  58. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +931 -0
  59. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +4 -0
  60. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +508 -0
  61. package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.dbg.json +1 -1
  62. package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.json +59 -0
  63. package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.dbg.json +1 -1
  64. package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
  65. package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.json +27 -158
  66. package/artifacts/contracts/instance/base/ILifecycle.sol/ILifecycle.dbg.json +1 -1
  67. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
  68. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.json +37 -253
  69. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json +1 -1
  70. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.json +2 -2
  71. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +4 -0
  72. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.json +211 -0
  73. package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +4 -0
  74. package/artifacts/contracts/instance/module/{bundle/IBundle.sol → IBundle.sol}/IBundle.json +1 -1
  75. package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +4 -0
  76. package/artifacts/contracts/instance/module/{distribution/IDistribution.sol → IDistribution.sol}/IDistribution.json +1 -1
  77. package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +4 -0
  78. package/artifacts/contracts/instance/module/{policy/IPolicy.sol → IPolicy.sol}/IPolicy.json +1 -1
  79. package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +4 -0
  80. package/artifacts/contracts/instance/module/{risk/IRisk.sol → IRisk.sol}/IRisk.json +1 -1
  81. package/artifacts/contracts/instance/module/ISetup.sol/ISetup.dbg.json +4 -0
  82. package/artifacts/contracts/instance/{base/ModuleBase.sol/ModuleBase.json → module/ISetup.sol/ISetup.json} +2 -2
  83. package/artifacts/contracts/instance/module/ITreasury.sol/ITreasury.dbg.json +4 -0
  84. package/artifacts/contracts/instance/module/{treasury/ITreasury.sol → ITreasury.sol}/ITreasury.json +1 -1
  85. package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.dbg.json +1 -1
  86. package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.json +32 -48
  87. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +1 -1
  88. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +111 -41
  89. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +4 -0
  90. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.json +444 -0
  91. package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.dbg.json +1 -1
  92. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +1 -1
  93. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +1 -1
  94. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +87 -0
  95. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +1 -1
  96. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +40 -31
  97. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +1 -1
  98. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +200 -43
  99. package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.dbg.json +4 -0
  100. package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.json +448 -0
  101. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +1 -1
  102. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +176 -105
  103. package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.dbg.json +4 -0
  104. package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.json +488 -0
  105. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  106. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  107. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +201 -0
  108. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
  109. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +94 -19
  110. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
  111. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  112. package/artifacts/contracts/registry/Registry.sol/Registry.json +172 -49
  113. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
  114. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +61 -29
  115. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
  116. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +47 -34
  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 +1 -1
  120. package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +1 -1
  121. package/artifacts/contracts/shared/ERC165.sol/ERC165.json +2 -2
  122. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
  123. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  124. package/artifacts/contracts/shared/IService.sol/IService.dbg.json +4 -0
  125. package/artifacts/contracts/{instance/base → shared}/IService.sol/IService.json +1 -1
  126. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +1 -1
  127. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
  128. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +2 -2
  129. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +1 -1
  130. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +2 -2
  131. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  132. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +4 -4
  133. package/artifacts/contracts/shared/RegisterableUpgradable.sol/RegisterableUpgradable.dbg.json +4 -0
  134. package/artifacts/contracts/{instance/base/InstanceBase.sol/InstanceBase.json → shared/RegisterableUpgradable.sol/RegisterableUpgradable.json} +2 -104
  135. package/artifacts/contracts/shared/Service.sol/Service.dbg.json +4 -0
  136. package/artifacts/contracts/{instance/base/ServiceBase.sol/ServiceBase.json → shared/Service.sol/Service.json} +2 -2
  137. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +4 -0
  138. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +96 -0
  139. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
  140. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +2 -2
  141. package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +1 -1
  142. package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json +1 -1
  143. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json +1 -1
  144. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +4 -4
  145. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +1 -1
  146. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.json +2 -2
  147. package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +1 -1
  148. package/artifacts/contracts/test/TestService.sol/TestService.json +11 -11
  149. package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json +1 -1
  150. package/artifacts/contracts/test/TestVersion.sol/TestVersion.dbg.json +1 -1
  151. package/artifacts/contracts/test/TestVersion.sol/TestVersion.json +2 -2
  152. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json +1 -1
  153. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.json +2 -2
  154. package/artifacts/contracts/test/Usdc.sol/USDC.dbg.json +1 -1
  155. package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.dbg.json +1 -1
  156. package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
  157. package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +1 -1
  158. package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.dbg.json +1 -1
  159. package/artifacts/contracts/types/Fee.sol/FeeLib.dbg.json +1 -1
  160. package/artifacts/contracts/types/Key32.sol/Key32Lib.dbg.json +1 -1
  161. package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +1 -1
  162. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
  163. package/artifacts/contracts/types/NumberId.sol/NumberIdLib.dbg.json +1 -1
  164. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
  165. package/artifacts/contracts/types/Referral.sol/ReferralLib.dbg.json +1 -1
  166. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.dbg.json +1 -1
  167. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.dbg.json +1 -1
  168. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.json +2 -2
  169. package/artifacts/contracts/types/StateId.sol/StateIdLib.dbg.json +1 -1
  170. package/artifacts/contracts/types/StateId.sol/StateIdLib.json +2 -2
  171. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json +1 -1
  172. package/artifacts/contracts/types/UFixed.sol/MathLib.dbg.json +1 -1
  173. package/artifacts/contracts/types/UFixed.sol/UFixedLib.dbg.json +1 -1
  174. package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +1 -1
  175. package/artifacts/contracts/types/Version.sol/VersionLib.json +2 -2
  176. package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +1 -1
  177. package/artifacts/contracts/types/Version.sol/VersionPartLib.json +22 -3
  178. package/contracts/components/BaseComponent.sol +15 -3
  179. package/contracts/components/Distribution.sol +22 -14
  180. package/contracts/components/IBaseComponent.sol +8 -2
  181. package/contracts/components/IDistributionComponent.sol +1 -3
  182. package/contracts/components/IPoolComponent.sol +0 -2
  183. package/contracts/components/IProductComponent.sol +1 -3
  184. package/contracts/components/Pool.sol +26 -26
  185. package/contracts/components/Product.sol +49 -60
  186. package/contracts/instance/AccessManagedSimple.sol +115 -0
  187. package/contracts/instance/AccessManagerSimple.sol +692 -0
  188. package/contracts/instance/IAccessManagerSimple.sol +391 -0
  189. package/contracts/instance/IInstance.sol +46 -44
  190. package/contracts/instance/IInstanceService.sol +30 -0
  191. package/contracts/instance/Instance.sol +423 -63
  192. package/contracts/instance/InstanceAccessManager.sol +288 -0
  193. package/contracts/instance/InstanceReader.sol +315 -0
  194. package/contracts/instance/InstanceService.sol +198 -0
  195. package/contracts/instance/InstanceServiceManager.sol +57 -0
  196. package/contracts/instance/base/ComponentServiceBase.sol +93 -8
  197. package/contracts/instance/base/IKeyValueStore.sol +13 -14
  198. package/contracts/instance/base/ILifecycle.sol +3 -3
  199. package/contracts/instance/base/KeyValueStore.sol +49 -39
  200. package/contracts/instance/base/Lifecycle.sol +1 -1
  201. package/contracts/instance/module/IAccess.sol +38 -0
  202. package/contracts/instance/module/IBundle.sol +20 -0
  203. package/contracts/instance/module/IDistribution.sol +39 -0
  204. package/contracts/instance/module/IPolicy.sol +45 -0
  205. package/contracts/instance/module/IRisk.sol +11 -0
  206. package/contracts/instance/module/ISetup.sol +45 -0
  207. package/contracts/instance/module/ITreasury.sol +23 -0
  208. package/contracts/instance/service/ComponentOwnerService.sol +62 -60
  209. package/contracts/instance/service/DistributionService.sol +49 -15
  210. package/contracts/instance/service/DistributionServiceManager.sol +54 -0
  211. package/contracts/instance/service/IComponentOwnerService.sol +1 -1
  212. package/contracts/instance/service/IDistributionService.sol +1 -1
  213. package/contracts/instance/service/IPoolService.sol +5 -1
  214. package/contracts/instance/service/IProductService.sol +8 -5
  215. package/contracts/instance/service/PoolService.sol +104 -52
  216. package/contracts/instance/service/PoolServiceManager.sol +54 -0
  217. package/contracts/instance/service/ProductService.sol +168 -111
  218. package/contracts/instance/service/ProductServiceManager.sol +54 -0
  219. package/contracts/registry/IRegistry.sol +26 -2
  220. package/contracts/registry/IRegistryService.sol +34 -19
  221. package/contracts/registry/Registry.sol +61 -36
  222. package/contracts/registry/RegistryService.sol +42 -125
  223. package/contracts/registry/RegistryServiceManager.sol +21 -5
  224. package/contracts/registry/TokenRegistry.sol +111 -0
  225. package/contracts/shared/ERC165.sol +6 -2
  226. package/contracts/{instance/base → shared}/IService.sol +3 -3
  227. package/contracts/shared/NftOwnable.sol +2 -4
  228. package/contracts/shared/Registerable.sol +1 -0
  229. package/contracts/shared/RegisterableUpgradable.sol +16 -0
  230. package/contracts/shared/Service.sol +55 -0
  231. package/contracts/shared/TokenHandler.sol +27 -0
  232. package/contracts/test/TestService.sol +3 -5
  233. package/contracts/types/RoleId.sol +8 -0
  234. package/contracts/types/StateId.sol +4 -0
  235. package/contracts/types/Version.sol +4 -1
  236. package/package.json +1 -1
  237. package/artifacts/contracts/instance/IInstanceLinked.sol/IInstanceLinked.dbg.json +0 -4
  238. package/artifacts/contracts/instance/IInstanceLinked.sol/IInstanceLinked.json +0 -24
  239. package/artifacts/contracts/instance/base/IService.sol/IService.dbg.json +0 -4
  240. package/artifacts/contracts/instance/base/InstanceBase.sol/InstanceBase.dbg.json +0 -4
  241. package/artifacts/contracts/instance/base/ModuleBase.sol/ModuleBase.dbg.json +0 -4
  242. package/artifacts/contracts/instance/base/ServiceBase.sol/ServiceBase.dbg.json +0 -4
  243. package/artifacts/contracts/instance/module/bundle/BundleModule.sol/BundleModule.dbg.json +0 -4
  244. package/artifacts/contracts/instance/module/bundle/BundleModule.sol/BundleModule.json +0 -297
  245. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundle.dbg.json +0 -4
  246. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundleModule.dbg.json +0 -4
  247. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundleModule.json +0 -297
  248. package/artifacts/contracts/instance/module/component/ComponentModule.sol/ComponentModule.dbg.json +0 -4
  249. package/artifacts/contracts/instance/module/component/ComponentModule.sol/ComponentModule.json +0 -117
  250. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponent.dbg.json +0 -4
  251. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponent.json +0 -10
  252. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponentModule.dbg.json +0 -4
  253. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponentModule.json +0 -117
  254. package/artifacts/contracts/instance/module/distribution/DistributionModule.sol/DistributionModule.dbg.json +0 -4
  255. package/artifacts/contracts/instance/module/distribution/DistributionModule.sol/DistributionModule.json +0 -10
  256. package/artifacts/contracts/instance/module/distribution/IDistribution.sol/IDistribution.dbg.json +0 -4
  257. package/artifacts/contracts/instance/module/distribution/IDistribution.sol/IDistributionModule.dbg.json +0 -4
  258. package/artifacts/contracts/instance/module/distribution/IDistribution.sol/IDistributionModule.json +0 -10
  259. package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicy.dbg.json +0 -4
  260. package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicyModule.dbg.json +0 -4
  261. package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicyModule.json +0 -271
  262. package/artifacts/contracts/instance/module/policy/PolicyModule.sol/PolicyModule.dbg.json +0 -4
  263. package/artifacts/contracts/instance/module/policy/PolicyModule.sol/PolicyModule.json +0 -271
  264. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPool.dbg.json +0 -4
  265. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPool.json +0 -10
  266. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPoolModule.dbg.json +0 -4
  267. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPoolModule.json +0 -164
  268. package/artifacts/contracts/instance/module/pool/PoolModule.sol/PoolModule.dbg.json +0 -4
  269. package/artifacts/contracts/instance/module/pool/PoolModule.sol/PoolModule.json +0 -164
  270. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRisk.dbg.json +0 -4
  271. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRiskModule.dbg.json +0 -4
  272. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRiskModule.json +0 -113
  273. package/artifacts/contracts/instance/module/risk/RiskModule.sol/RiskModule.dbg.json +0 -4
  274. package/artifacts/contracts/instance/module/risk/RiskModule.sol/RiskModule.json +0 -131
  275. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasury.dbg.json +0 -4
  276. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasuryModule.dbg.json +0 -4
  277. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasuryModule.json +0 -638
  278. package/artifacts/contracts/instance/module/treasury/TokenHandler.sol/TokenHandler.dbg.json +0 -4
  279. package/artifacts/contracts/instance/module/treasury/TokenHandler.sol/TokenHandler.json +0 -76
  280. package/artifacts/contracts/instance/module/treasury/TreasuryModule.sol/TreasuryModule.dbg.json +0 -4
  281. package/artifacts/contracts/instance/module/treasury/TreasuryModule.sol/TreasuryModule.json +0 -638
  282. package/artifacts/contracts/test/TestDistribution.sol/TestDistribution.dbg.json +0 -4
  283. package/artifacts/contracts/test/TestDistribution.sol/TestDistribution.json +0 -557
  284. package/artifacts/contracts/test/TestPool.sol/TestPool.dbg.json +0 -4
  285. package/artifacts/contracts/test/TestPool.sol/TestPool.json +0 -716
  286. package/artifacts/contracts/test/TestProduct.sol/TestProduct.dbg.json +0 -4
  287. package/artifacts/contracts/test/TestProduct.sol/TestProduct.json +0 -744
  288. package/contracts/instance/IInstanceLinked.sol +0 -8
  289. package/contracts/instance/base/InstanceBase.sol +0 -89
  290. package/contracts/instance/base/ModuleBase.sol +0 -57
  291. package/contracts/instance/base/ServiceBase.sol +0 -44
  292. package/contracts/instance/module/bundle/BundleModule.sol +0 -134
  293. package/contracts/instance/module/bundle/IBundle.sol +0 -53
  294. package/contracts/instance/module/component/ComponentModule.sol +0 -71
  295. package/contracts/instance/module/component/IComponent.sol +0 -28
  296. package/contracts/instance/module/distribution/DistributionModule.sol +0 -17
  297. package/contracts/instance/module/distribution/IDistribution.sol +0 -10
  298. package/contracts/instance/module/policy/IPolicy.sol +0 -63
  299. package/contracts/instance/module/policy/PolicyModule.sol +0 -91
  300. package/contracts/instance/module/pool/IPoolModule.sol +0 -41
  301. package/contracts/instance/module/pool/PoolModule.sol +0 -95
  302. package/contracts/instance/module/risk/IRisk.sol +0 -26
  303. package/contracts/instance/module/risk/RiskModule.sol +0 -62
  304. package/contracts/instance/module/treasury/ITreasury.sol +0 -84
  305. package/contracts/instance/module/treasury/TokenHandler.sol +0 -48
  306. package/contracts/instance/module/treasury/TreasuryModule.sol +0 -131
  307. package/contracts/test/TestDistribution.sol +0 -22
  308. package/contracts/test/TestPool.sol +0 -27
  309. package/contracts/test/TestProduct.sol +0 -74
@@ -1,43 +1,76 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
2
  pragma solidity ^0.8.19;
3
3
 
4
+ import {Pool} from "../../components/Pool.sol";
4
5
  import {IRegistry} from "../../registry/IRegistry.sol";
5
6
  import {IInstance} from "../../instance/IInstance.sol";
6
- import {IBundle} from "../../instance/module/bundle/IBundle.sol";
7
- import {ITreasury, ITreasuryModule, TokenHandler} from "../../instance/module/treasury/ITreasury.sol";
7
+ import {IBundle} from "../../instance/module/IBundle.sol";
8
+ import {TokenHandler} from "../../instance/module/ITreasury.sol";
9
+ import {ISetup} from "../module/ISetup.sol";
8
10
 
9
11
  import {IVersionable} from "../../shared/IVersionable.sol";
10
12
  import {Versionable} from "../../shared/Versionable.sol";
13
+ import {INftOwnable} from "../../shared/INftOwnable.sol";
11
14
 
12
15
  import {NftId, NftIdLib, zeroNftId} from "../../types/NftId.sol";
13
16
  import {POOL, BUNDLE} from "../../types/ObjectType.sol";
14
- import {Fee} from "../../types/Fee.sol";
17
+ import {POOL_OWNER_ROLE, RoleId} from "../../types/RoleId.sol";
18
+ import {Fee, FeeLib} from "../../types/Fee.sol";
15
19
  import {Version, VersionLib} from "../../types/Version.sol";
20
+ import {KEEP_STATE, StateId} from "../../types/StateId.sol";
21
+ import {zeroTimestamp} from "../../types/Timestamp.sol";
16
22
 
17
- import {IService} from "../base/IService.sol";
18
- import {ServiceBase} from "../base/ServiceBase.sol";
23
+ import {IService} from "../../shared/IService.sol";
24
+ import {Service} from "../../shared/Service.sol";
19
25
  import {ComponentServiceBase} from "../base/ComponentServiceBase.sol";
20
26
  import {IPoolService} from "./IPoolService.sol";
27
+ import {IRegistryService} from "../../registry/IRegistryService.sol";
28
+ import {InstanceService} from "../InstanceService.sol";
29
+ import {InstanceReader} from "../InstanceReader.sol";
21
30
 
22
31
 
23
- contract PoolService is ComponentServiceBase, IPoolService {
32
+ string constant POOL_SERVICE_NAME = "PoolService";
33
+
34
+ contract PoolService is
35
+ ComponentServiceBase,
36
+ IPoolService
37
+ {
24
38
  using NftIdLib for NftId;
25
39
 
26
40
  string public constant NAME = "PoolService";
27
41
 
28
- constructor(
29
- address registry,
30
- NftId registryNftId,
31
- address initialOwner
32
- ) ComponentServiceBase(registry, registryNftId, initialOwner)
42
+ address internal _registryAddress;
43
+
44
+ function _initialize(
45
+ address owner,
46
+ bytes memory data
47
+ )
48
+ internal
49
+ initializer
50
+ virtual override
33
51
  {
52
+ address initialOwner = address(0);
53
+ (_registryAddress, initialOwner) = abi.decode(data, (address, address));
54
+ // TODO while PoolService is not deployed in PoolServiceManager constructor
55
+ // owner is PoolServiceManager deployer
56
+ _initializeService(_registryAddress, owner);
57
+
58
+ _registerInterface(type(IService).interfaceId);
34
59
  _registerInterface(type(IPoolService).interfaceId);
35
60
  }
36
61
 
37
- function getName() public pure override(IService, ServiceBase) returns(string memory name) {
62
+ function getName() public pure override(Service, IService) returns(string memory name) {
38
63
  return NAME;
39
64
  }
40
65
 
66
+ function _finalizeComponentRegistration(NftId componentNftId, bytes memory initialObjData, IInstance instance) internal override {
67
+ ISetup.PoolSetupInfo memory initialSetup = abi.decode(
68
+ initialObjData,
69
+ (ISetup.PoolSetupInfo)
70
+ );
71
+ instance.createPoolSetup(componentNftId, initialSetup);
72
+ }
73
+
41
74
  function setFees(
42
75
  Fee memory poolFee,
43
76
  Fee memory stakingFee,
@@ -47,13 +80,15 @@ contract PoolService is ComponentServiceBase, IPoolService {
47
80
  override
48
81
  {
49
82
  (IRegistry.ObjectInfo memory poolInfo, IInstance instance) = _getAndVerifyComponentInfoAndInstance(POOL());
50
-
51
- NftId productNftId = instance.getProductNftId(poolInfo.nftId);
52
- ITreasury.TreasuryInfo memory treasuryInfo = instance.getTreasuryInfo(productNftId);
53
- treasuryInfo.poolFee = poolFee;
54
- treasuryInfo.stakingFee = stakingFee;
55
- treasuryInfo.performanceFee = performanceFee;
56
- instance.setTreasuryInfo(productNftId, treasuryInfo);
83
+ InstanceReader instanceReader = instance.getInstanceReader();
84
+ NftId poolNftId = poolInfo.nftId;
85
+
86
+ ISetup.PoolSetupInfo memory poolSetupInfo = instanceReader.getPoolSetupInfo(poolNftId);
87
+ poolSetupInfo.poolFee = poolFee;
88
+ poolSetupInfo.stakingFee = stakingFee;
89
+ poolSetupInfo.performanceFee = performanceFee;
90
+
91
+ instance.updatePoolSetup(poolNftId, poolSetupInfo, KEEP_STATE());
57
92
  }
58
93
 
59
94
  function createBundle(
@@ -68,42 +103,46 @@ contract PoolService is ComponentServiceBase, IPoolService {
68
103
  returns(NftId bundleNftId)
69
104
  {
70
105
  (IRegistry.ObjectInfo memory info, IInstance instance) = _getAndVerifyComponentInfoAndInstance(POOL());
106
+ InstanceReader instanceReader = instance.getInstanceReader();
107
+ NftId poolNftId = info.nftId;
108
+
109
+ IBundle.BundleInfo memory bundleInfo = IBundle.BundleInfo(
110
+ poolNftId,
111
+ fee,
112
+ filter,
113
+ stakingAmount,
114
+ 0,
115
+ stakingAmount,
116
+ lifetime,
117
+ zeroTimestamp(),
118
+ zeroTimestamp()
119
+ );
71
120
 
72
121
  // register bundle with registry
73
- NftId poolNftId = info.nftId;
74
122
  bundleNftId = getRegistryService().registerBundle(
75
123
  IRegistry.ObjectInfo(
76
- zeroNftId(),
124
+ zeroNftId(),
77
125
  poolNftId,
78
126
  BUNDLE(),
79
127
  false, // intercepting property for bundles is defined on pool
80
128
  address(0),
81
129
  owner,
82
- ""
130
+ abi.encode(bundleInfo)
83
131
  )
84
132
  );
85
133
 
86
134
  // create bundle info in instance
87
- instance.createBundleInfo(
88
- bundleNftId,
89
- poolNftId,
90
- fee,
91
- stakingAmount,
92
- lifetime,
93
- filter);
94
-
95
- // add bundle to pool in instance
96
- instance.addBundleToPool(
97
- bundleNftId,
98
- poolNftId,
99
- stakingAmount);
100
-
101
- // collect capital
102
- _processStakingByTreasury(
103
- instance,
104
- poolNftId,
105
- bundleNftId,
106
- stakingAmount);
135
+ instance.createBundle(bundleNftId, bundleInfo);
136
+
137
+ // TODO add bundle to pool in instance
138
+
139
+ // TODO collect capital
140
+ // _processStakingByTreasury(
141
+ // instanceReader,
142
+ // zeroNftId(),
143
+ // poolNftId,
144
+ // bundleNftId,
145
+ // stakingAmount);
107
146
 
108
147
  // TODO add logging
109
148
  }
@@ -115,17 +154,31 @@ contract PoolService is ComponentServiceBase, IPoolService {
115
154
  external
116
155
  override
117
156
  {
118
- (IRegistry.ObjectInfo memory poolInfo, IInstance instance) = _getAndVerifyComponentInfoAndInstance(POOL());
119
- IBundle.BundleInfo memory bundleInfo = instance.getBundleInfo(bundleNftId);
157
+ (IRegistry.ObjectInfo memory info , IInstance instance) = _getAndVerifyComponentInfoAndInstance(POOL());
158
+ InstanceReader instanceReader = instance.getInstanceReader();
159
+ NftId poolNftId = info.nftId;
160
+
161
+ IBundle.BundleInfo memory bundleInfo = instanceReader.getBundleInfo(bundleNftId);
120
162
  require(bundleInfo.poolNftId.gtz(), "ERROR:PLS-010:BUNDLE_UNKNOWN");
121
- require(poolInfo.nftId == bundleInfo.poolNftId, "ERROR:PLS-011:BUNDLE_POOL_MISMATCH");
163
+ require(poolNftId == bundleInfo.poolNftId, "ERROR:PLS-011:BUNDLE_POOL_MISMATCH");
164
+
122
165
  bundleInfo.fee = fee;
123
- instance.setBundleInfo(bundleNftId, bundleInfo);
166
+
167
+ instance.updateBundle(bundleNftId, bundleInfo, KEEP_STATE());
124
168
  }
125
169
 
170
+ function updateBundle(NftId instanceNftId, NftId bundleNftId, IBundle.BundleInfo memory bundleInfo, StateId state)
171
+ external
172
+ onlyService
173
+ {
174
+ IRegistry.ObjectInfo memory instanceInfo = getRegistry().getObjectInfo(instanceNftId);
175
+ IInstance instance = IInstance(instanceInfo.objectAddress);
176
+ instance.updateBundle(bundleNftId, bundleInfo, state);
177
+ }
126
178
 
127
179
  function _processStakingByTreasury(
128
- IInstance instance,
180
+ InstanceReader instanceReader,
181
+ NftId productNftId,
129
182
  NftId poolNftId,
130
183
  NftId bundleNftId,
131
184
  uint256 stakingAmount
@@ -134,14 +187,13 @@ contract PoolService is ComponentServiceBase, IPoolService {
134
187
  {
135
188
  // process token transfer(s)
136
189
  if(stakingAmount > 0) {
137
- NftId productNftId = instance.getProductNftId(poolNftId);
138
- TokenHandler tokenHandler = instance.getTokenHandler(productNftId);
190
+ TokenHandler tokenHandler = TokenHandler(instanceReader.getTokenHandler(productNftId));
139
191
  address bundleOwner = getRegistry().ownerOf(bundleNftId);
140
- address poolWallet = instance.getComponentWallet(poolNftId);
141
-
192
+ ISetup.PoolSetupInfo memory poolInfo = instanceReader.getPoolSetupInfo(poolNftId);
193
+
142
194
  tokenHandler.transfer(
143
195
  bundleOwner,
144
- poolWallet,
196
+ poolInfo.wallet,
145
197
  stakingAmount
146
198
  );
147
199
  }
@@ -0,0 +1,54 @@
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 {PoolService} from "./PoolService.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 PoolServiceManager is ProxyManager {
12
+
13
+ PoolService private _poolService;
14
+
15
+ /// @dev initializes proxy manager with pool service implementation
16
+ constructor(
17
+ address registryAddress
18
+ )
19
+ ProxyManager()
20
+ {
21
+ PoolService poolSrv = new PoolService();
22
+ bytes memory data = abi.encode(registryAddress, address(this));
23
+ IVersionable versionable = deploy(
24
+ address(poolSrv),
25
+ data);
26
+
27
+ _poolService = PoolService(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
+ // TODO this must have a role or own nft to register service
33
+ //registryService.registerService(_poolService);
34
+
35
+ // TODO no nft to link yet
36
+ // link ownership of instance service manager ot nft owner of instance service
37
+ //_linkToNftOwnable(
38
+ // address(registryAddress),
39
+ // address(_poolService));
40
+
41
+ // implies that after this constructor call only upgrade functionality is available
42
+ _isDeployed = true;
43
+ }
44
+
45
+ //--- view functions ----------------------------------------------------//
46
+ function getPoolService()
47
+ external
48
+ view
49
+ returns (PoolService poolService)
50
+ {
51
+ return _poolService;
52
+ }
53
+
54
+ }