@etherisc/gif-next 0.0.2-acc7efa-771 → 0.0.2-ad346f1-601

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 (496) hide show
  1. package/README.md +81 -7
  2. package/artifacts/contracts/accounting/AccountingService.sol/AccountingService.dbg.json +4 -0
  3. package/artifacts/contracts/accounting/AccountingService.sol/AccountingService.json +1056 -0
  4. package/artifacts/contracts/accounting/AccountingServiceManager.sol/AccountingServiceManager.dbg.json +4 -0
  5. package/artifacts/contracts/accounting/AccountingServiceManager.sol/AccountingServiceManager.json +771 -0
  6. package/artifacts/contracts/accounting/IAccountingService.sol/IAccountingService.dbg.json +4 -0
  7. package/artifacts/contracts/accounting/IAccountingService.sol/IAccountingService.json +824 -0
  8. package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.dbg.json +1 -1
  9. package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.json +640 -269
  10. package/artifacts/contracts/authorization/AccessAdminLib.sol/AccessAdminLib.dbg.json +4 -0
  11. package/artifacts/contracts/authorization/AccessAdminLib.sol/AccessAdminLib.json +1289 -0
  12. package/artifacts/contracts/authorization/AccessManagerCloneable.sol/AccessManagerCloneable.dbg.json +1 -1
  13. package/artifacts/contracts/authorization/AccessManagerCloneable.sol/AccessManagerCloneable.json +202 -5
  14. package/artifacts/contracts/authorization/Authorization.sol/Authorization.dbg.json +1 -1
  15. package/artifacts/contracts/authorization/Authorization.sol/Authorization.json +409 -33
  16. package/artifacts/contracts/authorization/IAccess.sol/IAccess.dbg.json +1 -1
  17. package/artifacts/contracts/authorization/IAccessAdmin.sol/IAccessAdmin.dbg.json +1 -1
  18. package/artifacts/contracts/authorization/IAccessAdmin.sol/IAccessAdmin.json +525 -213
  19. package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.dbg.json +1 -1
  20. package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.json +179 -19
  21. package/artifacts/contracts/authorization/IServiceAuthorization.sol/IServiceAuthorization.dbg.json +1 -1
  22. package/artifacts/contracts/authorization/IServiceAuthorization.sol/IServiceAuthorization.json +246 -16
  23. package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.dbg.json +1 -1
  24. package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.json +420 -27
  25. package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.dbg.json +1 -1
  26. package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.json +114 -291
  27. package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.dbg.json +1 -1
  28. package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.json +381 -46
  29. package/artifacts/contracts/distribution/Distribution.sol/Distribution.dbg.json +1 -1
  30. package/artifacts/contracts/distribution/Distribution.sol/Distribution.json +46 -164
  31. package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.dbg.json +1 -1
  32. package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.json +577 -185
  33. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
  34. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.json +170 -69
  35. package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
  36. package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.json +32 -132
  37. package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.dbg.json +1 -1
  38. package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.json +376 -71
  39. package/artifacts/contracts/examples/fire/DamageLevel.sol/DamageLevelLib.dbg.json +1 -1
  40. package/artifacts/contracts/examples/fire/FirePool.sol/FirePool.dbg.json +1 -1
  41. package/artifacts/contracts/examples/fire/FirePool.sol/FirePool.json +131 -171
  42. package/artifacts/contracts/examples/fire/FirePoolAuthorization.sol/FirePoolAuthorization.dbg.json +1 -1
  43. package/artifacts/contracts/examples/fire/FirePoolAuthorization.sol/FirePoolAuthorization.json +380 -45
  44. package/artifacts/contracts/examples/fire/FireProduct.sol/FireProduct.dbg.json +1 -1
  45. package/artifacts/contracts/examples/fire/FireProduct.sol/FireProduct.json +292 -308
  46. package/artifacts/contracts/examples/fire/FireProductAuthorization.sol/FireProductAuthorization.dbg.json +1 -1
  47. package/artifacts/contracts/examples/fire/FireProductAuthorization.sol/FireProductAuthorization.json +380 -45
  48. package/artifacts/contracts/examples/fire/FireUSD.sol/FireUSD.dbg.json +1 -1
  49. package/artifacts/contracts/examples/unpermissioned/SimpleDistribution.sol/SimpleDistribution.dbg.json +1 -1
  50. package/artifacts/contracts/examples/unpermissioned/SimpleDistribution.sol/SimpleDistribution.json +185 -252
  51. package/artifacts/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol/SimpleDistributionAuthorization.dbg.json +4 -0
  52. package/artifacts/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol/SimpleDistributionAuthorization.json +805 -0
  53. package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.dbg.json +1 -1
  54. package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.json +76 -155
  55. package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.dbg.json +1 -1
  56. package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.json +191 -186
  57. package/artifacts/contracts/examples/unpermissioned/SimplePoolAuthorization.sol/SimplePoolAuthorization.dbg.json +4 -0
  58. package/artifacts/contracts/examples/unpermissioned/SimplePoolAuthorization.sol/SimplePoolAuthorization.json +805 -0
  59. package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.dbg.json +1 -1
  60. package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.json +415 -290
  61. package/artifacts/contracts/examples/unpermissioned/SimpleProductAuthorization.sol/SimpleProductAuthorization.dbg.json +4 -0
  62. package/artifacts/contracts/examples/unpermissioned/SimpleProductAuthorization.sol/SimpleProductAuthorization.json +805 -0
  63. package/artifacts/contracts/instance/BundleSet.sol/BundleSet.dbg.json +1 -1
  64. package/artifacts/contracts/instance/BundleSet.sol/BundleSet.json +193 -45
  65. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  66. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +502 -49
  67. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
  68. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +312 -14
  69. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  70. package/artifacts/contracts/instance/Instance.sol/Instance.json +531 -81
  71. package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.dbg.json +1 -1
  72. package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.json +1024 -328
  73. package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.dbg.json +1 -1
  74. package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.json +393 -52
  75. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
  76. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +1060 -472
  77. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
  78. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +334 -83
  79. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
  80. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +82 -51
  81. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.dbg.json +1 -1
  82. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.json +673 -567
  83. package/artifacts/contracts/instance/RiskSet.sol/RiskSet.dbg.json +4 -0
  84. package/artifacts/contracts/instance/RiskSet.sol/RiskSet.json +853 -0
  85. package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.dbg.json +1 -1
  86. package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.json +2 -2
  87. package/artifacts/contracts/instance/base/Cloneable.sol/Cloneable.dbg.json +1 -1
  88. package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.dbg.json +1 -1
  89. package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.json +2 -2
  90. package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.dbg.json +1 -1
  91. package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.json +2 -2
  92. package/artifacts/contracts/instance/base/ObjectSet.sol/ObjectSet.dbg.json +1 -1
  93. package/artifacts/contracts/instance/base/ObjectSet.sol/ObjectSet.json +16 -5
  94. package/artifacts/contracts/instance/base/ObjectSetHelperLib.sol/ObjectSetHelperLib.dbg.json +4 -0
  95. package/artifacts/contracts/instance/base/ObjectSetHelperLib.sol/ObjectSetHelperLib.json +168 -0
  96. package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
  97. package/artifacts/contracts/instance/module/IComponents.sol/IComponents.dbg.json +1 -1
  98. package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +1 -1
  99. package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +1 -1
  100. package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +1 -1
  101. package/artifacts/contracts/mock/Dip.sol/Dip.dbg.json +1 -1
  102. package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.dbg.json +1 -1
  103. package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.json +66 -167
  104. package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.dbg.json +1 -1
  105. package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.json +379 -47
  106. package/artifacts/contracts/oracle/IOracle.sol/IOracle.dbg.json +1 -1
  107. package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.dbg.json +1 -1
  108. package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.json +36 -71
  109. package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.dbg.json +1 -1
  110. package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.json +37 -3
  111. package/artifacts/contracts/oracle/Oracle.sol/Oracle.dbg.json +1 -1
  112. package/artifacts/contracts/oracle/Oracle.sol/Oracle.json +50 -103
  113. package/artifacts/contracts/oracle/OracleService.sol/OracleService.dbg.json +1 -1
  114. package/artifacts/contracts/oracle/OracleService.sol/OracleService.json +138 -81
  115. package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.dbg.json +1 -1
  116. package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.json +114 -45
  117. package/artifacts/contracts/pool/BasicPool.sol/BasicPool.dbg.json +1 -1
  118. package/artifacts/contracts/pool/BasicPool.sol/BasicPool.json +71 -134
  119. package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.dbg.json +1 -1
  120. package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.json +380 -45
  121. package/artifacts/contracts/pool/BundleService.sol/BundleService.dbg.json +1 -1
  122. package/artifacts/contracts/pool/BundleService.sol/BundleService.json +282 -312
  123. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.dbg.json +1 -1
  124. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.json +108 -91
  125. package/artifacts/contracts/pool/IBundleService.sol/IBundleService.dbg.json +1 -1
  126. package/artifacts/contracts/pool/IBundleService.sol/IBundleService.json +183 -121
  127. package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
  128. package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.json +46 -115
  129. package/artifacts/contracts/pool/IPoolService.sol/IPoolService.dbg.json +1 -1
  130. package/artifacts/contracts/pool/IPoolService.sol/IPoolService.json +355 -208
  131. package/artifacts/contracts/pool/Pool.sol/Pool.dbg.json +1 -1
  132. package/artifacts/contracts/pool/Pool.sol/Pool.json +59 -146
  133. package/artifacts/contracts/pool/PoolLib.sol/PoolLib.dbg.json +4 -0
  134. package/artifacts/contracts/pool/PoolLib.sol/PoolLib.json +546 -0
  135. package/artifacts/contracts/pool/PoolService.sol/PoolService.dbg.json +1 -1
  136. package/artifacts/contracts/pool/PoolService.sol/PoolService.json +600 -411
  137. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
  138. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.json +148 -67
  139. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.dbg.json +1 -1
  140. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.json +308 -62
  141. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +1 -1
  142. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.json +103 -42
  143. package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.dbg.json +1 -1
  144. package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.json +182 -220
  145. package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.dbg.json +1 -1
  146. package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.json +380 -45
  147. package/artifacts/contracts/product/ClaimService.sol/ClaimService.dbg.json +1 -1
  148. package/artifacts/contracts/product/ClaimService.sol/ClaimService.json +282 -180
  149. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +1 -1
  150. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.json +119 -82
  151. package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.dbg.json +1 -1
  152. package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.json +249 -10
  153. package/artifacts/contracts/product/IClaimService.sol/IClaimService.dbg.json +1 -1
  154. package/artifacts/contracts/product/IClaimService.sol/IClaimService.json +164 -21
  155. package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.dbg.json +1 -1
  156. package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.json +148 -56
  157. package/artifacts/contracts/product/IPricingService.sol/IPricingService.dbg.json +1 -1
  158. package/artifacts/contracts/product/IPricingService.sol/IPricingService.json +58 -3
  159. package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.dbg.json +1 -1
  160. package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.json +163 -183
  161. package/artifacts/contracts/product/IRiskService.sol/IRiskService.dbg.json +1 -1
  162. package/artifacts/contracts/product/IRiskService.sol/IRiskService.json +131 -7
  163. package/artifacts/contracts/product/PolicyService.sol/PolicyService.dbg.json +1 -1
  164. package/artifacts/contracts/product/PolicyService.sol/PolicyService.json +277 -194
  165. package/artifacts/contracts/product/PolicyServiceLib.sol/PolicyServiceLib.dbg.json +4 -0
  166. package/artifacts/contracts/product/PolicyServiceLib.sol/PolicyServiceLib.json +783 -0
  167. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +1 -1
  168. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.json +130 -77
  169. package/artifacts/contracts/product/PricingService.sol/PricingService.dbg.json +1 -1
  170. package/artifacts/contracts/product/PricingService.sol/PricingService.json +125 -119
  171. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.dbg.json +1 -1
  172. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.json +92 -59
  173. package/artifacts/contracts/product/Product.sol/Product.dbg.json +1 -1
  174. package/artifacts/contracts/product/Product.sol/Product.json +176 -214
  175. package/artifacts/contracts/product/RiskService.sol/RiskService.dbg.json +1 -1
  176. package/artifacts/contracts/product/RiskService.sol/RiskService.json +211 -72
  177. package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.dbg.json +1 -1
  178. package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.json +103 -42
  179. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  180. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +2 -2
  181. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  182. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +72 -13
  183. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
  184. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +37 -3
  185. package/artifacts/contracts/registry/IRelease.sol/IRelease.dbg.json +4 -0
  186. package/artifacts/contracts/registry/IRelease.sol/IRelease.json +24 -0
  187. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
  188. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  189. package/artifacts/contracts/registry/Registry.sol/Registry.json +110 -51
  190. package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.dbg.json +1 -1
  191. package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.json +726 -465
  192. package/artifacts/contracts/registry/RegistryAuthorization.sol/RegistryAuthorization.dbg.json +4 -0
  193. package/artifacts/contracts/registry/RegistryAuthorization.sol/RegistryAuthorization.json +1053 -0
  194. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
  195. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +75 -42
  196. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
  197. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +79 -38
  198. package/artifacts/contracts/registry/ReleaseAdmin.sol/ReleaseAdmin.dbg.json +4 -0
  199. package/artifacts/contracts/registry/ReleaseAdmin.sol/ReleaseAdmin.json +2152 -0
  200. package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.dbg.json +1 -1
  201. package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.json +2 -2
  202. package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.dbg.json +1 -1
  203. package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.json +386 -64
  204. package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.dbg.json +1 -1
  205. package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.json +437 -26
  206. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
  207. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +15 -15
  208. package/artifacts/contracts/shared/Component.sol/Component.dbg.json +1 -1
  209. package/artifacts/contracts/shared/Component.sol/Component.json +49 -88
  210. package/artifacts/contracts/shared/ComponentService.sol/ComponentService.dbg.json +1 -1
  211. package/artifacts/contracts/shared/ComponentService.sol/ComponentService.json +270 -522
  212. package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.dbg.json +1 -1
  213. package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.json +100 -79
  214. package/artifacts/contracts/shared/ContractLib.sol/ContractLib.dbg.json +1 -1
  215. package/artifacts/contracts/shared/ContractLib.sol/ContractLib.json +544 -4
  216. package/artifacts/contracts/shared/ContractLib.sol/IInstanceAdminHelper.dbg.json +4 -0
  217. package/artifacts/contracts/shared/ContractLib.sol/IInstanceAdminHelper.json +24 -0
  218. package/artifacts/contracts/shared/ContractLib.sol/ITargetHelper.dbg.json +4 -0
  219. package/artifacts/contracts/shared/ContractLib.sol/ITargetHelper.json +30 -0
  220. package/artifacts/contracts/shared/ContractLib.sol/ITokenRegistryHelper.dbg.json +4 -0
  221. package/artifacts/contracts/shared/ContractLib.sol/ITokenRegistryHelper.json +40 -0
  222. package/artifacts/contracts/shared/IComponent.sol/IComponent.dbg.json +1 -1
  223. package/artifacts/contracts/shared/IComponent.sol/IComponent.json +36 -57
  224. package/artifacts/contracts/shared/IComponentService.sol/IComponentService.dbg.json +1 -1
  225. package/artifacts/contracts/shared/IComponentService.sol/IComponentService.json +168 -347
  226. package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.dbg.json +1 -1
  227. package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.json +36 -71
  228. package/artifacts/contracts/shared/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
  229. package/artifacts/contracts/shared/ILifecycle.sol/ILifecycle.dbg.json +1 -1
  230. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
  231. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +1 -1
  232. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  233. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +120 -1
  234. package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +1 -1
  235. package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
  236. package/artifacts/contracts/shared/IService.sol/IService.json +37 -3
  237. package/artifacts/contracts/shared/InitializableERC165.sol/InitializableERC165.dbg.json +1 -1
  238. package/artifacts/contracts/shared/InitializableERC165.sol/InitializableERC165.json +2 -2
  239. package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.dbg.json +1 -1
  240. package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.json +49 -102
  241. package/artifacts/contracts/shared/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
  242. package/artifacts/contracts/shared/Lifecycle.sol/Lifecycle.dbg.json +1 -1
  243. package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.dbg.json +1 -1
  244. package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.json +2 -2
  245. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
  246. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +2 -2
  247. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +1 -1
  248. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +2 -2
  249. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  250. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +118 -62
  251. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +1 -1
  252. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +2 -2
  253. package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
  254. package/artifacts/contracts/shared/Service.sol/Service.json +37 -16
  255. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
  256. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +327 -73
  257. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandlerBase.dbg.json +4 -0
  258. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandlerBase.json +484 -0
  259. package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.dbg.json +1 -1
  260. package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.json +88 -24
  261. package/artifacts/contracts/staking/IStaking.sol/IStaking.dbg.json +1 -1
  262. package/artifacts/contracts/staking/IStaking.sol/IStaking.json +251 -89
  263. package/artifacts/contracts/staking/IStakingService.sol/IStakingService.dbg.json +1 -1
  264. package/artifacts/contracts/staking/IStakingService.sol/IStakingService.json +144 -10
  265. package/artifacts/contracts/staking/Staking.sol/Staking.dbg.json +1 -1
  266. package/artifacts/contracts/staking/Staking.sol/Staking.json +350 -203
  267. package/artifacts/contracts/staking/StakingLib.sol/StakingLib.dbg.json +4 -0
  268. package/artifacts/contracts/staking/StakingLib.sol/StakingLib.json +469 -0
  269. package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.dbg.json +1 -1
  270. package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.json +2 -2
  271. package/artifacts/contracts/staking/StakingManager.sol/StakingManager.dbg.json +1 -1
  272. package/artifacts/contracts/staking/StakingManager.sol/StakingManager.json +107 -60
  273. package/artifacts/contracts/staking/StakingReader.sol/StakingReader.dbg.json +1 -1
  274. package/artifacts/contracts/staking/StakingReader.sol/StakingReader.json +90 -61
  275. package/artifacts/contracts/staking/StakingService.sol/StakingService.dbg.json +1 -1
  276. package/artifacts/contracts/staking/StakingService.sol/StakingService.json +213 -56
  277. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.dbg.json +1 -1
  278. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.json +96 -43
  279. package/artifacts/contracts/staking/StakingStore.sol/StakingStore.dbg.json +1 -1
  280. package/artifacts/contracts/staking/StakingStore.sol/StakingStore.json +163 -149
  281. package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.dbg.json +1 -1
  282. package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.json +61 -51
  283. package/artifacts/contracts/type/AddressSet.sol/LibAddressSet.dbg.json +1 -1
  284. package/artifacts/contracts/type/Amount.sol/AmountLib.dbg.json +1 -1
  285. package/artifacts/contracts/type/Amount.sol/AmountLib.json +11 -11
  286. package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
  287. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.dbg.json +1 -1
  288. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.json +2 -2
  289. package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.dbg.json +1 -1
  290. package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.json +2 -2
  291. package/artifacts/contracts/type/Fee.sol/FeeLib.dbg.json +1 -1
  292. package/artifacts/contracts/type/Fee.sol/FeeLib.json +94 -38
  293. package/artifacts/contracts/type/Key32.sol/Key32Lib.dbg.json +1 -1
  294. package/artifacts/contracts/type/Key32.sol/Key32Lib.json +2 -2
  295. package/artifacts/contracts/type/Key32Set.sol/LibKey32Set.dbg.json +4 -0
  296. package/artifacts/contracts/type/Key32Set.sol/LibKey32Set.json +33 -0
  297. package/artifacts/contracts/type/NftId.sol/NftIdLib.dbg.json +1 -1
  298. package/artifacts/contracts/type/NftId.sol/NftIdLib.json +23 -4
  299. package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
  300. package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.json +2 -2
  301. package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
  302. package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.json +33 -31
  303. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.dbg.json +1 -1
  304. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.json +2 -2
  305. package/artifacts/contracts/type/Referral.sol/ReferralLib.dbg.json +1 -1
  306. package/artifacts/contracts/type/Referral.sol/ReferralLib.json +2 -2
  307. package/artifacts/contracts/type/RequestId.sol/RequestIdLib.dbg.json +1 -1
  308. package/artifacts/contracts/type/RequestId.sol/RequestIdLib.json +2 -2
  309. package/artifacts/contracts/type/RiskId.sol/RiskIdLib.dbg.json +1 -1
  310. package/artifacts/contracts/type/RiskId.sol/RiskIdLib.json +69 -7
  311. package/artifacts/contracts/type/RoleId.sol/RoleIdLib.dbg.json +1 -1
  312. package/artifacts/contracts/type/RoleId.sol/RoleIdLib.json +42 -157
  313. package/artifacts/contracts/type/Seconds.sol/SecondsLib.dbg.json +1 -1
  314. package/artifacts/contracts/type/Seconds.sol/SecondsLib.json +21 -2
  315. package/artifacts/contracts/type/Selector.sol/SelectorLib.dbg.json +1 -1
  316. package/artifacts/contracts/type/Selector.sol/SelectorLib.json +21 -2
  317. package/artifacts/contracts/type/Selector.sol/SelectorSetLib.dbg.json +1 -1
  318. package/artifacts/contracts/type/Selector.sol/SelectorSetLib.json +2 -2
  319. package/artifacts/contracts/type/StateId.sol/StateIdLib.dbg.json +1 -1
  320. package/artifacts/contracts/type/String.sol/StrLib.dbg.json +1 -1
  321. package/artifacts/contracts/type/String.sol/StrLib.json +50 -2
  322. package/artifacts/contracts/type/Timestamp.sol/TimestampLib.dbg.json +1 -1
  323. package/artifacts/contracts/type/Timestamp.sol/TimestampLib.json +2 -2
  324. package/artifacts/contracts/type/UFixed.sol/UFixedLib.dbg.json +1 -1
  325. package/artifacts/contracts/type/UFixed.sol/UFixedLib.json +61 -37
  326. package/artifacts/contracts/type/Version.sol/VersionLib.dbg.json +1 -1
  327. package/artifacts/contracts/type/Version.sol/VersionLib.json +2 -21
  328. package/artifacts/contracts/type/Version.sol/VersionPartLib.dbg.json +1 -1
  329. package/artifacts/contracts/type/Version.sol/VersionPartLib.json +101 -2
  330. package/artifacts/contracts/upgradeability/IVersionable.sol/IVersionable.dbg.json +1 -1
  331. package/artifacts/contracts/upgradeability/IVersionable.sol/IVersionable.json +10 -0
  332. package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.dbg.json +1 -1
  333. package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.json +59 -24
  334. package/artifacts/contracts/upgradeability/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
  335. package/artifacts/contracts/upgradeability/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +15 -2
  336. package/artifacts/contracts/upgradeability/Versionable.sol/Versionable.dbg.json +1 -1
  337. package/artifacts/contracts/upgradeability/Versionable.sol/Versionable.json +10 -0
  338. package/contracts/accounting/AccountingService.sol +274 -0
  339. package/contracts/accounting/AccountingServiceManager.sol +38 -0
  340. package/contracts/accounting/IAccountingService.sol +47 -0
  341. package/contracts/authorization/AccessAdmin.sol +426 -242
  342. package/contracts/authorization/AccessAdminLib.sol +396 -0
  343. package/contracts/authorization/AccessManagerCloneable.sol +146 -4
  344. package/contracts/authorization/Authorization.sol +142 -262
  345. package/contracts/authorization/IAccess.sol +25 -7
  346. package/contracts/authorization/IAccessAdmin.sol +87 -80
  347. package/contracts/authorization/IAuthorization.sol +9 -42
  348. package/contracts/authorization/IServiceAuthorization.sol +55 -17
  349. package/contracts/authorization/ServiceAuthorization.sol +247 -33
  350. package/contracts/distribution/BasicDistribution.sol +18 -16
  351. package/contracts/distribution/BasicDistributionAuthorization.sol +30 -10
  352. package/contracts/distribution/Distribution.sol +41 -79
  353. package/contracts/distribution/DistributionService.sol +192 -98
  354. package/contracts/distribution/DistributionServiceManager.sol +1 -1
  355. package/contracts/distribution/IDistributionComponent.sol +3 -10
  356. package/contracts/distribution/IDistributionService.sol +38 -24
  357. package/contracts/examples/fire/FirePool.sol +10 -11
  358. package/contracts/examples/fire/FirePoolAuthorization.sol +2 -1
  359. package/contracts/examples/fire/FireProduct.sol +17 -12
  360. package/contracts/examples/fire/FireProductAuthorization.sol +2 -1
  361. package/contracts/examples/unpermissioned/SimpleDistribution.sol +39 -8
  362. package/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol +28 -0
  363. package/contracts/examples/unpermissioned/SimpleOracle.sol +4 -8
  364. package/contracts/examples/unpermissioned/SimplePool.sol +26 -5
  365. package/contracts/examples/unpermissioned/SimplePoolAuthorization.sol +28 -0
  366. package/contracts/examples/unpermissioned/SimpleProduct.sol +51 -11
  367. package/contracts/examples/unpermissioned/SimpleProductAuthorization.sol +28 -0
  368. package/contracts/instance/BundleSet.sol +42 -38
  369. package/contracts/instance/IInstance.sol +97 -18
  370. package/contracts/instance/IInstanceService.sol +52 -11
  371. package/contracts/instance/Instance.sol +171 -57
  372. package/contracts/instance/InstanceAdmin.sol +271 -165
  373. package/contracts/instance/InstanceAuthorizationV3.sol +115 -43
  374. package/contracts/instance/InstanceReader.sol +449 -312
  375. package/contracts/instance/InstanceService.sol +269 -167
  376. package/contracts/instance/InstanceServiceManager.sol +1 -1
  377. package/contracts/instance/InstanceStore.sol +13 -2
  378. package/contracts/instance/RiskSet.sol +118 -0
  379. package/contracts/instance/base/BalanceStore.sol +3 -5
  380. package/contracts/instance/base/ObjectCounter.sol +1 -2
  381. package/contracts/instance/base/ObjectLifecycle.sol +4 -2
  382. package/contracts/instance/base/ObjectSet.sol +31 -33
  383. package/contracts/instance/base/ObjectSetHelperLib.sol +30 -0
  384. package/contracts/instance/module/IBundle.sol +6 -5
  385. package/contracts/instance/module/IComponents.sol +19 -8
  386. package/contracts/instance/module/IDistribution.sol +21 -8
  387. package/contracts/instance/module/IPolicy.sol +28 -7
  388. package/contracts/instance/module/IRisk.sol +5 -0
  389. package/contracts/oracle/BasicOracle.sol +1 -3
  390. package/contracts/oracle/BasicOracleAuthorization.sol +15 -8
  391. package/contracts/oracle/IOracle.sol +9 -4
  392. package/contracts/oracle/Oracle.sol +1 -3
  393. package/contracts/oracle/OracleService.sol +96 -77
  394. package/contracts/oracle/OracleServiceManager.sol +1 -1
  395. package/contracts/pool/BasicPool.sol +19 -2
  396. package/contracts/pool/BasicPoolAuthorization.sol +33 -8
  397. package/contracts/pool/BundleService.sol +108 -163
  398. package/contracts/pool/BundleServiceManager.sol +1 -1
  399. package/contracts/pool/IBundleService.sol +24 -46
  400. package/contracts/pool/IPoolComponent.sol +1 -7
  401. package/contracts/pool/IPoolService.sol +65 -62
  402. package/contracts/pool/Pool.sol +99 -85
  403. package/contracts/pool/PoolLib.sol +359 -0
  404. package/contracts/pool/PoolService.sol +314 -225
  405. package/contracts/pool/PoolServiceManager.sol +1 -1
  406. package/contracts/product/ApplicationService.sol +100 -24
  407. package/contracts/product/ApplicationServiceManager.sol +1 -1
  408. package/contracts/product/BasicProduct.sol +2 -2
  409. package/contracts/product/BasicProductAuthorization.sol +32 -11
  410. package/contracts/product/ClaimService.sol +201 -151
  411. package/contracts/product/ClaimServiceManager.sol +1 -1
  412. package/contracts/product/IApplicationService.sol +28 -3
  413. package/contracts/product/IClaimService.sol +14 -2
  414. package/contracts/product/IPolicyService.sol +34 -12
  415. package/contracts/product/IPricingService.sol +1 -0
  416. package/contracts/product/IProductComponent.sol +4 -1
  417. package/contracts/product/IRiskService.sol +11 -7
  418. package/contracts/product/PolicyService.sol +256 -294
  419. package/contracts/product/PolicyServiceLib.sol +139 -0
  420. package/contracts/product/PolicyServiceManager.sol +1 -1
  421. package/contracts/product/PricingService.sol +55 -46
  422. package/contracts/product/PricingServiceManager.sol +3 -3
  423. package/contracts/product/Product.sol +68 -27
  424. package/contracts/product/RiskService.sol +98 -31
  425. package/contracts/product/RiskServiceManager.sol +1 -1
  426. package/contracts/registry/ChainNft.sol +4 -2
  427. package/contracts/registry/IRegistry.sol +20 -16
  428. package/contracts/registry/IRelease.sol +29 -0
  429. package/contracts/registry/Registry.sol +25 -6
  430. package/contracts/registry/RegistryAdmin.sol +101 -361
  431. package/contracts/registry/RegistryAuthorization.sol +284 -0
  432. package/contracts/registry/RegistryService.sol +4 -4
  433. package/contracts/registry/RegistryServiceManager.sol +1 -1
  434. package/contracts/registry/ReleaseAdmin.sol +195 -0
  435. package/contracts/registry/ReleaseLifecycle.sol +2 -0
  436. package/contracts/registry/ReleaseRegistry.sol +154 -135
  437. package/contracts/registry/ServiceAuthorizationV3.sol +197 -46
  438. package/contracts/registry/TokenRegistry.sol +12 -13
  439. package/contracts/shared/Component.sol +52 -107
  440. package/contracts/shared/ComponentService.sol +354 -410
  441. package/contracts/shared/ComponentServiceManager.sol +1 -1
  442. package/contracts/shared/ContractLib.sol +276 -3
  443. package/contracts/shared/IComponent.sol +2 -18
  444. package/contracts/shared/IComponentService.sol +28 -37
  445. package/contracts/shared/IInstanceLinkedComponent.sol +0 -11
  446. package/contracts/shared/IRegisterable.sol +15 -5
  447. package/contracts/shared/IService.sol +3 -5
  448. package/contracts/shared/InitializableERC165.sol +9 -1
  449. package/contracts/shared/InstanceLinkedComponent.sol +6 -25
  450. package/contracts/shared/NftOwnable.sol +11 -7
  451. package/contracts/shared/PolicyHolder.sol +4 -3
  452. package/contracts/shared/Registerable.sol +41 -20
  453. package/contracts/shared/RegistryLinked.sol +7 -13
  454. package/contracts/shared/Service.sol +13 -30
  455. package/contracts/shared/TokenHandler.sol +275 -72
  456. package/contracts/shared/TokenHandlerDeployerLib.sol +10 -2
  457. package/contracts/staking/IStaking.sol +46 -19
  458. package/contracts/staking/IStakingService.sol +21 -8
  459. package/contracts/staking/Staking.sol +190 -82
  460. package/contracts/staking/{StakeManagerLib.sol → StakingLib.sol} +80 -23
  461. package/contracts/staking/StakingReader.sol +28 -19
  462. package/contracts/staking/StakingService.sol +91 -16
  463. package/contracts/staking/StakingServiceManager.sol +5 -4
  464. package/contracts/staking/StakingStore.sol +3 -2
  465. package/contracts/staking/TargetManagerLib.sol +1 -1
  466. package/contracts/type/Fee.sol +8 -8
  467. package/contracts/type/Key32.sol +2 -2
  468. package/contracts/type/Key32Set.sol +62 -0
  469. package/contracts/type/NftId.sol +6 -0
  470. package/contracts/type/ObjectType.sol +69 -38
  471. package/contracts/type/RiskId.sol +26 -8
  472. package/contracts/type/RoleId.sol +63 -45
  473. package/contracts/type/Seconds.sol +4 -0
  474. package/contracts/type/Selector.sol +5 -0
  475. package/contracts/type/String.sol +12 -0
  476. package/contracts/type/Timestamp.sol +0 -5
  477. package/contracts/type/UFixed.sol +34 -127
  478. package/contracts/type/Version.sol +54 -5
  479. package/contracts/upgradeability/IVersionable.sol +3 -0
  480. package/contracts/upgradeability/ProxyManager.sol +26 -12
  481. package/contracts/upgradeability/UpgradableProxyWithAdmin.sol +7 -1
  482. package/contracts/upgradeability/Versionable.sol +6 -3
  483. package/package.json +4 -4
  484. package/artifacts/contracts/authorization/ReleaseAccessManager.sol/ReleaseAccessManager.dbg.json +0 -4
  485. package/artifacts/contracts/authorization/ReleaseAccessManager.sol/ReleaseAccessManager.json +0 -1196
  486. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +0 -4
  487. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.json +0 -129
  488. package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.dbg.json +0 -4
  489. package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.json +0 -474
  490. package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.dbg.json +0 -4
  491. package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.json +0 -440
  492. package/artifacts/contracts/type/UFixed.sol/MathLib.dbg.json +0 -4
  493. package/artifacts/contracts/type/UFixed.sol/MathLib.json +0 -16
  494. package/contracts/authorization/ReleaseAccessManager.sol +0 -38
  495. package/contracts/instance/module/IAccess.sol +0 -46
  496. package/contracts/shared/ComponentVerifyingService.sol +0 -126
@@ -1,39 +1,37 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
2
  pragma solidity ^0.8.20;
3
3
 
4
- import {IBundle} from "../instance/module/IBundle.sol";
4
+ import {IAccountingService} from "../accounting/IAccountingService.sol";
5
5
  import {IBundleService} from "./IBundleService.sol";
6
6
  import {IComponents} from "../instance/module/IComponents.sol";
7
7
  import {IComponentService} from "../shared/IComponentService.sol";
8
8
  import {IInstance} from "../instance/IInstance.sol";
9
- import {IInstanceService} from "../instance/IInstanceService.sol";
10
9
  import {IPolicy} from "../instance/module/IPolicy.sol";
11
- import {IProductComponent} from "../product/IProductComponent.sol";
10
+ import {IPoolComponent} from "../pool/IPoolComponent.sol";
12
11
  import {IPoolService} from "./IPoolService.sol";
12
+ import {IProductComponent} from "../product/IProductComponent.sol";
13
13
  import {IRegistry} from "../registry/IRegistry.sol";
14
- import {IRegistryService} from "../registry/IRegistryService.sol";
15
14
  import {IStaking} from "../staking/IStaking.sol";
16
15
 
17
16
  import {Amount, AmountLib} from "../type/Amount.sol";
18
17
  import {ClaimId} from "../type/ClaimId.sol";
19
- import {Fee, FeeLib} from "../type/Fee.sol";
20
- import {NftId} from "../type/NftId.sol";
21
- import {ObjectType, POOL, BUNDLE, COMPONENT, INSTANCE, REGISTRY} from "../type/ObjectType.sol";
22
- import {RoleId, PUBLIC_ROLE} from "../type/RoleId.sol";
23
- import {Fee, FeeLib} from "../type/Fee.sol";
24
- import {KEEP_STATE} from "../type/StateId.sol";
25
- import {Seconds} from "../type/Seconds.sol";
26
- import {UFixed, UFixedLib} from "../type/UFixed.sol";
27
- import {ComponentVerifyingService} from "../shared/ComponentVerifyingService.sol";
18
+ import {ContractLib} from "../shared/ContractLib.sol";
28
19
  import {InstanceReader} from "../instance/InstanceReader.sol";
29
20
  import {InstanceStore} from "../instance/InstanceStore.sol";
21
+ import {KEEP_STATE} from "../type/StateId.sol";
22
+ import {NftId} from "../type/NftId.sol";
23
+ import {ObjectType, ACCOUNTING, POOL, BUNDLE, PRODUCT, POLICY, COMPONENT} from "../type/ObjectType.sol";
24
+ import {PayoutId} from "../type/PayoutId.sol";
25
+ import {PoolLib} from "./PoolLib.sol";
26
+ import {Service} from "../shared/Service.sol";
27
+ import {TokenHandler} from "../shared/TokenHandler.sol";
30
28
 
31
- string constant POOL_SERVICE_NAME = "PoolService";
32
29
 
33
30
  contract PoolService is
34
- ComponentVerifyingService,
31
+ Service,
35
32
  IPoolService
36
33
  {
34
+ IAccountingService private _accountingService;
37
35
  IBundleService internal _bundleService;
38
36
  IComponentService internal _componentService;
39
37
  IStaking private _staking;
@@ -47,12 +45,13 @@ contract PoolService is
47
45
  initializer()
48
46
  {
49
47
  (
50
- address registryAddress,
51
- address authority
48
+ address authority,
49
+ address registry
52
50
  ) = abi.decode(data, (address, address));
53
51
 
54
- _initializeService(registryAddress, authority, owner);
52
+ __Service_init(authority, registry, owner);
55
53
 
54
+ _accountingService = IAccountingService(_getServiceAddress(ACCOUNTING()));
56
55
  _bundleService = IBundleService(_getServiceAddress(BUNDLE()));
57
56
  _componentService = IComponentService(_getServiceAddress(COMPONENT()));
58
57
  _staking = IStaking(getRegistry().getStakingAddress());
@@ -65,8 +64,9 @@ contract PoolService is
65
64
  function setMaxBalanceAmount(Amount maxBalanceAmount)
66
65
  external
67
66
  virtual
67
+ restricted()
68
68
  {
69
- (NftId poolNftId,, IInstance instance) = _getAndVerifyActiveComponent(POOL());
69
+ (NftId poolNftId, IInstance instance) = _getAndVerifyActivePool();
70
70
  InstanceReader instanceReader = instance.getInstanceReader();
71
71
  IComponents.PoolInfo memory poolInfo = instanceReader.getPoolInfo(poolNftId);
72
72
 
@@ -78,45 +78,21 @@ contract PoolService is
78
78
  }
79
79
 
80
80
 
81
- /// @inheritdoc IPoolService
82
- function createBundle(
83
- address bundleOwner, // initial bundle owner
84
- Fee memory fee, // fees deducted from premium that go to bundle owner
85
- Seconds lifetime, // initial duration for which new policies are covered
86
- bytes calldata filter // optional use case specific criteria that define if a policy may be covered by this bundle
87
- )
88
- external
89
- virtual
90
- returns(NftId bundleNftId)
91
- {
92
- (NftId poolNftId,, IInstance instance) = _getAndVerifyActiveComponent(POOL());
93
-
94
- // create the empty bundle
95
- bundleNftId = _bundleService.create(
96
- instance,
97
- poolNftId,
98
- bundleOwner,
99
- fee,
100
- AmountLib.zero(),
101
- lifetime,
102
- filter);
103
-
104
- emit LogPoolServiceBundleCreated(instance.getNftId(), poolNftId, bundleNftId);
105
- }
106
-
107
-
108
81
  function closeBundle(NftId bundleNftId)
109
82
  external
83
+ restricted()
110
84
  virtual
111
85
  {
112
- (NftId poolNftId,, IInstance instance) = _getAndVerifyActiveComponent(POOL());
86
+ _checkNftType(bundleNftId, BUNDLE());
87
+
88
+ (NftId poolNftId, IInstance instance) = _getAndVerifyActivePool();
113
89
 
114
90
  // TODO get performance fee for pool (#477)
115
91
 
116
92
  // releasing collateral in bundle
117
93
  (Amount unstakedAmount, Amount feeAmount) = _bundleService.close(instance, bundleNftId);
118
94
 
119
- _componentService.decreasePoolBalance(
95
+ _accountingService.decreasePoolBalance(
120
96
  instance.getInstanceStore(),
121
97
  poolNftId,
122
98
  unstakedAmount + feeAmount,
@@ -126,8 +102,7 @@ contract PoolService is
126
102
 
127
103
  if ((unstakedAmount + feeAmount).gtz()){
128
104
  IComponents.ComponentInfo memory poolComponentInfo = instance.getInstanceReader().getComponentInfo(poolNftId);
129
- poolComponentInfo.tokenHandler.distributeTokens(
130
- poolComponentInfo.wallet,
105
+ poolComponentInfo.tokenHandler.pushToken(
131
106
  getRegistry().ownerOf(bundleNftId),
132
107
  unstakedAmount + feeAmount);
133
108
  }
@@ -141,11 +116,14 @@ contract PoolService is
141
116
  Amount availableAmount
142
117
  )
143
118
  external
119
+ restricted()
144
120
  virtual
145
121
  {
146
- (NftId poolNftId,, IInstance instance) = _getAndVerifyActiveComponent(POOL());
122
+ _checkNftType(policyNftId, POLICY());
123
+
124
+ (NftId poolNftId, IInstance instance) = _getAndVerifyActivePool();
147
125
  InstanceReader instanceReader = instance.getInstanceReader();
148
- NftId productNftId = _getProductNftId(poolNftId);
126
+ NftId productNftId = getRegistry().getParentNftId(poolNftId);
149
127
 
150
128
  // check policy matches with calling pool
151
129
  IPolicy.PolicyInfo memory policyInfo = instanceReader.getPolicyInfo(policyNftId);
@@ -166,22 +144,47 @@ contract PoolService is
166
144
  }
167
145
 
168
146
 
147
+ // function _checkAndGetPoolInfo(NftId bundleNftId)
148
+ // internal
149
+ // view
150
+ // returns (
151
+ // InstanceReader instanceReader,
152
+ // InstanceStore instanceStore,
153
+ // NftId instanceNftId,
154
+ // NftId poolNftId,
155
+ // IComponents.PoolInfo memory poolInfo
156
+ // )
157
+ // {
158
+ // _checkNftType(bundleNftId, BUNDLE());
159
+
160
+ // (NftId poolNftId, IInstance instance) = _getAndVerifyActivePool();
161
+ // instanceReader = instance.getInstanceReader();
162
+ // instanceStore = instance.getInstanceStore();
163
+ // instanceNftId = instance.getNftId();
164
+ // poolInfo = instanceReader.getPoolInfo(poolNftId);
165
+
166
+ // if (getRegistry().getParentNftId(bundleNftId) != poolNftId) {
167
+ // revert ErrorPoolServiceBundlePoolMismatch(bundleNftId, poolNftId);
168
+ // }
169
+ // }
170
+
171
+
169
172
  /// @inheritdoc IPoolService
170
173
  function stake(NftId bundleNftId, Amount amount)
171
174
  external
172
175
  virtual
173
- // TODO: restricted() (once #462 is done)
174
- onlyNftOfType(bundleNftId, BUNDLE())
175
- returns(Amount netAmount)
176
+ restricted()
177
+ returns(
178
+ Amount netAmount
179
+ )
176
180
  {
177
- (NftId poolNftId,, IInstance instance) = _getAndVerifyActiveComponent(POOL());
178
- InstanceReader instanceReader = instance.getInstanceReader();
179
- IBundle.BundleInfo memory bundleInfo = instanceReader.getBundleInfo(bundleNftId);
180
- IComponents.PoolInfo memory poolInfo = instanceReader.getPoolInfo(poolNftId);
181
-
182
- if (bundleInfo.poolNftId != poolNftId) {
183
- revert ErrorPoolServiceBundlePoolMismatch(bundleNftId, poolNftId);
184
- }
181
+ (
182
+ InstanceReader instanceReader,
183
+ InstanceStore instanceStore,
184
+ NftId instanceNftId,
185
+ NftId poolNftId,
186
+ IComponents.PoolInfo memory poolInfo
187
+ ) = PoolLib.checkAndGetPoolInfo(getRegistry(), msg.sender, bundleNftId);
185
188
 
186
189
  {
187
190
  Amount currentPoolBalance = instanceReader.getBalanceAmount(poolNftId);
@@ -191,105 +194,142 @@ contract PoolService is
191
194
  }
192
195
 
193
196
  // calculate fees
194
- IRegistry registry = getRegistry();
195
197
  Amount feeAmount;
198
+ (
199
+ feeAmount,
200
+ netAmount
201
+ ) = PoolLib.calculateStakingAmounts(
202
+ getRegistry(),
203
+ instanceReader,
204
+ poolNftId,
205
+ amount);
196
206
 
197
- {
198
- NftId productNftId = registry.getObjectInfo(poolNftId).parentNftId;
199
- Fee memory stakingFee = instanceReader.getProductInfo(productNftId).stakingFee;
200
- (
201
- feeAmount,
202
- netAmount
203
- ) = FeeLib.calculateFee(
204
- stakingFee,
205
- amount);
206
- }
207
-
208
- // do all the bookkeeping
209
- _componentService.increasePoolBalance(
210
- instance.getInstanceStore(),
207
+ // do all the book keeping
208
+ _accountingService.increasePoolBalance(
209
+ instanceStore,
211
210
  poolNftId,
212
211
  netAmount,
213
212
  feeAmount);
214
213
 
215
- _bundleService.stake(instance, bundleNftId, netAmount);
214
+ _bundleService.stake(instanceReader, instanceStore, bundleNftId, netAmount);
216
215
 
217
- // collect tokens from bundle owner
218
- address bundleOwner = registry.ownerOf(bundleNftId);
219
- emit LogPoolServiceBundleStaked(instance.getNftId(), poolNftId, bundleNftId, amount, netAmount);
216
+ emit LogPoolServiceBundleStaked(instanceNftId, poolNftId, bundleNftId, amount, netAmount);
220
217
 
221
- // TODO only collect staking token when pool is not externally managed
222
- _collectStakingAmount(
223
- instanceReader,
224
- poolNftId,
225
- bundleOwner,
226
- amount);
218
+ // only collect staking amount when pool is not externally managed
219
+ if (!poolInfo.isExternallyManaged) {
220
+
221
+ // collect tokens from bundle owner
222
+ address bundleOwner = getRegistry().ownerOf(bundleNftId);
223
+ PoolLib.pullStakingAmount(
224
+ instanceReader,
225
+ poolNftId,
226
+ bundleOwner,
227
+ amount);
228
+ }
227
229
  }
228
230
 
231
+
229
232
  /// @inheritdoc IPoolService
230
233
  function unstake(NftId bundleNftId, Amount amount)
231
234
  external
232
235
  virtual
233
- // TODO: restricted() (once #462 is done)
236
+ restricted()
234
237
  returns(Amount netAmount)
235
238
  {
236
- (NftId poolNftId,, IInstance instance) = _getAndVerifyActiveComponent(POOL());
237
- InstanceReader instanceReader = instance.getInstanceReader();
238
- InstanceStore instanceStore = instance.getInstanceStore();
239
- IBundle.BundleInfo memory bundleInfo = instanceReader.getBundleInfo(bundleNftId);
240
-
241
- if (bundleInfo.poolNftId != poolNftId) {
242
- revert ErrorPoolServiceBundlePoolMismatch(bundleNftId, poolNftId);
243
- }
239
+ (
240
+ InstanceReader instanceReader,
241
+ InstanceStore instanceStore,
242
+ NftId instanceNftId,
243
+ NftId poolNftId,
244
+ ) = PoolLib.checkAndGetPoolInfo(getRegistry(), msg.sender, bundleNftId);
244
245
 
245
246
  // call bundle service for bookkeeping and additional checks
246
- Amount unstakedAmount = _bundleService.unstake(instance, bundleNftId, amount);
247
+ Amount unstakedAmount = _bundleService.unstake(instanceStore, bundleNftId, amount);
247
248
 
248
249
  // Important: from now on work only with unstakedAmount as it is the only reliable amount.
249
250
  // if amount was max, this was set to the available amount
250
251
 
251
252
  // TODO: handle performance fees (issue #477)
253
+ netAmount = unstakedAmount;
252
254
 
253
255
  // update pool bookkeeping - performance fees stay in the pool, but as fees
254
- _componentService.decreasePoolBalance(
256
+ _accountingService.decreasePoolBalance(
255
257
  instanceStore,
256
258
  poolNftId,
257
259
  unstakedAmount,
258
260
  AmountLib.zero());
259
261
 
260
- IComponents.ComponentInfo memory poolComponentInfo = instanceReader.getComponentInfo(poolNftId);
261
262
 
262
- // transfer amount to bundle owner
263
- address owner = getRegistry().ownerOf(bundleNftId);
264
- emit LogPoolServiceBundleUnstaked(instance.getNftId(), poolNftId, bundleNftId, unstakedAmount);
265
- poolComponentInfo.tokenHandler.distributeTokens(
266
- poolComponentInfo.wallet,
267
- owner,
268
- unstakedAmount);
269
-
270
- return unstakedAmount;
263
+ emit LogPoolServiceBundleUnstaked(instanceNftId, poolNftId, bundleNftId, unstakedAmount, netAmount);
264
+
265
+ // only distribute staking amount when pool is not externally managed
266
+ if (!instanceReader.getPoolInfo(poolNftId).isExternallyManaged) {
267
+
268
+ // transfer amount to bundle owner
269
+ address bundleOwner = getRegistry().ownerOf(bundleNftId);
270
+ PoolLib.pushUnstakingAmount(
271
+ instanceReader,
272
+ poolNftId,
273
+ bundleOwner,
274
+ netAmount);
275
+ }
271
276
  }
272
277
 
273
278
 
274
- function fundPoolWallet(NftId poolNftId, Amount amount)
279
+ function fundPoolWallet(Amount amount)
275
280
  external
276
281
  virtual
277
282
  restricted()
278
283
  {
279
- // TODO check that poolNftId is externally managed
280
- // TODO implement
284
+ (
285
+ NftId poolNftId,
286
+ IInstance instance
287
+ ) = _getAndVerifyActivePool();
288
+
289
+ // check that pool is externally managed
290
+ InstanceReader reader = instance.getInstanceReader();
291
+ if (!reader.getPoolInfo(poolNftId).isExternallyManaged) {
292
+ revert ErrorPoolServicePoolNotExternallyManaged(poolNftId);
293
+ }
294
+
295
+ address poolOwner = getRegistry().ownerOf(poolNftId);
296
+ emit LogPoolServiceWalletFunded(poolNftId, poolOwner, amount);
297
+
298
+ PoolLib.pullStakingAmount(
299
+ reader,
300
+ poolNftId,
301
+ poolOwner,
302
+ amount);
281
303
  }
282
304
 
283
305
 
284
- function defundPoolWallet(NftId poolNftId, Amount amount)
306
+ function defundPoolWallet(Amount amount)
285
307
  external
286
308
  virtual
287
309
  restricted()
288
310
  {
289
- // TODO check that poolNftId is externally managed
290
- // TODO implement
311
+ (
312
+ NftId poolNftId,
313
+ IInstance instance
314
+ ) = _getAndVerifyActivePool();
315
+
316
+ // check that pool is externally managed
317
+ InstanceReader reader = instance.getInstanceReader();
318
+ if (!reader.getPoolInfo(poolNftId).isExternallyManaged) {
319
+ revert ErrorPoolServicePoolNotExternallyManaged(poolNftId);
320
+ }
321
+
322
+ address poolOwner = getRegistry().ownerOf(poolNftId);
323
+ emit LogPoolServiceWalletDefunded(poolNftId, poolOwner, amount);
324
+
325
+ PoolLib.pushUnstakingAmount(
326
+ reader,
327
+ poolNftId,
328
+ poolOwner,
329
+ amount);
291
330
  }
292
331
 
332
+
293
333
  function processSale(
294
334
  NftId bundleNftId,
295
335
  IPolicy.PremiumInfo memory premium
@@ -297,29 +337,32 @@ contract PoolService is
297
337
  external
298
338
  virtual
299
339
  restricted()
300
- onlyNftOfType(bundleNftId, BUNDLE())
301
340
  {
341
+ _checkNftType(bundleNftId, BUNDLE());
342
+
302
343
  IRegistry registry = getRegistry();
303
- IRegistry.ObjectInfo memory bundleInfo = registry.getObjectInfo(bundleNftId);
304
- IRegistry.ObjectInfo memory poolInfo = registry.getObjectInfo(bundleInfo.parentNftId);
305
- IInstance instance = _getInstanceForComponent(registry, poolInfo);
344
+ NftId poolNftId = registry.getParentNftId(bundleNftId);
345
+ (, address instanceAddress) = ContractLib.getInfoAndInstance(registry, poolNftId, true);
346
+ IInstance instance = IInstance(instanceAddress);
306
347
 
307
348
  Amount poolFeeAmount = premium.poolFeeFixAmount + premium.poolFeeVarAmount;
308
349
  Amount bundleFeeAmount = premium.bundleFeeFixAmount + premium.bundleFeeVarAmount;
309
350
  Amount bundleNetAmount = premium.netPremiumAmount;
310
351
 
311
352
  InstanceStore instanceStore = instance.getInstanceStore();
312
- _componentService.increasePoolBalance(
353
+ _accountingService.increasePoolBalance(
313
354
  instanceStore,
314
- poolInfo.nftId,
355
+ poolNftId,
315
356
  bundleNetAmount + bundleFeeAmount,
316
357
  poolFeeAmount);
317
358
 
318
- _componentService.increaseBundleBalance(
359
+ _accountingService.increaseBundleBalanceForPool(
319
360
  instanceStore,
320
- bundleInfo.nftId,
361
+ bundleNftId,
321
362
  bundleNetAmount,
322
363
  bundleFeeAmount);
364
+
365
+ emit LogPoolServiceSaleProcessed(poolNftId, bundleNftId, bundleNetAmount, bundleFeeAmount, poolFeeAmount);
323
366
  }
324
367
 
325
368
 
@@ -339,10 +382,18 @@ contract PoolService is
339
382
  Amount localCollateralAmount
340
383
  )
341
384
  {
385
+ _checkNftType(productNftId, PRODUCT());
386
+ _checkNftType(applicationNftId, POLICY());
387
+ _checkNftType(bundleNftId, BUNDLE());
388
+
389
+ NftId poolNftId;
390
+ bool poolIsVerifyingApplications;
342
391
  (
392
+ poolNftId,
343
393
  totalCollateralAmount,
344
- localCollateralAmount
345
- ) = calculateRequiredCollateral(
394
+ localCollateralAmount,
395
+ poolIsVerifyingApplications
396
+ ) = PoolLib.calculateRequiredCollateral(
346
397
  instance.getInstanceReader(),
347
398
  productNftId,
348
399
  sumInsuredAmount);
@@ -359,46 +410,153 @@ contract PoolService is
359
410
  instance.getNftId(),
360
411
  token,
361
412
  totalCollateralAmount);
413
+
414
+ // pool callback when required
415
+ if (poolIsVerifyingApplications) {
416
+ IPoolComponent pool = IPoolComponent(
417
+ getRegistry().getObjectAddress(poolNftId));
418
+
419
+ pool.verifyApplication(
420
+ applicationNftId,
421
+ bundleNftId,
422
+ totalCollateralAmount);
423
+
424
+ emit LogPoolServiceApplicationVerified(poolNftId, bundleNftId, applicationNftId, totalCollateralAmount);
425
+ }
426
+
427
+ emit LogPoolServiceCollateralLocked(
428
+ poolNftId,
429
+ bundleNftId,
430
+ applicationNftId,
431
+ totalCollateralAmount,
432
+ localCollateralAmount);
362
433
  }
363
434
 
364
435
  function processPayout(
365
- IInstance instance,
366
- address token,
436
+ InstanceReader instanceReader,
437
+ InstanceStore instanceStore,
438
+ NftId productNftId,
367
439
  NftId policyNftId,
368
- IPolicy.PolicyInfo memory policyInfo,
369
- Amount payoutAmount
440
+ NftId bundleNftId,
441
+ PayoutId payoutId,
442
+ Amount payoutAmount,
443
+ address payoutBeneficiary
370
444
  )
371
445
  external
372
446
  virtual
373
447
  restricted()
448
+ returns (
449
+ Amount netPayoutAmount,
450
+ Amount processingFeeAmount
451
+ )
374
452
  {
375
- NftId bundleNftId = policyInfo.bundleNftId;
376
- NftId poolNftId = getRegistry().getObjectInfo(bundleNftId).parentNftId;
377
- InstanceStore instanceStore = instance.getInstanceStore();
453
+ // checks
454
+ _checkNftType(policyNftId, POLICY());
455
+
456
+ // effects
457
+ NftId poolNftId = getRegistry().getParentNftId(bundleNftId);
378
458
 
379
- _componentService.decreasePoolBalance(
459
+ _accountingService.decreasePoolBalance(
380
460
  instanceStore,
381
461
  poolNftId,
382
462
  payoutAmount,
383
463
  AmountLib.zero());
384
464
 
385
- _componentService.decreaseBundleBalance(
465
+ _accountingService.decreaseBundleBalanceForPool(
386
466
  instanceStore,
387
467
  bundleNftId,
388
468
  payoutAmount,
389
469
  AmountLib.zero());
390
470
 
391
471
  _bundleService.releaseCollateral(
392
- instance,
472
+ instanceStore,
393
473
  policyNftId,
394
- policyInfo.bundleNftId,
474
+ bundleNftId,
395
475
  payoutAmount);
396
476
 
397
477
  // update value locked with staking service
478
+ TokenHandler poolTokenHandler = instanceReader.getTokenHandler(poolNftId);
479
+
398
480
  _staking.decreaseTotalValueLocked(
399
- instance.getNftId(),
400
- token,
481
+ instanceReader.getInstanceNftId(),
482
+ address(poolTokenHandler.TOKEN()),
401
483
  payoutAmount);
484
+
485
+ // interactions
486
+ (netPayoutAmount, processingFeeAmount) = PoolLib.transferTokenAndNotifyPolicyHolder(
487
+ getRegistry(),
488
+ instanceReader,
489
+ poolTokenHandler,
490
+ productNftId,
491
+ policyNftId,
492
+ payoutId,
493
+ payoutAmount,
494
+ payoutBeneficiary);
495
+
496
+ if (processingFeeAmount.gtz()) {
497
+ _accountingService.increaseProductFeesForPool(
498
+ instanceStore,
499
+ productNftId,
500
+ processingFeeAmount);
501
+ }
502
+
503
+ emit LogPoolServicePayoutProcessed(
504
+ poolNftId,
505
+ bundleNftId,
506
+ policyNftId,
507
+ payoutId,
508
+ netPayoutAmount,
509
+ processingFeeAmount,
510
+ payoutBeneficiary);
511
+ }
512
+
513
+
514
+ /// @inheritdoc IPoolService
515
+ function withdrawBundleFees(
516
+ NftId bundleNftId,
517
+ Amount amount
518
+ )
519
+ public
520
+ virtual
521
+ restricted()
522
+ returns (Amount withdrawnAmount)
523
+ {
524
+ // checks
525
+ _checkNftType(bundleNftId, BUNDLE());
526
+
527
+ (NftId poolNftId, IInstance instance) = _getAndVerifyActivePool();
528
+ InstanceReader reader = instance.getInstanceReader();
529
+
530
+ // determine withdrawn amount
531
+ withdrawnAmount = amount;
532
+ if (withdrawnAmount.gte(AmountLib.max())) {
533
+ withdrawnAmount = reader.getFeeAmount(bundleNftId);
534
+ } else {
535
+ if (withdrawnAmount > reader.getFeeAmount(bundleNftId)) {
536
+ revert ErrorPoolServiceFeesWithdrawAmountExceedsLimit(withdrawnAmount, reader.getFeeAmount(bundleNftId));
537
+ }
538
+ }
539
+
540
+ // effects
541
+ // decrease fee counters by withdrawnAmount
542
+ {
543
+ InstanceStore store = instance.getInstanceStore();
544
+ // decrease fee amount of the bundle
545
+ _accountingService.decreaseBundleBalanceForPool(store, bundleNftId, AmountLib.zero(), withdrawnAmount);
546
+ // decrease pool balance
547
+ _accountingService.decreasePoolBalance(store, poolNftId, withdrawnAmount, AmountLib.zero());
548
+ }
549
+
550
+ // interactions
551
+ // transfer amount to bundle owner
552
+ {
553
+ address bundleOwner = getRegistry().ownerOf(bundleNftId);
554
+ TokenHandler tokenHandler = reader.getTokenHandler(poolNftId);
555
+ address token = address(tokenHandler.TOKEN());
556
+ emit LogPoolServiceFeesWithdrawn(bundleNftId, bundleOwner, token, withdrawnAmount);
557
+
558
+ tokenHandler.pushToken(bundleOwner, withdrawnAmount);
559
+ }
402
560
  }
403
561
 
404
562
 
@@ -406,7 +564,6 @@ contract PoolService is
406
564
  /// may only be called by the policy service for unlocked pool components
407
565
  function releaseCollateral(
408
566
  IInstance instance,
409
- address token,
410
567
  NftId policyNftId,
411
568
  IPolicy.PolicyInfo memory policyInfo
412
569
  )
@@ -414,111 +571,43 @@ contract PoolService is
414
571
  virtual
415
572
  restricted()
416
573
  {
574
+ _checkNftType(policyNftId, POLICY());
575
+
417
576
  Amount remainingCollateralAmount = policyInfo.sumInsuredAmount - policyInfo.claimAmount;
418
577
 
419
578
  _bundleService.releaseCollateral(
420
- instance,
579
+ instance.getInstanceStore(),
421
580
  policyNftId,
422
581
  policyInfo.bundleNftId,
423
582
  remainingCollateralAmount);
424
583
 
425
- _bundleService.unlinkPolicy(
426
- instance,
427
- policyNftId);
428
-
429
584
  // update value locked with staking service
585
+ InstanceReader instanceReader = instance.getInstanceReader();
430
586
  _staking.decreaseTotalValueLocked(
431
- instance.getNftId(),
432
- token,
587
+ instanceReader.getInstanceNftId(),
588
+ address(instanceReader.getToken(policyInfo.productNftId)),
433
589
  remainingCollateralAmount);
434
- }
435
-
436
-
437
- function calculateRequiredCollateral(
438
- InstanceReader instanceReader,
439
- NftId productNftId,
440
- Amount sumInsuredAmount
441
- )
442
- public
443
- view
444
- returns(
445
- Amount totalCollateralAmount,
446
- Amount localCollateralAmount
447
- )
448
- {
449
- NftId poolNftId = instanceReader.getProductInfo(productNftId).poolNftId;
450
- IComponents.PoolInfo memory poolInfo = instanceReader.getPoolInfo(poolNftId);
451
-
452
- (
453
- totalCollateralAmount,
454
- localCollateralAmount
455
- ) = calculateRequiredCollateral(
456
- poolInfo.collateralizationLevel,
457
- poolInfo.retentionLevel,
458
- sumInsuredAmount);
459
- }
460
-
461
-
462
- function calculateRequiredCollateral(
463
- UFixed collateralizationLevel,
464
- UFixed retentionLevel,
465
- Amount sumInsuredAmount
466
- )
467
- public
468
- pure
469
- returns(
470
- Amount totalCollateralAmount,
471
- Amount localCollateralAmount
472
- )
473
- {
474
- // collateralization is applied to sum insured
475
- UFixed totalUFixed = collateralizationLevel * sumInsuredAmount.toUFixed();
476
- totalCollateralAmount = AmountLib.toAmount(totalUFixed.toInt());
477
590
 
478
- // retention level defines how much capital is required locally
479
- localCollateralAmount = AmountLib.toAmount(
480
- (retentionLevel * totalUFixed).toInt());
591
+ emit LogPoolServiceCollateralReleased(
592
+ policyInfo.bundleNftId,
593
+ policyNftId,
594
+ remainingCollateralAmount);
481
595
  }
482
596
 
483
597
 
484
- function _processStakingFees(
485
- Fee memory stakingFee,
486
- Amount stakingAmount
487
- )
598
+ function _getAndVerifyActivePool()
488
599
  internal
489
- returns (Amount stakingNetAmount)
600
+ virtual
601
+ view
602
+ returns (
603
+ NftId poolNftId,
604
+ IInstance instance
605
+ )
490
606
  {
491
- stakingNetAmount = stakingAmount;
492
-
493
- // check if any staking fees apply
494
- if (FeeLib.gtz(stakingFee)) {
495
- (Amount feeAmount, Amount netAmount) = FeeLib.calculateFee(stakingFee, stakingAmount);
496
- stakingNetAmount = netAmount;
497
-
498
- // TODO update fee balance for pool
499
- }
607
+ return PoolLib.getAndVerifyActivePool(getRegistry(), msg.sender);
500
608
  }
501
609
 
502
610
 
503
- /// @dev transfers the specified amount from the bundle owner to the pool's wallet
504
- function _collectStakingAmount(
505
- InstanceReader instanceReader,
506
- NftId poolNftId,
507
- address bundleOwner,
508
- Amount amount
509
- )
510
- internal
511
- {
512
-
513
- // collecting investor token
514
- IComponents.ComponentInfo memory componentInfo = instanceReader.getComponentInfo(poolNftId);
515
- address poolWallet = componentInfo.wallet;
516
- componentInfo.tokenHandler.collectTokens(
517
- bundleOwner,
518
- poolWallet,
519
- amount);
520
- }
521
-
522
611
  function _getDomain() internal pure override returns(ObjectType) {
523
612
  return POOL();
524
613
  }