@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,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/22ace16a46acabda891a4eae781c3ca6.json"
3
+ "buildInfo": "../../../build-info/2d379e3be07995e9ef3aeb0cf9a0cc9e.json"
4
4
  }
@@ -170,8 +170,8 @@
170
170
  "type": "function"
171
171
  }
172
172
  ],
173
- "bytecode": "0x61039161003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100925760003560e01c80638e4ad86c116100655780638e4ad86c1461012157806394aa449c14610144578063a123b37c14610152578063c9e66e291461017957600080fd5b806304b8f6c5146100975780632efe0113146100b357806349a7111a146100c657806355601007146100fd575b600080fd5b60005b60405162ffffff90911681526020015b60405180910390f35b61009a6100c136600461026e565b610190565b6100d96100d436600461029a565b610231565b6040805160ff948516815292841660208401529216918101919091526060016100aa565b61011361010b36600461029a565b62ffffff1690565b6040519081526020016100aa565b61013261012f3660046102c6565b90565b60405160ff90911681526020016100aa565b61009a61012f3660046102df565b61016061010b36600461029a565b60405167ffffffffffffffff90911681526020016100aa565b61013261018736600461029a565b60101c60ff1690565b6000610100841080156101a4575061010083105b80156101b1575061010082105b61020c5760405162461bcd60e51b815260206004820152602260248201527f4552524f523a5652532d3031303a56455253494f4e5f504152545f544f4f5f42604482015261494760f01b606482015260840160405180910390fd5b8161021f600885901b601087901b61031f565b610229919061031f565b949350505050565b600080808360ff601082901c166102488383610338565b915061ffff600883901c16600061025f8185610338565b92989197509195509350505050565b60008060006060848603121561028357600080fd5b505081359360208301359350604090920135919050565b6000602082840312156102ac57600080fd5b813562ffffff811681146102bf57600080fd5b9392505050565b6000602082840312156102d857600080fd5b5035919050565b6000602082840312156102f157600080fd5b813567ffffffffffffffff811681146102bf57600080fd5b634e487b7160e01b600052601160045260246000fd5b8082018082111561033257610332610309565b92915050565b62ffffff82811682821603908082111561035457610354610309565b509291505056fea2646970667358221220e42f77cfda39708b26a423d08fb99d9e3d65c337357ab7291eb4fdfec94256eb64736f6c63430008140033",
174
- "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100925760003560e01c80638e4ad86c116100655780638e4ad86c1461012157806394aa449c14610144578063a123b37c14610152578063c9e66e291461017957600080fd5b806304b8f6c5146100975780632efe0113146100b357806349a7111a146100c657806355601007146100fd575b600080fd5b60005b60405162ffffff90911681526020015b60405180910390f35b61009a6100c136600461026e565b610190565b6100d96100d436600461029a565b610231565b6040805160ff948516815292841660208401529216918101919091526060016100aa565b61011361010b36600461029a565b62ffffff1690565b6040519081526020016100aa565b61013261012f3660046102c6565b90565b60405160ff90911681526020016100aa565b61009a61012f3660046102df565b61016061010b36600461029a565b60405167ffffffffffffffff90911681526020016100aa565b61013261018736600461029a565b60101c60ff1690565b6000610100841080156101a4575061010083105b80156101b1575061010082105b61020c5760405162461bcd60e51b815260206004820152602260248201527f4552524f523a5652532d3031303a56455253494f4e5f504152545f544f4f5f42604482015261494760f01b606482015260840160405180910390fd5b8161021f600885901b601087901b61031f565b610229919061031f565b949350505050565b600080808360ff601082901c166102488383610338565b915061ffff600883901c16600061025f8185610338565b92989197509195509350505050565b60008060006060848603121561028357600080fd5b505081359360208301359350604090920135919050565b6000602082840312156102ac57600080fd5b813562ffffff811681146102bf57600080fd5b9392505050565b6000602082840312156102d857600080fd5b5035919050565b6000602082840312156102f157600080fd5b813567ffffffffffffffff811681146102bf57600080fd5b634e487b7160e01b600052601160045260246000fd5b8082018082111561033257610332610309565b92915050565b62ffffff82811682821603908082111561035457610354610309565b509291505056fea2646970667358221220e42f77cfda39708b26a423d08fb99d9e3d65c337357ab7291eb4fdfec94256eb64736f6c63430008140033",
173
+ "bytecode": "0x61039161003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100925760003560e01c80638e4ad86c116100655780638e4ad86c1461012157806394aa449c14610144578063a123b37c14610152578063c9e66e291461017957600080fd5b806304b8f6c5146100975780632efe0113146100b357806349a7111a146100c657806355601007146100fd575b600080fd5b60005b60405162ffffff90911681526020015b60405180910390f35b61009a6100c136600461026e565b610190565b6100d96100d436600461029a565b610231565b6040805160ff948516815292841660208401529216918101919091526060016100aa565b61011361010b36600461029a565b62ffffff1690565b6040519081526020016100aa565b61013261012f3660046102c6565b90565b60405160ff90911681526020016100aa565b61009a61012f3660046102df565b61016061010b36600461029a565b60405167ffffffffffffffff90911681526020016100aa565b61013261018736600461029a565b60101c60ff1690565b6000610100841080156101a4575061010083105b80156101b1575061010082105b61020c5760405162461bcd60e51b815260206004820152602260248201527f4552524f523a5652532d3031303a56455253494f4e5f504152545f544f4f5f42604482015261494760f01b606482015260840160405180910390fd5b8161021f600885901b601087901b61031f565b610229919061031f565b949350505050565b600080808360ff601082901c166102488383610338565b915061ffff600883901c16600061025f8185610338565b92989197509195509350505050565b60008060006060848603121561028357600080fd5b505081359360208301359350604090920135919050565b6000602082840312156102ac57600080fd5b813562ffffff811681146102bf57600080fd5b9392505050565b6000602082840312156102d857600080fd5b5035919050565b6000602082840312156102f157600080fd5b813567ffffffffffffffff811681146102bf57600080fd5b634e487b7160e01b600052601160045260246000fd5b8082018082111561033257610332610309565b92915050565b62ffffff82811682821603908082111561035457610354610309565b509291505056fea264697066735822122096e4b37266f82e0aaf6f30afa90c545c35f82576ca3b67d630233921e58f525b64736f6c63430008140033",
174
+ "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100925760003560e01c80638e4ad86c116100655780638e4ad86c1461012157806394aa449c14610144578063a123b37c14610152578063c9e66e291461017957600080fd5b806304b8f6c5146100975780632efe0113146100b357806349a7111a146100c657806355601007146100fd575b600080fd5b60005b60405162ffffff90911681526020015b60405180910390f35b61009a6100c136600461026e565b610190565b6100d96100d436600461029a565b610231565b6040805160ff948516815292841660208401529216918101919091526060016100aa565b61011361010b36600461029a565b62ffffff1690565b6040519081526020016100aa565b61013261012f3660046102c6565b90565b60405160ff90911681526020016100aa565b61009a61012f3660046102df565b61016061010b36600461029a565b60405167ffffffffffffffff90911681526020016100aa565b61013261018736600461029a565b60101c60ff1690565b6000610100841080156101a4575061010083105b80156101b1575061010082105b61020c5760405162461bcd60e51b815260206004820152602260248201527f4552524f523a5652532d3031303a56455253494f4e5f504152545f544f4f5f42604482015261494760f01b606482015260840160405180910390fd5b8161021f600885901b601087901b61031f565b610229919061031f565b949350505050565b600080808360ff601082901c166102488383610338565b915061ffff600883901c16600061025f8185610338565b92989197509195509350505050565b60008060006060848603121561028357600080fd5b505081359360208301359350604090920135919050565b6000602082840312156102ac57600080fd5b813562ffffff811681146102bf57600080fd5b9392505050565b6000602082840312156102d857600080fd5b5035919050565b6000602082840312156102f157600080fd5b813567ffffffffffffffff811681146102bf57600080fd5b634e487b7160e01b600052601160045260246000fd5b8082018082111561033257610332610309565b92915050565b62ffffff82811682821603908082111561035457610354610309565b509291505056fea264697066735822122096e4b37266f82e0aaf6f30afa90c545c35f82576ca3b67d630233921e58f525b64736f6c63430008140033",
175
175
  "linkReferences": {},
176
176
  "deployedLinkReferences": {}
177
177
  }
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/22ace16a46acabda891a4eae781c3ca6.json"
3
+ "buildInfo": "../../../build-info/2d379e3be07995e9ef3aeb0cf9a0cc9e.json"
4
4
  }
@@ -7,7 +7,7 @@
7
7
  "inputs": [
8
8
  {
9
9
  "internalType": "VersionPart",
10
- "name": "x",
10
+ "name": "a",
11
11
  "type": "uint8"
12
12
  }
13
13
  ],
@@ -21,10 +21,29 @@
21
21
  ],
22
22
  "stateMutability": "pure",
23
23
  "type": "function"
24
+ },
25
+ {
26
+ "inputs": [
27
+ {
28
+ "internalType": "uint256",
29
+ "name": "a",
30
+ "type": "uint256"
31
+ }
32
+ ],
33
+ "name": "toVersionPart",
34
+ "outputs": [
35
+ {
36
+ "internalType": "VersionPart",
37
+ "name": "",
38
+ "type": "uint8"
39
+ }
40
+ ],
41
+ "stateMutability": "pure",
42
+ "type": "function"
24
43
  }
25
44
  ],
26
- "bytecode": "0x60b9610039600b82828239805160001a60731461002c57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe730000000000000000000000000000000000000000301460806040526004361060335760003560e01c8063ac43d834146038575b600080fd5b60496043366004605b565b60ff1690565b60405190815260200160405180910390f35b600060208284031215606c57600080fd5b813560ff81168114607c57600080fd5b939250505056fea264697066735822122028c6578af7cf354c26921be53c7bafd817914c3fa380a53d5f0e3935a1b47c8b64736f6c63430008140033",
27
- "deployedBytecode": "0x730000000000000000000000000000000000000000301460806040526004361060335760003560e01c8063ac43d834146038575b600080fd5b60496043366004605b565b60ff1690565b60405190815260200160405180910390f35b600060208284031215606c57600080fd5b813560ff81168114607c57600080fd5b939250505056fea264697066735822122028c6578af7cf354c26921be53c7bafd817914c3fa380a53d5f0e3935a1b47c8b64736f6c63430008140033",
45
+ "bytecode": "0x60fb610039600b82828239805160001a60731461002c57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe7300000000000000000000000000000000000000003014608060405260043610603d5760003560e01c80638e4ad86c146042578063ac43d834146067575b600080fd5b6050604d3660046085565b90565b60405160ff90911681526020015b60405180910390f35b60786072366004609d565b60ff1690565b604051908152602001605e565b600060208284031215609657600080fd5b5035919050565b60006020828403121560ae57600080fd5b813560ff8116811460be57600080fd5b939250505056fea264697066735822122074bb6f75f2cab9692d05e41844bf40283045a9440c662c37a97b2502d38207ed64736f6c63430008140033",
46
+ "deployedBytecode": "0x7300000000000000000000000000000000000000003014608060405260043610603d5760003560e01c80638e4ad86c146042578063ac43d834146067575b600080fd5b6050604d3660046085565b90565b60405160ff90911681526020015b60405180910390f35b60786072366004609d565b60ff1690565b604051908152602001605e565b600060208284031215609657600080fd5b5035919050565b60006020828403121560ae57600080fd5b813560ff8116811460be57600080fd5b939250505056fea264697066735822122074bb6f75f2cab9692d05e41844bf40283045a9440c662c37a97b2502d38207ed64736f6c63430008140033",
28
47
  "linkReferences": {},
29
48
  "deployedLinkReferences": {}
30
49
  }
@@ -11,19 +11,22 @@ import {IInstance} from "../instance/IInstance.sol";
11
11
  import {IInstance} from "../instance/IInstance.sol";
12
12
  import {IComponentOwnerService} from "../instance/service/IComponentOwnerService.sol";
13
13
  import {IBaseComponent} from "./IBaseComponent.sol";
14
- import {NftId} from "../types/NftId.sol";
14
+ import {NftId, zeroNftId, NftIdLib} from "../types/NftId.sol";
15
15
  import {ObjectType} from "../types/ObjectType.sol";
16
16
 
17
17
  abstract contract BaseComponent is
18
18
  Registerable,
19
19
  IBaseComponent
20
20
  {
21
+ using NftIdLib for NftId;
22
+
21
23
  IComponentOwnerService internal _componentOwnerService;
22
24
 
23
25
  address internal _deployer;
24
26
  address internal _wallet;
25
27
  IERC20Metadata internal _token;
26
28
  IInstance internal _instance;
29
+ NftId internal _productNftId;
27
30
 
28
31
  constructor(
29
32
  address registry,
@@ -69,11 +72,20 @@ abstract contract BaseComponent is
69
72
  return _wallet;
70
73
  }
71
74
 
72
- function getToken() external view override returns (IERC20Metadata token) {
75
+ function getToken() public view override returns (IERC20Metadata token) {
73
76
  return _token;
74
77
  }
75
78
 
76
- function getInstance() external view override returns (IInstance instance) {
79
+ function getInstance() public view override returns (IInstance instance) {
77
80
  return _instance;
78
81
  }
82
+
83
+ function setProductNftId(NftId productNftId) public override onlyOwner {
84
+ require(_productNftId.eq(zeroNftId()), "product nft id already set");
85
+ _productNftId = productNftId;
86
+ }
87
+
88
+ function getProductNftId() public view override returns (NftId productNftId) {
89
+ return _productNftId;
90
+ }
79
91
  }
@@ -4,23 +4,29 @@ pragma solidity ^0.8.19;
4
4
  import {DISTRIBUTION} from "../types/ObjectType.sol";
5
5
  import {IDistributionService} from "../instance/service/IDistributionService.sol";
6
6
  import {IProductService} from "../instance/service/IProductService.sol";
7
- import {NftId} from "../types/NftId.sol";
7
+ import {NftId, zeroNftId, NftIdLib} from "../types/NftId.sol";
8
8
  import {ReferralId} from "../types/Referral.sol";
9
9
  import {Fee, FeeLib} from "../types/Fee.sol";
10
10
  import {BaseComponent} from "./BaseComponent.sol";
11
11
  import {IDistributionComponent} from "./IDistributionComponent.sol";
12
12
  import {IRegistry} from "../registry/IRegistry.sol";
13
13
  import {IRegisterable} from "../shared/IRegisterable.sol";
14
+ import {ISetup} from "../instance/module/ISetup.sol";
14
15
  import {Registerable} from "../shared/Registerable.sol";
16
+ import {TokenHandler} from "../shared/TokenHandler.sol";
17
+ import {InstanceReader} from "../instance/InstanceReader.sol";
15
18
 
16
19
  contract Distribution is
17
20
  BaseComponent,
18
21
  IDistributionComponent
19
22
  {
23
+ using NftIdLib for NftId;
20
24
 
21
25
  Fee internal _initialDistributionFee;
22
26
  bool internal _isVerifying;
23
27
 
28
+ TokenHandler internal _tokenHandler;
29
+
24
30
  IDistributionService private _distributionService;
25
31
  IProductService private _productService;
26
32
 
@@ -45,6 +51,8 @@ contract Distribution is
45
51
  _isVerifying = verifying;
46
52
  _initialDistributionFee = distributionFee;
47
53
 
54
+ _tokenHandler = TokenHandler(token);
55
+
48
56
  _distributionService = _instance.getDistributionService();
49
57
  _productService = _instance.getProductService();
50
58
 
@@ -70,7 +78,8 @@ contract Distribution is
70
78
  virtual override
71
79
  returns (uint256 feeAmount)
72
80
  {
73
- Fee memory fee = getDistributionFee();
81
+ ISetup.DistributionSetupInfo memory setupInfo = getSetupInfo();
82
+ Fee memory fee = setupInfo.distributionFee;
74
83
  (feeAmount,) = FeeLib.calculateFee(fee, netPremiumAmount);
75
84
  }
76
85
 
@@ -115,16 +124,11 @@ contract Distribution is
115
124
  return false;
116
125
  }
117
126
 
118
- /// @dev default distribution fee, ie when not using any valid referralId
119
- function getDistributionFee() public view returns (Fee memory distributionFee) {
120
- NftId productNftId = _instance.getProductNftId(getNftId());
121
- if (_instance.hasTreasuryInfo(productNftId)) {
122
- return _instance.getTreasuryInfo(productNftId).distributionFee;
123
- } else {
124
- return _initialDistributionFee;
125
- }
127
+ function getSetupInfo() public view returns (ISetup.DistributionSetupInfo memory setupInfo) {
128
+ InstanceReader reader = _instance.getInstanceReader();
129
+ return reader.getDistributionSetupInfo(getNftId());
126
130
  }
127
-
131
+
128
132
 
129
133
  /// @dev returns true iff the component needs to be called when selling/renewing policis
130
134
  function isVerifying() external view returns (bool verifying) {
@@ -141,14 +145,18 @@ contract Distribution is
141
145
  {
142
146
  (
143
147
  IRegistry.ObjectInfo memory info,
144
- bytes memory data
145
148
  ) = super.getInitialInfo();
146
149
 
147
150
  return (
148
151
  info,
149
152
  abi.encode(
150
- _initialDistributionFee,
151
- _isVerifying
153
+ ISetup.DistributionSetupInfo(
154
+ _productNftId,
155
+ _tokenHandler,
156
+ _initialDistributionFee,
157
+ _isVerifying,
158
+ address(this)
159
+ )
152
160
  )
153
161
  );
154
162
  }
@@ -4,9 +4,10 @@ pragma solidity ^0.8.20;
4
4
  import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
5
5
 
6
6
  import {IRegisterable} from "../shared/IRegisterable.sol";
7
- import {IInstanceLinked} from "../instance/IInstanceLinked.sol";
7
+ import {IInstance} from "../instance/IInstance.sol";
8
+ import {NftId} from "../types/NftId.sol";
8
9
 
9
- interface IBaseComponent is IRegisterable, IInstanceLinked {
10
+ interface IBaseComponent is IRegisterable {
10
11
 
11
12
  function lock() external;
12
13
 
@@ -16,4 +17,9 @@ interface IBaseComponent is IRegisterable, IInstanceLinked {
16
17
 
17
18
  function getWallet() external view returns (address walletAddress);
18
19
 
20
+ function getInstance() external view returns (IInstance instance);
21
+
22
+ function setProductNftId(NftId productNftId) external;
23
+ function getProductNftId() external view returns (NftId productNftId);
24
+
19
25
  }
@@ -4,6 +4,7 @@ pragma solidity ^0.8.19;
4
4
  import {Fee} from "../types/Fee.sol";
5
5
  import {ReferralId} from "../types/Referral.sol";
6
6
  import {NftId} from "../types/NftId.sol";
7
+ import {ISetup} from "../instance/module/ISetup.sol";
7
8
 
8
9
  interface IDistributionComponent {
9
10
 
@@ -38,9 +39,6 @@ interface IDistributionComponent {
38
39
  /// @dev returns true iff the referral id is valid
39
40
  function referralIsValid(ReferralId referralId) external view returns (bool isValid);
40
41
 
41
- /// @dev default distribution fee, ie when not using any valid referralId
42
- function getDistributionFee() external view returns (Fee memory distributionFee);
43
-
44
42
  /// @dev returns true iff the component needs to be called when selling/renewing policis
45
43
  function isVerifying() external view returns (bool verifying);
46
44
  }
@@ -59,6 +59,4 @@ interface IPoolComponent {
59
59
 
60
60
  function getCollateralizationLevel() external view returns (UFixed collateralizationLevel);
61
61
 
62
- function getFees() external view returns (Fee memory poolFee, Fee memory stakingFee, Fee memory performanceFee);
63
-
64
62
  }
@@ -29,9 +29,7 @@ interface IProductComponent {
29
29
  bytes memory applicationData
30
30
  ) external view returns (uint256 netPremiumAmount);
31
31
 
32
- function getProductFee() external view returns (Fee memory productFee);
33
- function getProcessingFee() external view returns (Fee memory processingFee);
34
-
32
+
35
33
  function getPoolNftId() external view returns (NftId poolNftId);
36
34
  function getDistributionNftId() external view returns (NftId distributionNftId);
37
35
  }
@@ -4,20 +4,26 @@ pragma solidity ^0.8.20;
4
4
  import {ObjectType, POOL} from "../types/ObjectType.sol";
5
5
  import {IProductService} from "../instance/service/IProductService.sol";
6
6
  import {IPoolService} from "../instance/service/IPoolService.sol";
7
- import {NftId} from "../types/NftId.sol";
7
+ import {NftId, zeroNftId, NftIdLib} from "../types/NftId.sol";
8
8
  import {Fee} from "../types/Fee.sol";
9
9
  import {UFixed} from "../types/UFixed.sol";
10
10
  import {IPoolComponent} from "./IPoolComponent.sol";
11
11
  import {BaseComponent} from "./BaseComponent.sol";
12
+ import {TokenHandler} from "../shared/TokenHandler.sol";
13
+ import {ISetup} from "../instance/module/ISetup.sol";
12
14
 
13
15
  import {IRegistry} from "../registry/IRegistry.sol";
14
- import {IPool} from "../instance/module/pool/IPoolModule.sol";
15
- import {ITreasury} from "../instance/module/treasury/ITreasury.sol";
16
+
17
+ // import {IPool} from "../instance/module/pool/IPoolModule.sol";
18
+ import {ITreasury} from "../instance/module/ITreasury.sol";
19
+ import {ISetup} from "../instance/module/ISetup.sol";
20
+ import {InstanceReader} from "../instance/InstanceReader.sol";
16
21
 
17
22
  import {IRegisterable} from "../shared/IRegisterable.sol";
18
23
  import {Registerable} from "../shared/Registerable.sol";
19
24
 
20
25
  contract Pool is BaseComponent, IPoolComponent {
26
+ using NftIdLib for NftId;
21
27
 
22
28
  bool internal _isVerifying;
23
29
  UFixed internal _collateralizationLevel;
@@ -26,6 +32,8 @@ contract Pool is BaseComponent, IPoolComponent {
26
32
  Fee internal _initialStakingFee;
27
33
  Fee internal _initialPerformanceFee;
28
34
 
35
+ TokenHandler internal _tokenHandler;
36
+
29
37
  // may be used to interact with instance by derived contracts
30
38
  IPoolService internal _poolService;
31
39
 
@@ -68,6 +76,8 @@ contract Pool is BaseComponent, IPoolComponent {
68
76
  _initialStakingFee = stakingFee;
69
77
  _initialPerformanceFee = performanceFee;
70
78
 
79
+ _tokenHandler = new TokenHandler(token);
80
+
71
81
  _poolService = _instance.getPoolService();
72
82
  _productService = _instance.getProductService();
73
83
 
@@ -160,20 +170,10 @@ contract Pool is BaseComponent, IPoolComponent {
160
170
  {
161
171
  _poolService.setBundleFee(bundleNftId, fee);
162
172
  }
163
- // TODO delete, call instance instead
164
- function getFees()
165
- external
166
- view
167
- override
168
- returns (Fee memory, Fee memory, Fee memory)
169
- {
170
- NftId productNftId = _instance.getProductNftId(getNftId());
171
- //if (_instance.hasTreasuryInfo(productNftId)) {
172
- ITreasury.TreasuryInfo memory info = _instance.getTreasuryInfo(productNftId);
173
- return (info.poolFee, info.stakingFee, info.performanceFee);
174
- //} else {
175
- // return (_initialPoolFee, _initialStakingFee, _initialPerformanceFee);
176
- //}
173
+
174
+ function getSetupInfo() public view returns (ISetup.PoolSetupInfo memory setupInfo) {
175
+ InstanceReader reader = _instance.getInstanceReader();
176
+ return reader.getPoolSetupInfo(getNftId());
177
177
  }
178
178
 
179
179
  // from IRegisterable
@@ -188,21 +188,21 @@ contract Pool is BaseComponent, IPoolComponent {
188
188
  {
189
189
  (
190
190
  IRegistry.ObjectInfo memory info,
191
- bytes memory data
192
191
  ) = super.getInitialInfo();
193
192
 
194
193
  return (
195
194
  info,
196
195
  abi.encode(
197
- IPool.PoolInfo(
196
+ ISetup.PoolSetupInfo(
197
+ _productNftId,
198
+ _tokenHandler,
199
+ _collateralizationLevel,
200
+ _initialPoolFee,
201
+ _initialStakingFee,
202
+ _initialPerformanceFee,
198
203
  _isVerifying,
199
- _collateralizationLevel
200
- ),
201
- _wallet,
202
- _token,
203
- _initialPoolFee,
204
- _initialStakingFee,
205
- _initialPerformanceFee
204
+ _wallet
205
+ )
206
206
  )
207
207
  );
208
208
  }
@@ -3,11 +3,11 @@ pragma solidity ^0.8.19;
3
3
 
4
4
  import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
5
5
 
6
- import {IRisk} from "../instance/module/risk/IRisk.sol";
7
- import {ITreasury} from "../instance/module/treasury/ITreasury.sol";
6
+ import {IRisk} from "../instance/module/IRisk.sol";
7
+ import {ITreasury} from "../instance/module/ITreasury.sol";
8
8
  import {IProductService} from "../instance/service/IProductService.sol";
9
9
  import {IProductComponent} from "./IProductComponent.sol";
10
- import {NftId, zeroNftId} from "../types/NftId.sol";
10
+ import {NftId, zeroNftId, NftIdLib} from "../types/NftId.sol";
11
11
  import {ObjectType, PRODUCT} from "../types/ObjectType.sol";
12
12
  import {ReferralId} from "../types/Referral.sol";
13
13
  import {RiskId, RiskIdLib} from "../types/RiskId.sol";
@@ -19,16 +19,24 @@ import {BaseComponent} from "./BaseComponent.sol";
19
19
  import {IRegistry} from "../registry/IRegistry.sol";
20
20
  import {IRegisterable} from "../shared/IRegisterable.sol";
21
21
  import {Registerable} from "../shared/Registerable.sol";
22
+ import {TokenHandler} from "../shared/TokenHandler.sol";
22
23
 
23
- import {IPool} from "../instance/module/pool/IPoolModule.sol";
24
+ import {InstanceReader} from "../instance/InstanceReader.sol";
25
+ import {ISetup} from "../instance/module/ISetup.sol";
24
26
  import {Pool} from "../components/Pool.sol";
27
+ import {Distribution} from "../components/Distribution.sol";
28
+
29
+ import {zeroNftId} from "../types/NftId.sol";
25
30
 
26
31
  contract Product is BaseComponent, IProductComponent {
32
+ using NftIdLib for NftId;
33
+
27
34
  IProductService internal _productService;
28
35
  Pool internal _pool;
29
- address internal _distribution;
36
+ Distribution internal _distribution;
30
37
  Fee internal _initialProductFee;
31
38
  Fee internal _initialProcessingFee;
39
+ TokenHandler internal _tokenHandler;
32
40
 
33
41
  NftId internal _poolNftId;
34
42
  NftId internal _distributionNftId;
@@ -47,12 +55,14 @@ contract Product is BaseComponent, IProductComponent {
47
55
  // TODO add validation
48
56
  _productService = _instance.getProductService();
49
57
  _pool = Pool(pool);
50
- _distribution = distribution;
58
+ _distribution = Distribution(distribution);
51
59
  _initialProductFee = productFee;
52
60
  _initialProcessingFee = processingFee;
53
61
 
62
+ _tokenHandler = new TokenHandler(token);
63
+
54
64
  _poolNftId = getRegistry().getNftId(address(_pool));
55
- _distributionNftId = getRegistry().getNftId(_distribution);
65
+ _distributionNftId = getRegistry().getNftId(address(_distribution));
56
66
 
57
67
  _registerInterface(type(IProductComponent).interfaceId);
58
68
  }
@@ -111,13 +121,13 @@ contract Product is BaseComponent, IProductComponent {
111
121
  );
112
122
  }
113
123
 
114
- function _setRiskInfo(
124
+ function _updateRisk(
115
125
  RiskId id,
116
- IRisk.RiskInfo memory info
126
+ bytes memory data
117
127
  ) internal {
118
- _productService.setRiskInfo(
128
+ _productService.updateRisk(
119
129
  id,
120
- info
130
+ data
121
131
  );
122
132
  }
123
133
 
@@ -132,7 +142,7 @@ contract Product is BaseComponent, IProductComponent {
132
142
  }
133
143
 
134
144
  function _getRiskInfo(RiskId id) internal view returns (IRisk.RiskInfo memory info) {
135
- return _instance.getRiskInfo(id);
145
+ return _instance.getInstanceReader().getRiskInfo(id);
136
146
  }
137
147
 
138
148
  function _createApplication(
@@ -195,7 +205,7 @@ contract Product is BaseComponent, IProductComponent {
195
205
  }
196
206
 
197
207
  function getDistributionNftId() external view override returns (NftId distributionNftId) {
198
- return getRegistry().getNftId(_distribution);
208
+ return getRegistry().getNftId(address(_distribution));
199
209
  }
200
210
 
201
211
  // from product component
@@ -210,38 +220,13 @@ contract Product is BaseComponent, IProductComponent {
210
220
  _productService.setFees(productFee, processingFee);
211
221
  }
212
222
 
213
- // TODO delete, call instance intead
214
- function getProductFee()
215
- external
216
- view
217
- override
218
- returns (Fee memory productFee)
219
- {
220
- NftId productNftId = getNftId();
221
- if (_instance.hasTreasuryInfo(productNftId)) {
222
- return _instance.getTreasuryInfo(productNftId).productFee;
223
- } else {
224
- return _initialProductFee;
225
- }
226
- }
227
-
228
- function getProcessingFee()
229
- external
230
- view
231
- override
232
- returns (Fee memory processingFee)
233
- {
234
- NftId productNftId = getNftId();
235
- if (_instance.hasTreasuryInfo(productNftId)) {
236
- return _instance.getTreasuryInfo(productNftId).processingFee;
237
- } else {
238
- return _initialProcessingFee;
239
- }
223
+ function getSetupInfo() public view returns (ISetup.ProductSetupInfo memory setupInfo) {
224
+ InstanceReader reader = _instance.getInstanceReader();
225
+ return reader.getProductSetupInfo(getNftId());
240
226
  }
241
227
 
242
228
  // from IRegisterable
243
229
 
244
- // TODO used only once, occupies space
245
230
  function getInitialInfo()
246
231
  public
247
232
  view
@@ -253,7 +238,7 @@ contract Product is BaseComponent, IProductComponent {
253
238
  IRegistry.ObjectInfo memory productInfo,
254
239
  bytes memory data
255
240
  ) = super.getInitialInfo();
256
-
241
+
257
242
  // TODO read pool & distribution fees
258
243
  // 1) from pool -> the only option -> pool must be registered first?
259
244
  // 2) from instance -> all fees are set into instance at product registration which is ongoing here
@@ -263,36 +248,40 @@ contract Product is BaseComponent, IProductComponent {
263
248
 
264
249
  // from PoolComponent
265
250
  (
266
- IRegistry.ObjectInfo memory poolInfo,
251
+ ,
267
252
  bytes memory poolData
268
253
  ) = _pool.getInitialInfo();
254
+
255
+ (
256
+ ISetup.PoolSetupInfo memory poolSetupInfo
257
+ ) = abi.decode(poolData, (ISetup.PoolSetupInfo));
269
258
 
259
+ // from DistributionComponent
270
260
  (
271
- /*IPool.PoolInfo memory info*/,
272
- /*address wallet*/,
273
- /*IERC20Metadata token*/,
274
- Fee memory initialPoolFee,
275
- Fee memory initialStakingFee,
276
- Fee memory initialPerformanceFee
277
- ) = abi.decode(poolData, (IPool.PoolInfo, address, IERC20Metadata, Fee, Fee, Fee));
261
+ ,
262
+ bytes memory distributionData
263
+ ) = _distribution.getInitialInfo();
278
264
 
279
- // TODO from DistributionComponent
265
+ (
266
+ ISetup.DistributionSetupInfo memory distributionSetupInfo
267
+ ) = abi.decode(distributionData, (ISetup.DistributionSetupInfo));
280
268
 
281
269
  return (
282
270
  productInfo,
283
271
  abi.encode(
284
- ITreasury.TreasuryInfo(
285
- _poolNftId,
286
- _distributionNftId,
272
+ ISetup.ProductSetupInfo(
287
273
  _token,
274
+ _tokenHandler,
275
+ _distributionNftId,
276
+ _poolNftId,
277
+ distributionSetupInfo.distributionFee,
288
278
  _initialProductFee,
289
279
  _initialProcessingFee,
290
- initialPoolFee,
291
- initialStakingFee,
292
- initialPerformanceFee,
293
- FeeLib.zeroFee()//_instance.getDistributionFee(_distributionNftId)
294
- ),
295
- _wallet
280
+ poolSetupInfo.poolFee,
281
+ poolSetupInfo.stakingFee,
282
+ poolSetupInfo.performanceFee,
283
+ _wallet
284
+ )
296
285
  )
297
286
  );
298
287
  }