@etherisc/gif-next 0.0.2-e37834a-021 → 0.0.2-e38b7e6-931

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 (402) hide show
  1. package/README.md +171 -2
  2. package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.dbg.json +1 -1
  3. package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.json +282 -2
  4. package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +1 -1
  5. package/artifacts/contracts/components/Distribution.sol/Distribution.json +313 -72
  6. package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.dbg.json +1 -1
  7. package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.json +234 -3
  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 +24 -57
  12. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +1 -1
  13. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.json +5 -55
  14. package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
  15. package/artifacts/contracts/components/Pool.sol/Pool.json +378 -127
  16. package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
  17. package/artifacts/contracts/components/Product.sol/Product.json +391 -107
  18. package/artifacts/contracts/experiment/cloning/Cloner.sol/Cloner.dbg.json +4 -0
  19. package/artifacts/contracts/experiment/cloning/Cloner.sol/Cloner.json +66 -0
  20. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock1.dbg.json +4 -0
  21. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock1.json +24 -0
  22. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock2.dbg.json +4 -0
  23. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock2.json +42 -0
  24. package/artifacts/contracts/experiment/errors/Require.sol/Require.dbg.json +1 -1
  25. package/artifacts/contracts/experiment/errors/Revert.sol/Revert.dbg.json +1 -1
  26. package/artifacts/contracts/experiment/inheritance/A.sol/A.dbg.json +1 -1
  27. package/artifacts/contracts/experiment/inheritance/A.sol/AShared.dbg.json +1 -1
  28. package/artifacts/contracts/experiment/inheritance/B.sol/B.dbg.json +1 -1
  29. package/artifacts/contracts/experiment/inheritance/C.sol/C.dbg.json +1 -1
  30. package/artifacts/contracts/experiment/inheritance/IA.sol/IA.dbg.json +1 -1
  31. package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.dbg.json +1 -1
  32. package/artifacts/contracts/experiment/inheritance/IB.sol/IB.dbg.json +1 -1
  33. package/artifacts/contracts/experiment/inheritance/IC.sol/IC.dbg.json +1 -1
  34. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.dbg.json +1 -1
  35. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.json +2 -2
  36. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.dbg.json +1 -1
  37. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.dbg.json +1 -1
  38. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.dbg.json +1 -1
  39. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.json +2 -2
  40. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.dbg.json +1 -1
  41. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.json +2 -2
  42. package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.dbg.json +1 -1
  43. package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.dbg.json +1 -1
  44. package/artifacts/contracts/instance/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.dbg.json +4 -0
  45. package/artifacts/contracts/instance/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.json +1206 -0
  46. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.dbg.json +4 -0
  47. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.json +788 -0
  48. package/artifacts/contracts/instance/Cloneable.sol/Cloneable.dbg.json +4 -0
  49. package/artifacts/contracts/instance/Cloneable.sol/Cloneable.json +185 -0
  50. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  51. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +813 -1184
  52. package/artifacts/contracts/instance/IInstanceBase.sol/IInstanceBase.dbg.json +4 -0
  53. package/artifacts/contracts/instance/IInstanceBase.sol/IInstanceBase.json +448 -0
  54. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +4 -0
  55. package/artifacts/contracts/instance/{base/IService.sol/IService.json → IInstanceService.sol/IInstanceService.json} +244 -18
  56. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  57. package/artifacts/contracts/instance/Instance.sol/Instance.json +1762 -1332
  58. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +4 -0
  59. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +1047 -0
  60. package/artifacts/contracts/instance/InstanceBase.sol/InstanceBase.dbg.json +4 -0
  61. package/artifacts/contracts/instance/InstanceBase.sol/InstanceBase.json +763 -0
  62. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +4 -0
  63. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +1422 -0
  64. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +4 -0
  65. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +963 -0
  66. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +4 -0
  67. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +460 -0
  68. package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.dbg.json +4 -0
  69. package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.json +285 -0
  70. package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.dbg.json +1 -1
  71. package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.json +240 -11
  72. package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.dbg.json +1 -1
  73. package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.json +0 -13
  74. package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
  75. package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.json +27 -158
  76. package/artifacts/contracts/instance/base/ILifecycle.sol/ILifecycle.dbg.json +1 -1
  77. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
  78. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.json +37 -245
  79. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json +1 -1
  80. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.json +2 -2
  81. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +4 -0
  82. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.json +254 -0
  83. package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +4 -0
  84. package/artifacts/contracts/instance/module/{bundle/IBundle.sol → IBundle.sol}/IBundle.json +1 -1
  85. package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +4 -0
  86. package/artifacts/contracts/instance/module/{distribution/IDistribution.sol → IDistribution.sol}/IDistribution.json +1 -1
  87. package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +4 -0
  88. package/artifacts/contracts/instance/module/{policy/IPolicy.sol → IPolicy.sol}/IPolicy.json +1 -1
  89. package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +4 -0
  90. package/artifacts/contracts/instance/module/{risk/IRisk.sol → IRisk.sol}/IRisk.json +1 -1
  91. package/artifacts/contracts/instance/module/ISetup.sol/ISetup.dbg.json +4 -0
  92. package/artifacts/contracts/instance/{base/ModuleBase.sol/ModuleBase.json → module/ISetup.sol/ISetup.json} +2 -2
  93. package/artifacts/contracts/instance/module/ITreasury.sol/ITreasury.dbg.json +4 -0
  94. package/artifacts/contracts/instance/module/{treasury/ITreasury.sol → ITreasury.sol}/ITreasury.json +1 -1
  95. package/artifacts/contracts/instance/service/BundleService.sol/BundleService.dbg.json +4 -0
  96. package/artifacts/contracts/instance/service/BundleService.sol/BundleService.json +1121 -0
  97. package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.dbg.json +4 -0
  98. package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.json +436 -0
  99. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +1 -1
  100. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +304 -39
  101. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +4 -0
  102. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.json +424 -0
  103. package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.dbg.json +4 -0
  104. package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.json +720 -0
  105. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +1 -1
  106. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.json +93 -16
  107. package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.dbg.json +4 -0
  108. package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.json +771 -0
  109. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +1 -1
  110. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +95 -80
  111. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +1 -1
  112. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +89 -227
  113. package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.dbg.json +4 -0
  114. package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.json +1246 -0
  115. package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +4 -0
  116. package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.json +492 -0
  117. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +1 -1
  118. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +287 -111
  119. package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.dbg.json +4 -0
  120. package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.json +424 -0
  121. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +1 -1
  122. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +258 -347
  123. package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.dbg.json +4 -0
  124. package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.json +424 -0
  125. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  126. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +47 -2
  127. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  128. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +157 -71
  129. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
  130. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +339 -31
  131. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
  132. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  133. package/artifacts/contracts/registry/Registry.sol/Registry.json +131 -212
  134. package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.dbg.json +4 -0
  135. package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.json +285 -0
  136. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
  137. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +382 -72
  138. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
  139. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +68 -77
  140. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.dbg.json +4 -0
  141. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.json +530 -0
  142. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +4 -0
  143. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +397 -0
  144. package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.dbg.json +1 -1
  145. package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +1 -1
  146. package/artifacts/contracts/shared/ERC165.sol/ERC165.json +2 -2
  147. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +4 -0
  148. package/artifacts/contracts/{instance/module/component/ComponentModule.sol/ComponentModule.json → shared/INftOwnable.sol/INftOwnable.json} +67 -57
  149. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  150. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +80 -3
  151. package/artifacts/contracts/shared/IService.sol/IService.dbg.json +4 -0
  152. package/artifacts/contracts/{instance/service/IComponentOwnerService.sol/IComponentOwnerService.json → shared/IService.sol/IService.json} +90 -58
  153. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +1 -1
  154. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
  155. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +32 -6
  156. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +1 -1
  157. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +21 -16
  158. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  159. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +120 -6
  160. package/artifacts/contracts/shared/RegisterableUpgradable.sol/RegisterableUpgradable.dbg.json +4 -0
  161. package/artifacts/contracts/{instance/base/ServiceBase.sol/ServiceBase.json → shared/RegisterableUpgradable.sol/RegisterableUpgradable.json} +92 -30
  162. package/artifacts/contracts/shared/Service.sol/Service.dbg.json +4 -0
  163. package/artifacts/contracts/{instance/base/InstanceBase.sol/InstanceBase.json → shared/Service.sol/Service.json} +100 -88
  164. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +4 -0
  165. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +96 -0
  166. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
  167. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +2 -2
  168. package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +1 -1
  169. package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json +1 -1
  170. package/artifacts/contracts/test/TestFee.sol/TestFee.json +4 -4
  171. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json +1 -1
  172. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +120 -6
  173. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +1 -1
  174. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.json +14 -14
  175. package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +1 -1
  176. package/artifacts/contracts/test/TestService.sol/TestService.json +155 -27
  177. package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json +1 -1
  178. package/artifacts/contracts/test/TestToken.sol/TestUsdc.json +91 -53
  179. package/artifacts/contracts/test/TestVersion.sol/TestVersion.dbg.json +1 -1
  180. package/artifacts/contracts/test/TestVersion.sol/TestVersion.json +2 -2
  181. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json +1 -1
  182. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.json +18 -2
  183. package/artifacts/contracts/test/Usdc.sol/USDC.dbg.json +1 -1
  184. package/artifacts/contracts/test/Usdc.sol/USDC.json +91 -53
  185. package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.dbg.json +1 -1
  186. package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
  187. package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +1 -1
  188. package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.dbg.json +4 -0
  189. package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.json +104 -0
  190. package/artifacts/contracts/types/Fee.sol/FeeLib.dbg.json +1 -1
  191. package/artifacts/contracts/types/Fee.sol/FeeLib.json +4 -4
  192. package/artifacts/contracts/types/Key32.sol/Key32Lib.dbg.json +1 -1
  193. package/artifacts/contracts/types/Key32.sol/Key32Lib.json +31 -17
  194. package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +1 -1
  195. package/artifacts/contracts/types/NftId.sol/NftIdLib.json +2 -2
  196. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
  197. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.json +26 -3
  198. package/artifacts/contracts/types/NumberId.sol/NumberIdLib.dbg.json +4 -0
  199. package/artifacts/contracts/types/NumberId.sol/NumberIdLib.json +100 -0
  200. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
  201. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.json +2 -2
  202. package/artifacts/contracts/types/Referral.sol/ReferralLib.dbg.json +4 -0
  203. package/artifacts/contracts/types/Referral.sol/ReferralLib.json +123 -0
  204. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.dbg.json +1 -1
  205. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.json +2 -2
  206. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.dbg.json +1 -1
  207. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.json +134 -8
  208. package/artifacts/contracts/types/StateId.sol/StateIdLib.dbg.json +1 -1
  209. package/artifacts/contracts/types/StateId.sol/StateIdLib.json +2 -2
  210. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json +1 -1
  211. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.json +15 -2
  212. package/artifacts/contracts/types/UFixed.sol/MathLib.dbg.json +4 -0
  213. package/artifacts/contracts/types/UFixed.sol/MathLib.json +10 -0
  214. package/artifacts/contracts/types/UFixed.sol/UFixedLib.dbg.json +4 -0
  215. package/artifacts/contracts/types/UFixed.sol/{UFixedMathLib.json → UFixedLib.json} +3 -3
  216. package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +1 -1
  217. package/artifacts/contracts/types/Version.sol/VersionLib.json +2 -2
  218. package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +1 -1
  219. package/artifacts/contracts/types/Version.sol/VersionPartLib.json +22 -3
  220. package/contracts/components/BaseComponent.sol +107 -18
  221. package/contracts/components/Distribution.sol +24 -25
  222. package/contracts/components/IBaseComponent.sol +20 -4
  223. package/contracts/components/IDistributionComponent.sol +2 -4
  224. package/contracts/components/IPoolComponent.sol +5 -3
  225. package/contracts/components/IProductComponent.sol +4 -6
  226. package/contracts/components/Pool.sol +58 -46
  227. package/contracts/components/Product.sol +71 -75
  228. package/contracts/experiment/cloning/Cloner.sol +47 -0
  229. package/contracts/instance/AccessManagerUpgradeableInitializeable.sol +23 -0
  230. package/contracts/instance/BundleManager.sol +129 -0
  231. package/contracts/instance/Cloneable.sol +46 -0
  232. package/contracts/instance/IInstance.sol +54 -48
  233. package/contracts/instance/IInstanceBase.sol +25 -0
  234. package/contracts/instance/IInstanceService.sol +40 -0
  235. package/contracts/instance/Instance.sol +245 -68
  236. package/contracts/instance/InstanceAccessManager.sol +303 -0
  237. package/contracts/instance/InstanceBase.sol +39 -0
  238. package/contracts/instance/InstanceReader.sol +315 -0
  239. package/contracts/instance/InstanceService.sol +345 -0
  240. package/contracts/instance/InstanceServiceManager.sol +54 -0
  241. package/contracts/instance/ObjectManager.sol +101 -0
  242. package/contracts/instance/base/ComponentServiceBase.sol +109 -20
  243. package/contracts/instance/base/IInstanceBase.sol +0 -2
  244. package/contracts/instance/base/IKeyValueStore.sol +13 -14
  245. package/contracts/instance/base/ILifecycle.sol +3 -3
  246. package/contracts/instance/base/KeyValueStore.sol +49 -38
  247. package/contracts/instance/base/Lifecycle.sol +1 -1
  248. package/contracts/instance/module/IAccess.sol +48 -0
  249. package/contracts/instance/module/IBundle.sol +20 -0
  250. package/contracts/instance/module/IDistribution.sol +39 -0
  251. package/contracts/instance/module/IPolicy.sol +45 -0
  252. package/contracts/instance/module/IRisk.sol +11 -0
  253. package/contracts/instance/module/ISetup.sol +46 -0
  254. package/contracts/instance/module/ITreasury.sol +23 -0
  255. package/contracts/instance/service/BundleService.sol +294 -0
  256. package/contracts/instance/service/BundleServiceManager.sol +51 -0
  257. package/contracts/instance/service/DistributionService.sol +79 -18
  258. package/contracts/instance/service/DistributionServiceManager.sol +51 -0
  259. package/contracts/instance/service/IBundleService.sol +44 -0
  260. package/contracts/instance/service/IDistributionService.sol +1 -1
  261. package/contracts/instance/service/IPolicyService.sol +94 -0
  262. package/contracts/instance/service/IPoolService.sol +7 -24
  263. package/contracts/instance/service/IProductService.sol +9 -76
  264. package/contracts/instance/service/PolicyService.sol +539 -0
  265. package/contracts/instance/service/PolicyServiceManager.sol +54 -0
  266. package/contracts/instance/service/PoolService.sol +101 -108
  267. package/contracts/instance/service/PoolServiceManager.sol +51 -0
  268. package/contracts/instance/service/ProductService.sol +130 -431
  269. package/contracts/instance/service/ProductServiceManager.sol +54 -0
  270. package/contracts/registry/ChainNft.sol +41 -26
  271. package/contracts/registry/IRegistry.sol +48 -30
  272. package/contracts/registry/IRegistryService.sol +53 -24
  273. package/contracts/registry/Registry.sol +212 -306
  274. package/contracts/registry/RegistryAccessManager.sol +210 -0
  275. package/contracts/registry/RegistryService.sol +151 -206
  276. package/contracts/registry/RegistryServiceManager.sol +26 -16
  277. package/contracts/registry/ReleaseManager.sol +342 -0
  278. package/contracts/registry/TokenRegistry.sol +110 -0
  279. package/contracts/shared/ERC165.sol +7 -3
  280. package/contracts/shared/INftOwnable.sol +22 -0
  281. package/contracts/shared/IRegisterable.sol +3 -10
  282. package/contracts/shared/IService.sol +16 -0
  283. package/contracts/shared/NftOwnable.sol +85 -38
  284. package/contracts/shared/ProxyManager.sol +4 -13
  285. package/contracts/shared/Registerable.sol +15 -42
  286. package/contracts/shared/RegisterableUpgradable.sol +16 -0
  287. package/contracts/shared/Service.sol +58 -0
  288. package/contracts/shared/TokenHandler.sol +27 -0
  289. package/contracts/shared/UpgradableProxyWithAdmin.sol +2 -2
  290. package/contracts/shared/Versionable.sol +3 -3
  291. package/contracts/test/TestFee.sol +2 -2
  292. package/contracts/test/TestRoleId.sol +1 -1
  293. package/contracts/test/TestService.sol +6 -7
  294. package/contracts/types/DistributorType.sol +55 -0
  295. package/contracts/types/Fee.sol +3 -3
  296. package/contracts/types/Key32.sol +8 -3
  297. package/contracts/types/NftIdSet.sol +26 -24
  298. package/contracts/types/NumberId.sol +52 -0
  299. package/contracts/types/ObjectType.sol +35 -14
  300. package/contracts/types/Referral.sol +85 -0
  301. package/contracts/types/RoleId.sol +61 -9
  302. package/contracts/types/StateId.sol +5 -1
  303. package/contracts/types/Timestamp.sol +7 -3
  304. package/contracts/types/UFixed.sol +128 -12
  305. package/contracts/types/Version.sol +4 -1
  306. package/package.json +4 -3
  307. package/artifacts/contracts/instance/IInstanceLinked.sol/IInstanceLinked.dbg.json +0 -4
  308. package/artifacts/contracts/instance/IInstanceLinked.sol/IInstanceLinked.json +0 -24
  309. package/artifacts/contracts/instance/base/IService.sol/IService.dbg.json +0 -4
  310. package/artifacts/contracts/instance/base/InstanceBase.sol/InstanceBase.dbg.json +0 -4
  311. package/artifacts/contracts/instance/base/ModuleBase.sol/ModuleBase.dbg.json +0 -4
  312. package/artifacts/contracts/instance/base/ServiceBase.sol/ServiceBase.dbg.json +0 -4
  313. package/artifacts/contracts/instance/module/access/Access.sol/AccessModule.dbg.json +0 -4
  314. package/artifacts/contracts/instance/module/access/Access.sol/AccessModule.json +0 -333
  315. package/artifacts/contracts/instance/module/access/IAccess.sol/IAccess.dbg.json +0 -4
  316. package/artifacts/contracts/instance/module/access/IAccess.sol/IAccess.json +0 -10
  317. package/artifacts/contracts/instance/module/access/IAccess.sol/IAccessModule.dbg.json +0 -4
  318. package/artifacts/contracts/instance/module/access/IAccess.sol/IAccessModule.json +0 -333
  319. package/artifacts/contracts/instance/module/bundle/BundleModule.sol/BundleModule.dbg.json +0 -4
  320. package/artifacts/contracts/instance/module/bundle/BundleModule.sol/BundleModule.json +0 -297
  321. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundle.dbg.json +0 -4
  322. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundleModule.dbg.json +0 -4
  323. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundleModule.json +0 -297
  324. package/artifacts/contracts/instance/module/component/ComponentModule.sol/ComponentModule.dbg.json +0 -4
  325. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponent.dbg.json +0 -4
  326. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponent.json +0 -10
  327. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponentModule.dbg.json +0 -4
  328. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponentModule.json +0 -117
  329. package/artifacts/contracts/instance/module/distribution/DistributionModule.sol/DistributionModule.dbg.json +0 -4
  330. package/artifacts/contracts/instance/module/distribution/DistributionModule.sol/DistributionModule.json +0 -10
  331. package/artifacts/contracts/instance/module/distribution/IDistribution.sol/IDistribution.dbg.json +0 -4
  332. package/artifacts/contracts/instance/module/distribution/IDistribution.sol/IDistributionModule.dbg.json +0 -4
  333. package/artifacts/contracts/instance/module/distribution/IDistribution.sol/IDistributionModule.json +0 -10
  334. package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicy.dbg.json +0 -4
  335. package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicyModule.dbg.json +0 -4
  336. package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicyModule.json +0 -284
  337. package/artifacts/contracts/instance/module/policy/PolicyModule.sol/PolicyModule.dbg.json +0 -4
  338. package/artifacts/contracts/instance/module/policy/PolicyModule.sol/PolicyModule.json +0 -284
  339. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPool.dbg.json +0 -4
  340. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPool.json +0 -10
  341. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPoolModule.dbg.json +0 -4
  342. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPoolModule.json +0 -164
  343. package/artifacts/contracts/instance/module/pool/PoolModule.sol/PoolModule.dbg.json +0 -4
  344. package/artifacts/contracts/instance/module/pool/PoolModule.sol/PoolModule.json +0 -164
  345. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRisk.dbg.json +0 -4
  346. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRiskModule.dbg.json +0 -4
  347. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRiskModule.json +0 -113
  348. package/artifacts/contracts/instance/module/risk/RiskModule.sol/RiskModule.dbg.json +0 -4
  349. package/artifacts/contracts/instance/module/risk/RiskModule.sol/RiskModule.json +0 -131
  350. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasury.dbg.json +0 -4
  351. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasuryModule.dbg.json +0 -4
  352. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasuryModule.json +0 -638
  353. package/artifacts/contracts/instance/module/treasury/TokenHandler.sol/TokenHandler.dbg.json +0 -4
  354. package/artifacts/contracts/instance/module/treasury/TokenHandler.sol/TokenHandler.json +0 -76
  355. package/artifacts/contracts/instance/module/treasury/TreasuryModule.sol/TreasuryModule.dbg.json +0 -4
  356. package/artifacts/contracts/instance/module/treasury/TreasuryModule.sol/TreasuryModule.json +0 -638
  357. package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.dbg.json +0 -4
  358. package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.json +0 -690
  359. package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.dbg.json +0 -4
  360. package/artifacts/contracts/registry/IChainNft.sol/IChainNft.dbg.json +0 -4
  361. package/artifacts/contracts/registry/IChainNft.sol/IChainNft.json +0 -457
  362. package/artifacts/contracts/shared/IOwnable.sol/IOwnable.dbg.json +0 -4
  363. package/artifacts/contracts/shared/IOwnable.sol/IOwnable.json +0 -24
  364. package/artifacts/contracts/test/TestDistribution.sol/TestDistribution.dbg.json +0 -4
  365. package/artifacts/contracts/test/TestDistribution.sol/TestDistribution.json +0 -445
  366. package/artifacts/contracts/test/TestPool.sol/TestPool.dbg.json +0 -4
  367. package/artifacts/contracts/test/TestPool.sol/TestPool.json +0 -602
  368. package/artifacts/contracts/test/TestProduct.sol/TestProduct.dbg.json +0 -4
  369. package/artifacts/contracts/test/TestProduct.sol/TestProduct.json +0 -632
  370. package/artifacts/contracts/types/ReferralId.sol/ReferralIdLib.dbg.json +0 -4
  371. package/artifacts/contracts/types/ReferralId.sol/ReferralIdLib.json +0 -99
  372. package/artifacts/contracts/types/UFixed.sol/UFixedMathLib.dbg.json +0 -4
  373. package/contracts/instance/IInstanceLinked.sol +0 -8
  374. package/contracts/instance/base/IService.sol +0 -15
  375. package/contracts/instance/base/InstanceBase.sol +0 -89
  376. package/contracts/instance/base/ModuleBase.sol +0 -57
  377. package/contracts/instance/base/ServiceBase.sol +0 -43
  378. package/contracts/instance/module/access/Access.sol +0 -149
  379. package/contracts/instance/module/access/IAccess.sol +0 -53
  380. package/contracts/instance/module/bundle/BundleModule.sol +0 -134
  381. package/contracts/instance/module/bundle/IBundle.sol +0 -53
  382. package/contracts/instance/module/component/ComponentModule.sol +0 -71
  383. package/contracts/instance/module/component/IComponent.sol +0 -28
  384. package/contracts/instance/module/distribution/DistributionModule.sol +0 -17
  385. package/contracts/instance/module/distribution/IDistribution.sol +0 -10
  386. package/contracts/instance/module/policy/IPolicy.sol +0 -63
  387. package/contracts/instance/module/policy/PolicyModule.sol +0 -91
  388. package/contracts/instance/module/pool/IPoolModule.sol +0 -41
  389. package/contracts/instance/module/pool/PoolModule.sol +0 -95
  390. package/contracts/instance/module/risk/IRisk.sol +0 -26
  391. package/contracts/instance/module/risk/RiskModule.sol +0 -62
  392. package/contracts/instance/module/treasury/ITreasury.sol +0 -84
  393. package/contracts/instance/module/treasury/TokenHandler.sol +0 -48
  394. package/contracts/instance/module/treasury/TreasuryModule.sol +0 -131
  395. package/contracts/instance/service/ComponentOwnerService.sol +0 -272
  396. package/contracts/instance/service/IComponentOwnerService.sol +0 -20
  397. package/contracts/registry/IChainNft.sol +0 -22
  398. package/contracts/shared/IOwnable.sol +0 -6
  399. package/contracts/test/TestDistribution.sol +0 -22
  400. package/contracts/test/TestPool.sol +0 -27
  401. package/contracts/test/TestProduct.sol +0 -74
  402. package/contracts/types/ReferralId.sol +0 -48
@@ -1,36 +1,40 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
2
  pragma solidity ^0.8.20;
3
3
 
4
- import {ObjectType, POOL} from "../types/ObjectType.sol";
5
- import {IProductService} from "../instance/service/IProductService.sol";
4
+ import {POOL} from "../types/ObjectType.sol";
6
5
  import {IPoolService} from "../instance/service/IPoolService.sol";
7
- import {NftId} from "../types/NftId.sol";
6
+ import {IBundleService} from "../instance/service/IBundleService.sol";
7
+ import {NftId, 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 {ISetup} from "../instance/module/ISetup.sol";
18
+ import {InstanceReader} from "../instance/InstanceReader.sol";
16
19
 
17
20
  import {IRegisterable} from "../shared/IRegisterable.sol";
18
21
  import {Registerable} from "../shared/Registerable.sol";
19
22
 
20
- contract Pool is BaseComponent, IPoolComponent {
23
+ abstract contract Pool is BaseComponent, IPoolComponent {
24
+ using NftIdLib for NftId;
21
25
 
22
- bool internal _isVerifying;
26
+ bool internal _isConfirmingApplication;
23
27
  UFixed internal _collateralizationLevel;
24
28
 
25
29
  Fee internal _initialPoolFee;
26
30
  Fee internal _initialStakingFee;
27
31
  Fee internal _initialPerformanceFee;
28
32
 
33
+ TokenHandler internal _tokenHandler;
34
+
29
35
  // may be used to interact with instance by derived contracts
30
36
  IPoolService internal _poolService;
31
-
32
- // only relevant to protect callback functions for "active" pools
33
- IProductService private _productService;
37
+ IBundleService private _bundleService;
34
38
 
35
39
  modifier onlyPoolService() {
36
40
  require(
@@ -39,20 +43,13 @@ contract Pool is BaseComponent, IPoolComponent {
39
43
  _;
40
44
  }
41
45
 
42
- modifier onlyProductService() {
43
- require(
44
- msg.sender == address(_productService),
45
- "ERROR:POL-002:NOT_PRODUCT_SERVICE");
46
- _;
47
- }
48
-
49
46
  constructor(
50
47
  address registry,
51
48
  NftId instanceNftId,
52
49
  // TODO refactor into tokenNftId
53
50
  address token,
54
51
  bool isInterceptor,
55
- bool verifying,
52
+ bool isConfirmingApplication,
56
53
  UFixed collateralizationLevel,
57
54
  Fee memory poolFee,
58
55
  Fee memory stakingFee,
@@ -61,15 +58,18 @@ contract Pool is BaseComponent, IPoolComponent {
61
58
  )
62
59
  BaseComponent(registry, instanceNftId, token, POOL(), isInterceptor, initialOwner)
63
60
  {
64
- _isVerifying = verifying;
61
+ _isConfirmingApplication = isConfirmingApplication;
65
62
  // TODO add validation
66
63
  _collateralizationLevel = collateralizationLevel;
67
64
  _initialPoolFee = poolFee;
68
65
  _initialStakingFee = stakingFee;
69
66
  _initialPerformanceFee = performanceFee;
70
67
 
68
+ _tokenHandler = new TokenHandler(token);
69
+
71
70
  _poolService = _instance.getPoolService();
72
- _productService = _instance.getProductService();
71
+ // _productService = _instance.getProductService();
72
+ _bundleService = _instance.getBundleService();
73
73
 
74
74
  _registerInterface(type(IPoolComponent).interfaceId);
75
75
  }
@@ -85,7 +85,7 @@ contract Pool is BaseComponent, IPoolComponent {
85
85
  returns(NftId bundleNftId)
86
86
  {
87
87
  address owner = msg.sender;
88
- bundleNftId = _poolService.createBundle(
88
+ bundleNftId = _bundleService.createBundle(
89
89
  owner,
90
90
  fee,
91
91
  initialAmount,
@@ -130,8 +130,8 @@ contract Pool is BaseComponent, IPoolComponent {
130
130
  }
131
131
 
132
132
 
133
- function isVerifying() external view override returns (bool verifying) {
134
- return _isVerifying;
133
+ function isConfirmingApplication() external view override returns (bool isConfirmingApplication) {
134
+ return _isConfirmingApplication;
135
135
  }
136
136
 
137
137
  function getCollateralizationLevel() external view override returns (UFixed collateralizationLevel) {
@@ -158,22 +158,32 @@ contract Pool is BaseComponent, IPoolComponent {
158
158
  override
159
159
  // TODO add onlyBundleOwner
160
160
  {
161
- _poolService.setBundleFee(bundleNftId, fee);
161
+ _bundleService.setBundleFee(bundleNftId, fee);
162
162
  }
163
- // TODO delete, call instance instead
164
- function getFees()
163
+
164
+ function lockBundle(
165
+ NftId bundleNftId
166
+ )
165
167
  external
166
- view
167
168
  override
168
- returns (Fee memory, Fee memory, Fee memory)
169
+ // TODO add onlyBundleOwner
170
+ {
171
+ _bundleService.lockBundle(bundleNftId);
172
+ }
173
+
174
+ function unlockBundle(
175
+ NftId bundleNftId
176
+ )
177
+ external
178
+ override
179
+ // TODO add onlyBundleOwner
169
180
  {
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
- //}
181
+ _bundleService.unlockBundle(bundleNftId);
182
+ }
183
+
184
+ function getSetupInfo() public view returns (ISetup.PoolSetupInfo memory setupInfo) {
185
+ InstanceReader reader = _instance.getInstanceReader();
186
+ return reader.getPoolSetupInfo(getNftId());
177
187
  }
178
188
 
179
189
  // from IRegisterable
@@ -188,21 +198,23 @@ contract Pool is BaseComponent, IPoolComponent {
188
198
  {
189
199
  (
190
200
  IRegistry.ObjectInfo memory info,
191
- bytes memory data
192
201
  ) = super.getInitialInfo();
193
202
 
194
203
  return (
195
204
  info,
196
205
  abi.encode(
197
- IPool.PoolInfo(
198
- _isVerifying,
199
- _collateralizationLevel
200
- ),
201
- _wallet,
202
- _token,
203
- _initialPoolFee,
204
- _initialStakingFee,
205
- _initialPerformanceFee
206
+ getName(),
207
+ ISetup.PoolSetupInfo(
208
+ _productNftId,
209
+ _tokenHandler,
210
+ _collateralizationLevel,
211
+ _initialPoolFee,
212
+ _initialStakingFee,
213
+ _initialPerformanceFee,
214
+ false,
215
+ _isConfirmingApplication,
216
+ _wallet
217
+ )
206
218
  )
207
219
  );
208
220
  }
@@ -235,7 +247,7 @@ contract Pool is BaseComponent, IPoolComponent {
235
247
  internal
236
248
  returns(NftId bundleNftId)
237
249
  {
238
- bundleNftId = _poolService.createBundle(
250
+ bundleNftId = _bundleService.createBundle(
239
251
  bundleOwner,
240
252
  fee,
241
253
  amount,
@@ -1,34 +1,39 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
2
  pragma solidity ^0.8.19;
3
3
 
4
- import {IERC20Metadata} from "@openzeppelin5/contracts/token/ERC20/extensions/IERC20Metadata.sol";
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";
8
- import {IProductService} from "../instance/service/IProductService.sol";
6
+ import {IRisk} from "../instance/module/IRisk.sol";
7
+ import {IPolicyService} from "../instance/service/IPolicyService.sol";
9
8
  import {IProductComponent} from "./IProductComponent.sol";
10
- import {NftId, zeroNftId} from "../types/NftId.sol";
11
- import {ObjectType, PRODUCT} from "../types/ObjectType.sol";
12
- import {ReferralId} from "../types/ReferralId.sol";
9
+ import {NftId, NftIdLib} from "../types/NftId.sol";
10
+ import {PRODUCT} from "../types/ObjectType.sol";
11
+ import {ReferralId} from "../types/Referral.sol";
13
12
  import {RiskId, RiskIdLib} from "../types/RiskId.sol";
14
13
  import {StateId} from "../types/StateId.sol";
15
14
  import {Timestamp} from "../types/Timestamp.sol";
16
- import {Fee, FeeLib} from "../types/Fee.sol";
15
+ import {Fee} from "../types/Fee.sol";
17
16
  import {BaseComponent} from "./BaseComponent.sol";
18
17
 
19
18
  import {IRegistry} from "../registry/IRegistry.sol";
20
19
  import {IRegisterable} from "../shared/IRegisterable.sol";
21
20
  import {Registerable} from "../shared/Registerable.sol";
21
+ import {TokenHandler} from "../shared/TokenHandler.sol";
22
22
 
23
- import {IPool} from "../instance/module/pool/IPoolModule.sol";
23
+ import {InstanceReader} from "../instance/InstanceReader.sol";
24
+ import {ISetup} from "../instance/module/ISetup.sol";
24
25
  import {Pool} from "../components/Pool.sol";
26
+ import {Distribution} from "../components/Distribution.sol";
25
27
 
26
- contract Product is BaseComponent, IProductComponent {
27
- IProductService internal _productService;
28
+ abstract contract Product is BaseComponent, IProductComponent {
29
+ using NftIdLib for NftId;
30
+
31
+ IPolicyService internal _policyService;
28
32
  Pool internal _pool;
29
- address internal _distribution;
33
+ Distribution internal _distribution;
30
34
  Fee internal _initialProductFee;
31
35
  Fee internal _initialProcessingFee;
36
+ TokenHandler internal _tokenHandler;
32
37
 
33
38
  NftId internal _poolNftId;
34
39
  NftId internal _distributionNftId;
@@ -45,14 +50,16 @@ contract Product is BaseComponent, IProductComponent {
45
50
  address initialOwner
46
51
  ) BaseComponent(registry, instanceNftid, token, PRODUCT(), isInterceptor, initialOwner) {
47
52
  // TODO add validation
48
- _productService = _instance.getProductService();
53
+ _policyService = _instance.getPolicyService();
49
54
  _pool = Pool(pool);
50
- _distribution = distribution;
55
+ _distribution = Distribution(distribution);
51
56
  _initialProductFee = productFee;
52
57
  _initialProcessingFee = processingFee;
53
58
 
59
+ _tokenHandler = new TokenHandler(token);
60
+
54
61
  _poolNftId = getRegistry().getNftId(address(_pool));
55
- _distributionNftId = getRegistry().getNftId(_distribution);
62
+ _distributionNftId = getRegistry().getNftId(address(_distribution));
56
63
 
57
64
  _registerInterface(type(IProductComponent).interfaceId);
58
65
  }
@@ -63,15 +70,15 @@ contract Product is BaseComponent, IProductComponent {
63
70
  RiskId riskId,
64
71
  uint256 lifetime,
65
72
  bytes memory applicationData,
66
- ReferralId referralId,
67
- NftId bundleNftId
73
+ NftId bundleNftId,
74
+ ReferralId referralId
68
75
  )
69
76
  external
70
77
  view
71
78
  override
72
79
  returns (uint256 premiumAmount)
73
80
  {
74
- (premiumAmount,,,,) = _productService.calculatePremium(
81
+ (premiumAmount,,,,) = _policyService.calculatePremium(
75
82
  riskId,
76
83
  sumInsuredAmount,
77
84
  lifetime,
@@ -111,13 +118,13 @@ contract Product is BaseComponent, IProductComponent {
111
118
  );
112
119
  }
113
120
 
114
- function _setRiskInfo(
121
+ function _updateRisk(
115
122
  RiskId id,
116
- IRisk.RiskInfo memory info
123
+ bytes memory data
117
124
  ) internal {
118
- _productService.setRiskInfo(
125
+ _productService.updateRisk(
119
126
  id,
120
- info
127
+ data
121
128
  );
122
129
  }
123
130
 
@@ -132,7 +139,7 @@ contract Product is BaseComponent, IProductComponent {
132
139
  }
133
140
 
134
141
  function _getRiskInfo(RiskId id) internal view returns (IRisk.RiskInfo memory info) {
135
- return _instance.getRiskInfo(id);
142
+ return _instance.getInstanceReader().getRiskInfo(id);
136
143
  }
137
144
 
138
145
  function _createApplication(
@@ -144,7 +151,7 @@ contract Product is BaseComponent, IProductComponent {
144
151
  NftId bundleNftId,
145
152
  ReferralId referralId
146
153
  ) internal returns (NftId nftId) {
147
- nftId = _productService.createApplication(
154
+ nftId = _policyService.createApplication(
148
155
  applicationOwner,
149
156
  riskId,
150
157
  sumInsuredAmount,
@@ -162,7 +169,7 @@ contract Product is BaseComponent, IProductComponent {
162
169
  )
163
170
  internal
164
171
  {
165
- _productService.underwrite(
172
+ _policyService.underwrite(
166
173
  policyNftId,
167
174
  requirePremiumPayment,
168
175
  activateAt);
@@ -174,7 +181,7 @@ contract Product is BaseComponent, IProductComponent {
174
181
  )
175
182
  internal
176
183
  {
177
- _productService.collectPremium(
184
+ _policyService.collectPremium(
178
185
  policyNftId,
179
186
  activateAt);
180
187
  }
@@ -185,17 +192,25 @@ contract Product is BaseComponent, IProductComponent {
185
192
  )
186
193
  internal
187
194
  {
188
- _productService.activate(
195
+ _policyService.activate(
189
196
  policyNftId,
190
197
  activateAt);
191
198
  }
192
199
 
200
+ function _close(
201
+ NftId policyNftId
202
+ )
203
+ internal
204
+ {
205
+ _policyService.close(policyNftId);
206
+ }
207
+
193
208
  function getPoolNftId() external view override returns (NftId poolNftId) {
194
209
  return getRegistry().getNftId(address(_pool));
195
210
  }
196
211
 
197
212
  function getDistributionNftId() external view override returns (NftId distributionNftId) {
198
- return getRegistry().getNftId(_distribution);
213
+ return getRegistry().getNftId(address(_distribution));
199
214
  }
200
215
 
201
216
  // from product component
@@ -210,38 +225,13 @@ contract Product is BaseComponent, IProductComponent {
210
225
  _productService.setFees(productFee, processingFee);
211
226
  }
212
227
 
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
- }
228
+ function getSetupInfo() public view returns (ISetup.ProductSetupInfo memory setupInfo) {
229
+ InstanceReader reader = _instance.getInstanceReader();
230
+ return reader.getProductSetupInfo(getNftId());
240
231
  }
241
232
 
242
233
  // from IRegisterable
243
234
 
244
- // TODO used only once, occupies space
245
235
  function getInitialInfo()
246
236
  public
247
237
  view
@@ -253,7 +243,7 @@ contract Product is BaseComponent, IProductComponent {
253
243
  IRegistry.ObjectInfo memory productInfo,
254
244
  bytes memory data
255
245
  ) = super.getInitialInfo();
256
-
246
+
257
247
  // TODO read pool & distribution fees
258
248
  // 1) from pool -> the only option -> pool must be registered first?
259
249
  // 2) from instance -> all fees are set into instance at product registration which is ongoing here
@@ -263,36 +253,42 @@ contract Product is BaseComponent, IProductComponent {
263
253
 
264
254
  // from PoolComponent
265
255
  (
266
- IRegistry.ObjectInfo memory poolInfo,
256
+ ,
267
257
  bytes memory poolData
268
258
  ) = _pool.getInitialInfo();
259
+
260
+ (
261
+ , ISetup.PoolSetupInfo memory poolSetupInfo
262
+ ) = abi.decode(poolData, (string, ISetup.PoolSetupInfo));
269
263
 
264
+ // from DistributionComponent
270
265
  (
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));
266
+ ,
267
+ bytes memory distributionData
268
+ ) = _distribution.getInitialInfo();
278
269
 
279
- // TODO from DistributionComponent
270
+ (
271
+ , ISetup.DistributionSetupInfo memory distributionSetupInfo
272
+ ) = abi.decode(distributionData, (string, ISetup.DistributionSetupInfo));
280
273
 
281
274
  return (
282
275
  productInfo,
283
276
  abi.encode(
284
- ITreasury.TreasuryInfo(
285
- _poolNftId,
286
- _distributionNftId,
277
+ getName(),
278
+ ISetup.ProductSetupInfo(
287
279
  _token,
280
+ _tokenHandler,
281
+ _distributionNftId,
282
+ _poolNftId,
283
+ distributionSetupInfo.distributionFee,
288
284
  _initialProductFee,
289
285
  _initialProcessingFee,
290
- initialPoolFee,
291
- initialStakingFee,
292
- initialPerformanceFee,
293
- FeeLib.zeroFee()//_instance.getDistributionFee(_distributionNftId)
294
- ),
295
- _wallet
286
+ poolSetupInfo.poolFee,
287
+ poolSetupInfo.stakingFee,
288
+ poolSetupInfo.performanceFee,
289
+ false,
290
+ _wallet
291
+ )
296
292
  )
297
293
  );
298
294
  }
@@ -0,0 +1,47 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ pragma solidity ^0.8.20;
3
+
4
+ import {Clones} from "@openzeppelin/contracts/proxy/Clones.sol";
5
+
6
+
7
+ contract Cloner {
8
+
9
+ Mock1 public mock1;
10
+ Mock2 public mock2;
11
+
12
+ constructor() {
13
+ mock1 = new Mock1();
14
+ mock2 = new Mock2();
15
+ }
16
+
17
+ function createClone(address master)
18
+ external
19
+ returns (address cloned)
20
+ {
21
+ cloned = Clones.clone(master);
22
+ }
23
+ }
24
+
25
+
26
+ contract Mock1 {
27
+ function getValue() external virtual view returns (uint256) {
28
+ return 42;
29
+ }
30
+ }
31
+
32
+ contract Mock2 is Mock1 {
33
+ uint256 internal _value;
34
+
35
+ constructor() {
36
+ _value = 42;
37
+ }
38
+
39
+ function setValue(uint256 value) external virtual {
40
+ _value = value;
41
+ }
42
+
43
+ function getValue() external virtual override view returns (uint256) {
44
+ return _value;
45
+ }
46
+ }
47
+
@@ -0,0 +1,23 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ pragma solidity ^0.8.20;
3
+
4
+ import {AccessManagerUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagerUpgradeable.sol";
5
+
6
+
7
+ contract AccessManagerUpgradeableInitializeable is AccessManagerUpgradeable {
8
+
9
+ bool private _initialized;
10
+
11
+ function __AccessManagerUpgradeableInitializeable_init(address initialAdmin) public {
12
+ require(!_initialized, "AccessManager: already initialized");
13
+
14
+ if (initialAdmin == address(0)) {
15
+ revert AccessManagerInvalidInitialAdmin(address(0));
16
+ }
17
+
18
+ // admin is active immediately and without any execution delay.
19
+ _grantRole(ADMIN_ROLE, initialAdmin, 0, 0);
20
+ _initialized = true;
21
+ }
22
+
23
+ }
@@ -0,0 +1,129 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ pragma solidity ^0.8.20;
3
+
4
+ import {IInstance} from "./IInstance.sol";
5
+ import {INSTANCE} from "../types/ObjectType.sol";
6
+ import {InstanceReader} from "./InstanceReader.sol";
7
+ import {IPolicy} from "../instance/module/IPolicy.sol";
8
+ import {IRegistry} from "../registry/IRegistry.sol";
9
+ import {LibNftIdSet} from "../types/NftIdSet.sol";
10
+ import {NftId} from "../types/NftId.sol";
11
+ import {TimestampLib} from "../types/Timestamp.sol";
12
+
13
+ import {ObjectManager} from "./ObjectManager.sol";
14
+
15
+ contract BundleManager is
16
+ ObjectManager
17
+ {
18
+
19
+ event LogBundleManagerPolicyLinked(NftId bundleNftId, NftId policyNftId);
20
+ event LogBundleManagerPolicyUnlinked(NftId bundleNftId, NftId policyNftId);
21
+
22
+ event LogBundleManagerBundleAdded(NftId poolNftId, NftId bundleNftId);
23
+ event LogBundleManagerBundleUnlocked(NftId poolNftId, NftId bundleNftId);
24
+ event LogBundleManagerBundleLocked(NftId poolNftId, NftId bundleNftId);
25
+
26
+ error ErrorBundleManagerErrorPolicyAlreadyActivated(NftId policyNftId);
27
+ error ErrorBundleManagerErrorBundleLocked(NftId bundleNftId, NftId policyNftId);
28
+ error ErrorBundleManagerPolicyWithOpenClaims(NftId policyNftId, uint256 openClaimsCount);
29
+ error ErrorBundleManagerPolicyNotCloseable(NftId policyNftId);
30
+ error ErrorBundleManagerBundleUnknown(NftId bundleNftId);
31
+ error ErrorBundleManagerBundleNotRegistered(NftId bundleNftId);
32
+
33
+ mapping(NftId bundleNftId => LibNftIdSet.Set policies) internal _activePolicies;
34
+
35
+ constructor() ObjectManager() {
36
+ }
37
+
38
+
39
+ /// @dev links a policy with its bundle
40
+ // to link a policy it MUST NOT yet have been activated
41
+ // the bundle MUST be unlocked (active) for linking (underwriting) and registered with this instance
42
+ function linkPolicy(NftId policyNftId) external restricted() {
43
+ NftId bundleNftId = _instanceReader.getPolicyInfo(policyNftId).bundleNftId;
44
+ // decision will likely depend on the decision what to check here and what in the service
45
+ NftId poolNftId = _instanceReader.getBundleInfo(bundleNftId).poolNftId;
46
+
47
+ // ensure bundle is unlocked (in active set) and registered with this instance
48
+ if (!_isActive(poolNftId, bundleNftId)) {
49
+ revert ErrorBundleManagerErrorBundleLocked(bundleNftId, policyNftId);
50
+ }
51
+
52
+ LibNftIdSet.add(_activePolicies[bundleNftId], policyNftId);
53
+ emit LogBundleManagerPolicyLinked(bundleNftId, policyNftId);
54
+ }
55
+
56
+
57
+ /// @dev unlinks a policy from its bundle
58
+ // to unlink a policy it must closable, ie. meet one of the following criterias
59
+ // - the policy MUST be past its expiry period and it MUST NOT have any open claims
60
+ // - the policy's payoutAmount MUST be equal to its sumInsuredAmount and MUST NOT have any open claims
61
+ function unlinkPolicy(NftId policyNftId) external restricted() {
62
+ IPolicy.PolicyInfo memory policyInfo = _instanceReader.getPolicyInfo(policyNftId);
63
+
64
+ NftId bundleNftId = policyInfo.bundleNftId;
65
+ // decision will likely depend on the decision what to check here and what in the service
66
+ NftId poolNftId = _instanceReader.getBundleInfo(bundleNftId).poolNftId;
67
+
68
+ // ensure bundle is registered with this instance
69
+ if (!_contains(poolNftId, bundleNftId)) {
70
+ revert ErrorBundleManagerBundleUnknown(bundleNftId);
71
+ }
72
+
73
+ LibNftIdSet.remove(_activePolicies[bundleNftId], policyNftId);
74
+ emit LogBundleManagerPolicyUnlinked(policyInfo.bundleNftId, policyNftId);
75
+ }
76
+
77
+
78
+ /// @dev add a new bundle to a riskpool registerd with this instance
79
+ // the corresponding pool is fetched via instance reader
80
+ function add(NftId bundleNftId) external restricted() {
81
+ NftId poolNftId = _instanceReader.getBundleInfo(bundleNftId).poolNftId;
82
+
83
+ // ensure pool is registered with instance
84
+ if(poolNftId.eqz()) {
85
+ revert ErrorBundleManagerBundleNotRegistered(bundleNftId);
86
+ }
87
+
88
+ _add(poolNftId, bundleNftId);
89
+ emit LogBundleManagerBundleAdded(poolNftId, bundleNftId);
90
+ }
91
+
92
+ /// @dev unlocked (active) bundles are available to underwrite new policies
93
+ function unlock(NftId bundleNftId) external restricted() {
94
+ NftId poolNftId = _instanceReader.getBundleInfo(bundleNftId).poolNftId;
95
+ _activate(poolNftId, bundleNftId);
96
+ emit LogBundleManagerBundleUnlocked(poolNftId, bundleNftId);
97
+ }
98
+
99
+ /// @dev locked (deactivated) bundles may not underwrite any new policies
100
+ function lock(NftId bundleNftId) external restricted() {
101
+ NftId poolNftId = _instanceReader.getBundleInfo(bundleNftId).poolNftId;
102
+ _deactivate(poolNftId, bundleNftId);
103
+ emit LogBundleManagerBundleLocked(poolNftId, bundleNftId);
104
+ }
105
+
106
+ function bundles(NftId poolNftId) external view returns(uint256) {
107
+ return _objects(poolNftId);
108
+ }
109
+
110
+ function getBundleNftId(NftId poolNftId, uint256 idx) external view returns(NftId bundleNftId) {
111
+ return _getObject(poolNftId, idx);
112
+ }
113
+
114
+ function activeBundles(NftId poolNftId) external view returns(uint256) {
115
+ return _activeObjs(poolNftId);
116
+ }
117
+
118
+ function getActiveBundleNftId(NftId poolNftId, uint256 idx) external view returns(NftId bundleNftId) {
119
+ return _getActiveObject(poolNftId, idx);
120
+ }
121
+
122
+ function activePolicies(NftId bundleNftId) external view returns(uint256) {
123
+ return LibNftIdSet.size(_activePolicies[bundleNftId]);
124
+ }
125
+
126
+ function getActivePolicy(NftId bundleNftId, uint256 idx) external view returns(NftId policyNftId) {
127
+ return LibNftIdSet.getElementAt(_activePolicies[bundleNftId], idx);
128
+ }
129
+ }