@etherisc/gif-next 0.0.2-f1f3b2c-994 → 0.0.2-f2273b3-211

Sign up to get free protection for your applications and to get access to all the features.
Files changed (483) hide show
  1. package/README.md +27 -6
  2. package/artifacts/contracts/accounting/AccountingService.sol/AccountingService.dbg.json +4 -0
  3. package/artifacts/contracts/accounting/AccountingService.sol/AccountingService.json +1007 -0
  4. package/artifacts/contracts/accounting/AccountingServiceManager.sol/AccountingServiceManager.dbg.json +4 -0
  5. package/artifacts/contracts/accounting/AccountingServiceManager.sol/AccountingServiceManager.json +744 -0
  6. package/artifacts/contracts/accounting/IAccountingService.sol/IAccountingService.dbg.json +4 -0
  7. package/artifacts/contracts/accounting/IAccountingService.sol/IAccountingService.json +791 -0
  8. package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.dbg.json +1 -1
  9. package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.json +163 -55
  10. package/artifacts/contracts/authorization/AccessAdmin.sol/IAccessManagedChecker.dbg.json +4 -0
  11. package/artifacts/contracts/authorization/AccessAdmin.sol/IAccessManagedChecker.json +24 -0
  12. package/artifacts/contracts/authorization/AccessManagerCloneable.sol/AccessManagerCloneable.dbg.json +1 -1
  13. package/artifacts/contracts/authorization/AccessManagerCloneable.sol/AccessManagerCloneable.json +233 -5
  14. package/artifacts/contracts/authorization/Authorization.sol/Authorization.dbg.json +1 -1
  15. package/artifacts/contracts/authorization/Authorization.sol/Authorization.json +200 -16
  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 +94 -14
  19. package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.dbg.json +1 -1
  20. package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.json +107 -15
  21. package/artifacts/contracts/authorization/IServiceAuthorization.sol/IServiceAuthorization.dbg.json +1 -1
  22. package/artifacts/contracts/authorization/IServiceAuthorization.sol/IServiceAuthorization.json +2 -2
  23. package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.dbg.json +1 -1
  24. package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.json +8 -8
  25. package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.dbg.json +1 -1
  26. package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.json +175 -216
  27. package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.dbg.json +1 -1
  28. package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.json +206 -27
  29. package/artifacts/contracts/distribution/Distribution.sol/Distribution.dbg.json +1 -1
  30. package/artifacts/contracts/distribution/Distribution.sol/Distribution.json +113 -130
  31. package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.dbg.json +1 -1
  32. package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.json +275 -171
  33. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
  34. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.json +111 -65
  35. package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
  36. package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.json +100 -112
  37. package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.dbg.json +1 -1
  38. package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.json +148 -72
  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 +158 -195
  42. package/artifacts/contracts/examples/fire/FirePoolAuthorization.sol/FirePoolAuthorization.dbg.json +1 -1
  43. package/artifacts/contracts/examples/fire/FirePoolAuthorization.sol/FirePoolAuthorization.json +206 -27
  44. package/artifacts/contracts/examples/fire/FireProduct.sol/FireProduct.dbg.json +1 -1
  45. package/artifacts/contracts/examples/fire/FireProduct.sol/FireProduct.json +336 -295
  46. package/artifacts/contracts/examples/fire/FireProductAuthorization.sol/FireProductAuthorization.dbg.json +1 -1
  47. package/artifacts/contracts/examples/fire/FireProductAuthorization.sol/FireProductAuthorization.json +203 -28
  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 +215 -168
  51. package/artifacts/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol/SimpleDistributionAuthorization.dbg.json +4 -0
  52. package/artifacts/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol/SimpleDistributionAuthorization.json +589 -0
  53. package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.dbg.json +1 -1
  54. package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.json +156 -153
  55. package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.dbg.json +1 -1
  56. package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.json +282 -193
  57. package/artifacts/contracts/examples/unpermissioned/SimplePoolAuthorization.sol/SimplePoolAuthorization.dbg.json +4 -0
  58. package/artifacts/contracts/examples/unpermissioned/SimplePoolAuthorization.sol/SimplePoolAuthorization.json +589 -0
  59. package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.dbg.json +1 -1
  60. package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.json +717 -292
  61. package/artifacts/contracts/examples/unpermissioned/SimpleProductAuthorization.sol/SimpleProductAuthorization.dbg.json +4 -0
  62. package/artifacts/contracts/examples/unpermissioned/SimpleProductAuthorization.sol/SimpleProductAuthorization.json +589 -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 +158 -57
  67. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
  68. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +105 -103
  69. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  70. package/artifacts/contracts/instance/Instance.sol/Instance.json +211 -82
  71. package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.dbg.json +1 -1
  72. package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.json +386 -117
  73. package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.dbg.json +1 -1
  74. package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.json +150 -90
  75. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
  76. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +590 -204
  77. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
  78. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +129 -157
  79. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
  80. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +75 -45
  81. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.dbg.json +1 -1
  82. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.json +445 -375
  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 +3 -3
  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 +132 -173
  104. package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.dbg.json +1 -1
  105. package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.json +180 -29
  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 +94 -106
  109. package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.dbg.json +1 -1
  110. package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.json +69 -11
  111. package/artifacts/contracts/oracle/Oracle.sol/Oracle.dbg.json +1 -1
  112. package/artifacts/contracts/oracle/Oracle.sol/Oracle.json +108 -125
  113. package/artifacts/contracts/oracle/OracleService.sol/OracleService.dbg.json +1 -1
  114. package/artifacts/contracts/oracle/OracleService.sol/OracleService.json +151 -81
  115. package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.dbg.json +1 -1
  116. package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.json +95 -41
  117. package/artifacts/contracts/pool/BasicPool.sol/BasicPool.dbg.json +1 -1
  118. package/artifacts/contracts/pool/BasicPool.sol/BasicPool.json +107 -152
  119. package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.dbg.json +1 -1
  120. package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.json +206 -27
  121. package/artifacts/contracts/pool/BundleService.sol/BundleService.dbg.json +1 -1
  122. package/artifacts/contracts/pool/BundleService.sol/BundleService.json +156 -326
  123. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.dbg.json +1 -1
  124. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.json +79 -101
  125. package/artifacts/contracts/pool/IBundleService.sol/IBundleService.dbg.json +1 -1
  126. package/artifacts/contracts/pool/IBundleService.sol/IBundleService.json +84 -135
  127. package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
  128. package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.json +94 -145
  129. package/artifacts/contracts/pool/IPoolService.sol/IPoolService.dbg.json +1 -1
  130. package/artifacts/contracts/pool/IPoolService.sol/IPoolService.json +192 -229
  131. package/artifacts/contracts/pool/Pool.sol/Pool.dbg.json +1 -1
  132. package/artifacts/contracts/pool/Pool.sol/Pool.json +107 -163
  133. package/artifacts/contracts/pool/PoolLib.sol/PoolLib.dbg.json +4 -0
  134. package/artifacts/contracts/pool/PoolLib.sol/PoolLib.json +456 -0
  135. package/artifacts/contracts/pool/PoolService.sol/PoolService.dbg.json +1 -1
  136. package/artifacts/contracts/pool/PoolService.sol/PoolService.json +330 -368
  137. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
  138. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.json +119 -69
  139. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.dbg.json +1 -1
  140. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.json +130 -54
  141. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +1 -1
  142. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.json +71 -41
  143. package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.dbg.json +1 -1
  144. package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.json +228 -186
  145. package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.dbg.json +1 -1
  146. package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.json +206 -27
  147. package/artifacts/contracts/product/ClaimService.sol/ClaimService.dbg.json +1 -1
  148. package/artifacts/contracts/product/ClaimService.sol/ClaimService.json +272 -173
  149. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +1 -1
  150. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.json +100 -78
  151. package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.dbg.json +1 -1
  152. package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.json +89 -9
  153. package/artifacts/contracts/product/IClaimService.sol/IClaimService.dbg.json +1 -1
  154. package/artifacts/contracts/product/IClaimService.sol/IClaimService.json +170 -19
  155. package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.dbg.json +1 -1
  156. package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.json +139 -54
  157. package/artifacts/contracts/product/IPricingService.sol/IPricingService.dbg.json +1 -1
  158. package/artifacts/contracts/product/IPricingService.sol/IPricingService.json +105 -52
  159. package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.dbg.json +1 -1
  160. package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.json +211 -164
  161. package/artifacts/contracts/product/IRiskService.sol/IRiskService.dbg.json +1 -1
  162. package/artifacts/contracts/product/IRiskService.sol/IRiskService.json +55 -2
  163. package/artifacts/contracts/product/PolicyService.sol/PolicyService.dbg.json +1 -1
  164. package/artifacts/contracts/product/PolicyService.sol/PolicyService.json +235 -170
  165. package/artifacts/contracts/product/PolicyServiceLib.sol/PolicyServiceLib.dbg.json +4 -0
  166. package/artifacts/contracts/product/PolicyServiceLib.sol/PolicyServiceLib.json +293 -0
  167. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +1 -1
  168. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.json +102 -64
  169. package/artifacts/contracts/product/PricingService.sol/PricingService.dbg.json +1 -1
  170. package/artifacts/contracts/product/PricingService.sol/PricingService.json +181 -116
  171. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.dbg.json +1 -1
  172. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.json +89 -51
  173. package/artifacts/contracts/product/Product.sol/Product.dbg.json +1 -1
  174. package/artifacts/contracts/product/Product.sol/Product.json +224 -182
  175. package/artifacts/contracts/product/RiskService.sol/RiskService.dbg.json +1 -1
  176. package/artifacts/contracts/product/RiskService.sol/RiskService.json +112 -63
  177. package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.dbg.json +1 -1
  178. package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.json +80 -38
  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 +98 -2
  183. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
  184. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +144 -41
  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/ITransferInterceptor.sol/ITransferInterceptor.json +5 -18
  189. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  190. package/artifacts/contracts/registry/Registry.sol/Registry.json +142 -38
  191. package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.dbg.json +1 -1
  192. package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.json +277 -213
  193. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
  194. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +181 -74
  195. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
  196. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +67 -33
  197. package/artifacts/contracts/registry/ReleaseAdmin.sol/ReleaseAdmin.dbg.json +4 -0
  198. package/artifacts/contracts/registry/ReleaseAdmin.sol/ReleaseAdmin.json +1849 -0
  199. package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.dbg.json +1 -1
  200. package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.json +3 -3
  201. package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.dbg.json +1 -1
  202. package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.json +337 -65
  203. package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.dbg.json +1 -1
  204. package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.json +12 -12
  205. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
  206. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +4 -4
  207. package/artifacts/contracts/shared/Component.sol/Component.dbg.json +1 -1
  208. package/artifacts/contracts/shared/Component.sol/Component.json +105 -104
  209. package/artifacts/contracts/shared/ComponentService.sol/ComponentService.dbg.json +1 -1
  210. package/artifacts/contracts/shared/ComponentService.sol/ComponentService.json +483 -485
  211. package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.dbg.json +1 -1
  212. package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.json +99 -73
  213. package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.dbg.json +1 -1
  214. package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.json +55 -2
  215. package/artifacts/contracts/shared/ContractLib.sol/ContractLib.dbg.json +1 -1
  216. package/artifacts/contracts/shared/ContractLib.sol/ContractLib.json +454 -5
  217. package/artifacts/contracts/shared/ContractLib.sol/IInstanceAdminHelper.dbg.json +4 -0
  218. package/artifacts/contracts/shared/ContractLib.sol/IInstanceAdminHelper.json +24 -0
  219. package/artifacts/contracts/shared/ContractLib.sol/ITargetHelper.dbg.json +4 -0
  220. package/artifacts/contracts/shared/ContractLib.sol/ITargetHelper.json +30 -0
  221. package/artifacts/contracts/shared/ContractLib.sol/ITokenRegistryHelper.dbg.json +4 -0
  222. package/artifacts/contracts/shared/ContractLib.sol/ITokenRegistryHelper.json +40 -0
  223. package/artifacts/contracts/shared/IComponent.sol/IComponent.dbg.json +1 -1
  224. package/artifacts/contracts/shared/IComponent.sol/IComponent.json +92 -86
  225. package/artifacts/contracts/shared/IComponentService.sol/IComponentService.dbg.json +1 -1
  226. package/artifacts/contracts/shared/IComponentService.sol/IComponentService.json +446 -276
  227. package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.dbg.json +1 -1
  228. package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.json +94 -106
  229. package/artifacts/contracts/shared/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
  230. package/artifacts/contracts/shared/ILifecycle.sol/ILifecycle.dbg.json +1 -1
  231. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
  232. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.json +16 -0
  233. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +1 -1
  234. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  235. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +148 -0
  236. package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +1 -1
  237. package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
  238. package/artifacts/contracts/shared/IService.sol/IService.json +55 -2
  239. package/artifacts/contracts/shared/InitializableERC165.sol/InitializableERC165.dbg.json +1 -1
  240. package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.dbg.json +1 -1
  241. package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.json +107 -124
  242. package/artifacts/contracts/shared/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
  243. package/artifacts/contracts/shared/KeyValueStore.sol/KeyValueStore.json +1 -1
  244. package/artifacts/contracts/shared/Lifecycle.sol/Lifecycle.dbg.json +1 -1
  245. package/artifacts/contracts/shared/Lifecycle.sol/Lifecycle.json +1 -1
  246. package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.dbg.json +1 -1
  247. package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.json +2 -2
  248. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
  249. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +18 -2
  250. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +1 -1
  251. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +2 -2
  252. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  253. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +152 -38
  254. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +1 -1
  255. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +2 -2
  256. package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
  257. package/artifacts/contracts/shared/Service.sol/Service.json +55 -2
  258. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
  259. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +327 -73
  260. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandlerBase.dbg.json +4 -0
  261. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandlerBase.json +484 -0
  262. package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.dbg.json +1 -1
  263. package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.json +88 -24
  264. package/artifacts/contracts/staking/IStaking.sol/IStaking.dbg.json +1 -1
  265. package/artifacts/contracts/staking/IStaking.sol/IStaking.json +113 -136
  266. package/artifacts/contracts/staking/IStakingService.sol/IStakingService.dbg.json +1 -1
  267. package/artifacts/contracts/staking/IStakingService.sol/IStakingService.json +130 -16
  268. package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.dbg.json +1 -1
  269. package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.json +49 -49
  270. package/artifacts/contracts/staking/Staking.sol/Staking.dbg.json +1 -1
  271. package/artifacts/contracts/staking/Staking.sol/Staking.json +203 -206
  272. package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.dbg.json +1 -1
  273. package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.json +3 -3
  274. package/artifacts/contracts/staking/StakingManager.sol/StakingManager.dbg.json +1 -1
  275. package/artifacts/contracts/staking/StakingManager.sol/StakingManager.json +93 -51
  276. package/artifacts/contracts/staking/StakingReader.sol/StakingReader.dbg.json +1 -1
  277. package/artifacts/contracts/staking/StakingReader.sol/StakingReader.json +6 -57
  278. package/artifacts/contracts/staking/StakingService.sol/StakingService.dbg.json +1 -1
  279. package/artifacts/contracts/staking/StakingService.sol/StakingService.json +181 -55
  280. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.dbg.json +1 -1
  281. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.json +77 -39
  282. package/artifacts/contracts/staking/StakingStore.sol/StakingStore.dbg.json +1 -1
  283. package/artifacts/contracts/staking/StakingStore.sol/StakingStore.json +130 -130
  284. package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.dbg.json +1 -1
  285. package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.json +23 -23
  286. package/artifacts/contracts/type/AddressSet.sol/LibAddressSet.dbg.json +1 -1
  287. package/artifacts/contracts/type/Amount.sol/AmountLib.dbg.json +1 -1
  288. package/artifacts/contracts/type/Amount.sol/AmountLib.json +3 -3
  289. package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
  290. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.dbg.json +1 -1
  291. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.json +2 -2
  292. package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.dbg.json +1 -1
  293. package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.json +2 -2
  294. package/artifacts/contracts/type/Fee.sol/FeeLib.dbg.json +1 -1
  295. package/artifacts/contracts/type/Fee.sol/FeeLib.json +3 -3
  296. package/artifacts/contracts/type/Key32.sol/Key32Lib.dbg.json +1 -1
  297. package/artifacts/contracts/type/Key32.sol/Key32Lib.json +2 -2
  298. package/artifacts/contracts/type/Key32Set.sol/LibKey32Set.dbg.json +4 -0
  299. package/artifacts/contracts/type/Key32Set.sol/LibKey32Set.json +33 -0
  300. package/artifacts/contracts/type/NftId.sol/NftIdLib.dbg.json +1 -1
  301. package/artifacts/contracts/type/NftId.sol/NftIdLib.json +23 -4
  302. package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
  303. package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.json +2 -2
  304. package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
  305. package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.json +2 -2
  306. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.dbg.json +1 -1
  307. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.json +2 -2
  308. package/artifacts/contracts/type/Referral.sol/ReferralLib.dbg.json +1 -1
  309. package/artifacts/contracts/type/Referral.sol/ReferralLib.json +2 -2
  310. package/artifacts/contracts/type/RequestId.sol/RequestIdLib.dbg.json +1 -1
  311. package/artifacts/contracts/type/RequestId.sol/RequestIdLib.json +2 -2
  312. package/artifacts/contracts/type/RiskId.sol/RiskIdLib.dbg.json +1 -1
  313. package/artifacts/contracts/type/RiskId.sol/RiskIdLib.json +62 -5
  314. package/artifacts/contracts/type/RoleId.sol/RoleIdLib.dbg.json +1 -1
  315. package/artifacts/contracts/type/RoleId.sol/RoleIdLib.json +79 -15
  316. package/artifacts/contracts/type/Seconds.sol/SecondsLib.dbg.json +1 -1
  317. package/artifacts/contracts/type/Selector.sol/SelectorLib.dbg.json +1 -1
  318. package/artifacts/contracts/type/Selector.sol/SelectorLib.json +21 -2
  319. package/artifacts/contracts/type/Selector.sol/SelectorSetLib.dbg.json +1 -1
  320. package/artifacts/contracts/type/Selector.sol/SelectorSetLib.json +2 -2
  321. package/artifacts/contracts/type/StateId.sol/StateIdLib.dbg.json +1 -1
  322. package/artifacts/contracts/type/String.sol/StrLib.dbg.json +1 -1
  323. package/artifacts/contracts/type/Timestamp.sol/TimestampLib.dbg.json +1 -1
  324. package/artifacts/contracts/type/Timestamp.sol/TimestampLib.json +2 -2
  325. package/artifacts/contracts/type/UFixed.sol/UFixedLib.dbg.json +1 -1
  326. package/artifacts/contracts/type/UFixed.sol/UFixedLib.json +3 -3
  327. package/artifacts/contracts/type/Version.sol/VersionLib.dbg.json +1 -1
  328. package/artifacts/contracts/type/Version.sol/VersionLib.json +2 -21
  329. package/artifacts/contracts/type/Version.sol/VersionPartLib.dbg.json +1 -1
  330. package/artifacts/contracts/type/Version.sol/VersionPartLib.json +47 -2
  331. package/artifacts/contracts/upgradeability/IVersionable.sol/IVersionable.dbg.json +1 -1
  332. package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.dbg.json +1 -1
  333. package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.json +44 -12
  334. package/artifacts/contracts/upgradeability/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
  335. package/artifacts/contracts/upgradeability/Versionable.sol/Versionable.dbg.json +1 -1
  336. package/contracts/accounting/AccountingService.sol +262 -0
  337. package/contracts/accounting/AccountingServiceManager.sol +38 -0
  338. package/contracts/accounting/IAccountingService.sol +45 -0
  339. package/contracts/authorization/AccessAdmin.sol +216 -125
  340. package/contracts/authorization/AccessManagerCloneable.sol +136 -3
  341. package/contracts/authorization/Authorization.sol +321 -205
  342. package/contracts/authorization/IAccess.sol +1 -0
  343. package/contracts/authorization/IAccessAdmin.sol +14 -8
  344. package/contracts/authorization/IAuthorization.sol +27 -7
  345. package/contracts/authorization/IServiceAuthorization.sol +1 -1
  346. package/contracts/authorization/ServiceAuthorization.sol +4 -4
  347. package/contracts/distribution/BasicDistribution.sol +15 -12
  348. package/contracts/distribution/BasicDistributionAuthorization.sol +22 -9
  349. package/contracts/distribution/Distribution.sol +41 -47
  350. package/contracts/distribution/DistributionService.sol +100 -78
  351. package/contracts/distribution/DistributionServiceManager.sol +1 -1
  352. package/contracts/distribution/IDistributionComponent.sol +1 -1
  353. package/contracts/distribution/IDistributionService.sol +19 -19
  354. package/contracts/examples/fire/FirePool.sol +25 -10
  355. package/contracts/examples/fire/FirePoolAuthorization.sol +2 -1
  356. package/contracts/examples/fire/FireProduct.sol +40 -13
  357. package/contracts/examples/fire/FireProductAuthorization.sol +3 -3
  358. package/contracts/examples/unpermissioned/SimpleDistribution.sol +11 -4
  359. package/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol +28 -0
  360. package/contracts/examples/unpermissioned/SimpleOracle.sol +4 -4
  361. package/contracts/examples/unpermissioned/SimplePool.sol +37 -7
  362. package/contracts/examples/unpermissioned/SimplePoolAuthorization.sol +28 -0
  363. package/contracts/examples/unpermissioned/SimpleProduct.sol +49 -23
  364. package/contracts/examples/unpermissioned/SimpleProductAuthorization.sol +28 -0
  365. package/contracts/instance/BundleSet.sol +42 -38
  366. package/contracts/instance/IInstance.sol +17 -10
  367. package/contracts/instance/IInstanceService.sol +9 -29
  368. package/contracts/instance/Instance.sol +52 -34
  369. package/contracts/instance/InstanceAdmin.sol +249 -100
  370. package/contracts/instance/InstanceAuthorizationV3.sol +54 -45
  371. package/contracts/instance/InstanceReader.sol +174 -32
  372. package/contracts/instance/InstanceService.sol +85 -146
  373. package/contracts/instance/InstanceServiceManager.sol +1 -1
  374. package/contracts/instance/InstanceStore.sol +13 -2
  375. package/contracts/instance/RiskSet.sol +118 -0
  376. package/contracts/instance/base/ObjectCounter.sol +1 -2
  377. package/contracts/instance/base/ObjectLifecycle.sol +4 -2
  378. package/contracts/instance/base/ObjectSet.sol +31 -33
  379. package/contracts/instance/base/ObjectSetHelperLib.sol +30 -0
  380. package/contracts/instance/module/IComponents.sol +10 -7
  381. package/contracts/instance/module/IDistribution.sol +2 -1
  382. package/contracts/instance/module/IPolicy.sol +2 -1
  383. package/contracts/instance/module/IRisk.sol +3 -0
  384. package/contracts/oracle/BasicOracle.sol +0 -1
  385. package/contracts/oracle/BasicOracleAuthorization.sol +3 -12
  386. package/contracts/oracle/IOracleService.sol +2 -1
  387. package/contracts/oracle/Oracle.sol +5 -16
  388. package/contracts/oracle/OracleService.sol +107 -78
  389. package/contracts/oracle/OracleServiceManager.sol +1 -1
  390. package/contracts/pool/BasicPool.sol +33 -24
  391. package/contracts/pool/BasicPoolAuthorization.sol +27 -9
  392. package/contracts/pool/BundleService.sol +88 -154
  393. package/contracts/pool/BundleServiceManager.sol +1 -1
  394. package/contracts/pool/IBundleService.sol +15 -43
  395. package/contracts/pool/IPoolComponent.sol +1 -7
  396. package/contracts/pool/IPoolService.sol +58 -64
  397. package/contracts/pool/Pool.sol +112 -120
  398. package/contracts/pool/PoolLib.sol +216 -0
  399. package/contracts/pool/PoolService.sol +436 -242
  400. package/contracts/pool/PoolServiceManager.sol +1 -1
  401. package/contracts/product/ApplicationService.sol +24 -16
  402. package/contracts/product/ApplicationServiceManager.sol +1 -1
  403. package/contracts/product/BasicProduct.sol +10 -12
  404. package/contracts/product/BasicProductAuthorization.sol +24 -11
  405. package/contracts/product/ClaimService.sol +202 -151
  406. package/contracts/product/ClaimServiceManager.sol +1 -1
  407. package/contracts/product/IApplicationService.sol +5 -2
  408. package/contracts/product/IClaimService.sol +14 -2
  409. package/contracts/product/IPolicyService.sol +26 -11
  410. package/contracts/product/IPricingService.sol +9 -9
  411. package/contracts/product/IProductComponent.sol +10 -1
  412. package/contracts/product/PolicyService.sol +248 -252
  413. package/contracts/product/PolicyServiceLib.sol +65 -0
  414. package/contracts/product/PolicyServiceManager.sol +1 -1
  415. package/contracts/product/PricingService.sol +30 -26
  416. package/contracts/product/PricingServiceManager.sol +3 -3
  417. package/contracts/product/Product.sol +106 -60
  418. package/contracts/product/RiskService.sol +74 -25
  419. package/contracts/product/RiskServiceManager.sol +1 -1
  420. package/contracts/registry/ChainNft.sol +10 -11
  421. package/contracts/registry/IRegistry.sol +14 -15
  422. package/contracts/registry/IRegistryService.sol +6 -4
  423. package/contracts/registry/IRelease.sol +26 -0
  424. package/contracts/registry/ITransferInterceptor.sol +1 -2
  425. package/contracts/registry/Registry.sol +29 -6
  426. package/contracts/registry/RegistryAdmin.sol +132 -226
  427. package/contracts/registry/RegistryService.sol +40 -58
  428. package/contracts/registry/RegistryServiceManager.sol +1 -1
  429. package/contracts/registry/ReleaseAdmin.sol +245 -0
  430. package/contracts/registry/ReleaseLifecycle.sol +2 -0
  431. package/contracts/registry/ReleaseRegistry.sol +139 -124
  432. package/contracts/registry/ServiceAuthorizationV3.sol +97 -48
  433. package/contracts/registry/TokenRegistry.sol +6 -8
  434. package/contracts/shared/Component.sol +69 -118
  435. package/contracts/shared/ComponentService.sol +422 -371
  436. package/contracts/shared/ComponentServiceManager.sol +1 -1
  437. package/contracts/shared/ComponentVerifyingService.sol +27 -15
  438. package/contracts/shared/ContractLib.sol +224 -9
  439. package/contracts/shared/IComponent.sol +8 -20
  440. package/contracts/shared/IComponentService.sol +41 -37
  441. package/contracts/shared/IInstanceLinkedComponent.sol +3 -22
  442. package/contracts/shared/INftOwnable.sol +2 -0
  443. package/contracts/shared/IRegisterable.sol +23 -1
  444. package/contracts/shared/IService.sol +3 -5
  445. package/contracts/shared/InstanceLinkedComponent.sol +68 -42
  446. package/contracts/shared/Lifecycle.sol +7 -7
  447. package/contracts/shared/NftOwnable.sol +26 -6
  448. package/contracts/shared/PolicyHolder.sol +1 -1
  449. package/contracts/shared/Registerable.sol +53 -19
  450. package/contracts/shared/RegistryLinked.sol +7 -13
  451. package/contracts/shared/Service.sol +9 -31
  452. package/contracts/shared/TokenHandler.sol +274 -72
  453. package/contracts/shared/TokenHandlerDeployerLib.sol +10 -2
  454. package/contracts/staking/IStaking.sol +6 -10
  455. package/contracts/staking/IStakingService.sol +12 -4
  456. package/contracts/staking/StakeManagerLib.sol +69 -20
  457. package/contracts/staking/Staking.sol +73 -41
  458. package/contracts/staking/StakingReader.sol +1 -16
  459. package/contracts/staking/StakingService.sol +70 -24
  460. package/contracts/staking/StakingServiceManager.sol +5 -4
  461. package/contracts/type/Key32.sol +2 -2
  462. package/contracts/type/Key32Set.sol +62 -0
  463. package/contracts/type/NftId.sol +6 -0
  464. package/contracts/type/ObjectType.sol +48 -21
  465. package/contracts/type/RiskId.sol +23 -6
  466. package/contracts/type/RoleId.sol +23 -15
  467. package/contracts/type/Selector.sol +5 -0
  468. package/contracts/type/Timestamp.sol +0 -5
  469. package/contracts/type/UFixed.sol +9 -119
  470. package/contracts/type/Version.sol +15 -5
  471. package/contracts/upgradeability/ProxyManager.sol +2 -1
  472. package/package.json +3 -3
  473. package/artifacts/contracts/authorization/IModuleAuthorization.sol/IModuleAuthorization.dbg.json +0 -4
  474. package/artifacts/contracts/authorization/IModuleAuthorization.sol/IModuleAuthorization.json +0 -290
  475. package/artifacts/contracts/authorization/ModuleAuthorization.sol/ModuleAuthorization.dbg.json +0 -4
  476. package/artifacts/contracts/authorization/ModuleAuthorization.sol/ModuleAuthorization.json +0 -390
  477. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +0 -4
  478. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.json +0 -129
  479. package/artifacts/contracts/type/UFixed.sol/MathLib.dbg.json +0 -4
  480. package/artifacts/contracts/type/UFixed.sol/MathLib.json +0 -16
  481. package/contracts/authorization/IModuleAuthorization.sol +0 -21
  482. package/contracts/authorization/ModuleAuthorization.sol +0 -78
  483. package/contracts/instance/module/IAccess.sol +0 -46
@@ -3,48 +3,41 @@ pragma solidity ^0.8.20;
3
3
 
4
4
  import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
5
5
 
6
- import {IRegistry} from "../registry/IRegistry.sol";
7
- import {Product} from "./Product.sol";
6
+ import {IAccountingService} from "../accounting/IAccountingService.sol";
7
+ import {IComponentService} from "../shared/IComponentService.sol";
8
8
  import {IComponents} from "../instance/module/IComponents.sol";
9
+ import {IDistributionService} from "../distribution/IDistributionService.sol";
10
+ import {InstanceReader} from "../instance/InstanceReader.sol";
11
+ import {InstanceStore} from "../instance/InstanceStore.sol";
9
12
  import {IInstance} from "../instance/IInstance.sol";
10
13
  import {IPolicy} from "../instance/module/IPolicy.sol";
14
+ import {IPolicyHolder} from "../shared/IPolicyHolder.sol";
15
+ import {IPolicyService} from "./IPolicyService.sol";
16
+ import {IPoolService} from "../pool/IPoolService.sol";
17
+ import {IPricingService} from "./IPricingService.sol";
18
+ import {IRegistry} from "../registry/IRegistry.sol";
11
19
 
12
- import {TokenHandler} from "../shared/TokenHandler.sol";
13
-
14
- import {Amount, AmountLib} from "../type/Amount.sol";
15
- import {Timestamp, TimestampLib, zeroTimestamp} from "../type/Timestamp.sol";
16
- import {ObjectType, APPLICATION, COMPONENT, DISTRIBUTION, PRODUCT, POOL, POLICY, BUNDLE, CLAIM, PRICE} from "../type/ObjectType.sol";
20
+ import {Amount} from "../type/Amount.sol";
17
21
  import {APPLIED, COLLATERALIZED, KEEP_STATE, CLOSED, DECLINED, PAID} from "../type/StateId.sol";
18
- import {NftId, NftIdLib} from "../type/NftId.sol";
22
+ import {ContractLib} from "../shared/ContractLib.sol";
23
+ import {NftId} from "../type/NftId.sol";
24
+ import {ObjectType, ACCOUNTING, COMPONENT, DISTRIBUTION, PRODUCT, POOL, POLICY, PRICE} from "../type/ObjectType.sol";
25
+ import {PolicyServiceLib} from "./PolicyServiceLib.sol";
19
26
  import {ReferralId} from "../type/Referral.sol";
27
+ import {RiskId} from "../type/RiskId.sol";
28
+ import {Service} from "../shared/Service.sol";
20
29
  import {StateId} from "../type/StateId.sol";
30
+ import {Timestamp, TimestampLib} from "../type/Timestamp.sol";
31
+ import {TokenHandler} from "../shared/TokenHandler.sol";
21
32
  import {VersionPart} from "../type/Version.sol";
22
33
 
23
- import {ComponentVerifyingService} from "../shared/ComponentVerifyingService.sol";
24
- import {ContractLib} from "../shared/ContractLib.sol";
25
- import {IApplicationService} from "./IApplicationService.sol";
26
- import {IBundleService} from "../pool/IBundleService.sol";
27
- import {IClaimService} from "./IClaimService.sol";
28
- import {IComponentService} from "../shared/IComponentService.sol";
29
- import {IDistributionService} from "../distribution/IDistributionService.sol";
30
- import {InstanceReader} from "../instance/InstanceReader.sol";
31
- import {InstanceStore} from "../instance/InstanceStore.sol";
32
- import {IPolicyHolder} from "../shared/IPolicyHolder.sol";
33
- import {IPolicyService} from "./IPolicyService.sol";
34
- import {IPoolService} from "../pool/IPoolService.sol";
35
- import {IPricingService} from "./IPricingService.sol";
36
34
 
37
35
  contract PolicyService is
38
- ComponentVerifyingService,
36
+ Service,
39
37
  IPolicyService
40
38
  {
41
- using NftIdLib for NftId;
42
- using TimestampLib for Timestamp;
43
-
44
- IApplicationService internal _applicationService;
39
+ IAccountingService private _accountingService;
45
40
  IComponentService internal _componentService;
46
- IBundleService internal _bundleService;
47
- IClaimService internal _claimService;
48
41
  IDistributionService internal _distributionService;
49
42
  IPoolService internal _poolService;
50
43
  IPricingService internal _pricingService;
@@ -58,17 +51,15 @@ contract PolicyService is
58
51
  initializer
59
52
  {
60
53
  (
61
- address registryAddress,
62
- address authority
54
+ address authority,
55
+ address registry
63
56
  ) = abi.decode(data, (address, address));
64
57
 
65
- _initializeService(registryAddress, authority, owner);
58
+ __Service_init(authority, registry, owner);
66
59
 
67
60
  VersionPart majorVersion = getVersion().toMajorPart();
68
- _applicationService = IApplicationService(getRegistry().getServiceAddress(APPLICATION(), majorVersion));
69
- _bundleService = IBundleService(getRegistry().getServiceAddress(BUNDLE(), majorVersion));
61
+ _accountingService = IAccountingService(getRegistry().getServiceAddress(ACCOUNTING(), majorVersion));
70
62
  _componentService = IComponentService(getRegistry().getServiceAddress(COMPONENT(), majorVersion));
71
- _claimService = IClaimService(getRegistry().getServiceAddress(CLAIM(), majorVersion));
72
63
  _poolService = IPoolService(getRegistry().getServiceAddress(POOL(), majorVersion));
73
64
  _distributionService = IDistributionService(getRegistry().getServiceAddress(DISTRIBUTION(), majorVersion));
74
65
  _pricingService = IPricingService(getRegistry().getServiceAddress(PRICE(), majorVersion));
@@ -84,24 +75,15 @@ contract PolicyService is
84
75
  virtual
85
76
  nonReentrant()
86
77
  {
87
- (NftId productNftId,, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
88
- InstanceReader instanceReader = instance.getInstanceReader();
78
+ // checks
79
+ (IInstance instance,,) = _getAndVerifyCallerForPolicy(applicationNftId);
89
80
 
90
81
  // check policy is in state applied
91
- if (instanceReader.getPolicyState(applicationNftId) != APPLIED()) {
82
+ if (instance.getInstanceReader().getPolicyState(applicationNftId) != APPLIED()) {
92
83
  revert ErrorPolicyServicePolicyStateNotApplied(applicationNftId);
93
84
  }
94
85
 
95
- // check policy matches with calling product
96
- IPolicy.PolicyInfo memory applicationInfo = instanceReader.getPolicyInfo(applicationNftId);
97
- if(applicationInfo.productNftId != productNftId) {
98
- revert ErrorPolicyServicePolicyProductMismatch(
99
- applicationNftId,
100
- applicationInfo.productNftId,
101
- productNftId);
102
- }
103
-
104
-
86
+ // effects
105
87
  // store updated policy info
106
88
  instance.getInstanceStore().updatePolicyState(
107
89
  applicationNftId,
@@ -119,40 +101,34 @@ contract PolicyService is
119
101
  external
120
102
  virtual
121
103
  nonReentrant()
104
+ returns (Amount premiumAmount)
122
105
  {
123
- // check caller is registered product
124
- (NftId productNftId,, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
125
- InstanceReader instanceReader = instance.getInstanceReader();
106
+ // checks
107
+ (
108
+ IInstance instance,
109
+ NftId productNftId,
110
+ IPolicy.PolicyInfo memory applicationInfo
111
+ ) = _getAndVerifyCallerForPolicy(applicationNftId);
126
112
 
127
113
  // check policy is in state applied
114
+ InstanceReader instanceReader = instance.getInstanceReader();
128
115
  if (instanceReader.getPolicyState(applicationNftId) != APPLIED()) {
129
116
  revert ErrorPolicyServicePolicyStateNotApplied(applicationNftId);
130
117
  }
131
118
 
132
- // check policy matches with calling product
133
- IPolicy.PolicyInfo memory applicationInfo = instanceReader.getPolicyInfo(applicationNftId);
134
- if(applicationInfo.productNftId != productNftId) {
135
- revert ErrorPolicyServicePolicyProductMismatch(
136
- applicationNftId,
137
- applicationInfo.productNftId,
138
- productNftId);
139
- }
140
-
119
+ // effects
141
120
  // actual collateralizaion
142
121
  _poolService.lockCollateral(
143
122
  instance,
144
- address(instanceReader.getComponentInfo(productNftId).token),
123
+ address(instanceReader.getToken(productNftId)),
145
124
  productNftId,
146
125
  applicationNftId,
147
126
  applicationInfo.bundleNftId,
148
127
  applicationInfo.sumInsuredAmount);
149
128
 
150
129
  // optional activation of policy
151
- if(activateAt > zeroTimestamp()) {
152
- applicationInfo = _activate(
153
- applicationNftId,
154
- applicationInfo,
155
- activateAt);
130
+ if(activateAt.gtz()) {
131
+ applicationInfo = _activate(applicationNftId, applicationInfo, activateAt);
156
132
  }
157
133
 
158
134
  // update policy and set state to collateralized
@@ -162,35 +138,42 @@ contract PolicyService is
162
138
  COLLATERALIZED());
163
139
 
164
140
  // calculate and store premium
141
+ RiskId riskId = applicationInfo.riskId;
142
+ NftId bundleNftId = applicationInfo.bundleNftId;
143
+
165
144
  IPolicy.PremiumInfo memory premium = _pricingService.calculatePremium(
166
145
  productNftId,
167
- applicationInfo.riskId,
146
+ riskId,
168
147
  applicationInfo.sumInsuredAmount,
169
148
  applicationInfo.lifetime,
170
149
  applicationInfo.applicationData,
171
- applicationInfo.bundleNftId,
150
+ bundleNftId,
172
151
  applicationInfo.referralId);
173
152
 
153
+ premiumAmount = premium.fullPremiumAmount;
174
154
  instance.getInstanceStore().createPremium(
175
155
  applicationNftId,
176
156
  premium);
177
157
 
178
- // update referral counter
158
+ // update referral counter if product has linked distributino component
179
159
  {
180
160
  IComponents.ProductInfo memory productInfo = instanceReader.getProductInfo(productNftId);
181
-
182
- if (! productInfo.distributionNftId.eqz()) { // only call distribution service if a distribution component is connected to the product
161
+ if (productInfo.hasDistribution) {
183
162
  _distributionService.processReferral(
184
163
  productInfo.distributionNftId,
185
164
  applicationInfo.referralId);
186
165
  }
187
166
  }
188
167
 
168
+ // link policy to risk and bundle
169
+ NftId poolNftId = getRegistry().getParentNftId(bundleNftId);
170
+ instance.getRiskSet().linkPolicy(productNftId, riskId, applicationNftId);
171
+ instance.getBundleSet().linkPolicy(poolNftId, bundleNftId, applicationNftId);
172
+
189
173
  // log policy creation before interactions with token and policy holder
190
174
  emit LogPolicyServicePolicyCreated(applicationNftId, premium.premiumAmount, activateAt);
191
175
 
192
- // TODO add calling pool contract if it needs to validate application
193
-
176
+ // interactions
194
177
  // callback to policy holder if applicable
195
178
  _policyHolderPolicyActivated(applicationNftId, activateAt);
196
179
  }
@@ -205,28 +188,46 @@ contract PolicyService is
205
188
  virtual
206
189
  nonReentrant()
207
190
  {
208
- // check caller is registered product
209
- (,, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
210
- InstanceReader instanceReader = instance.getInstanceReader();
211
- StateId stateId = instanceReader.getPolicyState(policyNftId);
191
+ // checks
192
+ (
193
+ IInstance instance,
194
+ NftId productNftId,
195
+ IPolicy.PolicyInfo memory policyInfo
196
+ ) = _getAndVerifyCallerForPolicy(policyNftId);
212
197
 
213
- // check policy is in state collateralized or active
214
- if (!(stateId == COLLATERALIZED())) {
198
+ // check policy is in state collateralized
199
+ InstanceReader instanceReader = instance.getInstanceReader();
200
+ if (instanceReader.getPolicyState(policyNftId) != COLLATERALIZED()) {
215
201
  revert ErrorPolicyServicePolicyStateNotCollateralized(policyNftId);
216
202
  }
217
203
 
218
- // check if premium is already collected
204
+ // check if premium has already been collected
219
205
  if (instanceReader.getPremiumInfoState(policyNftId) == PAID()) {
220
206
  revert ErrorPolicyServicePremiumAlreadyPaid(policyNftId);
221
207
  }
222
208
 
223
- IPolicy.PolicyInfo memory policyInfo = instanceReader.getPolicyInfo(policyNftId);
224
- IPolicy.PremiumInfo memory premium = instanceReader.getPremiumInfo(policyNftId);
225
-
226
- _processPremium(
227
- instance,
228
- policyNftId,
229
- policyInfo,
209
+ // check funds and allowance of policy holder
210
+ IPolicy.PremiumInfo memory premium = instanceReader.getPremiumInfo(policyNftId);
211
+ instanceReader.getTokenHandler(
212
+ productNftId).checkBalanceAndAllowance(
213
+ getRegistry().ownerOf(policyNftId),
214
+ premium.premiumAmount,
215
+ false);
216
+
217
+ // )
218
+ // _checkPremiumBalanceAndAllowance(
219
+ // tokenHandler.TOKEN(),
220
+ // address(tokenHandler),
221
+ // getRegistry().ownerOf(policyNftId),
222
+ // premium.premiumAmount);
223
+
224
+ // effects
225
+ _processSale(
226
+ instanceReader,
227
+ instance.getInstanceStore(),
228
+ productNftId,
229
+ policyInfo.bundleNftId,
230
+ policyInfo.referralId,
230
231
  premium);
231
232
 
232
233
  // optionally activate policy
@@ -240,31 +241,74 @@ contract PolicyService is
240
241
  // log premium collection before interactions with token
241
242
  emit LogPolicyServicePolicyPremiumCollected(policyNftId, premium.premiumAmount);
242
243
 
243
- _transferFunds(instanceReader, policyNftId, policyInfo.productNftId, premium);
244
+ // interactions
245
+ _transferPremiumAmounts(instanceReader, policyNftId, policyInfo.productNftId, premium);
244
246
  }
245
247
 
248
+
246
249
  /// @inheritdoc IPolicyService
247
250
  function activate(NftId policyNftId, Timestamp activateAt)
248
251
  external
249
252
  virtual
250
253
  nonReentrant()
251
254
  {
252
- // check caller is registered product
253
- (,, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
254
- InstanceReader instanceReader = instance.getInstanceReader();
255
+ // checks
256
+ (
257
+ IInstance instance,,
258
+ IPolicy.PolicyInfo memory policyInfo
259
+ ) = _getAndVerifyCallerForPolicy(policyNftId);
255
260
 
256
- IPolicy.PolicyInfo memory policyInfo = instanceReader.getPolicyInfo(policyNftId);
261
+ // effects
257
262
  policyInfo = _activate(policyNftId, policyInfo, activateAt);
258
-
259
263
  instance.getInstanceStore().updatePolicy(policyNftId, policyInfo, KEEP_STATE());
260
264
 
261
265
  // log policy activation before interactions with policy holder
262
266
  emit LogPolicyServicePolicyActivated(policyNftId, activateAt);
263
267
 
268
+ // interactions
264
269
  // callback to policy holder if applicable
265
270
  _policyHolderPolicyActivated(policyNftId, activateAt);
266
271
  }
267
272
 
273
+ /// @inheritdoc IPolicyService
274
+ function adjustActivation(
275
+ NftId policyNftId,
276
+ Timestamp newActivateAt
277
+ )
278
+ external
279
+ virtual
280
+ nonReentrant()
281
+ {
282
+ // checks
283
+ (
284
+ IInstance instance,,
285
+ IPolicy.PolicyInfo memory policyInfo
286
+ ) = _getAndVerifyCallerForPolicy(policyNftId);
287
+
288
+ if (policyInfo.activatedAt.eqz()) {
289
+ revert ErrorPolicyServicePolicyNotActivated(policyNftId);
290
+ }
291
+
292
+ if (newActivateAt < TimestampLib.blockTimestamp()) {
293
+ revert ErrorPolicyServicePolicyActivationTooEarly(policyNftId, TimestampLib.blockTimestamp(), newActivateAt);
294
+ }
295
+
296
+ if (newActivateAt > policyInfo.expiredAt) {
297
+ revert ErrorPolicyServicePolicyActivationTooLate(policyNftId, policyInfo.expiredAt, newActivateAt);
298
+ }
299
+
300
+ // effects
301
+ policyInfo.activatedAt = newActivateAt;
302
+ instance.getInstanceStore().updatePolicy(policyNftId, policyInfo, KEEP_STATE());
303
+
304
+ // log policy activation before interactions with policy holder
305
+ emit LogPolicyServicePolicyActivatedUpdated(policyNftId, newActivateAt);
306
+
307
+ // interactions
308
+ // callback to policy holder if applicable
309
+ _policyHolderPolicyActivated(policyNftId, newActivateAt);
310
+ }
311
+
268
312
 
269
313
  /// @inheritdoc IPolicyService
270
314
  function expire(
@@ -276,24 +320,22 @@ contract PolicyService is
276
320
  nonReentrant()
277
321
  returns (Timestamp expiredAt)
278
322
  {
279
- (NftId productNftId,, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
280
-
281
- // check policy matches with calling product
282
- IPolicy.PolicyInfo memory policyInfo = instance.getInstanceReader().getPolicyInfo(policyNftId);
283
- if(policyInfo.productNftId != productNftId) {
284
- revert ErrorPolicyServicePolicyProductMismatch(
285
- policyNftId,
286
- policyInfo.productNftId,
287
- productNftId);
288
- }
323
+ // checks
324
+ (
325
+ IInstance instance,,
326
+ IPolicy.PolicyInfo memory policyInfo
327
+ ) = _getAndVerifyCallerForPolicy(policyNftId);
289
328
 
329
+ // more checks, effects + interactions
290
330
  return _expire(
291
331
  instance,
292
332
  policyNftId,
333
+ policyInfo,
293
334
  expireAt
294
335
  );
295
336
  }
296
337
 
338
+
297
339
  /// @inheritdoc IPolicyService
298
340
  function expirePolicy(
299
341
  IInstance instance,
@@ -305,58 +347,22 @@ contract PolicyService is
305
347
  nonReentrant()
306
348
  returns (Timestamp expiredAt)
307
349
  {
350
+ // checks
351
+ _checkNftType(policyNftId, POLICY());
352
+ IPolicy.PolicyInfo memory policyInfo = instance.getInstanceReader().getPolicyInfo(
353
+ policyNftId);
354
+
355
+ // more checks, effects + interactions
308
356
  return _expire(
309
357
  instance,
310
358
  policyNftId,
359
+ policyInfo,
311
360
  expireAt
312
361
  );
313
362
  }
314
363
 
315
- function _expire(
316
- IInstance instance,
317
- NftId policyNftId,
318
- Timestamp expireAt
319
- )
320
- internal
321
- returns (Timestamp expiredAt)
322
- {
323
- InstanceReader instanceReader = instance.getInstanceReader();
324
-
325
- // check policy is active
326
- StateId policyState = instanceReader.getPolicyState(policyNftId);
327
- IPolicy.PolicyInfo memory policyInfo = instance.getInstanceReader().getPolicyInfo(policyNftId);
328
- if (!_policyHasBeenActivated(policyState, policyInfo)) {
329
- revert ErrorPolicyServicePolicyNotActive(policyNftId, policyState);
330
- }
331
-
332
- // set return value to provided timestamp
333
- expiredAt = expireAt;
334
-
335
- // update expiredAt to current block timestamp if not set
336
- if (expiredAt.eqz()) {
337
- expiredAt = TimestampLib.blockTimestamp();
338
- }
339
-
340
- // check expiredAt represents a valid expiry time
341
- if (expiredAt >= policyInfo.expiredAt) {
342
- revert ErrorPolicyServicePolicyExpirationTooLate(policyNftId, policyInfo.expiredAt, expireAt);
343
- }
344
- if (expiredAt < TimestampLib.blockTimestamp()) {
345
- revert ErrorPolicyServicePolicyExpirationTooEarly(policyNftId, TimestampLib.blockTimestamp(), expireAt);
346
- }
347
-
348
- // update policyInfo with new expiredAt timestamp
349
- Timestamp originalExpiredAt = policyInfo.expiredAt;
350
- policyInfo.expiredAt = expiredAt;
351
- instance.getInstanceStore().updatePolicy(policyNftId, policyInfo, KEEP_STATE());
352
-
353
- emit LogPolicyServicePolicyExpirationUpdated(policyNftId, originalExpiredAt, expiredAt);
354
-
355
- // callback to policy holder if applicable
356
- _policyHolderPolicyExpired(policyNftId, expiredAt);
357
- }
358
-
359
364
 
365
+ /// @inheritdoc IPolicyService
360
366
  function close(
361
367
  NftId policyNftId
362
368
  )
@@ -364,36 +370,31 @@ contract PolicyService is
364
370
  virtual
365
371
  nonReentrant()
366
372
  {
367
- (,, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
373
+ // checks
374
+ (
375
+ IInstance instance,
376
+ NftId productNftId,
377
+ IPolicy.PolicyInfo memory policyInfo
378
+ ) = _getAndVerifyCallerForPolicy(policyNftId);
368
379
  InstanceReader instanceReader = instance.getInstanceReader();
369
380
 
370
- // check that policy has been activated
371
- IPolicy.PolicyInfo memory policyInfo = instanceReader.getPolicyInfo(policyNftId);
372
- StateId policyState = instanceReader.getPolicyState(policyNftId);
373
- if (!_policyHasBeenActivated(policyState, policyInfo)) {
374
- revert ErrorPolicyServicePolicyNotActive(policyNftId, policyState);
375
- }
376
-
377
- // check that policy has not already been closed
378
- if (policyInfo.closedAt.gtz()) {
379
- revert ErrorPolicyServicePolicyAlreadyClosed(policyNftId);
381
+ // check policy is in a closeable state
382
+ if (!PolicyServiceLib.policyIsCloseable(instanceReader, policyNftId)) {
383
+ revert ErrorPolicyServicePolicyNotCloseable(policyNftId);
380
384
  }
381
385
 
382
- // check that policy does not have any open claims
383
- if (policyInfo.openClaimsCount > 0) {
384
- revert ErrorPolicyServiceOpenClaims(policyNftId, policyInfo.openClaimsCount);
385
- }
386
+ // check that policy has been activated
387
+ RiskId riskId = policyInfo.riskId;
388
+ NftId bundleNftId = policyInfo.bundleNftId;
386
389
 
387
- // TODO consider to allow for underpaid premiums (with the effects of reducing max payouts accordingly)
388
- // TODO consider to remove requirement for fully paid premiums altogether
389
- if (! instanceReader.getPremiumInfoState(policyNftId).eq(PAID())) {
390
+ if (instanceReader.getPremiumInfoState(policyNftId) != PAID()) {
390
391
  revert ErrorPolicyServicePremiumNotPaid(policyNftId, policyInfo.premiumAmount);
391
392
  }
392
393
 
394
+ // effects
393
395
  // release (remaining) collateral that was blocked by policy
394
396
  _poolService.releaseCollateral(
395
397
  instance,
396
- address(instanceReader.getComponentInfo(policyInfo.productNftId).token),
397
398
  policyNftId,
398
399
  policyInfo);
399
400
 
@@ -403,45 +404,48 @@ contract PolicyService is
403
404
  policyInfo.closedAt = TimestampLib.blockTimestamp();
404
405
  instance.getInstanceStore().updatePolicy(policyNftId, policyInfo, CLOSED());
405
406
 
407
+ // unlink policy from risk and bundle
408
+ NftId poolNftId = getRegistry().getParentNftId(bundleNftId);
409
+ instance.getRiskSet().unlinkPolicy(productNftId, riskId, policyNftId);
410
+ instance.getBundleSet().unlinkPolicy(poolNftId, bundleNftId, policyNftId);
411
+
406
412
  emit LogPolicyServicePolicyClosed(policyNftId);
407
413
  }
408
414
 
409
-
410
- /// @dev calculates the premium and updates all counters in the other services
411
- function _processPremium(
415
+ /// @dev shared functionality for expire() and policyExpire().
416
+ function _expire(
412
417
  IInstance instance,
413
- NftId applicationNftId,
414
- IPolicy.PolicyInfo memory applicationInfo,
415
- IPolicy.PremiumInfo memory premium
418
+ NftId policyNftId,
419
+ IPolicy.PolicyInfo memory policyInfo,
420
+ Timestamp expireAt
416
421
  )
417
422
  internal
418
- virtual
423
+ returns (Timestamp)
419
424
  {
420
- NftId productNftId = applicationInfo.productNftId;
421
- InstanceReader instanceReader = instance.getInstanceReader();
425
+ PolicyServiceLib.checkExpiration(
426
+ expireAt,
427
+ policyNftId,
428
+ instance.getInstanceReader().getPolicyState(policyNftId),
429
+ policyInfo);
422
430
 
423
- // check if premium balance and allowance of policy holder is sufficient
424
- {
425
- TokenHandler tokenHandler = _getTokenHandler(instanceReader, productNftId);
426
- address policyHolder = getRegistry().ownerOf(applicationNftId);
427
-
428
- _checkPremiumBalanceAndAllowance(
429
- tokenHandler.getToken(),
430
- address(tokenHandler),
431
- policyHolder,
432
- premium.premiumAmount);
431
+ // effects
432
+ // update policyInfo with new expiredAt timestamp
433
+ if (expireAt.gtz()) {
434
+ policyInfo.expiredAt = expireAt;
435
+ } else {
436
+ policyInfo.expiredAt = TimestampLib.blockTimestamp();
433
437
  }
438
+ instance.getInstanceStore().updatePolicy(policyNftId, policyInfo, KEEP_STATE());
434
439
 
435
- // update the counters
436
- _processSale(
437
- instanceReader,
438
- instance.getInstanceStore(),
439
- productNftId,
440
- applicationInfo.bundleNftId,
441
- applicationInfo.referralId,
442
- premium);
440
+ emit LogPolicyServicePolicyExpirationUpdated(policyNftId, policyInfo.expiredAt);
441
+
442
+ // interactions
443
+ // callback to policy holder if applicable
444
+ _policyHolderPolicyExpired(policyNftId, policyInfo.expiredAt);
445
+ return policyInfo.expiredAt;
443
446
  }
444
447
 
448
+
445
449
  function _activate(
446
450
  NftId policyNftId,
447
451
  IPolicy.PolicyInfo memory policyInfo,
@@ -480,12 +484,12 @@ contract PolicyService is
480
484
  internal
481
485
  virtual
482
486
  {
483
- (NftId distributionNftId, , , ) = _getDistributionNftAndWallets(
487
+ (NftId distributionNftId,,,) = _getDistributionNftAndWallets(
484
488
  instanceReader,
485
489
  productNftId);
486
490
 
487
491
  // update product fees, distribution and pool fees
488
- _componentService.increaseProductFees(
492
+ _accountingService.increaseProductFees(
489
493
  instanceStore,
490
494
  productNftId,
491
495
  premium.productFeeVarAmount + premium.productFeeFixAmount);
@@ -506,7 +510,7 @@ contract PolicyService is
506
510
 
507
511
 
508
512
  /// @dev transfer the premium to the wallets the premium is distributed to
509
- function _transferFunds(
513
+ function _transferPremiumAmounts(
510
514
  InstanceReader instanceReader,
511
515
  NftId policyNftId,
512
516
  NftId productNftId,
@@ -515,7 +519,6 @@ contract PolicyService is
515
519
  internal
516
520
  virtual
517
521
  {
518
- TokenHandler tokenHandler = _getTokenHandler(instanceReader, productNftId);
519
522
  address policyHolder = getRegistry().ownerOf(policyNftId);
520
523
 
521
524
  (
@@ -527,14 +530,19 @@ contract PolicyService is
527
530
  instanceReader,
528
531
  productNftId);
529
532
 
530
- tokenHandler.collectTokensToThreeRecipients(
531
- policyHolder,
532
- productWallet,
533
- premium.productFeeAmount,
534
- distributionWallet,
535
- premium.distributionFeeAndCommissionAmount,
536
- poolWallet,
537
- premium.poolPremiumAndFeeAmount);
533
+ // step 1: collect premium amount from policy holder
534
+ TokenHandler tokenHandler = instanceReader.getTokenHandler(productNftId);
535
+ tokenHandler.pullToken(policyHolder, premium.premiumAmount);
536
+
537
+ // step 2: push distribution fee to distribution wallet
538
+ if (premium.distributionFeeAndCommissionAmount.gtz()) {
539
+ tokenHandler.pushToken(distributionWallet, premium.distributionFeeAndCommissionAmount);
540
+ }
541
+
542
+ // step 3: push pool fee, bundle fee and pool premium to pool wallet
543
+ if (premium.poolPremiumAndFeeAmount.gtz()) {
544
+ tokenHandler.pushToken(poolWallet, premium.poolPremiumAndFeeAmount);
545
+ }
538
546
  }
539
547
 
540
548
 
@@ -554,31 +562,6 @@ contract PolicyService is
554
562
  }
555
563
 
556
564
 
557
- /// @dev checks the balance and allowance of the policy holder
558
- function _checkPremiumBalanceAndAllowance(
559
- IERC20Metadata token,
560
- address tokenHandlerAddress,
561
- address policyHolder,
562
- Amount premiumAmount
563
- )
564
- internal
565
- virtual
566
- view
567
- {
568
- uint256 premium = premiumAmount.toInt();
569
- uint256 balance = token.balanceOf(policyHolder);
570
- uint256 allowance = token.allowance(policyHolder, tokenHandlerAddress);
571
-
572
- if (balance < premium) {
573
- revert ErrorPolicyServiceBalanceInsufficient(policyHolder, premium, balance);
574
- }
575
-
576
- if (allowance < premium) {
577
- revert ErrorPolicyServiceAllowanceInsufficient(policyHolder, tokenHandlerAddress, premium, allowance);
578
- }
579
- }
580
-
581
-
582
565
  function _policyHolderPolicyActivated(
583
566
  NftId policyNftId,
584
567
  Timestamp activateAt
@@ -637,21 +620,6 @@ contract PolicyService is
637
620
  }
638
621
 
639
622
 
640
- function _getTokenHandler(
641
- InstanceReader instanceReader,
642
- NftId productNftId
643
- )
644
- internal
645
- virtual
646
- view
647
- returns (
648
- TokenHandler tokenHandler
649
- )
650
- {
651
- tokenHandler = instanceReader.getComponentInfo(productNftId).tokenHandler;
652
- }
653
-
654
-
655
623
  function _getDistributionNftAndWallets(
656
624
  InstanceReader instanceReader,
657
625
  NftId productNftId
@@ -666,17 +634,45 @@ contract PolicyService is
666
634
  )
667
635
  {
668
636
  IComponents.ProductInfo memory productInfo = instanceReader.getProductInfo(productNftId);
669
- distributionNftId = productInfo.distributionNftId;
670
- distributionWallet = instanceReader.getComponentInfo(distributionNftId).wallet;
671
- poolWallet = instanceReader.getComponentInfo(productInfo.poolNftId).wallet;
672
- productWallet = instanceReader.getComponentInfo(productNftId).wallet;
637
+ productWallet = instanceReader.getComponentInfo(productNftId).tokenHandler.getWallet();
638
+ poolWallet = instanceReader.getComponentInfo(productInfo.poolNftId).tokenHandler.getWallet();
639
+
640
+ if (productInfo.hasDistribution) {
641
+ distributionNftId = productInfo.distributionNftId;
642
+ distributionWallet = instanceReader.getComponentInfo(distributionNftId).tokenHandler.getWallet();
643
+ }
673
644
  }
674
645
 
675
646
 
676
- function _getAndVerifyInstanceAndProduct() internal view returns (Product product) {
677
- IRegistry.ObjectInfo memory productInfo;
678
- (, productInfo,) = _getAndVerifyActiveComponent(PRODUCT());
679
- product = Product(productInfo.objectAddress);
647
+ function _getAndVerifyCallerForPolicy(NftId policyNftId)
648
+ internal
649
+ virtual
650
+ view
651
+ returns (
652
+ IInstance instance,
653
+ NftId productNftId,
654
+ IPolicy.PolicyInfo memory policyInfo
655
+ )
656
+ {
657
+ (
658
+ IRegistry.ObjectInfo memory productInfo,
659
+ address instanceAddress
660
+ ) = ContractLib.getAndVerifyComponent(
661
+ getRegistry(),
662
+ msg.sender, // caller contract
663
+ PRODUCT(), // caller must be product
664
+ true); // only active caller
665
+
666
+ productNftId = productInfo.nftId; // calling product nft id
667
+ instance = IInstance(instanceAddress);
668
+ policyInfo = instance.getInstanceReader().getPolicyInfo(policyNftId);
669
+
670
+ if (policyInfo.productNftId != productNftId) {
671
+ revert ErrorPolicyServicePolicyProductMismatch(
672
+ policyNftId,
673
+ productNftId,
674
+ policyInfo.productNftId);
675
+ }
680
676
  }
681
677
 
682
678