@etherisc/gif-next 0.0.2-b38343e-249 → 0.0.2-b44ae3c-205

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 (348) hide show
  1. package/README.md +6 -83
  2. package/artifacts/contracts/components/Component.sol/Component.dbg.json +1 -1
  3. package/artifacts/contracts/components/Component.sol/Component.json +115 -95
  4. package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +1 -1
  5. package/artifacts/contracts/components/Distribution.sol/Distribution.json +182 -195
  6. package/artifacts/contracts/components/IComponent.sol/IComponent.dbg.json +1 -1
  7. package/artifacts/contracts/components/IComponent.sol/IComponent.json +190 -67
  8. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
  9. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.json +207 -150
  10. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
  11. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.json +389 -181
  12. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +1 -1
  13. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.json +213 -158
  14. package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
  15. package/artifacts/contracts/components/Pool.sol/Pool.json +334 -249
  16. package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
  17. package/artifacts/contracts/components/Product.sol/Product.json +135 -183
  18. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.dbg.json +1 -1
  19. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.json +64 -50
  20. package/artifacts/contracts/instance/Cloneable.sol/Cloneable.dbg.json +1 -1
  21. package/artifacts/contracts/instance/Cloneable.sol/Cloneable.json +5 -0
  22. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  23. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +306 -2137
  24. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
  25. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +193 -75
  26. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  27. package/artifacts/contracts/instance/Instance.sol/Instance.json +432 -2883
  28. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +1 -1
  29. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +491 -127
  30. package/artifacts/contracts/instance/InstanceAuthorizationsLib.sol/InstanceAuthorizationsLib.dbg.json +4 -0
  31. package/artifacts/contracts/instance/InstanceAuthorizationsLib.sol/InstanceAuthorizationsLib.json +124 -0
  32. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
  33. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +425 -242
  34. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
  35. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +231 -287
  36. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
  37. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +38 -75
  38. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.dbg.json +4 -0
  39. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.json +2788 -0
  40. package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.dbg.json +1 -1
  41. package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.json +8 -13
  42. package/artifacts/contracts/instance/base/ComponentService.sol/ComponentService.dbg.json +1 -1
  43. package/artifacts/contracts/instance/base/ComponentService.sol/ComponentService.json +123 -33
  44. package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
  45. package/artifacts/contracts/instance/base/ILifecycle.sol/ILifecycle.dbg.json +1 -1
  46. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
  47. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.json +40 -10
  48. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json +1 -1
  49. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.json +36 -11
  50. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +1 -1
  51. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.json +56 -73
  52. package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
  53. package/artifacts/contracts/instance/module/IComponents.sol/IComponents.dbg.json +4 -0
  54. package/artifacts/contracts/instance/module/IComponents.sol/IComponents.json +10 -0
  55. package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +1 -1
  56. package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +1 -1
  57. package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +1 -1
  58. package/artifacts/contracts/instance/module/ISetup.sol/ISetup.dbg.json +1 -1
  59. package/artifacts/contracts/instance/module/ITreasury.sol/ITreasury.dbg.json +1 -1
  60. package/artifacts/contracts/instance/service/ApplicationService.sol/ApplicationService.dbg.json +1 -1
  61. package/artifacts/contracts/instance/service/ApplicationService.sol/ApplicationService.json +186 -126
  62. package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +1 -1
  63. package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.json +29 -38
  64. package/artifacts/contracts/instance/service/BundleService.sol/BundleService.dbg.json +1 -1
  65. package/artifacts/contracts/instance/service/BundleService.sol/BundleService.json +443 -240
  66. package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.dbg.json +1 -1
  67. package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.json +74 -39
  68. package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.dbg.json +1 -1
  69. package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.json +722 -81
  70. package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +1 -1
  71. package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.json +147 -32
  72. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +1 -1
  73. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +732 -111
  74. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
  75. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.json +147 -44
  76. package/artifacts/contracts/instance/service/IApplicationService.sol/IApplicationService.dbg.json +1 -1
  77. package/artifacts/contracts/instance/service/IApplicationService.sol/IApplicationService.json +126 -95
  78. package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.dbg.json +1 -1
  79. package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.json +300 -187
  80. package/artifacts/contracts/instance/service/IClaimService.sol/IClaimService.dbg.json +1 -1
  81. package/artifacts/contracts/instance/service/IClaimService.sol/IClaimService.json +395 -50
  82. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +1 -1
  83. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.json +424 -64
  84. package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.dbg.json +1 -1
  85. package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.json +212 -133
  86. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +1 -1
  87. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +787 -46
  88. package/artifacts/contracts/instance/service/IPricingService.sol/IPricingService.dbg.json +4 -0
  89. package/artifacts/contracts/instance/service/IPricingService.sol/IPricingService.json +510 -0
  90. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +1 -1
  91. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +95 -26
  92. package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.dbg.json +1 -1
  93. package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.json +387 -215
  94. package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +1 -1
  95. package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.json +84 -61
  96. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +1 -1
  97. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +958 -52
  98. package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
  99. package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.json +96 -37
  100. package/artifacts/contracts/instance/service/PricingService.sol/PricingService.dbg.json +4 -0
  101. package/artifacts/contracts/instance/service/PricingService.sol/PricingService.json +1004 -0
  102. package/artifacts/contracts/instance/service/PricingServiceManager.sol/PricingServiceManager.dbg.json +4 -0
  103. package/artifacts/contracts/instance/service/PricingServiceManager.sol/PricingServiceManager.json +688 -0
  104. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +1 -1
  105. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +152 -54
  106. package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.dbg.json +1 -1
  107. package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.json +28 -37
  108. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  109. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +15 -2
  110. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  111. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +19 -0
  112. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
  113. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +5 -26
  114. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
  115. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.json +18 -0
  116. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  117. package/artifacts/contracts/registry/Registry.sol/Registry.json +31 -12
  118. package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.dbg.json +1 -1
  119. package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.json +2 -2
  120. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
  121. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +23 -39
  122. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
  123. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +21 -34
  124. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.dbg.json +1 -1
  125. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.json +23 -11
  126. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
  127. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +10 -23
  128. package/artifacts/contracts/shared/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.dbg.json +4 -0
  129. package/artifacts/contracts/shared/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.json +1206 -0
  130. package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.dbg.json +1 -1
  131. package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +1 -1
  132. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
  133. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.json +0 -13
  134. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +1 -1
  135. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.json +69 -9
  136. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  137. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +0 -13
  138. package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +1 -1
  139. package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.json +0 -13
  140. package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
  141. package/artifacts/contracts/shared/IService.sol/IService.json +95 -26
  142. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +1 -1
  143. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
  144. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +6 -19
  145. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +1 -1
  146. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +80 -26
  147. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +1 -1
  148. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +14 -27
  149. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  150. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +7 -20
  151. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +1 -1
  152. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +2 -15
  153. package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
  154. package/artifacts/contracts/shared/Service.sol/Service.json +102 -28
  155. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
  156. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +24 -6
  157. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
  158. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +2 -2
  159. package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +1 -1
  160. package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json +1 -1
  161. package/artifacts/contracts/test/TestFee.sol/TestFee.json +2 -2
  162. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json +1 -1
  163. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +7 -20
  164. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +1 -1
  165. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.json +6 -6
  166. package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +1 -1
  167. package/artifacts/contracts/test/TestService.sol/TestService.json +117 -39
  168. package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json +1 -1
  169. package/artifacts/contracts/test/TestVersion.sol/TestVersion.dbg.json +1 -1
  170. package/artifacts/contracts/test/TestVersion.sol/TestVersion.json +2 -2
  171. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json +1 -1
  172. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.json +2 -2
  173. package/artifacts/contracts/test/Usdc.sol/USDC.dbg.json +1 -1
  174. package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.dbg.json +1 -1
  175. package/artifacts/contracts/types/Amount.sol/AmountLib.dbg.json +4 -0
  176. package/artifacts/contracts/types/Amount.sol/AmountLib.json +281 -0
  177. package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
  178. package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.json +2 -2
  179. package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +1 -1
  180. package/artifacts/contracts/types/ClaimId.sol/ClaimIdLib.dbg.json +1 -1
  181. package/artifacts/contracts/types/ClaimId.sol/ClaimIdLib.json +83 -4
  182. package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.dbg.json +1 -1
  183. package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.json +2 -2
  184. package/artifacts/contracts/types/Fee.sol/FeeLib.dbg.json +1 -1
  185. package/artifacts/contracts/types/Fee.sol/FeeLib.json +74 -19
  186. package/artifacts/contracts/types/Key32.sol/Key32Lib.dbg.json +1 -1
  187. package/artifacts/contracts/types/Key32.sol/Key32Lib.json +2 -2
  188. package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +1 -1
  189. package/artifacts/contracts/types/NftId.sol/NftIdLib.json +17 -4
  190. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
  191. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.json +2 -2
  192. package/artifacts/contracts/types/NumberId.sol/NumberIdLib.dbg.json +1 -1
  193. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
  194. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.json +2 -2
  195. package/artifacts/contracts/types/PayoutId.sol/PayoutIdLib.dbg.json +1 -1
  196. package/artifacts/contracts/types/PayoutId.sol/PayoutIdLib.json +116 -7
  197. package/artifacts/contracts/types/Referral.sol/ReferralLib.dbg.json +1 -1
  198. package/artifacts/contracts/types/Referral.sol/ReferralLib.json +23 -4
  199. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.dbg.json +1 -1
  200. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.json +2 -2
  201. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.dbg.json +1 -1
  202. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.json +2 -2
  203. package/artifacts/contracts/types/Seconds.sol/SecondsLib.dbg.json +4 -0
  204. package/artifacts/contracts/types/Seconds.sol/SecondsLib.json +124 -0
  205. package/artifacts/contracts/types/StateId.sol/StateIdLib.dbg.json +1 -1
  206. package/artifacts/contracts/types/StateId.sol/StateIdLib.json +2 -2
  207. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json +1 -1
  208. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.json +38 -7
  209. package/artifacts/contracts/types/UFixed.sol/MathLib.dbg.json +1 -1
  210. package/artifacts/contracts/types/UFixed.sol/MathLib.json +2 -2
  211. package/artifacts/contracts/types/UFixed.sol/UFixedLib.dbg.json +1 -1
  212. package/artifacts/contracts/types/UFixed.sol/UFixedLib.json +2 -2
  213. package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +1 -1
  214. package/artifacts/contracts/types/Version.sol/VersionLib.json +2 -2
  215. package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +1 -1
  216. package/artifacts/contracts/types/Version.sol/VersionPartLib.json +2 -2
  217. package/contracts/components/Component.sol +115 -85
  218. package/contracts/components/Distribution.sol +27 -50
  219. package/contracts/components/IComponent.sol +52 -17
  220. package/contracts/components/IDistributionComponent.sol +1 -30
  221. package/contracts/components/IPoolComponent.sol +75 -48
  222. package/contracts/components/IProductComponent.sol +8 -6
  223. package/contracts/components/Pool.sol +178 -130
  224. package/contracts/components/Product.sol +164 -74
  225. package/contracts/instance/BundleManager.sol +10 -9
  226. package/contracts/instance/Cloneable.sol +7 -2
  227. package/contracts/instance/IInstance.sol +40 -55
  228. package/contracts/instance/IInstanceService.sol +28 -14
  229. package/contracts/instance/Instance.sol +123 -185
  230. package/contracts/instance/InstanceAccessManager.sol +404 -160
  231. package/contracts/instance/InstanceAuthorizationsLib.sol +308 -0
  232. package/contracts/instance/InstanceReader.sol +90 -15
  233. package/contracts/instance/InstanceService.sol +173 -341
  234. package/contracts/instance/InstanceStore.sol +212 -0
  235. package/contracts/instance/ObjectManager.sol +6 -8
  236. package/contracts/instance/base/ComponentService.sol +53 -39
  237. package/contracts/instance/base/KeyValueStore.sol +13 -36
  238. package/contracts/instance/base/Lifecycle.sol +26 -6
  239. package/contracts/instance/module/IAccess.sol +21 -14
  240. package/contracts/instance/module/IBundle.sol +8 -5
  241. package/contracts/instance/module/IComponents.sol +41 -0
  242. package/contracts/instance/module/IDistribution.sol +3 -0
  243. package/contracts/instance/module/IPolicy.sol +39 -9
  244. package/contracts/instance/module/ISetup.sol +7 -21
  245. package/contracts/instance/service/ApplicationService.sol +68 -150
  246. package/contracts/instance/service/BundleService.sol +223 -139
  247. package/contracts/instance/service/ClaimService.sol +318 -32
  248. package/contracts/instance/service/DistributionService.sol +171 -100
  249. package/contracts/instance/service/IApplicationService.sol +11 -31
  250. package/contracts/instance/service/IBundleService.sol +92 -28
  251. package/contracts/instance/service/IClaimService.sol +52 -23
  252. package/contracts/instance/service/IDistributionService.sol +33 -11
  253. package/contracts/instance/service/IPolicyService.sol +24 -33
  254. package/contracts/instance/service/IPoolService.sol +97 -3
  255. package/contracts/instance/service/IPricingService.sol +37 -0
  256. package/contracts/instance/service/PolicyService.sol +168 -266
  257. package/contracts/instance/service/PoolService.sol +313 -19
  258. package/contracts/instance/service/PricingService.sol +275 -0
  259. package/contracts/instance/service/PricingServiceManager.sol +51 -0
  260. package/contracts/instance/service/ProductService.sol +37 -60
  261. package/contracts/registry/ChainNft.sol +8 -0
  262. package/contracts/registry/IRegistry.sol +2 -0
  263. package/contracts/registry/IRegistryService.sol +2 -3
  264. package/contracts/registry/ITransferInterceptor.sol +1 -0
  265. package/contracts/registry/Registry.sol +23 -20
  266. package/contracts/registry/RegistryService.sol +29 -26
  267. package/contracts/registry/ReleaseManager.sol +20 -18
  268. package/contracts/shared/AccessManagerUpgradeableInitializeable.sol +13 -0
  269. package/contracts/shared/IPolicyHolder.sol +23 -9
  270. package/contracts/shared/IRegistryLinked.sol +0 -1
  271. package/contracts/shared/IService.sol +6 -4
  272. package/contracts/shared/NftOwnable.sol +0 -2
  273. package/contracts/shared/PolicyHolder.sol +30 -17
  274. package/contracts/shared/Registerable.sol +12 -11
  275. package/contracts/shared/RegistryLinked.sol +0 -5
  276. package/contracts/shared/Service.sol +21 -7
  277. package/contracts/shared/TokenHandler.sol +14 -6
  278. package/contracts/test/TestService.sol +1 -1
  279. package/contracts/types/Amount.sol +109 -0
  280. package/contracts/types/Blocknumber.sol +1 -0
  281. package/contracts/types/ClaimId.sol +25 -2
  282. package/contracts/types/Fee.sol +17 -8
  283. package/contracts/types/NftId.sol +8 -0
  284. package/contracts/types/ObjectType.sol +10 -5
  285. package/contracts/types/PayoutId.sol +33 -5
  286. package/contracts/types/Referral.sol +4 -0
  287. package/contracts/types/RoleId.sol +13 -6
  288. package/contracts/types/Seconds.sol +54 -0
  289. package/contracts/types/StateId.sol +7 -2
  290. package/contracts/types/Timestamp.sol +18 -13
  291. package/contracts/types/UFixed.sol +1 -0
  292. package/contracts/types/Version.sol +1 -0
  293. package/package.json +1 -1
  294. package/artifacts/contracts/experiment/cloning/Cloner.sol/Cloner.dbg.json +0 -4
  295. package/artifacts/contracts/experiment/cloning/Cloner.sol/Cloner.json +0 -66
  296. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock1.dbg.json +0 -4
  297. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock1.json +0 -24
  298. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock2.dbg.json +0 -4
  299. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock2.json +0 -42
  300. package/artifacts/contracts/experiment/errors/Require.sol/Require.dbg.json +0 -4
  301. package/artifacts/contracts/experiment/errors/Require.sol/Require.json +0 -105
  302. package/artifacts/contracts/experiment/errors/Revert.sol/Revert.dbg.json +0 -4
  303. package/artifacts/contracts/experiment/errors/Revert.sol/Revert.json +0 -105
  304. package/artifacts/contracts/experiment/inheritance/A.sol/A.dbg.json +0 -4
  305. package/artifacts/contracts/experiment/inheritance/A.sol/A.json +0 -128
  306. package/artifacts/contracts/experiment/inheritance/A.sol/AShared.dbg.json +0 -4
  307. package/artifacts/contracts/experiment/inheritance/A.sol/AShared.json +0 -42
  308. package/artifacts/contracts/experiment/inheritance/B.sol/B.dbg.json +0 -4
  309. package/artifacts/contracts/experiment/inheritance/B.sol/B.json +0 -76
  310. package/artifacts/contracts/experiment/inheritance/C.sol/C.dbg.json +0 -4
  311. package/artifacts/contracts/experiment/inheritance/C.sol/C.json +0 -89
  312. package/artifacts/contracts/experiment/inheritance/IA.sol/IA.dbg.json +0 -4
  313. package/artifacts/contracts/experiment/inheritance/IA.sol/IA.json +0 -128
  314. package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.dbg.json +0 -4
  315. package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.json +0 -37
  316. package/artifacts/contracts/experiment/inheritance/IB.sol/IB.dbg.json +0 -4
  317. package/artifacts/contracts/experiment/inheritance/IB.sol/IB.json +0 -50
  318. package/artifacts/contracts/experiment/inheritance/IC.sol/IC.dbg.json +0 -4
  319. package/artifacts/contracts/experiment/inheritance/IC.sol/IC.json +0 -63
  320. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.dbg.json +0 -4
  321. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.json +0 -59
  322. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.dbg.json +0 -4
  323. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.json +0 -124
  324. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.dbg.json +0 -4
  325. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.json +0 -74
  326. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.dbg.json +0 -4
  327. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.json +0 -124
  328. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.dbg.json +0 -4
  329. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.json +0 -207
  330. package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.dbg.json +0 -4
  331. package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.json +0 -10
  332. package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.dbg.json +0 -4
  333. package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.json +0 -10
  334. package/contracts/experiment/cloning/Cloner.sol +0 -47
  335. package/contracts/experiment/errors/Require.sol +0 -38
  336. package/contracts/experiment/errors/Revert.sol +0 -44
  337. package/contracts/experiment/inheritance/A.sol +0 -53
  338. package/contracts/experiment/inheritance/B.sol +0 -28
  339. package/contracts/experiment/inheritance/C.sol +0 -34
  340. package/contracts/experiment/inheritance/IA.sol +0 -13
  341. package/contracts/experiment/inheritance/IB.sol +0 -10
  342. package/contracts/experiment/inheritance/IC.sol +0 -12
  343. package/contracts/experiment/statemachine/Dummy.sol +0 -27
  344. package/contracts/experiment/statemachine/ISM.sol +0 -25
  345. package/contracts/experiment/statemachine/SM.sol +0 -57
  346. package/contracts/experiment/statemachine/SimpleStateMachine.sol +0 -31
  347. package/contracts/experiment/types/TypeA.sol +0 -47
  348. package/contracts/experiment/types/TypeB.sol +0 -29
@@ -2,44 +2,40 @@
2
2
  pragma solidity ^0.8.19;
3
3
 
4
4
  import {IRegistry} from "../../registry/IRegistry.sol";
5
- import {IProductComponent} from "../../components/IProductComponent.sol";
6
5
  import {Product} from "../../components/Product.sol";
7
- import {IPoolComponent} from "../../components/IPoolComponent.sol";
6
+ import {IComponents} from "../module/IComponents.sol";
8
7
  import {IDistributionComponent} from "../../components/IDistributionComponent.sol";
9
8
  import {IInstance} from "../IInstance.sol";
10
9
  import {IPolicy} from "../module/IPolicy.sol";
10
+ import {IPoolComponent} from "../../components/IPoolComponent.sol";
11
11
  import {IRisk} from "../module/IRisk.sol";
12
12
  import {IBundle} from "../module/IBundle.sol";
13
- import {IProductService} from "./IProductService.sol";
14
- import {ITreasury} from "../module/ITreasury.sol";
15
13
  import {ISetup} from "../module/ISetup.sol";
16
14
 
17
15
  import {TokenHandler} from "../../shared/TokenHandler.sol";
18
16
 
19
- import {IVersionable} from "../../shared/IVersionable.sol";
20
- import {Versionable} from "../../shared/Versionable.sol";
21
-
17
+ import {Amount, AmountLib} from "../../types/Amount.sol";
18
+ import {ClaimId, ClaimIdLib} from "../../types/ClaimId.sol";
22
19
  import {Timestamp, TimestampLib, zeroTimestamp} from "../../types/Timestamp.sol";
23
20
  import {UFixed, UFixedLib} from "../../types/UFixed.sol";
24
- import {Blocknumber, blockNumber} from "../../types/Blocknumber.sol";
25
- import {ObjectType, INSTANCE, PRODUCT, POOL, POLICY, BUNDLE} from "../../types/ObjectType.sol";
26
- import {APPLIED, UNDERWRITTEN, ACTIVE, KEEP_STATE, CLOSED} from "../../types/StateId.sol";
27
- import {NftId, NftIdLib, zeroNftId} from "../../types/NftId.sol";
28
- import {Fee, FeeLib} from "../../types/Fee.sol";
29
- import {ReferralId} from "../../types/Referral.sol";
30
- import {RiskId} from "../../types/RiskId.sol";
21
+ import {ObjectType, APPLICATION, DISTRIBUTION, PRODUCT, POOL, POLICY, BUNDLE, CLAIM, PRICE} from "../../types/ObjectType.sol";
22
+ import {APPLIED, COLLATERALIZED, ACTIVE, KEEP_STATE, CLOSED, DECLINED, CONFIRMED} from "../../types/StateId.sol";
23
+ import {NftId, NftIdLib} from "../../types/NftId.sol";
24
+ import {PayoutId, PayoutIdLib} from "../../types/PayoutId.sol";
31
25
  import {StateId} from "../../types/StateId.sol";
32
- import {Version, VersionLib} from "../../types/Version.sol";
33
- //import {RoleId, PRODUCT_OWNER_ROLE} from "../../types/RoleId.sol";
26
+ import {VersionPart} from "../../types/Version.sol";
34
27
 
35
- import {IService} from "../../shared/IService.sol";
36
- import {Service} from "../../shared/Service.sol";
37
28
  import {ComponentService} from "../base/ComponentService.sol";
38
- import {IPolicyService} from "./IPolicyService.sol";
29
+ import {IApplicationService} from "./IApplicationService.sol";
30
+ import {IBundleService} from "./IBundleService.sol";
31
+ import {IClaimService} from "./IClaimService.sol";
32
+ import {IDistributionService} from "./IDistributionService.sol";
39
33
  import {InstanceReader} from "../InstanceReader.sol";
34
+ import {IPolicyService} from "./IPolicyService.sol";
40
35
  import {IPoolService} from "./IPoolService.sol";
41
- import {IBundleService} from "./IBundleService.sol";
42
-
36
+ import {IPricingService} from "./IPricingService.sol";
37
+ import {IService} from "../../shared/IService.sol";
38
+ import {Service} from "../../shared/Service.sol";
43
39
 
44
40
  contract PolicyService is
45
41
  ComponentService,
@@ -48,8 +44,12 @@ contract PolicyService is
48
44
  using NftIdLib for NftId;
49
45
  using TimestampLib for Timestamp;
50
46
 
51
- IPoolService internal _poolService;
47
+ IApplicationService internal _applicationService;
52
48
  IBundleService internal _bundleService;
49
+ IClaimService internal _claimService;
50
+ IDistributionService internal _distributionService;
51
+ IPoolService internal _poolService;
52
+ IPricingService internal _pricingService;
53
53
 
54
54
  event LogProductServiceSender(address sender);
55
55
 
@@ -65,142 +65,31 @@ contract PolicyService is
65
65
  address initialOwner;
66
66
  (registryAddress, initialOwner) = abi.decode(data, (address, address));
67
67
 
68
- initializeService(registryAddress, owner);
68
+ initializeService(registryAddress, address(0), owner);
69
69
 
70
- _poolService = IPoolService(getRegistry().getServiceAddress(POOL(), getMajorVersion()));
71
- _bundleService = IBundleService(getRegistry().getServiceAddress(BUNDLE(), getMajorVersion()));
70
+ VersionPart majorVersion = getVersion().toMajorPart();
71
+ _poolService = IPoolService(getRegistry().getServiceAddress(POOL(), majorVersion));
72
+ _bundleService = IBundleService(getRegistry().getServiceAddress(BUNDLE(), majorVersion));
73
+ _claimService = IClaimService(getRegistry().getServiceAddress(CLAIM(), majorVersion));
74
+ _applicationService = IApplicationService(getRegistry().getServiceAddress(APPLICATION(), majorVersion));
75
+ _distributionService = IDistributionService(getRegistry().getServiceAddress(DISTRIBUTION(), majorVersion));
76
+ _pricingService = IPricingService(getRegistry().getServiceAddress(PRICE(), majorVersion));
72
77
 
73
78
  registerInterface(type(IPolicyService).interfaceId);
74
79
  }
75
80
 
76
81
 
77
- function getDomain() public pure override(IService, Service) returns(ObjectType) {
82
+ function getDomain() public pure override returns(ObjectType) {
78
83
  return POLICY();
79
84
  }
80
85
 
81
86
 
82
87
  function _getAndVerifyInstanceAndProduct() internal view returns (Product product) {
83
88
  IRegistry.ObjectInfo memory productInfo;
84
- (productInfo,) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
89
+ (, productInfo,) = _getAndVerifyCallingComponentAndInstance(PRODUCT());
85
90
  product = Product(productInfo.objectAddress);
86
91
  }
87
92
 
88
- // TODO: no access restrictions
89
- function calculatePremium(
90
- RiskId riskId,
91
- uint256 sumInsuredAmount,
92
- uint256 lifetime,
93
- bytes memory applicationData,
94
- NftId bundleNftId,
95
- ReferralId referralId
96
- )
97
- public
98
- view
99
- virtual override
100
- returns (
101
- uint256 premiumAmount,
102
- uint256 productFeeAmount,
103
- uint256 poolFeeAmount,
104
- uint256 bundleFeeAmount,
105
- uint256 distributionFeeAmount
106
- )
107
- {
108
- Product product = _getAndVerifyInstanceAndProduct();
109
- uint256 netPremiumAmount = product.calculateNetPremium(
110
- sumInsuredAmount,
111
- riskId,
112
- lifetime,
113
- applicationData
114
- );
115
-
116
- (
117
- productFeeAmount,
118
- poolFeeAmount,
119
- bundleFeeAmount,
120
- distributionFeeAmount
121
- ) = _calculateFeeAmounts(
122
- netPremiumAmount,
123
- product,
124
- bundleNftId,
125
- referralId
126
- );
127
-
128
- premiumAmount = netPremiumAmount + productFeeAmount;
129
- premiumAmount += poolFeeAmount + bundleFeeAmount;
130
- premiumAmount += distributionFeeAmount;
131
- }
132
-
133
- function _calculateFeeAmounts(
134
- uint256 netPremiumAmount,
135
- Product product,
136
- NftId bundleNftId,
137
- ReferralId referralId
138
- )
139
- internal
140
- view
141
- returns (
142
- uint256 productFeeAmount,
143
- uint256 poolFeeAmount,
144
- uint256 bundleFeeAmount,
145
- uint256 distributionFeeAmount
146
- )
147
- {
148
- InstanceReader instanceReader;
149
- {
150
- IInstance instance = product.getInstance();
151
- instanceReader = instance.getInstanceReader();
152
- }
153
-
154
- NftId poolNftId = product.getPoolNftId();
155
- IBundle.BundleInfo memory bundleInfo = instanceReader.getBundleInfo(bundleNftId);
156
- require(bundleInfo.poolNftId == poolNftId,"ERROR:PRS-035:BUNDLE_POOL_MISMATCH");
157
-
158
- {
159
- ISetup.ProductSetupInfo memory productSetupInfo = instanceReader.getProductSetupInfo(product.getProductNftId());
160
- (productFeeAmount,) = FeeLib.calculateFee(productSetupInfo.productFee, netPremiumAmount);
161
- }
162
- {
163
- ISetup.PoolSetupInfo memory poolSetupInfo = instanceReader.getPoolSetupInfo(poolNftId);
164
- (poolFeeAmount,) = FeeLib.calculateFee(poolSetupInfo.poolFee, netPremiumAmount);
165
- }
166
- {
167
- NftId distributionNftId = product.getDistributionNftId();
168
- ISetup.DistributionSetupInfo memory distributionSetupInfo = instanceReader.getDistributionSetupInfo(distributionNftId);
169
- (distributionFeeAmount,) = FeeLib.calculateFee(distributionSetupInfo.distributionFee, netPremiumAmount);
170
- }
171
-
172
- (bundleFeeAmount,) = FeeLib.calculateFee(bundleInfo.fee, netPremiumAmount);
173
- }
174
-
175
- function _getAndVerifyUnderwritingSetup(
176
- IInstance instance,
177
- InstanceReader instanceReader,
178
- IPolicy.PolicyInfo memory policyInfo,
179
- ISetup.ProductSetupInfo memory productSetupInfo
180
- )
181
- internal
182
- view
183
- returns (
184
- NftId poolNftId,
185
- NftId bundleNftId,
186
- IBundle.BundleInfo memory bundleInfo,
187
- uint256 collateralAmount
188
- )
189
- {
190
- // check match between policy and bundle (via pool)
191
- poolNftId = productSetupInfo.poolNftId;
192
- bundleNftId = policyInfo.bundleNftId;
193
- bundleInfo = instanceReader.getBundleInfo(bundleNftId);
194
- require(bundleInfo.poolNftId == poolNftId, "POLICY_BUNDLE_MISMATCH");
195
-
196
- // calculate required collateral
197
- ISetup.PoolSetupInfo memory poolInfo = instanceReader.getPoolSetupInfo(poolNftId);
198
-
199
- // obtain remaining return values
200
- // TODO required collateral amount should be calculated by pool service, not policy service
201
- collateralAmount = calculateRequiredCollateral(poolInfo.collateralizationLevel, policyInfo.sumInsuredAmount);
202
- }
203
-
204
93
 
205
94
  function decline(
206
95
  NftId policyNftId
@@ -208,12 +97,12 @@ contract PolicyService is
208
97
  external
209
98
  override
210
99
  {
211
- require(false, "ERROR:PRS-235:NOT_YET_IMPLEMENTED");
100
+ revert();
212
101
  }
213
102
 
214
103
 
215
104
  /// @dev underwites application which includes the locking of the required collateral from the pool.
216
- function underwrite(
105
+ function collateralize(
217
106
  NftId applicationNftId, // = policyNftId
218
107
  bool requirePremiumPayment,
219
108
  Timestamp activateAt
@@ -222,122 +111,104 @@ contract PolicyService is
222
111
  virtual override
223
112
  {
224
113
  // check caller is registered product
225
- IInstance instance;
226
- InstanceReader instanceReader;
227
- NftId productNftId;
228
- {
229
- IRegistry.ObjectInfo memory productInfo;
230
- (productInfo, instance) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
231
- instanceReader = instance.getInstanceReader();
232
- productNftId = productInfo.nftId;
233
- }
114
+ (NftId productNftId,, IInstance instance) = _getAndVerifyCallingComponentAndInstance(PRODUCT());
115
+ InstanceReader instanceReader = instance.getInstanceReader();
234
116
 
235
117
  // check policy matches with calling product
236
- IPolicy.PolicyInfo memory policyInfo = instanceReader.getPolicyInfo(applicationNftId);
237
- require(policyInfo.productNftId == productNftId, "POLICY_PRODUCT_MISMATCH");
118
+ IPolicy.PolicyInfo memory applicationInfo = instanceReader.getPolicyInfo(applicationNftId);
119
+ if(applicationInfo.productNftId != productNftId) {
120
+ revert ErrorPolicyServicePolicyProductMismatch(
121
+ applicationNftId,
122
+ applicationInfo.productNftId,
123
+ productNftId);
124
+ }
238
125
 
239
126
  // check policy is in state applied
240
- require(instanceReader.getPolicyState(applicationNftId) == APPLIED(), "ERROR:PRS-021:STATE_NOT_APPLIED");
241
-
242
- (
243
- NftId poolNftId,
244
- NftId bundleNftId,
245
- IBundle.BundleInfo memory bundleInfo,
246
- uint256 collateralAmount
247
- ) = _getAndVerifyUnderwritingSetup(
248
- instance,
249
- instanceReader,
250
- policyInfo,
251
- instanceReader.getProductSetupInfo(productNftId)
252
- );
127
+ if (instanceReader.getPolicyState(applicationNftId) != APPLIED()) {
128
+ revert ErrorPolicyServicePolicyStateNotApplied(applicationNftId);
129
+ }
253
130
 
254
- StateId newPolicyState = UNDERWRITTEN();
131
+ StateId newPolicyState = COLLATERALIZED();
255
132
 
256
133
  // optional activation of policy
257
134
  if(activateAt > zeroTimestamp()) {
258
135
  newPolicyState = ACTIVE();
259
- policyInfo.activatedAt = activateAt;
260
- policyInfo.expiredAt = activateAt.addSeconds(policyInfo.lifetime);
136
+ applicationInfo.activatedAt = activateAt;
137
+ applicationInfo.expiredAt = activateAt.addSeconds(applicationInfo.lifetime);
261
138
  }
262
139
 
263
140
  // lock bundle collateral
264
- uint256 netPremiumAmount = 0; // > 0 if immediate premium payment
141
+ Amount netPremiumAmount = AmountLib.zero(); // > 0 if immediate premium payment
265
142
 
266
143
  // optional collection of premium
267
144
  if(requirePremiumPayment) {
268
145
  netPremiumAmount = _processPremiumByTreasury(
269
146
  instance,
270
- productNftId,
271
147
  applicationNftId,
272
- policyInfo.premiumAmount);
148
+ applicationInfo.premiumAmount);
273
149
 
274
- policyInfo.premiumPaidAmount += policyInfo.premiumAmount;
150
+ applicationInfo.premiumPaidAmount = applicationInfo.premiumPaidAmount + applicationInfo.premiumAmount;
275
151
  }
276
152
 
277
- // lock collateral and update bundle book keeping
278
- // TODO introduct indirection via pool service?
279
- // well pool would only need to be involved when a part of the collateral
280
- // is provided by a "re insurance policy" of the pool
281
- // but then again the policiy would likely best be attached to the bundle. really? why?
282
- // retention level: fraction of sum insured that product will cover from pool funds directly
153
+ // store updated policy info
154
+ instance.getInstanceStore().updatePolicy(applicationNftId, applicationInfo, newPolicyState);
155
+
156
+ // lock collateral and update pool and bundle book keeping
157
+ // pool retention level: fraction of sum insured that product will cover from pool funds directly
283
158
  // eg retention level 30%, payouts up to 30% of the sum insured will be made from the product's pool directly
284
159
  // for the remaining 70% the pool owns a policy that will cover claims that exceed the 30% of the sum insured
285
- // open points:
286
- // - do we need a link of a bundle to this policy or is it enough to know that the pool has an active policy?
287
- // - when to buy such policies and for which amount? manual trigger or link to bundle creation and/or funding?
288
- bundleInfo = _bundleService.lockCollateral(
160
+ // might also call pool component (for isVerifyingApplications pools)
161
+ _poolService.lockCollateral(
289
162
  instance,
163
+ productNftId,
290
164
  applicationNftId,
291
- bundleNftId,
292
- collateralAmount,
293
- netPremiumAmount);
294
-
295
- instance.updatePolicy(applicationNftId, policyInfo, newPolicyState);
296
-
297
- // also verify/confirm application by pool if necessary
298
- if(instanceReader.getPoolSetupInfo(poolNftId).isVerifyingApplications) {
299
- IPoolComponent pool = IPoolComponent(
300
- getRegistry().getObjectInfo(poolNftId).objectAddress);
301
-
302
- pool.verifyApplication(
303
- applicationNftId,
304
- policyInfo.applicationData,
305
- bundleInfo.filter,
306
- collateralAmount);
307
- }
165
+ applicationInfo,
166
+ netPremiumAmount); // for pool book keeping (fee + additional capital)
308
167
 
309
168
  // TODO: add logging
310
169
  }
311
170
 
312
171
 
313
- function calculateRequiredCollateral(UFixed collateralizationLevel, uint256 sumInsuredAmount) public pure override returns(uint256 collateralAmount) {
314
- UFixed sumInsuredUFixed = UFixedLib.toUFixed(sumInsuredAmount);
315
- UFixed collateralUFixed = collateralizationLevel * sumInsuredUFixed;
316
- return collateralUFixed.toInt();
172
+ function calculateRequiredCollateral(
173
+ UFixed collateralizationLevel,
174
+ Amount sumInsuredAmount
175
+ )
176
+ public
177
+ pure
178
+ virtual
179
+ returns(Amount collateralAmount)
180
+ {
181
+ UFixed collateralUFixed = collateralizationLevel * sumInsuredAmount.toUFixed();
182
+ return AmountLib.toAmount(collateralUFixed.toInt());
317
183
  }
318
184
 
319
- function collectPremium(NftId policyNftId, Timestamp activateAt) external override {
185
+ function collectPremium(
186
+ NftId policyNftId,
187
+ Timestamp activateAt
188
+ )
189
+ external
190
+ virtual
191
+ {
320
192
  // check caller is registered product
321
- (IRegistry.ObjectInfo memory productInfo, IInstance instance) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
193
+ (NftId productNftId,, IInstance instance) = _getAndVerifyCallingComponentAndInstance(PRODUCT());
322
194
  InstanceReader instanceReader = instance.getInstanceReader();
323
195
  IPolicy.PolicyInfo memory policyInfo = instanceReader.getPolicyInfo(policyNftId);
324
196
 
325
197
  if (policyInfo.premiumPaidAmount == policyInfo.premiumAmount) {
326
- revert ErrorIPolicyServicePremiumAlreadyPaid(policyNftId, policyInfo.premiumPaidAmount);
198
+ revert ErrorPolicyServicePremiumAlreadyPaid(policyNftId, policyInfo.premiumPaidAmount);
327
199
  }
328
200
 
329
- uint256 unpaidPremiumAmount = policyInfo.premiumAmount - policyInfo.premiumPaidAmount;
201
+ Amount unpaidPremiumAmount = policyInfo.premiumAmount - policyInfo.premiumPaidAmount;
330
202
 
331
- uint256 netPremiumAmount = _processPremiumByTreasury(
203
+ Amount netPremiumAmount = _processPremiumByTreasury(
332
204
  instance,
333
- productInfo.nftId,
334
205
  policyNftId,
335
206
  unpaidPremiumAmount);
336
207
 
337
- policyInfo.premiumPaidAmount += unpaidPremiumAmount;
208
+ policyInfo.premiumPaidAmount = policyInfo.premiumPaidAmount + unpaidPremiumAmount;
338
209
 
339
210
  _bundleService.increaseBalance(instance, policyInfo.bundleNftId, netPremiumAmount);
340
- instance.updatePolicy(policyNftId, policyInfo, KEEP_STATE());
211
+ instance.getInstanceStore().updatePolicy(policyNftId, policyInfo, KEEP_STATE());
341
212
 
342
213
  if(activateAt.gtz() && policyInfo.activatedAt.eqz()) {
343
214
  activate(policyNftId, activateAt);
@@ -348,7 +219,7 @@ contract PolicyService is
348
219
 
349
220
  function activate(NftId policyNftId, Timestamp activateAt) public override {
350
221
  // check caller is registered product
351
- (, IInstance instance) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
222
+ (,, IInstance instance) = _getAndVerifyCallingComponentAndInstance(PRODUCT());
352
223
  InstanceReader instanceReader = instance.getInstanceReader();
353
224
 
354
225
  IPolicy.PolicyInfo memory policyInfo = instanceReader.getPolicyInfo(policyNftId);
@@ -360,7 +231,7 @@ contract PolicyService is
360
231
  policyInfo.activatedAt = activateAt;
361
232
  policyInfo.expiredAt = activateAt.addSeconds(policyInfo.lifetime);
362
233
 
363
- instance.updatePolicy(policyNftId, policyInfo, ACTIVE());
234
+ instance.getInstanceStore().updatePolicy(policyNftId, policyInfo, ACTIVE());
364
235
 
365
236
  // TODO: add logging
366
237
  }
@@ -382,7 +253,7 @@ contract PolicyService is
382
253
  external
383
254
  override
384
255
  {
385
- (, IInstance instance) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
256
+ (,, IInstance instance) = _getAndVerifyCallingComponentAndInstance(PRODUCT());
386
257
  InstanceReader instanceReader = instance.getInstanceReader();
387
258
 
388
259
  IPolicy.PolicyInfo memory policyInfo = instanceReader.getPolicyInfo(policyNftId);
@@ -400,75 +271,106 @@ contract PolicyService is
400
271
  revert ErrorIPolicyServicePolicyAlreadyClosed(policyNftId);
401
272
  }
402
273
 
403
- if (policyInfo.premiumAmount != policyInfo.premiumPaidAmount) {
404
- revert ErrorIPolicyServicePremiumNotFullyPaid(policyNftId, policyInfo.premiumAmount, policyInfo.premiumPaidAmount);
274
+ // TODO consider to allow for underpaid premiums (with the effects of reducing max payouts accordingly)
275
+ if (!(policyInfo.premiumAmount == policyInfo.premiumPaidAmount)) {
276
+ revert ErrorPolicyServicePremiumNotFullyPaid(policyNftId, policyInfo.premiumAmount, policyInfo.premiumPaidAmount);
405
277
  }
406
278
 
407
279
  if (policyInfo.openClaimsCount > 0) {
408
280
  revert ErrorIPolicyServiceOpenClaims(policyNftId, policyInfo.openClaimsCount);
409
281
  }
410
282
 
411
- if (TimestampLib.blockTimestamp().lte(policyInfo.expiredAt) && (policyInfo.payoutAmount < policyInfo.sumInsuredAmount)) {
412
- revert ErrorIPolicyServicePolicyHasNotExpired(policyNftId, policyInfo.expiredAt);
413
- }
414
-
415
283
  policyInfo.closedAt = TimestampLib.blockTimestamp();
416
284
 
417
- _bundleService.closePolicy(instance, policyNftId, policyInfo.bundleNftId, policyInfo.sumInsuredAmount);
418
- instance.updatePolicy(policyNftId, policyInfo, CLOSED());
419
- }
285
+ _poolService.releaseCollateral(
286
+ instance,
287
+ policyNftId,
288
+ policyInfo);
420
289
 
421
- function _getPoolNftId(
422
- IInstance instance,
423
- NftId productNftId
424
- )
425
- internal
426
- view
427
- returns (NftId poolNftid)
428
- {
429
- InstanceReader instanceReader = instance.getInstanceReader();
430
- ISetup.ProductSetupInfo memory productSetupInfo = instanceReader.getProductSetupInfo(productNftId);
431
- return productSetupInfo.poolNftId;
290
+ instance.getInstanceStore().updatePolicy(policyNftId, policyInfo, CLOSED());
432
291
  }
433
292
 
434
293
 
435
294
  function _processPremiumByTreasury(
436
295
  IInstance instance,
437
- NftId productNftId,
438
296
  NftId policyNftId,
439
- uint256 premiumAmount
297
+ Amount premiumExpectedAmount
440
298
  )
441
299
  internal
442
- returns (uint256 netPremiumAmount)
300
+ returns (Amount netPremiumAmount)
443
301
  {
444
302
  // process token transfer(s)
445
- if(premiumAmount > 0) {
446
- ISetup.ProductSetupInfo memory productSetupInfo = instance.getInstanceReader().getProductSetupInfo(productNftId);
447
- TokenHandler tokenHandler = productSetupInfo.tokenHandler;
448
- address policyOwner = getRegistry().ownerOf(policyNftId);
449
- ISetup.PoolSetupInfo memory poolSetupInfo = instance.getInstanceReader().getPoolSetupInfo(productSetupInfo.poolNftId);
450
- address poolWallet = poolSetupInfo.wallet;
451
- netPremiumAmount = premiumAmount;
452
- Fee memory productFee = productSetupInfo.productFee;
453
-
454
- if (FeeLib.feeIsZero(productFee)) {
455
- tokenHandler.transfer(
456
- policyOwner,
457
- poolWallet,
458
- premiumAmount
459
- );
460
- } else {
461
- (uint256 productFeeAmount, uint256 netAmount) = FeeLib.calculateFee(productSetupInfo.productFee, netPremiumAmount);
462
- address productWallet = productSetupInfo.wallet;
463
- if (tokenHandler.getToken().allowance(policyOwner, address(tokenHandler)) < premiumAmount) {
464
- revert ErrorIPolicyServiceInsufficientAllowance(policyOwner, address(tokenHandler), premiumAmount);
465
- }
466
- tokenHandler.transfer(policyOwner, productWallet, productFeeAmount);
467
- tokenHandler.transfer(policyOwner, poolWallet, netAmount);
468
- netPremiumAmount = netAmount;
303
+ if(premiumExpectedAmount.eqz()) {
304
+ return AmountLib.zero();
305
+ }
306
+
307
+ NftId productNftId = getRegistry().getObjectInfo(policyNftId).parentNftId;
308
+ IPolicy.PolicyInfo memory policyInfo = instance.getInstanceReader().getPolicyInfo(policyNftId);
309
+ IPolicy.Premium memory premium = _pricingService.calculatePremium(
310
+ productNftId,
311
+ policyInfo.riskId,
312
+ policyInfo.sumInsuredAmount,
313
+ policyInfo.lifetime,
314
+ policyInfo.applicationData,
315
+ policyInfo.bundleNftId,
316
+ policyInfo.referralId
317
+ );
318
+
319
+ if (premium.premiumAmount != premiumExpectedAmount.toInt()) {
320
+ revert ErrorPolicyServicePremiumMismatch(
321
+ policyNftId,
322
+ premiumExpectedAmount,
323
+ AmountLib.toAmount(premium.premiumAmount));
324
+ }
325
+
326
+ address policyOwner = getRegistry().ownerOf(policyNftId);
327
+ ISetup.ProductSetupInfo memory productSetupInfo = instance.getInstanceReader().getProductSetupInfo(productNftId);
328
+ TokenHandler tokenHandler = productSetupInfo.tokenHandler;
329
+ if (tokenHandler.getToken().allowance(policyOwner, address(tokenHandler)) < premium.premiumAmount) {
330
+ revert ErrorIPolicyServiceInsufficientAllowance(policyOwner, address(tokenHandler), premium.premiumAmount);
331
+ }
332
+
333
+ Amount productFeeAmountToTransfer = AmountLib.toAmount(premium.productFeeFixAmount + premium.productFeeVarAmount);
334
+ Amount distributionFeeAmountToTransfer = AmountLib.toAmount(premium.distributionFeeFixAmount + premium.distributionFeeVarAmount - premium.discountAmount);
335
+ uint256 poolFeeAmountToTransfer = premium.poolFeeFixAmount + premium.poolFeeVarAmount;
336
+ uint256 bundleFeeAmountToTransfer = premium.bundleFeeFixAmount + premium.bundleFeeVarAmount;
337
+ Amount poolAmountToTransfer = AmountLib.toAmount(premium.netPremiumAmount + poolFeeAmountToTransfer + bundleFeeAmountToTransfer);
338
+
339
+ netPremiumAmount = AmountLib.toAmount(premium.netPremiumAmount);
340
+
341
+ // move product fee to product wallet
342
+ {
343
+ address productWallet = productSetupInfo.wallet;
344
+ tokenHandler.transfer(policyOwner, productWallet, productFeeAmountToTransfer);
345
+ }
346
+
347
+ // move distribution fee to distribution wallet
348
+ {
349
+ ISetup.DistributionSetupInfo memory distributionSetupInfo = instance.getInstanceReader().getDistributionSetupInfo(productSetupInfo.distributionNftId);
350
+ address distributionWallet = distributionSetupInfo.wallet;
351
+ tokenHandler.transfer(policyOwner, distributionWallet, distributionFeeAmountToTransfer);
352
+ _distributionService.processSale(productSetupInfo.distributionNftId, policyInfo.referralId, premium, distributionFeeAmountToTransfer);
353
+ }
354
+
355
+ // move netpremium, bundleFee and poolFee to pool wallet
356
+ {
357
+ address poolWallet = instance.getInstanceReader().getComponentInfo(productSetupInfo.poolNftId).wallet;
358
+ tokenHandler.transfer(policyOwner, poolWallet, poolAmountToTransfer);
359
+ _poolService.processSale(policyInfo.bundleNftId, premium, poolAmountToTransfer);
360
+ }
361
+
362
+ // validate total amount transferred
363
+ {
364
+ Amount totalTransferred = distributionFeeAmountToTransfer + poolAmountToTransfer + productFeeAmountToTransfer;
365
+
366
+ if (premium.premiumAmount != totalTransferred.toInt()) {
367
+ revert ErrorPolicyServiceTransferredPremiumMismatch(
368
+ policyNftId,
369
+ AmountLib.toAmount(premium.premiumAmount),
370
+ totalTransferred);
469
371
  }
470
372
  }
471
373
 
472
374
  // TODO: add logging
473
375
  }
474
- }
376
+ }