@etherisc/gif-next 0.0.2-dc7e4cb-141 → 0.0.2-de0a1d3-009

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 (268) hide show
  1. package/README.md +58 -11
  2. package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.dbg.json +1 -1
  3. package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +4 -0
  4. package/artifacts/contracts/components/Distribution.sol/Distribution.json +405 -0
  5. package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.dbg.json +1 -1
  6. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +4 -0
  7. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.json +340 -0
  8. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
  9. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.json +131 -0
  10. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +1 -1
  11. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.json +109 -18
  12. package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
  13. package/artifacts/contracts/components/Pool.sol/Pool.json +194 -3
  14. package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
  15. package/artifacts/contracts/components/Product.sol/Product.json +160 -21
  16. package/artifacts/contracts/experiment/errors/Require.sol/Require.dbg.json +1 -1
  17. package/artifacts/contracts/experiment/errors/Revert.sol/Revert.dbg.json +1 -1
  18. package/artifacts/contracts/experiment/inheritance/A.sol/A.dbg.json +1 -1
  19. package/artifacts/contracts/experiment/inheritance/A.sol/AShared.dbg.json +1 -1
  20. package/artifacts/contracts/experiment/inheritance/B.sol/B.dbg.json +1 -1
  21. package/artifacts/contracts/experiment/inheritance/C.sol/C.dbg.json +1 -1
  22. package/artifacts/contracts/experiment/inheritance/IA.sol/IA.dbg.json +1 -1
  23. package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.dbg.json +1 -1
  24. package/artifacts/contracts/experiment/inheritance/IB.sol/IB.dbg.json +1 -1
  25. package/artifacts/contracts/experiment/inheritance/IC.sol/IC.dbg.json +1 -1
  26. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.dbg.json +1 -1
  27. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.json +2 -2
  28. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.dbg.json +1 -1
  29. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.dbg.json +1 -1
  30. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.dbg.json +1 -1
  31. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.json +2 -2
  32. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.dbg.json +1 -1
  33. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.json +2 -2
  34. package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.dbg.json +1 -1
  35. package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.dbg.json +1 -1
  36. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  37. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +709 -678
  38. package/artifacts/contracts/instance/IInstanceLinked.sol/IInstanceLinked.dbg.json +1 -1
  39. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  40. package/artifacts/contracts/instance/Instance.sol/Instance.json +916 -717
  41. package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.dbg.json +4 -0
  42. package/artifacts/contracts/instance/{InstanceBase.sol/InstanceBase.json → base/ComponentServiceBase.sol/ComponentServiceBase.json} +102 -28
  43. package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.dbg.json +4 -0
  44. package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.json +113 -0
  45. package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.dbg.json +4 -0
  46. package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.json +560 -0
  47. package/artifacts/contracts/instance/base/ILifecycle.sol/ILifecycle.dbg.json +4 -0
  48. package/artifacts/contracts/instance/{module/lifecycle/ILifecycle.sol/ILifecycleModule.json → base/ILifecycle.sol/ILifecycle.json} +10 -77
  49. package/artifacts/contracts/instance/base/IService.sol/IService.dbg.json +4 -0
  50. package/artifacts/contracts/instance/{service → base}/IService.sol/IService.json +58 -17
  51. package/artifacts/contracts/instance/base/InstanceBase.sol/InstanceBase.dbg.json +4 -0
  52. package/artifacts/contracts/instance/base/InstanceBase.sol/InstanceBase.json +463 -0
  53. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.dbg.json +4 -0
  54. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.json +710 -0
  55. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json +4 -0
  56. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.json +169 -0
  57. package/artifacts/contracts/instance/base/ModuleBase.sol/ModuleBase.dbg.json +4 -0
  58. package/artifacts/contracts/instance/{module/compensation/ICompensation.sol/ICompensation.json → base/ModuleBase.sol/ModuleBase.json} +2 -2
  59. package/artifacts/contracts/instance/base/ServiceBase.sol/ServiceBase.dbg.json +4 -0
  60. package/artifacts/contracts/instance/{service → base}/ServiceBase.sol/ServiceBase.json +88 -1
  61. package/artifacts/contracts/instance/module/access/Access.sol/AccessModule.dbg.json +1 -1
  62. package/artifacts/contracts/instance/module/access/IAccess.sol/IAccess.dbg.json +1 -1
  63. package/artifacts/contracts/instance/module/access/IAccess.sol/IAccessModule.dbg.json +1 -1
  64. package/artifacts/contracts/instance/module/bundle/BundleModule.sol/BundleModule.dbg.json +1 -1
  65. package/artifacts/contracts/instance/module/bundle/BundleModule.sol/BundleModule.json +71 -50
  66. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundle.dbg.json +1 -1
  67. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundleModule.dbg.json +1 -1
  68. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundleModule.json +71 -50
  69. package/artifacts/contracts/instance/module/component/ComponentModule.sol/ComponentModule.dbg.json +1 -1
  70. package/artifacts/contracts/instance/module/component/ComponentModule.sol/ComponentModule.json +22 -93
  71. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponent.dbg.json +1 -1
  72. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponentModule.dbg.json +1 -1
  73. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponentModule.json +22 -93
  74. package/artifacts/contracts/instance/module/distribution/DistributionModule.sol/DistributionModule.dbg.json +4 -0
  75. package/artifacts/contracts/instance/module/distribution/DistributionModule.sol/DistributionModule.json +10 -0
  76. package/artifacts/contracts/instance/module/distribution/IDistribution.sol/IDistribution.dbg.json +4 -0
  77. package/artifacts/contracts/instance/module/{compensation/ICompensation.sol/ICompensationModule.json → distribution/IDistribution.sol/IDistribution.json} +2 -2
  78. package/artifacts/contracts/instance/module/distribution/IDistribution.sol/IDistributionModule.dbg.json +4 -0
  79. package/artifacts/contracts/instance/module/distribution/IDistribution.sol/IDistributionModule.json +10 -0
  80. package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicy.dbg.json +1 -1
  81. package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicyModule.dbg.json +1 -1
  82. package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicyModule.json +61 -38
  83. package/artifacts/contracts/instance/module/policy/PolicyModule.sol/PolicyModule.dbg.json +1 -1
  84. package/artifacts/contracts/instance/module/policy/PolicyModule.sol/PolicyModule.json +61 -38
  85. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPool.dbg.json +1 -1
  86. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPoolModule.dbg.json +1 -1
  87. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPoolModule.json +0 -5
  88. package/artifacts/contracts/instance/module/pool/PoolModule.sol/PoolModule.dbg.json +1 -1
  89. package/artifacts/contracts/instance/module/pool/PoolModule.sol/PoolModule.json +0 -5
  90. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRisk.dbg.json +1 -1
  91. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRiskModule.dbg.json +1 -1
  92. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRiskModule.json +104 -1
  93. package/artifacts/contracts/instance/module/risk/RiskModule.sol/RiskModule.dbg.json +1 -1
  94. package/artifacts/contracts/instance/module/risk/RiskModule.sol/RiskModule.json +126 -5
  95. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasury.dbg.json +1 -1
  96. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasuryModule.dbg.json +1 -1
  97. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasuryModule.json +209 -231
  98. package/artifacts/contracts/instance/module/treasury/TokenHandler.sol/TokenHandler.dbg.json +1 -1
  99. package/artifacts/contracts/instance/module/treasury/TokenHandler.sol/TokenHandler.json +2 -2
  100. package/artifacts/contracts/instance/module/treasury/TreasuryModule.sol/TreasuryModule.dbg.json +1 -1
  101. package/artifacts/contracts/instance/module/treasury/TreasuryModule.sol/TreasuryModule.json +209 -231
  102. package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.dbg.json +1 -1
  103. package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.json +145 -18
  104. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +4 -0
  105. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +507 -0
  106. package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.dbg.json +1 -1
  107. package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.json +57 -16
  108. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +4 -0
  109. package/artifacts/contracts/instance/service/{ComponentServiceBase.sol/ComponentServiceBase.json → IDistributionService.sol/IDistributionService.json} +91 -25
  110. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +1 -1
  111. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +122 -17
  112. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +1 -1
  113. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +210 -16
  114. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +1 -1
  115. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +171 -12
  116. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +1 -1
  117. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +303 -31
  118. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  119. package/artifacts/contracts/registry/IChainNft.sol/IChainNft.dbg.json +1 -1
  120. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  121. package/artifacts/contracts/registry/IRegistryLinked.sol/IRegistryLinked.dbg.json +1 -1
  122. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  123. package/artifacts/contracts/registry/Registry.sol/Registry.json +2 -2
  124. package/artifacts/contracts/registry/RegistryUpgradeable.sol/RegistryUpgradeable.dbg.json +4 -0
  125. package/artifacts/contracts/registry/RegistryUpgradeable.sol/RegistryUpgradeable.json +724 -0
  126. package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +1 -1
  127. package/artifacts/contracts/shared/IOwnable.sol/IOwnable.dbg.json +1 -1
  128. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  129. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +1 -1
  130. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.json +53 -12
  131. package/artifacts/contracts/shared/Proxy.sol/ProxyDeployer.dbg.json +4 -0
  132. package/artifacts/contracts/shared/Proxy.sol/ProxyDeployer.json +248 -0
  133. package/artifacts/contracts/shared/Proxy.sol/ProxyWithProxyAdminGetter.dbg.json +4 -0
  134. package/artifacts/contracts/shared/Proxy.sol/ProxyWithProxyAdminGetter.json +129 -0
  135. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  136. package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +1 -1
  137. package/artifacts/contracts/shared/Versionable.sol/Versionable.json +87 -0
  138. package/artifacts/contracts/shared/VersionableUpgradeable.sol/VersionableUpgradeable.dbg.json +4 -0
  139. package/artifacts/contracts/shared/VersionableUpgradeable.sol/VersionableUpgradeable.json +228 -0
  140. package/artifacts/contracts/test/TestDistribution.sol/TestDistribution.dbg.json +4 -0
  141. package/artifacts/contracts/test/TestDistribution.sol/TestDistribution.json +405 -0
  142. package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json +1 -1
  143. package/artifacts/contracts/test/TestFee.sol/TestFee.json +2 -2
  144. package/artifacts/contracts/test/TestPool.sol/TestPool.dbg.json +1 -1
  145. package/artifacts/contracts/test/TestPool.sol/TestPool.json +194 -3
  146. package/artifacts/contracts/test/TestProduct.sol/TestProduct.dbg.json +1 -1
  147. package/artifacts/contracts/test/TestProduct.sol/TestProduct.json +209 -27
  148. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json +1 -1
  149. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +2 -2
  150. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +1 -1
  151. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.json +38 -4
  152. package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +1 -1
  153. package/artifacts/contracts/test/TestService.sol/TestService.json +95 -8
  154. package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json +1 -1
  155. package/artifacts/contracts/test/TestVersion.sol/TestVersion.dbg.json +1 -1
  156. package/artifacts/contracts/test/TestVersion.sol/TestVersion.json +2 -2
  157. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json +1 -1
  158. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.json +95 -8
  159. package/artifacts/contracts/test/Usdc.sol/USDC.dbg.json +1 -1
  160. package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.dbg.json +1 -1
  161. package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
  162. package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +1 -1
  163. package/artifacts/contracts/types/Fee.sol/FeeLib.dbg.json +1 -1
  164. package/artifacts/contracts/types/Fee.sol/FeeLib.json +50 -11
  165. package/artifacts/contracts/types/Key32.sol/Key32Lib.dbg.json +4 -0
  166. package/artifacts/contracts/types/Key32.sol/Key32Lib.json +111 -0
  167. package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +1 -1
  168. package/artifacts/contracts/types/NftId.sol/NftIdLib.json +65 -4
  169. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
  170. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.json +2 -2
  171. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
  172. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.json +2 -2
  173. package/artifacts/contracts/types/ReferralId.sol/ReferralIdLib.dbg.json +4 -0
  174. package/artifacts/contracts/types/ReferralId.sol/ReferralIdLib.json +99 -0
  175. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.dbg.json +4 -0
  176. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.json +86 -0
  177. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.dbg.json +4 -0
  178. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.json +30 -0
  179. package/artifacts/contracts/types/StateId.sol/StateIdLib.dbg.json +1 -1
  180. package/artifacts/contracts/types/StateId.sol/StateIdLib.json +2 -2
  181. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json +1 -1
  182. package/artifacts/contracts/types/UFixed.sol/UFixedMathLib.dbg.json +1 -1
  183. package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +1 -1
  184. package/artifacts/contracts/types/Version.sol/VersionLib.json +40 -2
  185. package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +1 -1
  186. package/artifacts/contracts/types/Version.sol/VersionPartLib.json +2 -2
  187. package/contracts/components/BaseComponent.sol +7 -2
  188. package/contracts/components/Distribution.sol +132 -0
  189. package/contracts/components/IDistributionComponent.sol +47 -0
  190. package/contracts/components/IPoolComponent.sol +14 -0
  191. package/contracts/components/IProductComponent.sol +24 -5
  192. package/contracts/components/Pool.sol +64 -3
  193. package/contracts/components/Product.sol +123 -13
  194. package/contracts/instance/IInstance.sol +14 -14
  195. package/contracts/instance/Instance.sol +20 -12
  196. package/contracts/instance/{service → base}/ComponentServiceBase.sol +1 -0
  197. package/contracts/instance/base/IInstanceBase.sol +22 -0
  198. package/contracts/instance/base/IKeyValueStore.sol +50 -0
  199. package/contracts/instance/base/ILifecycle.sol +30 -0
  200. package/contracts/instance/{InstanceBase.sol → base/InstanceBase.sol} +33 -13
  201. package/contracts/instance/base/KeyValueStore.sol +161 -0
  202. package/contracts/instance/{module/lifecycle/LifecycleModule.sol → base/Lifecycle.sol} +50 -39
  203. package/contracts/instance/base/ModuleBase.sol +57 -0
  204. package/contracts/instance/{service → base}/ServiceBase.sol +0 -2
  205. package/contracts/instance/module/access/Access.sol +6 -6
  206. package/contracts/instance/module/bundle/BundleModule.sol +24 -118
  207. package/contracts/instance/module/bundle/IBundle.sol +9 -9
  208. package/contracts/instance/module/component/ComponentModule.sol +27 -60
  209. package/contracts/instance/module/component/IComponent.sol +5 -30
  210. package/contracts/instance/module/distribution/DistributionModule.sol +17 -0
  211. package/contracts/instance/module/distribution/IDistribution.sol +10 -0
  212. package/contracts/instance/module/policy/IPolicy.sol +12 -9
  213. package/contracts/instance/module/policy/PolicyModule.sol +33 -26
  214. package/contracts/instance/module/pool/IPoolModule.sol +0 -1
  215. package/contracts/instance/module/pool/PoolModule.sol +12 -9
  216. package/contracts/instance/module/risk/IRisk.sol +18 -2
  217. package/contracts/instance/module/risk/RiskModule.sol +56 -2
  218. package/contracts/instance/module/treasury/ITreasury.sol +29 -50
  219. package/contracts/instance/module/treasury/TreasuryModule.sol +71 -85
  220. package/contracts/instance/service/ComponentOwnerService.sol +30 -44
  221. package/contracts/instance/service/DistributionService.sol +59 -0
  222. package/contracts/instance/service/IComponentOwnerService.sol +1 -1
  223. package/contracts/instance/service/IDistributionService.sol +12 -0
  224. package/contracts/instance/service/IPoolService.sol +8 -1
  225. package/contracts/instance/service/IProductService.sol +56 -7
  226. package/contracts/instance/service/PoolService.sol +31 -5
  227. package/contracts/instance/service/ProductService.sol +231 -77
  228. package/contracts/registry/Registry.sol +4 -4
  229. package/contracts/registry/RegistryUpgradeable.sol +473 -0
  230. package/contracts/shared/IVersionable.sol +17 -4
  231. package/contracts/shared/Proxy.sol +94 -0
  232. package/contracts/shared/Versionable.sol +13 -3
  233. package/contracts/shared/VersionableUpgradeable.sol +133 -0
  234. package/contracts/test/TestDistribution.sol +21 -0
  235. package/contracts/test/TestPool.sol +5 -2
  236. package/contracts/test/TestProduct.sol +35 -7
  237. package/contracts/test/TestRoleId.sol +2 -2
  238. package/contracts/test/TestService.sol +1 -1
  239. package/contracts/types/Fee.sol +8 -3
  240. package/contracts/types/Key32.sol +45 -0
  241. package/contracts/types/NftId.sol +16 -1
  242. package/contracts/types/ObjectType.sol +24 -8
  243. package/contracts/types/ReferralId.sol +48 -0
  244. package/contracts/types/RiskId.sol +43 -0
  245. package/contracts/types/RoleId.sol +12 -10
  246. package/contracts/types/StateId.sol +7 -1
  247. package/contracts/types/Version.sol +8 -0
  248. package/package.json +1 -1
  249. package/artifacts/contracts/instance/IServiceLinked.sol/IServiceLinked.dbg.json +0 -4
  250. package/artifacts/contracts/instance/IServiceLinked.sol/IServiceLinked.json +0 -50
  251. package/artifacts/contracts/instance/InstanceBase.sol/InstanceBase.dbg.json +0 -4
  252. package/artifacts/contracts/instance/module/compensation/CompensationModule.sol/CompensationModule.dbg.json +0 -4
  253. package/artifacts/contracts/instance/module/compensation/CompensationModule.sol/CompensationModule.json +0 -10
  254. package/artifacts/contracts/instance/module/compensation/ICompensation.sol/ICompensation.dbg.json +0 -4
  255. package/artifacts/contracts/instance/module/compensation/ICompensation.sol/ICompensationModule.dbg.json +0 -4
  256. package/artifacts/contracts/instance/module/lifecycle/ILifecycle.sol/ILifecycle.dbg.json +0 -4
  257. package/artifacts/contracts/instance/module/lifecycle/ILifecycle.sol/ILifecycle.json +0 -134
  258. package/artifacts/contracts/instance/module/lifecycle/ILifecycle.sol/ILifecycleModule.dbg.json +0 -4
  259. package/artifacts/contracts/instance/module/lifecycle/LifecycleModule.sol/LifecycleModule.dbg.json +0 -4
  260. package/artifacts/contracts/instance/module/lifecycle/LifecycleModule.sol/LifecycleModule.json +0 -221
  261. package/artifacts/contracts/instance/service/ComponentServiceBase.sol/ComponentServiceBase.dbg.json +0 -4
  262. package/artifacts/contracts/instance/service/IService.sol/IService.dbg.json +0 -4
  263. package/artifacts/contracts/instance/service/ServiceBase.sol/ServiceBase.dbg.json +0 -4
  264. package/contracts/instance/IServiceLinked.sol +0 -12
  265. package/contracts/instance/module/compensation/CompensationModule.sol +0 -8
  266. package/contracts/instance/module/compensation/ICompensation.sol +0 -10
  267. package/contracts/instance/module/lifecycle/ILifecycle.sol +0 -47
  268. /package/contracts/instance/{service → base}/IService.sol +0 -0
@@ -2,102 +2,88 @@
2
2
  pragma solidity ^0.8.19;
3
3
 
4
4
  import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
5
+ import {IDistributionComponent} from "../../../components/IDistributionComponent.sol";
6
+ import {IPoolComponent} from "../../../components/IPoolComponent.sol";
7
+ import {IProductComponent} from "../../../components/IProductComponent.sol";
5
8
 
6
9
  import {NftId} from "../../../types/NftId.sol";
10
+ import {TREASURY} from "../../../types/ObjectType.sol";
7
11
  import {Fee, FeeLib} from "../../../types/Fee.sol";
8
12
  import {UFixed, UFixedMathLib} from "../../../types/UFixed.sol";
9
13
  import {TokenHandler} from "./TokenHandler.sol";
14
+ import {IKeyValueStore} from "../../base/IKeyValueStore.sol";
10
15
  import {ITreasuryModule} from "./ITreasury.sol";
16
+ import {ModuleBase} from "../../base/ModuleBase.sol";
17
+
18
+ abstract contract TreasuryModule is
19
+ ModuleBase,
20
+ ITreasuryModule
21
+ {
22
+ // relation of distributor and pool nft map to product nft
23
+ mapping(NftId componentNftId => NftId productNftId) internal _productNft;
24
+ // relation of component nft to token hanlder
25
+ mapping(NftId componentNftId => TokenHandler tokenHandler) internal _tokenHandler;
26
+ Fee internal _zeroFee;
27
+
28
+
29
+ function initializeTreasuryModule(IKeyValueStore keyValueStore) internal {
30
+ _initialize(keyValueStore);
31
+ _zeroFee = FeeLib.zeroFee();
32
+ }
11
33
 
12
- abstract contract TreasuryModule is ITreasuryModule {
13
- mapping(NftId productNftId => ProductSetup setup) private _productSetup;
14
- mapping(NftId distributorNftId => DistributorSetup setup)
15
- private _distributorSetup;
16
- mapping(NftId poolNftId => PoolSetup setup) private _poolSetup;
17
- mapping(NftId componentNftId => TokenHandler tokenHanlder) _tokenHandler;
18
-
19
- function registerProduct(
20
- NftId productNftId,
21
- NftId distributorNftId,
22
- NftId poolNftId,
23
- IERC20Metadata token,
24
- address wallet,
25
- Fee memory policyFee,
26
- Fee memory processingFee
34
+ function registerProductSetup(
35
+ IProductComponent product,
36
+ IPoolComponent pool,
37
+ IDistributionComponent distribution
27
38
  ) external override // TODO add authz (only component module)
28
39
  {
29
- require(address(_tokenHandler[productNftId]) == address(0), "ERROR:TRS-010:TOKEN_HANDLER_ALREADY_REGISTERED");
30
- require(address(_tokenHandler[poolNftId]) == address(0), "ERROR:TRS-011:TOKEN_HANDLER_ALREADY_REGISTERED");
31
- require(address(_tokenHandler[distributorNftId]) == address(0), "ERROR:TRS-012:TOKEN_HANDLER_ALREADY_REGISTERED");
32
- // TODO add additional validations
40
+ NftId productNftId = product.getNftId();
41
+ NftId poolNftId = pool.getNftId();
42
+ NftId distributionNftId = distribution.getNftId();
43
+
44
+ require(productNftId.gtz(), "ERROR:TRS-010:PRODUCT_UNDEFINED");
45
+ require(poolNftId.gtz(), "ERROR:TRS-011:POOL_UNDEFINED");
46
+
47
+ require(address(_tokenHandler[productNftId]) == address(0), "ERROR:TRS-012:TOKEN_HANDLER_ALREADY_REGISTERED");
48
+ require(_productNft[poolNftId].eqz(), "ERROR:TRS-013:POOL_ALREADY_LINKED");
49
+ require(_productNft[distributionNftId].eqz(), "ERROR:TRS-014:COMPENSATION_ALREADY_LINKED");
33
50
 
34
51
  // deploy product specific handler contract
35
- TokenHandler tokenHandler = new TokenHandler(productNftId, address(token));
36
- _tokenHandler[productNftId] = tokenHandler;
37
- _tokenHandler[poolNftId] = tokenHandler;
38
- _tokenHandler[distributorNftId] = tokenHandler;
39
-
40
- // create product setup
41
- _productSetup[productNftId] = ProductSetup(
42
- productNftId,
43
- distributorNftId,
52
+ IERC20Metadata token = product.getToken();
53
+ _tokenHandler[productNftId] = new TokenHandler(productNftId, address(token));
54
+ _productNft[distributionNftId] = productNftId;
55
+ _productNft[poolNftId] = productNftId;
56
+
57
+ TreasuryInfo memory info = TreasuryInfo(
44
58
  poolNftId,
59
+ distributionNftId,
45
60
  token,
46
- wallet,
47
- policyFee,
48
- processingFee
61
+ product.getProductFee(),
62
+ product.getProcessingFee(),
63
+ pool.getPoolFee(),
64
+ pool.getStakingFee(),
65
+ pool.getPerformanceFee(),
66
+ distribution.getDistributionFee()
49
67
  );
50
68
 
51
- // TODO add logging
69
+ _create(TREASURY(), productNftId, abi.encode(info));
52
70
  }
53
71
 
54
- function setProductFees(
72
+ function setTreasuryInfo(
55
73
  NftId productNftId,
56
- Fee memory policyFee,
57
- Fee memory processingFee
58
- ) external override // TODO add authz (only component owner service)
74
+ TreasuryInfo memory info
75
+ )
76
+ external
77
+ // TODO add authz (only component module)
78
+ override
59
79
  {
60
- // TODO add validation
61
-
62
- ProductSetup storage setup = _productSetup[productNftId];
63
- setup.policyFee = policyFee;
64
- setup.processingFee = processingFee;
65
-
66
- // TODO add logging
80
+ _updateData(TREASURY(), productNftId, abi.encode(info));
67
81
  }
68
82
 
69
- function registerPool(
70
- NftId poolNftId,
71
- address wallet,
72
- Fee memory stakingFee,
73
- Fee memory performanceFee
74
- ) external override // TODO add authz (only component module)
75
- {
76
- // TODO add validation
77
-
78
- _poolSetup[poolNftId] = PoolSetup(
79
- poolNftId,
80
- wallet,
81
- stakingFee,
82
- performanceFee
83
- );
84
-
85
- // TODO add logging
86
- }
87
-
88
- function setPoolFees(
89
- NftId poolNftId,
90
- Fee memory stakingFee,
91
- Fee memory performanceFee
92
- ) external override // TODO add authz (only component owner service)
93
- {
94
- // TODO add validation
95
-
96
- PoolSetup storage setup = _poolSetup[poolNftId];
97
- setup.stakingFee = stakingFee;
98
- setup.performanceFee = performanceFee;
99
-
100
- // TODO add logging
83
+ function getProductNftId(
84
+ NftId componentNftId
85
+ ) external view returns (NftId productNftId) {
86
+ return _productNft[componentNftId];
101
87
  }
102
88
 
103
89
  function getTokenHandler(
@@ -106,23 +92,23 @@ abstract contract TreasuryModule is ITreasuryModule {
106
92
  return _tokenHandler[componentNftId];
107
93
  }
108
94
 
109
- function getProductSetup(
95
+ function hasTreasuryInfo(
110
96
  NftId productNftId
111
- ) external view override returns (ProductSetup memory setup) {
112
- return _productSetup[productNftId];
97
+ ) public view override returns (bool hasInfo) {
98
+ return _exists(TREASURY(), productNftId);
113
99
  }
114
100
 
115
- function getPoolSetup(
116
- NftId poolNftId
117
- ) external view override returns (PoolSetup memory setup) {
118
- return _poolSetup[poolNftId];
101
+ function getTreasuryInfo(
102
+ NftId productNftId
103
+ ) public view override returns (TreasuryInfo memory info) {
104
+ return abi.decode(_getData(TREASURY(), productNftId), (TreasuryInfo));
119
105
  }
120
106
 
121
107
  function calculateFeeAmount(
122
108
  uint256 amount,
123
109
  Fee memory fee
124
110
  ) public pure override returns (uint256 feeAmount, uint256 netAmount) {
125
- return FeeLib.calculateFee(amount, fee);
111
+ return FeeLib.calculateFee(fee, amount);
126
112
  }
127
113
 
128
114
  function getFee(
@@ -132,8 +118,8 @@ abstract contract TreasuryModule is ITreasuryModule {
132
118
  return FeeLib.toFee(fractionalFee, fixedFee);
133
119
  }
134
120
 
135
- function getZeroFee() external pure override returns (Fee memory fee) {
136
- return FeeLib.zeroFee();
121
+ function getZeroFee() external view override returns (Fee memory fee) {
122
+ return _zeroFee;
137
123
  }
138
124
 
139
125
  function getUFixed(
@@ -6,25 +6,27 @@ import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IER
6
6
  import {IRegistry} from "../../registry/IRegistry.sol";
7
7
  import {IInstance} from "../IInstance.sol";
8
8
 
9
- import {LifecycleModule} from "../module/lifecycle/LifecycleModule.sol";
10
9
  import {ITreasuryModule} from "../module/treasury/ITreasury.sol";
11
10
  import {TreasuryModule} from "../module/treasury/TreasuryModule.sol";
12
11
  import {IComponent, IComponentModule} from "../module/component/IComponent.sol";
13
12
  import {IBaseComponent} from "../../components/IBaseComponent.sol";
14
13
  import {IPoolComponent} from "../../components/IPoolComponent.sol";
15
-
14
+ import {IKeyValueStore} from "../../instance/base/IKeyValueStore.sol";
16
15
  import {IVersionable} from "../../shared/IVersionable.sol";
17
16
  import {Versionable} from "../../shared/Versionable.sol";
18
17
 
19
- import {RoleId, PRODUCT_OWNER_ROLE, POOL_OWNER_ROLE, ORACLE_OWNER_ROLE} from "../../types/RoleId.sol";
20
- import {ObjectType, PRODUCT, ORACLE, POOL} from "../../types/ObjectType.sol";
18
+ import {RoleId, PRODUCT_OWNER_ROLE, POOL_OWNER_ROLE, DISTRIBUTION_OWNER_ROLE, ORACLE_OWNER_ROLE} from "../../types/RoleId.sol";
19
+ import {ObjectType, COMPONENT, PRODUCT, ORACLE, POOL, DISTRIBUTION} from "../../types/ObjectType.sol";
21
20
  import {StateId, ACTIVE, PAUSED} from "../../types/StateId.sol";
21
+ import {Key32} from "../../types/Key32.sol";
22
22
  import {NftId, NftIdLib, zeroNftId} from "../../types/NftId.sol";
23
23
  import {Fee} from "../../types/Fee.sol";
24
24
  import {Version, VersionLib} from "../../types/Version.sol";
25
25
 
26
+ import {IDistributionComponent} from "../../components/IDistributionComponent.sol";
27
+ import {IPoolComponent} from "../../components/IPoolComponent.sol";
26
28
  import {IProductComponent} from "../../components/IProductComponent.sol";
27
- import {ServiceBase} from "./ServiceBase.sol";
29
+ import {ServiceBase} from "../base/ServiceBase.sol";
28
30
  import {IComponentOwnerService} from "./IComponentOwnerService.sol";
29
31
 
30
32
  contract ComponentOwnerService is
@@ -71,6 +73,9 @@ contract ComponentOwnerService is
71
73
  if (cType == POOL()) {
72
74
  return POOL_OWNER_ROLE();
73
75
  }
76
+ if (cType == DISTRIBUTION()) {
77
+ return DISTRIBUTION_OWNER_ROLE();
78
+ }
74
79
  if (cType == ORACLE()) {
75
80
  return ORACLE_OWNER_ROLE();
76
81
  }
@@ -98,29 +103,25 @@ contract ComponentOwnerService is
98
103
 
99
104
  instance.registerComponent(
100
105
  nftId,
101
- objectType,
102
- token);
103
-
104
- address wallet = component.getWallet();
106
+ token,
107
+ component.getWallet());
105
108
 
106
109
  // component type specific registration actions
107
110
  if (component.getType() == PRODUCT()) {
108
111
  IProductComponent product = IProductComponent(address(component));
112
+
109
113
  NftId poolNftId = product.getPoolNftId();
110
114
  require(poolNftId.gtz(), "ERROR:CMP-005:POOL_UNKNOWN");
111
- // validate pool token and product token are same
115
+ IPoolComponent pool = IPoolComponent(_registry.getObjectInfo(poolNftId).objectAddress);
116
+
117
+ NftId distributionNftId = product.getDistributionNftId();
118
+ IDistributionComponent distribution = IDistributionComponent(_registry.getObjectInfo(distributionNftId).objectAddress);
112
119
 
113
120
  // register with tresury
114
- // implement and add validation
115
- NftId distributorNftId = zeroNftId();
116
- instance.registerProduct(
117
- nftId,
118
- distributorNftId,
119
- poolNftId,
120
- token,
121
- wallet,
122
- product.getPolicyFee(),
123
- product.getProcessingFee()
121
+ instance.registerProductSetup(
122
+ product,
123
+ pool,
124
+ distribution
124
125
  );
125
126
  } else if (component.getType() == POOL()) {
126
127
  IPoolComponent pool = IPoolComponent(address(component));
@@ -130,42 +131,27 @@ contract ComponentOwnerService is
130
131
  nftId,
131
132
  pool.isVerifying(),
132
133
  pool.getCollateralizationLevel());
133
-
134
- // register with tresury
135
- instance.registerPool(
136
- nftId,
137
- wallet,
138
- pool.getStakingFee(),
139
- pool.getPerformanceFee());
140
134
  }
141
- // TODO add distribution
135
+ // TODO add compensation
142
136
  }
143
137
 
144
138
  function lock(
145
139
  IBaseComponent component
146
140
  ) external override onlyRegisteredComponent(component) {
141
+ // TODO use msg.sender to get component and get instance via registered parent nft id
147
142
  IInstance instance = component.getInstance();
148
- IComponent.ComponentInfo memory info = instance.getComponentInfo(
149
- component.getNftId()
150
- );
151
- require(info.nftId.gtz(), "ERROR_COMPONENT_UNKNOWN");
152
-
153
- info.state = PAUSED();
154
- // setComponentInfo checks for valid state changes
155
- instance.setComponentInfo(info);
143
+ NftId nftId = component.getNftId();
144
+ Key32 key = nftId.toKey32(COMPONENT());
145
+ instance.updateState(key, PAUSED());
156
146
  }
157
147
 
158
148
  function unlock(
159
149
  IBaseComponent component
160
150
  ) external override onlyRegisteredComponent(component) {
151
+ // TODO use msg.sender to get component and get instance via registered parent nft id
161
152
  IInstance instance = component.getInstance();
162
- IComponent.ComponentInfo memory info = instance.getComponentInfo(
163
- component.getNftId()
164
- );
165
- require(info.nftId.gtz(), "ERROR_COMPONENT_UNKNOWN");
166
-
167
- info.state = ACTIVE();
168
- // setComponentInfo checks for valid state changes
169
- instance.setComponentInfo(info);
153
+ NftId nftId = component.getNftId();
154
+ Key32 key = nftId.toKey32(COMPONENT());
155
+ instance.updateState(key, ACTIVE());
170
156
  }
171
157
  }
@@ -0,0 +1,59 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ pragma solidity ^0.8.19;
3
+
4
+ import {IRegistry} from "../../registry/IRegistry.sol";
5
+ import {IInstance} from "../../instance/IInstance.sol";
6
+ import {ITreasury} from "../../instance/module/treasury/ITreasury.sol";
7
+
8
+ import {NftId} from "../../types/NftId.sol";
9
+ import {Fee} from "../../types/Fee.sol";
10
+ import {DISTRIBUTION} from "../../types/ObjectType.sol";
11
+ import {Version, VersionLib} from "../../types/Version.sol";
12
+
13
+ import {IVersionable} from "../../shared/IVersionable.sol";
14
+ import {Versionable} from "../../shared/Versionable.sol";
15
+
16
+ import {ComponentServiceBase} from "../base/ComponentServiceBase.sol";
17
+ import {IDistributionService} from "./IDistributionService.sol";
18
+
19
+ contract DistributionService is
20
+ ComponentServiceBase,
21
+ IDistributionService
22
+ {
23
+ string public constant NAME = "DistributionService";
24
+
25
+ constructor(
26
+ address registry,
27
+ NftId registryNftId
28
+ ) ComponentServiceBase(registry, registryNftId) // solhint-disable-next-line no-empty-blocks
29
+ {
30
+ _registerInterface(type(IDistributionService).interfaceId);
31
+ }
32
+
33
+ function getVersion()
34
+ public
35
+ pure
36
+ virtual override (IVersionable, Versionable)
37
+ returns(Version)
38
+ {
39
+ return VersionLib.toVersion(3,0,0);
40
+ }
41
+
42
+ function getName() external pure override returns(string memory name) {
43
+ return NAME;
44
+ }
45
+
46
+ function setFees(
47
+ Fee memory distributionFee
48
+ )
49
+ external
50
+ override
51
+ {
52
+ (IRegistry.ObjectInfo memory distributionInfo, IInstance instance) = _getAndVerifyComponentInfoAndInstance(DISTRIBUTION());
53
+
54
+ NftId productNftId = instance.getProductNftId(distributionInfo.nftId);
55
+ ITreasury.TreasuryInfo memory treasuryInfo = instance.getTreasuryInfo(productNftId);
56
+ treasuryInfo.distributionFee = distributionFee;
57
+ instance.setTreasuryInfo(productNftId, treasuryInfo);
58
+ }
59
+ }
@@ -5,7 +5,7 @@ import {NftId} from "../../types/NftId.sol";
5
5
  import {ObjectType} from "../../types/ObjectType.sol";
6
6
  import {RoleId} from "../../types/RoleId.sol";
7
7
  import {IBaseComponent} from "../../components/IBaseComponent.sol";
8
- import {IService} from "./IService.sol";
8
+ import {IService} from "../base/IService.sol";
9
9
 
10
10
  // TODO rename to registry service
11
11
  interface IComponentOwnerService is IService {
@@ -0,0 +1,12 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ pragma solidity ^0.8.19;
3
+
4
+ import {NftId} from "../../types/NftId.sol";
5
+ import {Fee} from "../../types/Fee.sol";
6
+ import {IService} from "../base/IService.sol";
7
+
8
+ interface IDistributionService is IService {
9
+ function setFees(
10
+ Fee memory distributionFee
11
+ ) external;
12
+ }
@@ -3,21 +3,28 @@ pragma solidity ^0.8.19;
3
3
 
4
4
  import {NftId} from "../../types/NftId.sol";
5
5
  import {Fee} from "../../types/Fee.sol";
6
- import {IService} from "./IService.sol";
6
+ import {IService} from "../base/IService.sol";
7
7
 
8
8
  interface IPoolService is IService {
9
9
  function setFees(
10
+ Fee memory poolFee,
10
11
  Fee memory stakingFee,
11
12
  Fee memory performanceFee
12
13
  ) external;
13
14
 
14
15
  function createBundle(
15
16
  address owner,
17
+ Fee memory fee,
16
18
  uint256 amount,
17
19
  uint256 lifetime,
18
20
  bytes calldata filter
19
21
  ) external returns(NftId bundleNftId);
20
22
 
23
+ function setBundleFee(
24
+ NftId bundleNftId,
25
+ Fee memory fee
26
+ ) external;
27
+
21
28
  // function fundBundle(NftId bundleNftId, uint256 amount) external returns(uint256 netAmount);
22
29
 
23
30
  // function defundBundle(NftId bundleNftId, uint256 amount) external returns(uint256 netAmount);
@@ -1,27 +1,76 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
2
  pragma solidity ^0.8.19;
3
3
 
4
+ import {IRisk} from "../module/risk/IRisk.sol";
5
+ import {IService} from "../base/IService.sol";
6
+
4
7
  import {NftId} from "../../types/NftId.sol";
8
+ import {ReferralId} from "../../types/ReferralId.sol";
9
+ import {RiskId} from "../../types/RiskId.sol";
10
+ import {StateId} from "../../types/StateId.sol";
5
11
  import {Timestamp} from "../../types/Timestamp.sol";
6
12
  import {UFixed} from "../../types/UFixed.sol";
7
13
  import {Fee} from "../../types/Fee.sol";
8
- import {IService} from "./IService.sol";
9
14
 
10
15
  interface IProductService is IService {
11
16
  function setFees(
12
- Fee memory policyFee,
17
+ Fee memory productFee,
13
18
  Fee memory processingFee
14
19
  ) external;
15
20
 
21
+ function createRisk(
22
+ RiskId riskId,
23
+ bytes memory data
24
+ ) external;
25
+
26
+
27
+ function setRiskInfo(
28
+ RiskId riskId,
29
+ IRisk.RiskInfo memory data
30
+ ) external;
31
+
32
+
33
+ function updateRiskState(
34
+ RiskId riskId,
35
+ StateId state
36
+ ) external;
37
+
38
+
39
+ function calculatePremium(
40
+ RiskId riskId,
41
+ uint256 sumInsuredAmount,
42
+ uint256 lifetime,
43
+ bytes memory applicationData,
44
+ NftId bundleNftId,
45
+ ReferralId referralId
46
+ )
47
+ external
48
+ view
49
+ returns (
50
+ uint256 premiumAmount,
51
+ uint256 productFeeAmount,
52
+ uint256 poolFeeAmount,
53
+ uint256 bundleFeeAmount,
54
+ uint256 distributionFeeAmount
55
+ );
56
+
57
+
16
58
  function createApplication(
17
59
  address applicationOwner,
60
+ RiskId riskId,
18
61
  uint256 sumInsuredAmount,
19
- uint256 premiumAmount,
20
62
  uint256 lifetime,
21
- NftId bundleNftId
63
+ bytes memory applicationData,
64
+ NftId bundleNftId,
65
+ ReferralId referralId
22
66
  ) external returns (NftId nftId);
23
67
 
24
- // function revoke(unit256 nftId) external;
68
+ /**
69
+ * @dev revokes the application represented by {policyNftId}.
70
+ * an application can only be revoked in applied state.
71
+ * only the application holder may revoke an application.
72
+ */
73
+ function revoke(NftId policyNftId) external;
25
74
 
26
75
  /**
27
76
  * @dev underwrites the policy represented by {policyNftId}.
@@ -38,9 +87,9 @@ interface IProductService is IService {
38
87
  // function decline(uint256 nftId) external;
39
88
  // function expire(uint256 nftId) external;
40
89
 
41
- function collectPremium(NftId nftId, Timestamp activateAt) external;
90
+ function collectPremium(NftId policyNftId, Timestamp activateAt) external;
42
91
 
43
- function activate(NftId nftId, Timestamp activateAt) external;
92
+ function activate(NftId policyNftId, Timestamp activateAt) external;
44
93
 
45
94
 
46
95
  function close(NftId nftId) external;
@@ -3,6 +3,7 @@ pragma solidity ^0.8.19;
3
3
 
4
4
  import {IRegistry} from "../../registry/IRegistry.sol";
5
5
  import {IInstance} from "../../instance/IInstance.sol";
6
+ import {IBundle} from "../../instance/module/bundle/IBundle.sol";
6
7
  import {ITreasury, ITreasuryModule, TokenHandler} from "../../instance/module/treasury/ITreasury.sol";
7
8
 
8
9
  import {IVersionable} from "../../shared/IVersionable.sol";
@@ -13,7 +14,7 @@ import {POOL, BUNDLE} from "../../types/ObjectType.sol";
13
14
  import {Fee} from "../../types/Fee.sol";
14
15
  import {Version, VersionLib} from "../../types/Version.sol";
15
16
 
16
- import {ComponentServiceBase} from "./ComponentServiceBase.sol";
17
+ import {ComponentServiceBase} from "../base/ComponentServiceBase.sol";
17
18
  import {IPoolService} from "./IPoolService.sol";
18
19
 
19
20
 
@@ -44,18 +45,26 @@ contract PoolService is ComponentServiceBase, IPoolService {
44
45
  }
45
46
 
46
47
  function setFees(
48
+ Fee memory poolFee,
47
49
  Fee memory stakingFee,
48
50
  Fee memory performanceFee
49
51
  )
50
52
  external
51
53
  override
52
54
  {
53
- (IRegistry.ObjectInfo memory info, IInstance instance) = _getAndVerifyComponentInfoAndInstance(POOL());
54
- instance.setPoolFees(info.nftId, stakingFee, performanceFee);
55
+ (IRegistry.ObjectInfo memory poolInfo, IInstance instance) = _getAndVerifyComponentInfoAndInstance(POOL());
56
+
57
+ NftId productNftId = instance.getProductNftId(poolInfo.nftId);
58
+ ITreasury.TreasuryInfo memory treasuryInfo = instance.getTreasuryInfo(productNftId);
59
+ treasuryInfo.poolFee = poolFee;
60
+ treasuryInfo.stakingFee = stakingFee;
61
+ treasuryInfo.performanceFee = performanceFee;
62
+ instance.setTreasuryInfo(productNftId, treasuryInfo);
55
63
  }
56
64
 
57
65
  function createBundle(
58
66
  address owner,
67
+ Fee memory fee,
59
68
  uint256 stakingAmount,
60
69
  uint256 lifetime,
61
70
  bytes calldata filter
@@ -78,6 +87,7 @@ contract PoolService is ComponentServiceBase, IPoolService {
78
87
  instance.createBundleInfo(
79
88
  bundleNftId,
80
89
  poolNftId,
90
+ fee,
81
91
  stakingAmount,
82
92
  lifetime,
83
93
  filter);
@@ -98,6 +108,21 @@ contract PoolService is ComponentServiceBase, IPoolService {
98
108
  // TODO add logging
99
109
  }
100
110
 
111
+ function setBundleFee(
112
+ NftId bundleNftId,
113
+ Fee memory fee
114
+ )
115
+ external
116
+ override
117
+ {
118
+ (IRegistry.ObjectInfo memory poolInfo, IInstance instance) = _getAndVerifyComponentInfoAndInstance(POOL());
119
+ IBundle.BundleInfo memory bundleInfo = instance.getBundleInfo(bundleNftId);
120
+ require(bundleInfo.poolNftId.gtz(), "ERROR:PLS-010:BUNDLE_UNKNOWN");
121
+ require(poolInfo.nftId == bundleInfo.poolNftId, "ERROR:PLS-011:BUNDLE_POOL_MISMATCH");
122
+ bundleInfo.fee = fee;
123
+ instance.setBundleInfo(bundleNftId, bundleInfo);
124
+ }
125
+
101
126
 
102
127
  function _processStakingByTreasury(
103
128
  IInstance instance,
@@ -109,9 +134,10 @@ contract PoolService is ComponentServiceBase, IPoolService {
109
134
  {
110
135
  // process token transfer(s)
111
136
  if(stakingAmount > 0) {
112
- TokenHandler tokenHandler = instance.getTokenHandler(poolNftId);
137
+ NftId productNftId = instance.getProductNftId(poolNftId);
138
+ TokenHandler tokenHandler = instance.getTokenHandler(productNftId);
113
139
  address bundleOwner = _registry.getOwner(bundleNftId);
114
- address poolWallet = instance.getPoolSetup(poolNftId).wallet;
140
+ address poolWallet = instance.getComponentWallet(poolNftId);
115
141
 
116
142
  tokenHandler.transfer(
117
143
  bundleOwner,