@etherisc/gif-next 0.0.2-7b86057-523 → 0.0.2-7bdebe2-893

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 (353) hide show
  1. package/README.md +8 -13
  2. package/artifacts/contracts/components/Component.sol/Component.dbg.json +1 -1
  3. package/artifacts/contracts/components/Component.sol/Component.json +315 -98
  4. package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +1 -1
  5. package/artifacts/contracts/components/Distribution.sol/Distribution.json +668 -141
  6. package/artifacts/contracts/components/IComponent.sol/IComponent.dbg.json +1 -1
  7. package/artifacts/contracts/components/IComponent.sol/IComponent.json +241 -60
  8. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
  9. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.json +438 -86
  10. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
  11. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.json +489 -163
  12. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +1 -1
  13. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.json +250 -137
  14. package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
  15. package/artifacts/contracts/components/Pool.sol/Pool.json +626 -189
  16. package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
  17. package/artifacts/contracts/components/Product.sol/Product.json +427 -178
  18. package/artifacts/contracts/instance/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.dbg.json +4 -0
  19. package/artifacts/contracts/instance/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.json +1206 -0
  20. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.dbg.json +1 -1
  21. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.json +64 -50
  22. package/artifacts/contracts/instance/Cloneable.sol/Cloneable.dbg.json +1 -1
  23. package/artifacts/contracts/instance/Cloneable.sol/Cloneable.json +5 -0
  24. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  25. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +1562 -814
  26. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
  27. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +227 -213
  28. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  29. package/artifacts/contracts/instance/Instance.sol/Instance.json +1119 -785
  30. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +1 -1
  31. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +463 -167
  32. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
  33. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +418 -230
  34. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
  35. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +439 -379
  36. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
  37. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +355 -104
  38. package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.dbg.json +1 -1
  39. package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.json +8 -13
  40. package/artifacts/contracts/instance/base/ComponentService.sol/ComponentService.dbg.json +1 -1
  41. package/artifacts/contracts/instance/base/ComponentService.sol/ComponentService.json +197 -169
  42. package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
  43. package/artifacts/contracts/instance/base/ILifecycle.sol/ILifecycle.dbg.json +1 -1
  44. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
  45. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.json +40 -10
  46. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json +1 -1
  47. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.json +36 -11
  48. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +1 -1
  49. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.json +58 -75
  50. package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
  51. package/artifacts/contracts/instance/module/IComponents.sol/IComponents.dbg.json +4 -0
  52. package/artifacts/contracts/instance/module/IComponents.sol/IComponents.json +10 -0
  53. package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +1 -1
  54. package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +1 -1
  55. package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +1 -1
  56. package/artifacts/contracts/instance/module/ISetup.sol/ISetup.dbg.json +1 -1
  57. package/artifacts/contracts/instance/module/ITreasury.sol/ITreasury.dbg.json +1 -1
  58. package/artifacts/contracts/instance/service/ApplicationService.sol/ApplicationService.dbg.json +4 -0
  59. package/artifacts/contracts/instance/service/ApplicationService.sol/ApplicationService.json +1092 -0
  60. package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +4 -0
  61. package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.json +672 -0
  62. package/artifacts/contracts/instance/service/BundleService.sol/BundleService.dbg.json +1 -1
  63. package/artifacts/contracts/instance/service/BundleService.sol/BundleService.json +527 -338
  64. package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.dbg.json +1 -1
  65. package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.json +344 -93
  66. package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.dbg.json +4 -0
  67. package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.json +1400 -0
  68. package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +4 -0
  69. package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.json +760 -0
  70. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +1 -1
  71. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +1282 -256
  72. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
  73. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.json +430 -87
  74. package/artifacts/contracts/instance/service/IApplicationService.sol/IApplicationService.dbg.json +4 -0
  75. package/artifacts/contracts/instance/service/IApplicationService.sol/IApplicationService.json +619 -0
  76. package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.dbg.json +1 -1
  77. package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.json +279 -264
  78. package/artifacts/contracts/instance/service/IClaimService.sol/IClaimService.dbg.json +4 -0
  79. package/artifacts/contracts/instance/service/IClaimService.sol/IClaimService.json +743 -0
  80. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +1 -1
  81. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.json +800 -159
  82. package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.dbg.json +1 -1
  83. package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.json +159 -274
  84. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +1 -1
  85. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +701 -118
  86. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +1 -1
  87. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +71 -160
  88. package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.dbg.json +1 -1
  89. package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.json +338 -412
  90. package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +1 -1
  91. package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.json +299 -128
  92. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +1 -1
  93. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +1062 -198
  94. package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
  95. package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.json +384 -89
  96. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +1 -1
  97. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +231 -223
  98. package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.dbg.json +1 -1
  99. package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.json +298 -95
  100. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  101. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +15 -2
  102. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  103. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +34 -2
  104. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
  105. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +70 -193
  106. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
  107. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.json +18 -0
  108. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  109. package/artifacts/contracts/registry/Registry.sol/Registry.json +47 -15
  110. package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.dbg.json +1 -1
  111. package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.json +2 -2
  112. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
  113. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +182 -232
  114. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
  115. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +287 -94
  116. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.dbg.json +1 -1
  117. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.json +23 -11
  118. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
  119. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +128 -37
  120. package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.dbg.json +1 -1
  121. package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +1 -1
  122. package/artifacts/contracts/shared/ERC165.sol/ERC165.json +41 -3
  123. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
  124. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.json +27 -29
  125. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +4 -0
  126. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.json +189 -0
  127. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  128. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +8 -29
  129. package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +4 -0
  130. package/artifacts/contracts/{experiment/inheritance/IA.sol/ISharedA.json → shared/IRegistryLinked.sol/IRegistryLinked.json} +15 -17
  131. package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
  132. package/artifacts/contracts/shared/IService.sol/IService.json +71 -160
  133. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +1 -1
  134. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.json +2 -152
  135. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
  136. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +100 -33
  137. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +4 -0
  138. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +302 -0
  139. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +1 -1
  140. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +283 -76
  141. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  142. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +115 -58
  143. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +4 -0
  144. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +71 -0
  145. package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
  146. package/artifacts/contracts/shared/Service.sol/Service.json +172 -160
  147. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
  148. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +2 -2
  149. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
  150. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +2 -2
  151. package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +1 -1
  152. package/artifacts/contracts/shared/Versionable.sol/Versionable.json +2 -152
  153. package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json +1 -1
  154. package/artifacts/contracts/test/TestFee.sol/TestFee.json +2 -2
  155. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json +1 -1
  156. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +115 -58
  157. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +1 -1
  158. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.json +6 -6
  159. package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +1 -1
  160. package/artifacts/contracts/test/TestService.sol/TestService.json +190 -210
  161. package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json +1 -1
  162. package/artifacts/contracts/test/TestVersion.sol/TestVersion.dbg.json +1 -1
  163. package/artifacts/contracts/test/TestVersion.sol/TestVersion.json +2 -2
  164. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json +1 -1
  165. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.json +8 -190
  166. package/artifacts/contracts/test/Usdc.sol/USDC.dbg.json +1 -1
  167. package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.dbg.json +1 -1
  168. package/artifacts/contracts/types/Amount.sol/AmountLib.dbg.json +4 -0
  169. package/artifacts/contracts/types/Amount.sol/AmountLib.json +209 -0
  170. package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
  171. package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.json +2 -2
  172. package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +1 -1
  173. package/artifacts/contracts/types/ClaimId.sol/ClaimIdLib.dbg.json +4 -0
  174. package/artifacts/contracts/types/ClaimId.sol/ClaimIdLib.json +179 -0
  175. package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.dbg.json +1 -1
  176. package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.json +2 -2
  177. package/artifacts/contracts/types/Fee.sol/FeeLib.dbg.json +1 -1
  178. package/artifacts/contracts/types/Fee.sol/FeeLib.json +40 -9
  179. package/artifacts/contracts/types/Key32.sol/Key32Lib.dbg.json +1 -1
  180. package/artifacts/contracts/types/Key32.sol/Key32Lib.json +2 -2
  181. package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +1 -1
  182. package/artifacts/contracts/types/NftId.sol/NftIdLib.json +17 -4
  183. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
  184. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.json +2 -2
  185. package/artifacts/contracts/types/NumberId.sol/NumberIdLib.dbg.json +1 -1
  186. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
  187. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.json +2 -2
  188. package/artifacts/contracts/types/PayoutId.sol/PayoutIdLib.dbg.json +4 -0
  189. package/artifacts/contracts/types/PayoutId.sol/PayoutIdLib.json +209 -0
  190. package/artifacts/contracts/types/Referral.sol/ReferralLib.dbg.json +1 -1
  191. package/artifacts/contracts/types/Referral.sol/ReferralLib.json +23 -4
  192. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.dbg.json +1 -1
  193. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.json +2 -2
  194. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.dbg.json +1 -1
  195. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.json +2 -2
  196. package/artifacts/contracts/types/Seconds.sol/SecondsLib.dbg.json +4 -0
  197. package/artifacts/contracts/types/Seconds.sol/SecondsLib.json +124 -0
  198. package/artifacts/contracts/types/StateId.sol/StateIdLib.dbg.json +1 -1
  199. package/artifacts/contracts/types/StateId.sol/StateIdLib.json +2 -2
  200. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json +1 -1
  201. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.json +38 -7
  202. package/artifacts/contracts/types/UFixed.sol/MathLib.dbg.json +1 -1
  203. package/artifacts/contracts/types/UFixed.sol/MathLib.json +2 -2
  204. package/artifacts/contracts/types/UFixed.sol/UFixedLib.dbg.json +1 -1
  205. package/artifacts/contracts/types/UFixed.sol/UFixedLib.json +2 -2
  206. package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +1 -1
  207. package/artifacts/contracts/types/Version.sol/VersionLib.json +2 -2
  208. package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +1 -1
  209. package/artifacts/contracts/types/Version.sol/VersionPartLib.json +2 -2
  210. package/contracts/components/Component.sol +134 -78
  211. package/contracts/components/Distribution.sol +190 -57
  212. package/contracts/components/IComponent.sol +62 -15
  213. package/contracts/components/IDistributionComponent.sol +39 -15
  214. package/contracts/components/IPoolComponent.sol +84 -31
  215. package/contracts/components/IProductComponent.sol +3 -2
  216. package/contracts/components/Pool.sol +223 -148
  217. package/contracts/components/Product.sol +221 -115
  218. package/contracts/instance/AccessManagerUpgradeableInitializeable.sol +13 -0
  219. package/contracts/instance/BundleManager.sol +10 -9
  220. package/contracts/instance/Cloneable.sol +7 -2
  221. package/contracts/instance/IInstance.sol +51 -19
  222. package/contracts/instance/IInstanceService.sol +33 -11
  223. package/contracts/instance/Instance.sol +143 -94
  224. package/contracts/instance/InstanceAccessManager.sol +389 -160
  225. package/contracts/instance/InstanceReader.sol +85 -12
  226. package/contracts/instance/InstanceService.sol +273 -224
  227. package/contracts/instance/InstanceServiceManager.sol +1 -1
  228. package/contracts/instance/ObjectManager.sol +6 -8
  229. package/contracts/instance/base/ComponentService.sol +28 -32
  230. package/contracts/instance/base/KeyValueStore.sol +13 -36
  231. package/contracts/instance/base/Lifecycle.sol +26 -6
  232. package/contracts/instance/module/IAccess.sol +22 -16
  233. package/contracts/instance/module/IBundle.sol +8 -5
  234. package/contracts/instance/module/IComponents.sol +41 -0
  235. package/contracts/instance/module/IDistribution.sol +2 -0
  236. package/contracts/instance/module/IPolicy.sol +41 -9
  237. package/contracts/instance/module/ISetup.sol +7 -20
  238. package/contracts/instance/service/ApplicationService.sol +356 -0
  239. package/contracts/instance/service/ApplicationServiceManager.sol +35 -0
  240. package/contracts/instance/service/BundleService.sol +224 -132
  241. package/contracts/instance/service/BundleServiceManager.sol +1 -1
  242. package/contracts/instance/service/ClaimService.sol +444 -0
  243. package/contracts/instance/service/ClaimServiceManager.sol +35 -0
  244. package/contracts/instance/service/DistributionService.sol +344 -19
  245. package/contracts/instance/service/DistributionServiceManager.sol +1 -1
  246. package/contracts/instance/service/IApplicationService.sol +78 -0
  247. package/contracts/instance/service/IBundleService.sol +93 -22
  248. package/contracts/instance/service/IClaimService.sol +90 -0
  249. package/contracts/instance/service/IDistributionService.sol +87 -0
  250. package/contracts/instance/service/IPolicyService.sol +36 -50
  251. package/contracts/instance/service/IPoolService.sol +106 -3
  252. package/contracts/instance/service/PolicyService.sol +166 -346
  253. package/contracts/instance/service/PolicyServiceManager.sol +2 -2
  254. package/contracts/instance/service/PoolService.sol +312 -19
  255. package/contracts/instance/service/PoolServiceManager.sol +1 -1
  256. package/contracts/instance/service/ProductService.sol +35 -58
  257. package/contracts/instance/service/ProductServiceManager.sol +2 -2
  258. package/contracts/registry/ChainNft.sol +8 -0
  259. package/contracts/registry/IRegistry.sol +5 -2
  260. package/contracts/registry/IRegistryService.sol +12 -11
  261. package/contracts/registry/ITransferInterceptor.sol +1 -0
  262. package/contracts/registry/Registry.sol +43 -28
  263. package/contracts/registry/RegistryService.sol +70 -50
  264. package/contracts/registry/RegistryServiceManager.sol +13 -13
  265. package/contracts/registry/ReleaseManager.sol +32 -40
  266. package/contracts/registry/TokenRegistry.sol +16 -12
  267. package/contracts/shared/ERC165.sol +14 -12
  268. package/contracts/shared/INftOwnable.sol +11 -10
  269. package/contracts/shared/IPolicyHolder.sol +40 -0
  270. package/contracts/shared/IRegisterable.sol +3 -3
  271. package/contracts/shared/IRegistryLinked.sol +11 -0
  272. package/contracts/shared/IService.sol +6 -4
  273. package/contracts/shared/IVersionable.sol +4 -47
  274. package/contracts/shared/NftOwnable.sol +64 -85
  275. package/contracts/shared/PolicyHolder.sol +94 -0
  276. package/contracts/shared/ProxyManager.sol +100 -25
  277. package/contracts/shared/Registerable.sol +16 -27
  278. package/contracts/shared/RegistryLinked.sol +43 -0
  279. package/contracts/shared/Service.sol +32 -20
  280. package/contracts/shared/TokenHandler.sol +11 -5
  281. package/contracts/shared/Versionable.sol +4 -92
  282. package/contracts/test/TestRegisterable.sol +1 -1
  283. package/contracts/test/TestService.sol +1 -1
  284. package/contracts/types/Amount.sol +80 -0
  285. package/contracts/types/Blocknumber.sol +1 -0
  286. package/contracts/types/ClaimId.sol +75 -0
  287. package/contracts/types/DistributorType.sol +2 -2
  288. package/contracts/types/Fee.sol +13 -5
  289. package/contracts/types/NftId.sol +8 -0
  290. package/contracts/types/ObjectType.sol +11 -6
  291. package/contracts/types/PayoutId.sol +82 -0
  292. package/contracts/types/Referral.sol +4 -0
  293. package/contracts/types/RoleId.sol +16 -9
  294. package/contracts/types/Seconds.sol +54 -0
  295. package/contracts/types/StateId.sol +7 -2
  296. package/contracts/types/Timestamp.sol +18 -13
  297. package/contracts/types/UFixed.sol +1 -0
  298. package/contracts/types/Version.sol +1 -0
  299. package/package.json +3 -3
  300. package/artifacts/contracts/experiment/cloning/Cloner.sol/Cloner.dbg.json +0 -4
  301. package/artifacts/contracts/experiment/cloning/Cloner.sol/Cloner.json +0 -66
  302. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock1.dbg.json +0 -4
  303. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock1.json +0 -24
  304. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock2.dbg.json +0 -4
  305. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock2.json +0 -42
  306. package/artifacts/contracts/experiment/errors/Require.sol/Require.dbg.json +0 -4
  307. package/artifacts/contracts/experiment/errors/Require.sol/Require.json +0 -105
  308. package/artifacts/contracts/experiment/errors/Revert.sol/Revert.dbg.json +0 -4
  309. package/artifacts/contracts/experiment/errors/Revert.sol/Revert.json +0 -105
  310. package/artifacts/contracts/experiment/inheritance/A.sol/A.dbg.json +0 -4
  311. package/artifacts/contracts/experiment/inheritance/A.sol/A.json +0 -128
  312. package/artifacts/contracts/experiment/inheritance/A.sol/AShared.dbg.json +0 -4
  313. package/artifacts/contracts/experiment/inheritance/A.sol/AShared.json +0 -42
  314. package/artifacts/contracts/experiment/inheritance/B.sol/B.dbg.json +0 -4
  315. package/artifacts/contracts/experiment/inheritance/B.sol/B.json +0 -76
  316. package/artifacts/contracts/experiment/inheritance/C.sol/C.dbg.json +0 -4
  317. package/artifacts/contracts/experiment/inheritance/C.sol/C.json +0 -89
  318. package/artifacts/contracts/experiment/inheritance/IA.sol/IA.dbg.json +0 -4
  319. package/artifacts/contracts/experiment/inheritance/IA.sol/IA.json +0 -128
  320. package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.dbg.json +0 -4
  321. package/artifacts/contracts/experiment/inheritance/IB.sol/IB.dbg.json +0 -4
  322. package/artifacts/contracts/experiment/inheritance/IB.sol/IB.json +0 -50
  323. package/artifacts/contracts/experiment/inheritance/IC.sol/IC.dbg.json +0 -4
  324. package/artifacts/contracts/experiment/inheritance/IC.sol/IC.json +0 -63
  325. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.dbg.json +0 -4
  326. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.json +0 -59
  327. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.dbg.json +0 -4
  328. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.json +0 -124
  329. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.dbg.json +0 -4
  330. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.json +0 -74
  331. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.dbg.json +0 -4
  332. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.json +0 -124
  333. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.dbg.json +0 -4
  334. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.json +0 -207
  335. package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.dbg.json +0 -4
  336. package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.json +0 -10
  337. package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.dbg.json +0 -4
  338. package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.json +0 -10
  339. package/contracts/experiment/cloning/Cloner.sol +0 -47
  340. package/contracts/experiment/errors/Require.sol +0 -38
  341. package/contracts/experiment/errors/Revert.sol +0 -44
  342. package/contracts/experiment/inheritance/A.sol +0 -53
  343. package/contracts/experiment/inheritance/B.sol +0 -28
  344. package/contracts/experiment/inheritance/C.sol +0 -34
  345. package/contracts/experiment/inheritance/IA.sol +0 -13
  346. package/contracts/experiment/inheritance/IB.sol +0 -10
  347. package/contracts/experiment/inheritance/IC.sol +0 -12
  348. package/contracts/experiment/statemachine/Dummy.sol +0 -27
  349. package/contracts/experiment/statemachine/ISM.sol +0 -25
  350. package/contracts/experiment/statemachine/SM.sol +0 -57
  351. package/contracts/experiment/statemachine/SimpleStateMachine.sol +0 -31
  352. package/contracts/experiment/types/TypeA.sol +0 -47
  353. package/contracts/experiment/types/TypeB.sol +0 -29
@@ -2,51 +2,53 @@
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} 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";
36
+ import {IService} from "../../shared/IService.sol";
37
+ import {Service} from "../../shared/Service.sol";
42
38
 
43
39
 
44
- contract PolicyService is ComponentService, IPolicyService {
40
+ contract PolicyService is
41
+ ComponentService,
42
+ IPolicyService
43
+ {
45
44
  using NftIdLib for NftId;
46
45
  using TimestampLib for Timestamp;
47
46
 
48
- IPoolService internal _poolService;
47
+ IApplicationService internal _applicationService;
49
48
  IBundleService internal _bundleService;
49
+ IClaimService internal _claimService;
50
+ IDistributionService internal _distributionService;
51
+ IPoolService internal _poolService;
50
52
 
51
53
  event LogProductServiceSender(address sender);
52
54
 
@@ -55,338 +57,114 @@ contract PolicyService is ComponentService, IPolicyService {
55
57
  bytes memory data
56
58
  )
57
59
  internal
58
- initializer
59
60
  virtual override
61
+ initializer
60
62
  {
61
63
  address registryAddress;
62
64
  address initialOwner;
63
65
  (registryAddress, initialOwner) = abi.decode(data, (address, address));
64
66
 
65
- _initializeService(registryAddress, owner);
67
+ initializeService(registryAddress, address(0), owner);
66
68
 
67
- _poolService = IPoolService(_registry.getServiceAddress(POOL(), getMajorVersion()));
68
- _bundleService = IBundleService(_registry.getServiceAddress(BUNDLE(), getMajorVersion()));
69
+ VersionPart majorVersion = getVersion().toMajorPart();
70
+ _poolService = IPoolService(getRegistry().getServiceAddress(POOL(), majorVersion));
71
+ _bundleService = IBundleService(getRegistry().getServiceAddress(BUNDLE(), majorVersion));
72
+ _claimService = IClaimService(getRegistry().getServiceAddress(CLAIM(), majorVersion));
73
+ _applicationService = IApplicationService(getRegistry().getServiceAddress(APPLICATION(), majorVersion));
74
+ _distributionService = IDistributionService(getRegistry().getServiceAddress(DISTRIBUTION(), majorVersion));
69
75
 
70
- _registerInterface(type(IPolicyService).interfaceId);
76
+ registerInterface(type(IPolicyService).interfaceId);
71
77
  }
72
78
 
73
79
 
74
- function getDomain() public pure override(IService, Service) returns(ObjectType) {
80
+ function getDomain() public pure override returns(ObjectType) {
75
81
  return POLICY();
76
82
  }
77
83
 
78
84
 
79
85
  function _getAndVerifyInstanceAndProduct() internal view returns (Product product) {
80
86
  IRegistry.ObjectInfo memory productInfo;
81
- (productInfo,) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
87
+ (, productInfo,) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
82
88
  product = Product(productInfo.objectAddress);
83
89
  }
84
- // TODO: no access restrictions
85
- function calculatePremium(
86
- RiskId riskId,
87
- uint256 sumInsuredAmount,
88
- uint256 lifetime,
89
- bytes memory applicationData,
90
- NftId bundleNftId,
91
- ReferralId referralId
92
- )
93
- public
94
- view
95
- override
96
- returns (
97
- uint256 premiumAmount,
98
- uint256 productFeeAmount,
99
- uint256 poolFeeAmount,
100
- uint256 bundleFeeAmount,
101
- uint256 distributionFeeAmount
102
- )
103
- {
104
- Product product = _getAndVerifyInstanceAndProduct();
105
- uint256 netPremiumAmount = product.calculateNetPremium(
106
- sumInsuredAmount,
107
- riskId,
108
- lifetime,
109
- applicationData
110
- );
111
-
112
- (
113
- productFeeAmount,
114
- poolFeeAmount,
115
- bundleFeeAmount,
116
- distributionFeeAmount
117
- ) = _calculateFeeAmounts(
118
- netPremiumAmount,
119
- product,
120
- bundleNftId,
121
- referralId
122
- );
123
-
124
- premiumAmount = netPremiumAmount + productFeeAmount;
125
- premiumAmount += poolFeeAmount + bundleFeeAmount;
126
- premiumAmount += distributionFeeAmount;
127
- }
128
90
 
129
- function _calculateFeeAmounts(
130
- uint256 netPremiumAmount,
131
- Product product,
132
- NftId bundleNftId,
133
- ReferralId referralId
134
- )
135
- internal
136
- view
137
- returns (
138
- uint256 productFeeAmount,
139
- uint256 poolFeeAmount,
140
- uint256 bundleFeeAmount,
141
- uint256 distributionFeeAmount
142
- )
143
- {
144
- InstanceReader instanceReader;
145
- {
146
- IInstance instance = product.getInstance();
147
- instanceReader = instance.getInstanceReader();
148
- }
149
-
150
- NftId poolNftId = product.getPoolNftId();
151
- IBundle.BundleInfo memory bundleInfo = instanceReader.getBundleInfo(bundleNftId);
152
- require(bundleInfo.poolNftId == poolNftId,"ERROR:PRS-035:BUNDLE_POOL_MISMATCH");
153
91
 
154
- {
155
- ISetup.ProductSetupInfo memory productSetupInfo = instanceReader.getProductSetupInfo(product.getProductNftId());
156
- (productFeeAmount,) = FeeLib.calculateFee(productSetupInfo.productFee, netPremiumAmount);
157
- }
158
- {
159
- ISetup.PoolSetupInfo memory poolSetupInfo = instanceReader.getPoolSetupInfo(poolNftId);
160
- (poolFeeAmount,) = FeeLib.calculateFee(poolSetupInfo.poolFee, netPremiumAmount);
161
- }
162
- {
163
- NftId distributionNftId = product.getDistributionNftId();
164
- ISetup.DistributionSetupInfo memory distributionSetupInfo = instanceReader.getDistributionSetupInfo(distributionNftId);
165
- (distributionFeeAmount,) = FeeLib.calculateFee(distributionSetupInfo.distributionFee, netPremiumAmount);
166
- }
167
-
168
- (bundleFeeAmount,) = FeeLib.calculateFee(bundleInfo.fee, netPremiumAmount);
169
- }
170
-
171
-
172
- function createApplication(
173
- address applicationOwner,
174
- RiskId riskId,
175
- uint256 sumInsuredAmount,
176
- uint256 lifetime,
177
- bytes memory applicationData,
178
- NftId bundleNftId,
179
- ReferralId referralId
180
- ) external override returns (NftId policyNftId) {
181
- (IRegistry.ObjectInfo memory productInfo, IInstance instance) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
182
- // TODO: add validations (see create bundle in pool service)
183
-
184
- policyNftId = getRegistryService().registerPolicy(
185
- IRegistry.ObjectInfo(
186
- zeroNftId(),
187
- productInfo.nftId,
188
- POLICY(),
189
- false, // intercepting property for policies is defined on product
190
- address(0),
191
- applicationOwner,
192
- ""
193
- )
194
- );
195
-
196
- (uint256 premiumAmount,,,,) = calculatePremium(
197
- riskId,
198
- sumInsuredAmount,
199
- lifetime,
200
- applicationData,
201
- bundleNftId,
202
- referralId
203
- );
204
-
205
- IPolicy.PolicyInfo memory policyInfo = IPolicy.PolicyInfo(
206
- productInfo.nftId,
207
- bundleNftId,
208
- referralId,
209
- riskId,
210
- sumInsuredAmount,
211
- premiumAmount,
212
- 0,
213
- lifetime,
214
- applicationData,
215
- "",
216
- 0,
217
- 0,
218
- 0,
219
- zeroTimestamp(),
220
- zeroTimestamp(),
221
- zeroTimestamp()
222
- );
223
-
224
- instance.createPolicy(policyNftId, policyInfo);
225
- instance.updatePolicyState(policyNftId, APPLIED());
226
-
227
- // TODO: add logging
228
- }
229
-
230
- function _getAndVerifyUnderwritingSetup(
231
- IInstance instance,
232
- InstanceReader instanceReader,
233
- IPolicy.PolicyInfo memory policyInfo,
234
- ISetup.ProductSetupInfo memory productSetupInfo
235
- )
236
- internal
237
- view
238
- returns (
239
- NftId bundleNftId,
240
- IBundle.BundleInfo memory bundleInfo,
241
- uint256 collateralAmount
242
- )
243
- {
244
- // check match between policy and bundle (via pool)
245
- bundleNftId = policyInfo.bundleNftId;
246
- bundleInfo = instanceReader.getBundleInfo(bundleNftId);
247
- require(bundleInfo.poolNftId == productSetupInfo.poolNftId, "POLICY_BUNDLE_MISMATCH");
248
-
249
- // calculate required collateral
250
- NftId poolNftId = productSetupInfo.poolNftId;
251
- ISetup.PoolSetupInfo memory poolInfo = instanceReader.getPoolSetupInfo(poolNftId);
252
-
253
- // obtain remaining return values
254
- collateralAmount = calculateRequiredCollateral(poolInfo.collateralizationLevel, policyInfo.sumInsuredAmount);
255
- }
256
-
257
- function _lockCollateralInBundle(
258
- IInstance instance,
259
- NftId bundleNftId,
260
- IBundle.BundleInfo memory bundleInfo,
261
- NftId policyNftId,
262
- uint256 collateralAmount
263
- )
264
- internal
265
- returns (IBundle.BundleInfo memory)
266
- {
267
- bundleInfo.lockedAmount += collateralAmount;
268
- // TODO: track policy associated to bundle in bundlemanager (tbd) and how much is locked for it
269
- return bundleInfo;
270
- }
271
-
272
- function _underwriteByPool(
273
- NftId poolNftId,
274
- NftId policyNftId,
275
- IPolicy.PolicyInfo memory policyInfo,
276
- bytes memory bundleFilter,
277
- uint256 collateralAmount
278
- )
279
- internal
280
- {
281
- address poolAddress = getRegistry().getObjectInfo(poolNftId).objectAddress;
282
- IPoolComponent pool = IPoolComponent(poolAddress);
283
- pool.underwrite(
284
- policyNftId,
285
- policyInfo.applicationData,
286
- bundleFilter,
287
- collateralAmount);
288
- }
289
-
290
-
291
- function revoke(
92
+ function decline(
292
93
  NftId policyNftId
293
94
  )
294
95
  external
295
96
  override
296
97
  {
297
- require(false, "ERROR:PRS-234:NOT_YET_IMPLEMENTED");
98
+ revert();
298
99
  }
299
100
 
300
101
 
301
- function underwrite(
302
- NftId policyNftId,
102
+ /// @dev underwites application which includes the locking of the required collateral from the pool.
103
+ function collateralize(
104
+ NftId applicationNftId, // = policyNftId
303
105
  bool requirePremiumPayment,
304
106
  Timestamp activateAt
305
107
  )
306
108
  external
307
- override
109
+ virtual override
308
110
  {
309
111
  // check caller is registered product
310
- (
311
- IRegistry.ObjectInfo memory productInfo,
312
- IInstance instance
313
- ) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
112
+ (NftId productNftId,, IInstance instance) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
314
113
  InstanceReader instanceReader = instance.getInstanceReader();
315
114
 
316
- // check match between policy and calling product
317
- NftId productNftId = productInfo.nftId;
318
- IPolicy.PolicyInfo memory policyInfo = instanceReader.getPolicyInfo(policyNftId);
319
- require(policyInfo.productNftId == productNftId, "POLICY_PRODUCT_MISMATCH");
320
- require(instanceReader.getPolicyState(policyNftId) == APPLIED(), "ERROR:PRS-021:STATE_NOT_APPLIED");
115
+ // check policy matches with calling product
116
+ IPolicy.PolicyInfo memory applicationInfo = instanceReader.getPolicyInfo(applicationNftId);
117
+
118
+ if (applicationInfo.productNftId != productNftId) {
119
+ revert ErrorPolicyServiceProductMismatch(applicationNftId, applicationInfo.productNftId, productNftId);
120
+ }
321
121
 
322
- NftId bundleNftId;
323
- IBundle.BundleInfo memory bundleInfo;
324
- uint256 collateralAmount;
325
- uint256 netPremiumAmount = 0; // > 0 if immediate premium payment
326
- {
327
- ISetup.ProductSetupInfo memory productSetupInfo = instanceReader.getProductSetupInfo(productNftId);
328
- IBundle.BundleInfo memory bundleInfo;
329
-
330
- (
331
- bundleNftId,
332
- bundleInfo,
333
- collateralAmount
334
- ) = _getAndVerifyUnderwritingSetup(
335
- instance,
336
- instanceReader,
337
- policyInfo,
338
- productSetupInfo
339
- );
122
+ // check policy is in state applied
123
+ if (instanceReader.getPolicyState(applicationNftId) != APPLIED()) {
124
+ revert ErrorPolicyServicePolicyStateNotApplied(applicationNftId);
340
125
  }
341
126
 
342
- // lock bundle collateral
343
- bundleInfo = _lockCollateralInBundle(
344
- instance,
345
- bundleNftId,
346
- bundleInfo,
347
- policyNftId,
348
- collateralAmount);
349
- StateId newPolicyState = UNDERWRITTEN();
350
-
127
+ StateId newPolicyState = COLLATERALIZED();
128
+
351
129
  // optional activation of policy
352
130
  if(activateAt > zeroTimestamp()) {
353
131
  newPolicyState = ACTIVE();
354
- policyInfo.activatedAt = activateAt;
355
- policyInfo.expiredAt = activateAt.addSeconds(policyInfo.lifetime);
132
+ applicationInfo.activatedAt = activateAt;
133
+ applicationInfo.expiredAt = activateAt.addSeconds(applicationInfo.lifetime);
356
134
  }
357
135
 
136
+ // lock bundle collateral
137
+ uint256 netPremiumAmount = 0; // > 0 if immediate premium payment
138
+
358
139
  // optional collection of premium
359
140
  if(requirePremiumPayment) {
360
141
  netPremiumAmount = _processPremiumByTreasury(
361
142
  instance,
362
- productInfo.nftId,
363
- policyNftId,
364
- policyInfo.premiumAmount);
143
+ applicationNftId,
144
+ applicationInfo.premiumAmount);
365
145
 
366
- policyInfo.premiumPaidAmount += policyInfo.premiumAmount;
146
+ applicationInfo.premiumPaidAmount += applicationInfo.premiumAmount;
367
147
  }
368
148
 
369
- _bundleService.underwritePolicy(instance, policyNftId, bundleNftId, collateralAmount, netPremiumAmount);
370
- instance.updatePolicy(policyNftId, policyInfo, newPolicyState);
149
+ // store updated policy info
150
+ instance.updatePolicy(applicationNftId, applicationInfo, newPolicyState);
371
151
 
372
- // involve pool if necessary
373
- {
374
- ISetup.PoolSetupInfo memory poolInfo = instanceReader.getPoolSetupInfo(bundleInfo.poolNftId);
375
-
376
- if(poolInfo.isConfirmingApplication) {
377
- _underwriteByPool(
378
- bundleInfo.poolNftId,
379
- policyNftId,
380
- policyInfo,
381
- bundleInfo.filter,
382
- collateralAmount
383
- );
384
- }
385
- }
152
+ // lock collateral and update pool and bundle book keeping
153
+ // pool retention level: fraction of sum insured that product will cover from pool funds directly
154
+ // eg retention level 30%, payouts up to 30% of the sum insured will be made from the product's pool directly
155
+ // for the remaining 70% the pool owns a policy that will cover claims that exceed the 30% of the sum insured
156
+ // might also call pool component (for isVerifyingApplications pools)
157
+ _poolService.lockCollateral(
158
+ instance,
159
+ productNftId,
160
+ applicationNftId,
161
+ applicationInfo,
162
+ netPremiumAmount); // for pool book keeping (fee + additional capital)
386
163
 
387
164
  // TODO: add logging
388
165
  }
389
166
 
167
+
390
168
  function calculateRequiredCollateral(UFixed collateralizationLevel, uint256 sumInsuredAmount) public pure override returns(uint256 collateralAmount) {
391
169
  UFixed sumInsuredUFixed = UFixedLib.toUFixed(sumInsuredAmount);
392
170
  UFixed collateralUFixed = collateralizationLevel * sumInsuredUFixed;
@@ -395,7 +173,7 @@ contract PolicyService is ComponentService, IPolicyService {
395
173
 
396
174
  function collectPremium(NftId policyNftId, Timestamp activateAt) external override {
397
175
  // check caller is registered product
398
- (IRegistry.ObjectInfo memory productInfo, IInstance instance) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
176
+ (NftId productNftId,, IInstance instance) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
399
177
  InstanceReader instanceReader = instance.getInstanceReader();
400
178
  IPolicy.PolicyInfo memory policyInfo = instanceReader.getPolicyInfo(policyNftId);
401
179
 
@@ -407,7 +185,6 @@ contract PolicyService is ComponentService, IPolicyService {
407
185
 
408
186
  uint256 netPremiumAmount = _processPremiumByTreasury(
409
187
  instance,
410
- productInfo.nftId,
411
188
  policyNftId,
412
189
  unpaidPremiumAmount);
413
190
 
@@ -425,7 +202,7 @@ contract PolicyService is ComponentService, IPolicyService {
425
202
 
426
203
  function activate(NftId policyNftId, Timestamp activateAt) public override {
427
204
  // check caller is registered product
428
- (, IInstance instance) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
205
+ (,, IInstance instance) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
429
206
  InstanceReader instanceReader = instance.getInstanceReader();
430
207
 
431
208
  IPolicy.PolicyInfo memory policyInfo = instanceReader.getPolicyInfo(policyNftId);
@@ -442,11 +219,24 @@ contract PolicyService is ComponentService, IPolicyService {
442
219
  // TODO: add logging
443
220
  }
444
221
 
222
+
223
+ function expire(
224
+ NftId policyNftId
225
+ )
226
+ external
227
+ override
228
+ // solhint-disable-next-line no-empty-blocks
229
+ {
230
+
231
+ }
232
+
445
233
  function close(
446
234
  NftId policyNftId
447
- ) external override // solhint-disable-next-line no-empty-blocks
235
+ )
236
+ external
237
+ override
448
238
  {
449
- (, IInstance instance) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
239
+ (,, IInstance instance) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
450
240
  InstanceReader instanceReader = instance.getInstanceReader();
451
241
 
452
242
  IPolicy.PolicyInfo memory policyInfo = instanceReader.getPolicyInfo(policyNftId);
@@ -464,6 +254,7 @@ contract PolicyService is ComponentService, IPolicyService {
464
254
  revert ErrorIPolicyServicePolicyAlreadyClosed(policyNftId);
465
255
  }
466
256
 
257
+ // TODO consider to allow for underpaid premiums (with the effects of reducing max payouts accordingly)
467
258
  if (policyInfo.premiumAmount != policyInfo.premiumPaidAmount) {
468
259
  revert ErrorIPolicyServicePremiumNotFullyPaid(policyNftId, policyInfo.premiumAmount, policyInfo.premiumPaidAmount);
469
260
  }
@@ -472,64 +263,93 @@ contract PolicyService is ComponentService, IPolicyService {
472
263
  revert ErrorIPolicyServiceOpenClaims(policyNftId, policyInfo.openClaimsCount);
473
264
  }
474
265
 
475
- if (TimestampLib.blockTimestamp().lte(policyInfo.expiredAt) && (policyInfo.payoutAmount < policyInfo.sumInsuredAmount)) {
476
- revert ErrorIPolicyServicePolicyHasNotExpired(policyNftId, policyInfo.expiredAt);
477
- }
478
-
479
266
  policyInfo.closedAt = TimestampLib.blockTimestamp();
480
267
 
481
- _bundleService.closePolicy(instance, policyNftId, policyInfo.bundleNftId, policyInfo.sumInsuredAmount);
482
- instance.updatePolicy(policyNftId, policyInfo, CLOSED());
483
- }
268
+ _poolService.releaseCollateral(
269
+ instance,
270
+ policyNftId,
271
+ policyInfo);
484
272
 
485
- function _getPoolNftId(
486
- IInstance instance,
487
- NftId productNftId
488
- )
489
- internal
490
- view
491
- returns (NftId poolNftid)
492
- {
493
- InstanceReader instanceReader = instance.getInstanceReader();
494
- ISetup.ProductSetupInfo memory productSetupInfo = instanceReader.getProductSetupInfo(productNftId);
495
- return productSetupInfo.poolNftId;
273
+ instance.updatePolicy(policyNftId, policyInfo, CLOSED());
496
274
  }
497
275
 
498
276
 
499
277
  function _processPremiumByTreasury(
500
278
  IInstance instance,
501
- NftId productNftId,
502
279
  NftId policyNftId,
503
- uint256 premiumAmount
280
+ uint256 premiumExpectedAmount
504
281
  )
505
282
  internal
506
283
  returns (uint256 netPremiumAmount)
507
284
  {
508
285
  // process token transfer(s)
509
- if(premiumAmount > 0) {
510
- ISetup.ProductSetupInfo memory productSetupInfo = instance.getInstanceReader().getProductSetupInfo(productNftId);
511
- TokenHandler tokenHandler = productSetupInfo.tokenHandler;
512
- address policyOwner = getRegistry().ownerOf(policyNftId);
513
- ISetup.PoolSetupInfo memory poolSetupInfo = instance.getInstanceReader().getPoolSetupInfo(productSetupInfo.poolNftId);
514
- address poolWallet = poolSetupInfo.wallet;
515
- netPremiumAmount = premiumAmount;
516
- Fee memory productFee = productSetupInfo.productFee;
517
-
518
- if (FeeLib.feeIsZero(productFee)) {
519
- tokenHandler.transfer(
520
- policyOwner,
521
- poolWallet,
522
- premiumAmount
523
- );
524
- } else {
525
- (uint256 productFeeAmount, uint256 netAmount) = FeeLib.calculateFee(productSetupInfo.productFee, netPremiumAmount);
526
- address productWallet = productSetupInfo.wallet;
527
- if (tokenHandler.getToken().allowance(policyOwner, address(tokenHandler)) < premiumAmount) {
528
- revert ErrorIPolicyServiceInsufficientAllowance(policyOwner, address(tokenHandler), premiumAmount);
529
- }
530
- tokenHandler.transfer(policyOwner, productWallet, productFeeAmount);
531
- tokenHandler.transfer(policyOwner, poolWallet, netAmount);
532
- netPremiumAmount = netAmount;
286
+ if(premiumExpectedAmount == 0) {
287
+ return 0;
288
+ }
289
+
290
+ NftId productNftId = getRegistry().getObjectInfo(policyNftId).parentNftId;
291
+ IPolicy.PolicyInfo memory policyInfo = instance.getInstanceReader().getPolicyInfo(policyNftId);
292
+ IPolicy.Premium memory premium = _applicationService.calculatePremium(
293
+ productNftId,
294
+ policyInfo.riskId,
295
+ policyInfo.sumInsuredAmount,
296
+ policyInfo.lifetime,
297
+ policyInfo.applicationData,
298
+ policyInfo.bundleNftId,
299
+ policyInfo.referralId
300
+ );
301
+
302
+ if (premium.premiumAmount != premiumExpectedAmount) {
303
+ revert ErrorIPolicyServicePremiumMismatch(
304
+ policyNftId,
305
+ premiumExpectedAmount,
306
+ premium.premiumAmount);
307
+ }
308
+
309
+ address policyOwner = getRegistry().ownerOf(policyNftId);
310
+ ISetup.ProductSetupInfo memory productSetupInfo = instance.getInstanceReader().getProductSetupInfo(productNftId);
311
+ TokenHandler tokenHandler = productSetupInfo.tokenHandler;
312
+ if (tokenHandler.getToken().allowance(policyOwner, address(tokenHandler)) < premium.premiumAmount) {
313
+ revert ErrorIPolicyServiceInsufficientAllowance(policyOwner, address(tokenHandler), premium.premiumAmount);
314
+ }
315
+
316
+ uint256 productFeeAmountToTransfer = premium.productFeeFixAmount + premium.productFeeVarAmount;
317
+ uint256 distributionFeeAmountToTransfer = premium.distributionFeeFixAmount + premium.distributionFeeVarAmount - premium.discountAmount;
318
+ uint256 poolFeeAmountToTransfer = premium.poolFeeFixAmount + premium.poolFeeVarAmount;
319
+ uint256 bundleFeeAmountToTransfer = premium.bundleFeeFixAmount + premium.bundleFeeVarAmount;
320
+ uint256 poolAmountToTransfer = premium.netPremiumAmount + poolFeeAmountToTransfer + bundleFeeAmountToTransfer;
321
+ netPremiumAmount = premium.netPremiumAmount;
322
+
323
+ // move product fee to product wallet
324
+ {
325
+ address productWallet = productSetupInfo.wallet;
326
+ tokenHandler.transfer(policyOwner, productWallet, productFeeAmountToTransfer);
327
+ }
328
+
329
+ // move distribution fee to distribution wallet
330
+ {
331
+ ISetup.DistributionSetupInfo memory distributionSetupInfo = instance.getInstanceReader().getDistributionSetupInfo(productSetupInfo.distributionNftId);
332
+ address distributionWallet = distributionSetupInfo.wallet;
333
+ tokenHandler.transfer(policyOwner, distributionWallet, distributionFeeAmountToTransfer);
334
+ _distributionService.processSale(productSetupInfo.distributionNftId, policyInfo.referralId, premium, distributionFeeAmountToTransfer);
335
+ }
336
+
337
+ // move netpremium, bundleFee and poolFee to pool wallet
338
+ {
339
+ address poolWallet = instance.getInstanceReader().getComponentInfo(productSetupInfo.poolNftId).wallet;
340
+ tokenHandler.transfer(policyOwner, poolWallet, poolAmountToTransfer);
341
+ _poolService.processSale(policyInfo.bundleNftId, premium, poolAmountToTransfer);
342
+ }
343
+
344
+ // validate total amount transferred
345
+ {
346
+ uint256 totalTransferred = distributionFeeAmountToTransfer + poolAmountToTransfer + productFeeAmountToTransfer;
347
+
348
+ if (premium.premiumAmount != totalTransferred) {
349
+ revert ErrorPolicyServiceTransferredPremiumMismatch(
350
+ policyNftId,
351
+ premium.premiumAmount,
352
+ totalTransferred);
533
353
  }
534
354
  }
535
355