@etherisc/gif-next 0.0.2-f62dcdf-553 → 0.0.2-f634e5c-828

Sign up to get free protection for your applications and to get access to all the features.
Files changed (363) hide show
  1. package/README.md +27 -6
  2. package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.dbg.json +1 -1
  3. package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.json +2 -2
  4. package/artifacts/contracts/authorization/AccessAdmin.sol/IAccessManagedChecker.dbg.json +4 -0
  5. package/artifacts/contracts/authorization/AccessAdmin.sol/IAccessManagedChecker.json +24 -0
  6. package/artifacts/contracts/authorization/AccessManagerCloneable.sol/AccessManagerCloneable.dbg.json +1 -1
  7. package/artifacts/contracts/authorization/Authorization.sol/Authorization.dbg.json +1 -1
  8. package/artifacts/contracts/authorization/Authorization.sol/Authorization.json +2 -2
  9. package/artifacts/contracts/authorization/IAccess.sol/IAccess.dbg.json +1 -1
  10. package/artifacts/contracts/authorization/IAccessAdmin.sol/IAccessAdmin.dbg.json +1 -1
  11. package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.dbg.json +1 -1
  12. package/artifacts/contracts/authorization/IServiceAuthorization.sol/IServiceAuthorization.dbg.json +1 -1
  13. package/artifacts/contracts/authorization/ReleaseAccessManager.sol/ReleaseAccessManager.dbg.json +1 -1
  14. package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.dbg.json +1 -1
  15. package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.json +2 -2
  16. package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.dbg.json +1 -1
  17. package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.json +55 -147
  18. package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.dbg.json +1 -1
  19. package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.json +2 -2
  20. package/artifacts/contracts/distribution/Distribution.sol/Distribution.dbg.json +1 -1
  21. package/artifacts/contracts/distribution/Distribution.sol/Distribution.json +8 -52
  22. package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.dbg.json +1 -1
  23. package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.json +121 -82
  24. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
  25. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.json +72 -48
  26. package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
  27. package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.json +11 -37
  28. package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.dbg.json +1 -1
  29. package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.json +23 -0
  30. package/artifacts/contracts/examples/fire/DamageLevel.sol/DamageLevelLib.dbg.json +1 -1
  31. package/artifacts/contracts/examples/fire/FirePool.sol/FirePool.dbg.json +1 -1
  32. package/artifacts/contracts/examples/fire/FirePool.sol/FirePool.json +37 -160
  33. package/artifacts/contracts/examples/fire/FirePoolAuthorization.sol/FirePoolAuthorization.dbg.json +1 -1
  34. package/artifacts/contracts/examples/fire/FirePoolAuthorization.sol/FirePoolAuthorization.json +49 -17
  35. package/artifacts/contracts/examples/fire/FireProduct.sol/FireProduct.dbg.json +1 -1
  36. package/artifacts/contracts/examples/fire/FireProduct.sol/FireProduct.json +93 -200
  37. package/artifacts/contracts/examples/fire/FireProductAuthorization.sol/FireProductAuthorization.dbg.json +1 -1
  38. package/artifacts/contracts/examples/fire/FireProductAuthorization.sol/FireProductAuthorization.json +2 -2
  39. package/artifacts/contracts/examples/fire/FireUSD.sol/FireUSD.dbg.json +1 -1
  40. package/artifacts/contracts/examples/unpermissioned/SimpleDistribution.sol/SimpleDistribution.dbg.json +1 -1
  41. package/artifacts/contracts/examples/unpermissioned/SimpleDistribution.sol/SimpleDistribution.json +79 -121
  42. package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.dbg.json +1 -1
  43. package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.json +33 -101
  44. package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.dbg.json +1 -1
  45. package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.json +155 -155
  46. package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.dbg.json +1 -1
  47. package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.json +391 -219
  48. package/artifacts/contracts/instance/BundleSet.sol/BundleSet.dbg.json +1 -1
  49. package/artifacts/contracts/instance/BundleSet.sol/BundleSet.json +147 -42
  50. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  51. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +64 -18
  52. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
  53. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +24 -17
  54. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  55. package/artifacts/contracts/instance/Instance.sol/Instance.json +96 -29
  56. package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.dbg.json +1 -1
  57. package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.json +103 -72
  58. package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.dbg.json +1 -1
  59. package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.json +40 -27
  60. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
  61. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +302 -74
  62. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
  63. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +71 -48
  64. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
  65. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +46 -22
  66. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.dbg.json +1 -1
  67. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.json +59 -69
  68. package/artifacts/contracts/instance/RiskSet.sol/RiskSet.dbg.json +4 -0
  69. package/artifacts/contracts/instance/RiskSet.sol/RiskSet.json +810 -0
  70. package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.dbg.json +1 -1
  71. package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.json +2 -2
  72. package/artifacts/contracts/instance/base/Cloneable.sol/Cloneable.dbg.json +1 -1
  73. package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.dbg.json +1 -1
  74. package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.json +2 -2
  75. package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.dbg.json +1 -1
  76. package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.json +2 -2
  77. package/artifacts/contracts/instance/base/ObjectSet.sol/ObjectSet.dbg.json +1 -1
  78. package/artifacts/contracts/instance/base/ObjectSet.sol/ObjectSet.json +2 -2
  79. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +1 -1
  80. package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
  81. package/artifacts/contracts/instance/module/IComponents.sol/IComponents.dbg.json +1 -1
  82. package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +1 -1
  83. package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +1 -1
  84. package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +1 -1
  85. package/artifacts/contracts/mock/Dip.sol/Dip.dbg.json +1 -1
  86. package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.dbg.json +1 -1
  87. package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.json +22 -114
  88. package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.dbg.json +1 -1
  89. package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.json +2 -2
  90. package/artifacts/contracts/oracle/IOracle.sol/IOracle.dbg.json +1 -1
  91. package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.dbg.json +1 -1
  92. package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.json +11 -37
  93. package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.dbg.json +1 -1
  94. package/artifacts/contracts/oracle/Oracle.sol/Oracle.dbg.json +1 -1
  95. package/artifacts/contracts/oracle/Oracle.sol/Oracle.json +8 -52
  96. package/artifacts/contracts/oracle/OracleService.sol/OracleService.dbg.json +1 -1
  97. package/artifacts/contracts/oracle/OracleService.sol/OracleService.json +84 -60
  98. package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.dbg.json +1 -1
  99. package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.json +66 -22
  100. package/artifacts/contracts/pool/BasicPool.sol/BasicPool.dbg.json +1 -1
  101. package/artifacts/contracts/pool/BasicPool.sol/BasicPool.json +8 -67
  102. package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.dbg.json +1 -1
  103. package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.json +49 -17
  104. package/artifacts/contracts/pool/BundleService.sol/BundleService.dbg.json +1 -1
  105. package/artifacts/contracts/pool/BundleService.sol/BundleService.json +101 -206
  106. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.dbg.json +1 -1
  107. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.json +58 -70
  108. package/artifacts/contracts/pool/IBundleService.sol/IBundleService.dbg.json +1 -1
  109. package/artifacts/contracts/pool/IBundleService.sol/IBundleService.json +19 -57
  110. package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
  111. package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.json +11 -76
  112. package/artifacts/contracts/pool/IPoolService.sol/IPoolService.dbg.json +1 -1
  113. package/artifacts/contracts/pool/IPoolService.sol/IPoolService.json +77 -75
  114. package/artifacts/contracts/pool/Pool.sol/Pool.dbg.json +1 -1
  115. package/artifacts/contracts/pool/Pool.sol/Pool.json +8 -91
  116. package/artifacts/contracts/pool/PoolService.sol/PoolService.dbg.json +1 -1
  117. package/artifacts/contracts/pool/PoolService.sol/PoolService.json +154 -160
  118. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
  119. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.json +61 -33
  120. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.dbg.json +1 -1
  121. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.json +58 -23
  122. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +1 -1
  123. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.json +42 -22
  124. package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.dbg.json +1 -1
  125. package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.json +13 -52
  126. package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.dbg.json +1 -1
  127. package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.json +2 -2
  128. package/artifacts/contracts/product/ClaimService.sol/ClaimService.dbg.json +1 -1
  129. package/artifacts/contracts/product/ClaimService.sol/ClaimService.json +74 -66
  130. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +1 -1
  131. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.json +67 -47
  132. package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.dbg.json +1 -1
  133. package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.json +34 -7
  134. package/artifacts/contracts/product/IClaimService.sol/IClaimService.dbg.json +1 -1
  135. package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.dbg.json +1 -1
  136. package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.json +38 -19
  137. package/artifacts/contracts/product/IPricingService.sol/IPricingService.dbg.json +1 -1
  138. package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.dbg.json +1 -1
  139. package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.json +16 -37
  140. package/artifacts/contracts/product/IRiskService.sol/IRiskService.dbg.json +1 -1
  141. package/artifacts/contracts/product/PolicyService.sol/PolicyService.dbg.json +1 -1
  142. package/artifacts/contracts/product/PolicyService.sol/PolicyService.json +132 -121
  143. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +1 -1
  144. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.json +70 -42
  145. package/artifacts/contracts/product/PricingService.sol/PricingService.dbg.json +1 -1
  146. package/artifacts/contracts/product/PricingService.sol/PricingService.json +50 -34
  147. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.dbg.json +1 -1
  148. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.json +56 -32
  149. package/artifacts/contracts/product/Product.sol/Product.dbg.json +1 -1
  150. package/artifacts/contracts/product/Product.sol/Product.json +13 -52
  151. package/artifacts/contracts/product/RiskService.sol/RiskService.dbg.json +1 -1
  152. package/artifacts/contracts/product/RiskService.sol/RiskService.json +34 -18
  153. package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.dbg.json +1 -1
  154. package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.json +40 -16
  155. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  156. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +2 -2
  157. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  158. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +24 -0
  159. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
  160. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
  161. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  162. package/artifacts/contracts/registry/Registry.sol/Registry.json +62 -38
  163. package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.dbg.json +1 -1
  164. package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.json +107 -94
  165. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
  166. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +32 -16
  167. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
  168. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +39 -15
  169. package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.dbg.json +1 -1
  170. package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.json +2 -2
  171. package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.dbg.json +1 -1
  172. package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.json +12 -12
  173. package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.dbg.json +1 -1
  174. package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.json +6 -6
  175. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
  176. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +2 -2
  177. package/artifacts/contracts/shared/Component.sol/Component.dbg.json +1 -1
  178. package/artifacts/contracts/shared/Component.sol/Component.json +8 -38
  179. package/artifacts/contracts/shared/ComponentService.sol/ComponentService.dbg.json +1 -1
  180. package/artifacts/contracts/shared/ComponentService.sol/ComponentService.json +256 -116
  181. package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.dbg.json +1 -1
  182. package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.json +78 -42
  183. package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.dbg.json +1 -1
  184. package/artifacts/contracts/shared/ContractLib.sol/ContractLib.dbg.json +1 -1
  185. package/artifacts/contracts/shared/ContractLib.sol/ContractLib.json +402 -6
  186. package/artifacts/contracts/shared/ContractLib.sol/IInstanceAdminHelper.dbg.json +4 -0
  187. package/artifacts/contracts/shared/ContractLib.sol/IInstanceAdminHelper.json +24 -0
  188. package/artifacts/contracts/shared/ContractLib.sol/ITargetHelper.dbg.json +4 -0
  189. package/artifacts/contracts/shared/ContractLib.sol/ITargetHelper.json +30 -0
  190. package/artifacts/contracts/shared/IComponent.sol/IComponent.dbg.json +1 -1
  191. package/artifacts/contracts/shared/IComponent.sol/IComponent.json +11 -23
  192. package/artifacts/contracts/shared/IComponentService.sol/IComponentService.dbg.json +1 -1
  193. package/artifacts/contracts/shared/IComponentService.sol/IComponentService.json +146 -14
  194. package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.dbg.json +1 -1
  195. package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.json +11 -37
  196. package/artifacts/contracts/shared/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
  197. package/artifacts/contracts/shared/ILifecycle.sol/ILifecycle.dbg.json +1 -1
  198. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
  199. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +1 -1
  200. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  201. package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +1 -1
  202. package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
  203. package/artifacts/contracts/shared/InitializableERC165.sol/InitializableERC165.dbg.json +1 -1
  204. package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.dbg.json +1 -1
  205. package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.json +8 -52
  206. package/artifacts/contracts/shared/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
  207. package/artifacts/contracts/shared/Lifecycle.sol/Lifecycle.dbg.json +1 -1
  208. package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.dbg.json +1 -1
  209. package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.json +2 -2
  210. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
  211. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +2 -2
  212. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +1 -1
  213. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +2 -2
  214. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  215. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +2 -2
  216. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +1 -1
  217. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +2 -2
  218. package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
  219. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
  220. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +388 -35
  221. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandlerBase.dbg.json +4 -0
  222. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandlerBase.json +395 -0
  223. package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.dbg.json +1 -1
  224. package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.json +88 -24
  225. package/artifacts/contracts/staking/IStaking.sol/IStaking.dbg.json +1 -1
  226. package/artifacts/contracts/staking/IStaking.sol/IStaking.json +29 -59
  227. package/artifacts/contracts/staking/IStakingService.sol/IStakingService.dbg.json +1 -1
  228. package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.dbg.json +1 -1
  229. package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.json +3 -3
  230. package/artifacts/contracts/staking/Staking.sol/Staking.dbg.json +1 -1
  231. package/artifacts/contracts/staking/Staking.sol/Staking.json +80 -152
  232. package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.dbg.json +1 -1
  233. package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.json +2 -2
  234. package/artifacts/contracts/staking/StakingManager.sol/StakingManager.dbg.json +1 -1
  235. package/artifacts/contracts/staking/StakingManager.sol/StakingManager.json +50 -46
  236. package/artifacts/contracts/staking/StakingReader.sol/StakingReader.dbg.json +1 -1
  237. package/artifacts/contracts/staking/StakingReader.sol/StakingReader.json +2 -2
  238. package/artifacts/contracts/staking/StakingService.sol/StakingService.dbg.json +1 -1
  239. package/artifacts/contracts/staking/StakingService.sol/StakingService.json +36 -20
  240. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.dbg.json +1 -1
  241. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.json +43 -19
  242. package/artifacts/contracts/staking/StakingStore.sol/StakingStore.dbg.json +1 -1
  243. package/artifacts/contracts/staking/StakingStore.sol/StakingStore.json +13 -13
  244. package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.dbg.json +1 -1
  245. package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.json +3 -3
  246. package/artifacts/contracts/type/AddressSet.sol/LibAddressSet.dbg.json +1 -1
  247. package/artifacts/contracts/type/Amount.sol/AmountLib.dbg.json +1 -1
  248. package/artifacts/contracts/type/Amount.sol/AmountLib.json +3 -3
  249. package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
  250. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.dbg.json +1 -1
  251. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.json +2 -2
  252. package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.dbg.json +1 -1
  253. package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.json +2 -2
  254. package/artifacts/contracts/type/Fee.sol/FeeLib.dbg.json +1 -1
  255. package/artifacts/contracts/type/Fee.sol/FeeLib.json +3 -3
  256. package/artifacts/contracts/type/Key32.sol/Key32Lib.dbg.json +1 -1
  257. package/artifacts/contracts/type/Key32.sol/Key32Lib.json +2 -2
  258. package/artifacts/contracts/type/Key32Set.sol/LibKey32Set.dbg.json +4 -0
  259. package/artifacts/contracts/type/Key32Set.sol/LibKey32Set.json +33 -0
  260. package/artifacts/contracts/type/NftId.sol/NftIdLib.dbg.json +1 -1
  261. package/artifacts/contracts/type/NftId.sol/NftIdLib.json +23 -4
  262. package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
  263. package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.json +2 -2
  264. package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
  265. package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.json +2 -2
  266. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.dbg.json +1 -1
  267. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.json +2 -2
  268. package/artifacts/contracts/type/Referral.sol/ReferralLib.dbg.json +1 -1
  269. package/artifacts/contracts/type/Referral.sol/ReferralLib.json +2 -2
  270. package/artifacts/contracts/type/RequestId.sol/RequestIdLib.dbg.json +1 -1
  271. package/artifacts/contracts/type/RequestId.sol/RequestIdLib.json +2 -2
  272. package/artifacts/contracts/type/RiskId.sol/RiskIdLib.dbg.json +1 -1
  273. package/artifacts/contracts/type/RiskId.sol/RiskIdLib.json +43 -5
  274. package/artifacts/contracts/type/RoleId.sol/RoleIdLib.dbg.json +1 -1
  275. package/artifacts/contracts/type/RoleId.sol/RoleIdLib.json +2 -2
  276. package/artifacts/contracts/type/Seconds.sol/SecondsLib.dbg.json +1 -1
  277. package/artifacts/contracts/type/Selector.sol/SelectorLib.dbg.json +1 -1
  278. package/artifacts/contracts/type/Selector.sol/SelectorSetLib.dbg.json +1 -1
  279. package/artifacts/contracts/type/StateId.sol/StateIdLib.dbg.json +1 -1
  280. package/artifacts/contracts/type/String.sol/StrLib.dbg.json +1 -1
  281. package/artifacts/contracts/type/Timestamp.sol/TimestampLib.dbg.json +1 -1
  282. package/artifacts/contracts/type/UFixed.sol/UFixedLib.dbg.json +1 -1
  283. package/artifacts/contracts/type/UFixed.sol/UFixedLib.json +3 -3
  284. package/artifacts/contracts/type/Version.sol/VersionLib.dbg.json +1 -1
  285. package/artifacts/contracts/type/Version.sol/VersionPartLib.dbg.json +1 -1
  286. package/artifacts/contracts/upgradeability/IVersionable.sol/IVersionable.dbg.json +1 -1
  287. package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.dbg.json +1 -1
  288. package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.json +18 -2
  289. package/artifacts/contracts/upgradeability/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
  290. package/artifacts/contracts/upgradeability/Versionable.sol/Versionable.dbg.json +1 -1
  291. package/contracts/authorization/AccessAdmin.sol +21 -2
  292. package/contracts/authorization/ReleaseAccessManager.sol +1 -1
  293. package/contracts/distribution/BasicDistribution.sol +2 -2
  294. package/contracts/distribution/BasicDistributionAuthorization.sol +1 -1
  295. package/contracts/distribution/Distribution.sol +5 -6
  296. package/contracts/distribution/DistributionService.sol +18 -19
  297. package/contracts/distribution/IDistributionService.sol +5 -6
  298. package/contracts/examples/fire/FirePool.sol +16 -3
  299. package/contracts/examples/fire/FireProduct.sol +24 -8
  300. package/contracts/examples/unpermissioned/SimpleDistribution.sol +15 -0
  301. package/contracts/examples/unpermissioned/SimplePool.sol +34 -2
  302. package/contracts/examples/unpermissioned/SimpleProduct.sol +15 -21
  303. package/contracts/instance/BundleSet.sol +38 -34
  304. package/contracts/instance/IInstance.sol +7 -2
  305. package/contracts/instance/IInstanceService.sol +7 -9
  306. package/contracts/instance/Instance.sol +16 -9
  307. package/contracts/instance/InstanceAdmin.sol +41 -30
  308. package/contracts/instance/InstanceAuthorizationV3.sol +33 -9
  309. package/contracts/instance/InstanceReader.sol +88 -2
  310. package/contracts/instance/InstanceService.sol +39 -58
  311. package/contracts/instance/RiskSet.sol +119 -0
  312. package/contracts/instance/base/ObjectCounter.sol +1 -2
  313. package/contracts/instance/base/ObjectSet.sol +24 -25
  314. package/contracts/instance/module/IComponents.sol +1 -2
  315. package/contracts/instance/module/IPolicy.sol +2 -1
  316. package/contracts/instance/module/IRisk.sol +1 -0
  317. package/contracts/oracle/OracleService.sol +87 -69
  318. package/contracts/pool/BasicPool.sol +24 -3
  319. package/contracts/pool/BasicPoolAuthorization.sol +12 -1
  320. package/contracts/pool/BundleService.sol +14 -84
  321. package/contracts/pool/IBundleService.sol +2 -23
  322. package/contracts/pool/IPoolComponent.sol +1 -7
  323. package/contracts/pool/IPoolService.sol +12 -26
  324. package/contracts/pool/Pool.sol +112 -102
  325. package/contracts/pool/PoolService.sol +156 -88
  326. package/contracts/product/ApplicationService.sol +12 -12
  327. package/contracts/product/BasicProduct.sol +7 -11
  328. package/contracts/product/ClaimService.sol +3 -1
  329. package/contracts/product/IApplicationService.sol +5 -2
  330. package/contracts/product/IPolicyService.sol +17 -7
  331. package/contracts/product/PolicyService.sol +237 -195
  332. package/contracts/product/Product.sol +12 -40
  333. package/contracts/product/RiskService.sol +14 -3
  334. package/contracts/registry/ChainNft.sol +4 -2
  335. package/contracts/registry/IRegistry.sol +2 -0
  336. package/contracts/registry/Registry.sol +9 -1
  337. package/contracts/registry/RegistryAdmin.sol +15 -12
  338. package/contracts/registry/ReleaseRegistry.sol +5 -20
  339. package/contracts/registry/ServiceAuthorizationV3.sol +13 -31
  340. package/contracts/shared/Component.sol +43 -86
  341. package/contracts/shared/ComponentService.sol +160 -36
  342. package/contracts/shared/ComponentVerifyingService.sol +15 -13
  343. package/contracts/shared/ContractLib.sol +196 -10
  344. package/contracts/shared/IComponent.sol +5 -12
  345. package/contracts/shared/IComponentService.sol +19 -5
  346. package/contracts/shared/IInstanceLinkedComponent.sol +0 -11
  347. package/contracts/shared/InstanceLinkedComponent.sol +1 -17
  348. package/contracts/shared/Registerable.sol +0 -2
  349. package/contracts/shared/RegistryLinked.sol +6 -12
  350. package/contracts/shared/TokenHandler.sol +316 -66
  351. package/contracts/shared/TokenHandlerDeployerLib.sol +10 -2
  352. package/contracts/staking/IStaking.sol +9 -4
  353. package/contracts/staking/Staking.sol +29 -21
  354. package/contracts/staking/StakingService.sol +41 -8
  355. package/contracts/type/Key32.sol +2 -2
  356. package/contracts/type/Key32Set.sol +62 -0
  357. package/contracts/type/NftId.sol +6 -0
  358. package/contracts/type/ObjectType.sol +2 -0
  359. package/contracts/type/RiskId.sol +18 -6
  360. package/contracts/type/UFixed.sol +9 -119
  361. package/package.json +3 -3
  362. package/artifacts/contracts/type/UFixed.sol/MathLib.dbg.json +0 -4
  363. package/artifacts/contracts/type/UFixed.sol/MathLib.json +0 -16
@@ -3,39 +3,35 @@ pragma solidity ^0.8.20;
3
3
 
4
4
  import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
5
5
 
6
- import {IRegistry} from "../registry/IRegistry.sol";
7
- import {Product} from "./Product.sol";
6
+ import {IComponentService} from "../shared/IComponentService.sol";
8
7
  import {IComponents} from "../instance/module/IComponents.sol";
8
+ import {IDistributionService} from "../distribution/IDistributionService.sol";
9
+ import {InstanceReader} from "../instance/InstanceReader.sol";
10
+ import {InstanceStore} from "../instance/InstanceStore.sol";
9
11
  import {IInstance} from "../instance/IInstance.sol";
10
12
  import {IPolicy} from "../instance/module/IPolicy.sol";
13
+ import {IPolicyHolder} from "../shared/IPolicyHolder.sol";
14
+ import {IPolicyService} from "./IPolicyService.sol";
15
+ import {IPoolService} from "../pool/IPoolService.sol";
16
+ import {IPricingService} from "./IPricingService.sol";
17
+ import {IRegistry} from "../registry/IRegistry.sol";
11
18
 
12
- import {TokenHandler} from "../shared/TokenHandler.sol";
13
-
14
- import {Amount, AmountLib} from "../type/Amount.sol";
15
- import {Timestamp, TimestampLib, zeroTimestamp} from "../type/Timestamp.sol";
16
- import {ObjectType, APPLICATION, COMPONENT, DISTRIBUTION, PRODUCT, POOL, POLICY, BUNDLE, CLAIM, PRICE} from "../type/ObjectType.sol";
19
+ import {Amount} from "../type/Amount.sol";
17
20
  import {APPLIED, COLLATERALIZED, KEEP_STATE, CLOSED, DECLINED, PAID} from "../type/StateId.sol";
21
+ import {ContractLib} from "../shared/ContractLib.sol";
18
22
  import {NftId} from "../type/NftId.sol";
23
+ import {ObjectType, COMPONENT, DISTRIBUTION, PRODUCT, POOL, POLICY, PRICE} from "../type/ObjectType.sol";
19
24
  import {ReferralId} from "../type/Referral.sol";
25
+ import {RiskId} from "../type/RiskId.sol";
26
+ import {Service} from "../shared/Service.sol";
20
27
  import {StateId} from "../type/StateId.sol";
28
+ import {Timestamp, TimestampLib} from "../type/Timestamp.sol";
29
+ import {TokenHandler} from "../shared/TokenHandler.sol";
21
30
  import {VersionPart} from "../type/Version.sol";
22
31
 
23
- import {ComponentVerifyingService} from "../shared/ComponentVerifyingService.sol";
24
- import {ContractLib} from "../shared/ContractLib.sol";
25
- import {IApplicationService} from "./IApplicationService.sol";
26
- import {IBundleService} from "../pool/IBundleService.sol";
27
- import {IClaimService} from "./IClaimService.sol";
28
- import {IComponentService} from "../shared/IComponentService.sol";
29
- import {IDistributionService} from "../distribution/IDistributionService.sol";
30
- import {InstanceReader} from "../instance/InstanceReader.sol";
31
- import {InstanceStore} from "../instance/InstanceStore.sol";
32
- import {IPolicyHolder} from "../shared/IPolicyHolder.sol";
33
- import {IPolicyService} from "./IPolicyService.sol";
34
- import {IPoolService} from "../pool/IPoolService.sol";
35
- import {IPricingService} from "./IPricingService.sol";
36
32
 
37
33
  contract PolicyService is
38
- ComponentVerifyingService,
34
+ Service,
39
35
  IPolicyService
40
36
  {
41
37
  IComponentService internal _componentService;
@@ -75,26 +71,15 @@ contract PolicyService is
75
71
  virtual
76
72
  nonReentrant()
77
73
  {
78
- _checkNftType(applicationNftId, POLICY());
79
-
80
- (NftId productNftId,, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
81
- InstanceReader instanceReader = instance.getInstanceReader();
74
+ // checks
75
+ (IInstance instance,,) = _getAndVerifyCallerForPolicy(applicationNftId);
82
76
 
83
77
  // check policy is in state applied
84
- if (instanceReader.getPolicyState(applicationNftId) != APPLIED()) {
78
+ if (instance.getInstanceReader().getPolicyState(applicationNftId) != APPLIED()) {
85
79
  revert ErrorPolicyServicePolicyStateNotApplied(applicationNftId);
86
80
  }
87
81
 
88
- // check policy matches with calling product
89
- IPolicy.PolicyInfo memory applicationInfo = instanceReader.getPolicyInfo(applicationNftId);
90
- if(applicationInfo.productNftId != productNftId) {
91
- revert ErrorPolicyServicePolicyProductMismatch(
92
- applicationNftId,
93
- applicationInfo.productNftId,
94
- productNftId);
95
- }
96
-
97
-
82
+ // effects
98
83
  // store updated policy info
99
84
  instance.getInstanceStore().updatePolicyState(
100
85
  applicationNftId,
@@ -112,27 +97,22 @@ contract PolicyService is
112
97
  external
113
98
  virtual
114
99
  nonReentrant()
100
+ returns (Amount premiumAmount)
115
101
  {
116
- _checkNftType(applicationNftId, POLICY());
117
-
118
- // check caller is registered product
119
- (NftId productNftId,, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
120
- InstanceReader instanceReader = instance.getInstanceReader();
102
+ // checks
103
+ (
104
+ IInstance instance,
105
+ NftId productNftId,
106
+ IPolicy.PolicyInfo memory applicationInfo
107
+ ) = _getAndVerifyCallerForPolicy(applicationNftId);
121
108
 
122
109
  // check policy is in state applied
110
+ InstanceReader instanceReader = instance.getInstanceReader();
123
111
  if (instanceReader.getPolicyState(applicationNftId) != APPLIED()) {
124
112
  revert ErrorPolicyServicePolicyStateNotApplied(applicationNftId);
125
113
  }
126
114
 
127
- // check policy matches with calling product
128
- IPolicy.PolicyInfo memory applicationInfo = instanceReader.getPolicyInfo(applicationNftId);
129
- if(applicationInfo.productNftId != productNftId) {
130
- revert ErrorPolicyServicePolicyProductMismatch(
131
- applicationNftId,
132
- applicationInfo.productNftId,
133
- productNftId);
134
- }
135
-
115
+ // effects
136
116
  // actual collateralizaion
137
117
  _poolService.lockCollateral(
138
118
  instance,
@@ -143,11 +123,8 @@ contract PolicyService is
143
123
  applicationInfo.sumInsuredAmount);
144
124
 
145
125
  // optional activation of policy
146
- if(activateAt > zeroTimestamp()) {
147
- applicationInfo = _activate(
148
- applicationNftId,
149
- applicationInfo,
150
- activateAt);
126
+ if(activateAt > TimestampLib.zero()) {
127
+ applicationInfo = _activate(applicationNftId, applicationInfo, activateAt);
151
128
  }
152
129
 
153
130
  // update policy and set state to collateralized
@@ -157,35 +134,42 @@ contract PolicyService is
157
134
  COLLATERALIZED());
158
135
 
159
136
  // calculate and store premium
137
+ RiskId riskId = applicationInfo.riskId;
138
+ NftId bundleNftId = applicationInfo.bundleNftId;
139
+
160
140
  IPolicy.PremiumInfo memory premium = _pricingService.calculatePremium(
161
141
  productNftId,
162
- applicationInfo.riskId,
142
+ riskId,
163
143
  applicationInfo.sumInsuredAmount,
164
144
  applicationInfo.lifetime,
165
145
  applicationInfo.applicationData,
166
- applicationInfo.bundleNftId,
146
+ bundleNftId,
167
147
  applicationInfo.referralId);
168
148
 
149
+ premiumAmount = premium.fullPremiumAmount;
169
150
  instance.getInstanceStore().createPremium(
170
151
  applicationNftId,
171
152
  premium);
172
153
 
173
- // update referral counter
154
+ // update referral counter if product has linked distributino component
174
155
  {
175
156
  IComponents.ProductInfo memory productInfo = instanceReader.getProductInfo(productNftId);
176
-
177
- if (! productInfo.distributionNftId.eqz()) { // only call distribution service if a distribution component is connected to the product
157
+ if (productInfo.hasDistribution) {
178
158
  _distributionService.processReferral(
179
159
  productInfo.distributionNftId,
180
160
  applicationInfo.referralId);
181
161
  }
182
162
  }
183
163
 
164
+ // link policy to risk and bundle
165
+ NftId poolNftId = getRegistry().getObjectInfo(bundleNftId).parentNftId;
166
+ instance.getRiskSet().linkPolicy(productNftId, riskId, applicationNftId);
167
+ instance.getBundleSet().linkPolicy(poolNftId, bundleNftId, applicationNftId);
168
+
184
169
  // log policy creation before interactions with token and policy holder
185
170
  emit LogPolicyServicePolicyCreated(applicationNftId, premium.premiumAmount, activateAt);
186
171
 
187
- // TODO add calling pool contract if it needs to validate application
188
-
172
+ // interactions
189
173
  // callback to policy holder if applicable
190
174
  _policyHolderPolicyActivated(applicationNftId, activateAt);
191
175
  }
@@ -200,30 +184,40 @@ contract PolicyService is
200
184
  virtual
201
185
  nonReentrant()
202
186
  {
203
- _checkNftType(policyNftId, POLICY());
187
+ // checks
188
+ (
189
+ IInstance instance,
190
+ NftId productNftId,
191
+ IPolicy.PolicyInfo memory policyInfo
192
+ ) = _getAndVerifyCallerForPolicy(policyNftId);
204
193
 
205
- // check caller is registered product
206
- (,, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
194
+ // check policy is in state collateralized
207
195
  InstanceReader instanceReader = instance.getInstanceReader();
208
- StateId stateId = instanceReader.getPolicyState(policyNftId);
209
-
210
- // check policy is in state collateralized or active
211
- if (!(stateId == COLLATERALIZED())) {
196
+ if (instanceReader.getPolicyState(policyNftId) != COLLATERALIZED()) {
212
197
  revert ErrorPolicyServicePolicyStateNotCollateralized(policyNftId);
213
198
  }
214
199
 
215
- // check if premium is already collected
200
+ // check if premium has already been collected
216
201
  if (instanceReader.getPremiumInfoState(policyNftId) == PAID()) {
217
202
  revert ErrorPolicyServicePremiumAlreadyPaid(policyNftId);
218
203
  }
219
204
 
220
- IPolicy.PolicyInfo memory policyInfo = instanceReader.getPolicyInfo(policyNftId);
221
- IPolicy.PremiumInfo memory premium = instanceReader.getPremiumInfo(policyNftId);
222
-
223
- _processPremium(
224
- instance,
225
- policyNftId,
226
- policyInfo,
205
+ // check funds and allowance of policy holder
206
+ IPolicy.PremiumInfo memory premium = instanceReader.getPremiumInfo(policyNftId);
207
+ TokenHandler tokenHandler = _getTokenHandler(instanceReader, policyInfo.productNftId);
208
+ _checkPremiumBalanceAndAllowance(
209
+ tokenHandler.TOKEN(),
210
+ address(tokenHandler),
211
+ getRegistry().ownerOf(policyNftId),
212
+ premium.premiumAmount);
213
+
214
+ // effects
215
+ _processSale(
216
+ instanceReader,
217
+ instance.getInstanceStore(),
218
+ productNftId,
219
+ policyInfo.bundleNftId,
220
+ policyInfo.referralId,
227
221
  premium);
228
222
 
229
223
  // optionally activate policy
@@ -237,29 +231,31 @@ contract PolicyService is
237
231
  // log premium collection before interactions with token
238
232
  emit LogPolicyServicePolicyPremiumCollected(policyNftId, premium.premiumAmount);
239
233
 
234
+ // interactions
240
235
  _transferFunds(instanceReader, policyNftId, policyInfo.productNftId, premium);
241
236
  }
242
237
 
238
+
243
239
  /// @inheritdoc IPolicyService
244
240
  function activate(NftId policyNftId, Timestamp activateAt)
245
241
  external
246
242
  virtual
247
243
  nonReentrant()
248
244
  {
249
- _checkNftType(policyNftId, POLICY());
250
-
251
- // check caller is registered product
252
- (,, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
253
- InstanceReader instanceReader = instance.getInstanceReader();
245
+ // checks
246
+ (
247
+ IInstance instance,,
248
+ IPolicy.PolicyInfo memory policyInfo
249
+ ) = _getAndVerifyCallerForPolicy(policyNftId);
254
250
 
255
- IPolicy.PolicyInfo memory policyInfo = instanceReader.getPolicyInfo(policyNftId);
251
+ // effects
256
252
  policyInfo = _activate(policyNftId, policyInfo, activateAt);
257
-
258
253
  instance.getInstanceStore().updatePolicy(policyNftId, policyInfo, KEEP_STATE());
259
254
 
260
255
  // log policy activation before interactions with policy holder
261
256
  emit LogPolicyServicePolicyActivated(policyNftId, activateAt);
262
257
 
258
+ // interactions
263
259
  // callback to policy holder if applicable
264
260
  _policyHolderPolicyActivated(policyNftId, activateAt);
265
261
  }
@@ -275,26 +271,22 @@ contract PolicyService is
275
271
  nonReentrant()
276
272
  returns (Timestamp expiredAt)
277
273
  {
278
- _checkNftType(policyNftId, POLICY());
279
-
280
- (NftId productNftId,, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
281
-
282
- // check policy matches with calling product
283
- IPolicy.PolicyInfo memory policyInfo = instance.getInstanceReader().getPolicyInfo(policyNftId);
284
- if(policyInfo.productNftId != productNftId) {
285
- revert ErrorPolicyServicePolicyProductMismatch(
286
- policyNftId,
287
- policyInfo.productNftId,
288
- productNftId);
289
- }
274
+ // checks
275
+ (
276
+ IInstance instance,,
277
+ IPolicy.PolicyInfo memory policyInfo
278
+ ) = _getAndVerifyCallerForPolicy(policyNftId);
290
279
 
280
+ // more checks, effects + interactions
291
281
  return _expire(
292
282
  instance,
293
283
  policyNftId,
284
+ policyInfo,
294
285
  expireAt
295
286
  );
296
287
  }
297
288
 
289
+
298
290
  /// @inheritdoc IPolicyService
299
291
  function expirePolicy(
300
292
  IInstance instance,
@@ -306,28 +298,112 @@ contract PolicyService is
306
298
  nonReentrant()
307
299
  returns (Timestamp expiredAt)
308
300
  {
301
+ // checks
309
302
  _checkNftType(policyNftId, POLICY());
303
+ IPolicy.PolicyInfo memory policyInfo = instance.getInstanceReader().getPolicyInfo(
304
+ policyNftId);
310
305
 
306
+ // more checks, effects + interactions
311
307
  return _expire(
312
308
  instance,
313
309
  policyNftId,
310
+ policyInfo,
314
311
  expireAt
315
312
  );
316
313
  }
317
314
 
315
+
316
+ /// @inheritdoc IPolicyService
317
+ function close(
318
+ NftId policyNftId
319
+ )
320
+ external
321
+ virtual
322
+ nonReentrant()
323
+ {
324
+ // checks
325
+ (
326
+ IInstance instance,
327
+ NftId productNftId,
328
+ IPolicy.PolicyInfo memory policyInfo
329
+ ) = _getAndVerifyCallerForPolicy(policyNftId);
330
+ InstanceReader instanceReader = instance.getInstanceReader();
331
+
332
+ // check policy is in a closeable state
333
+ if (!policyIsCloseable(instanceReader, policyNftId)) {
334
+ revert ErrorPolicyServicePolicyNotCloseable(policyNftId);
335
+ }
336
+
337
+ // check that policy has been activated
338
+ RiskId riskId = policyInfo.riskId;
339
+ NftId bundleNftId = policyInfo.bundleNftId;
340
+
341
+ if (instanceReader.getPremiumInfoState(policyNftId) != PAID()) {
342
+ revert ErrorPolicyServicePremiumNotPaid(policyNftId, policyInfo.premiumAmount);
343
+ }
344
+
345
+ // effects
346
+ // release (remaining) collateral that was blocked by policy
347
+ _poolService.releaseCollateral(
348
+ instance,
349
+ address(instanceReader.getComponentInfo(productNftId).token),
350
+ policyNftId,
351
+ policyInfo);
352
+
353
+ // TODO consider to also set expiredAt to current block timestamp if that timestamp is still in the futue
354
+
355
+ // update policy state to closed
356
+ policyInfo.closedAt = TimestampLib.blockTimestamp();
357
+ instance.getInstanceStore().updatePolicy(policyNftId, policyInfo, CLOSED());
358
+
359
+ // unlink policy from risk and bundle
360
+ NftId poolNftId = getRegistry().getObjectInfo(bundleNftId).parentNftId;
361
+ instance.getRiskSet().unlinkPolicy(productNftId, riskId, policyNftId);
362
+ instance.getBundleSet().unlinkPolicy(poolNftId, bundleNftId, policyNftId);
363
+
364
+ emit LogPolicyServicePolicyClosed(policyNftId);
365
+ }
366
+
367
+
368
+ function policyIsCloseable(InstanceReader instanceReader, NftId policyNftId)
369
+ public
370
+ view
371
+ returns (bool isCloseable)
372
+ {
373
+ // policy already closed
374
+ if (instanceReader.getPolicyState(policyNftId) == CLOSED()) {
375
+ return false;
376
+ }
377
+
378
+ IPolicy.PolicyInfo memory info = instanceReader.getPolicyInfo(policyNftId);
379
+
380
+ if (info.productNftId.eqz()) { return false; } // not closeable: policy does not exist (or does not belong to this instance)
381
+ if (info.activatedAt.eqz()) { return false; } // not closeable: not yet activated
382
+ if (info.openClaimsCount > 0) { return false; } // not closeable: has open claims
383
+
384
+ // closeable: if sum of claims matches sum insured a policy may be closed prior to the expiry date
385
+ if (info.claimAmount == info.sumInsuredAmount) { return true; }
386
+
387
+ // not closeable: not yet expired
388
+ if (TimestampLib.blockTimestamp() < info.expiredAt) { return false; }
389
+
390
+ // all conditions to close the policy are met
391
+ return true;
392
+ }
393
+
394
+ /// @dev shared functionality for expire() and policyExpire().
318
395
  function _expire(
319
396
  IInstance instance,
320
397
  NftId policyNftId,
398
+ IPolicy.PolicyInfo memory policyInfo,
321
399
  Timestamp expireAt
322
400
  )
323
401
  internal
324
402
  returns (Timestamp expiredAt)
325
403
  {
326
- InstanceReader instanceReader = instance.getInstanceReader();
327
-
404
+ // checks
328
405
  // check policy is active
329
- StateId policyState = instanceReader.getPolicyState(policyNftId);
330
- IPolicy.PolicyInfo memory policyInfo = instance.getInstanceReader().getPolicyInfo(policyNftId);
406
+ StateId policyState = instance.getInstanceReader().getPolicyState(policyNftId);
331
407
  if (!_policyHasBeenActivated(policyState, policyInfo)) {
332
408
  revert ErrorPolicyServicePolicyNotActive(policyNftId, policyState);
333
409
  }
@@ -344,10 +420,12 @@ contract PolicyService is
344
420
  if (expiredAt >= policyInfo.expiredAt) {
345
421
  revert ErrorPolicyServicePolicyExpirationTooLate(policyNftId, policyInfo.expiredAt, expireAt);
346
422
  }
423
+
347
424
  if (expiredAt < TimestampLib.blockTimestamp()) {
348
425
  revert ErrorPolicyServicePolicyExpirationTooEarly(policyNftId, TimestampLib.blockTimestamp(), expireAt);
349
426
  }
350
427
 
428
+ // effects
351
429
  // update policyInfo with new expiredAt timestamp
352
430
  Timestamp originalExpiredAt = policyInfo.expiredAt;
353
431
  policyInfo.expiredAt = expiredAt;
@@ -355,97 +433,33 @@ contract PolicyService is
355
433
 
356
434
  emit LogPolicyServicePolicyExpirationUpdated(policyNftId, originalExpiredAt, expiredAt);
357
435
 
436
+ // interactions
358
437
  // callback to policy holder if applicable
359
438
  _policyHolderPolicyExpired(policyNftId, expiredAt);
360
439
  }
361
440
 
441
+ // TODO cleanup
442
+ // /// @dev Calculates the premium and updates all counters in the other services.
443
+ // /// Only book keeping, no token transfers.
444
+ // function _processPremium(
445
+ // IInstance instance,
446
+ // NftId applicationNftId,
447
+ // IPolicy.PolicyInfo memory applicationInfo,
448
+ // IPolicy.PremiumInfo memory premium
449
+ // )
450
+ // internal
451
+ // virtual
452
+ // {
453
+ // // update the counters
454
+ // _processSale(
455
+ // instanceReader,
456
+ // instance.getInstanceStore(),
457
+ // productNftId,
458
+ // applicationInfo.bundleNftId,
459
+ // applicationInfo.referralId,
460
+ // premium);
461
+ // }
362
462
 
363
- function close(
364
- NftId policyNftId
365
- )
366
- external
367
- virtual
368
- nonReentrant()
369
- {
370
- _checkNftType(policyNftId, POLICY());
371
-
372
- (,, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
373
- InstanceReader instanceReader = instance.getInstanceReader();
374
-
375
- // check that policy has been activated
376
- IPolicy.PolicyInfo memory policyInfo = instanceReader.getPolicyInfo(policyNftId);
377
- StateId policyState = instanceReader.getPolicyState(policyNftId);
378
- if (!_policyHasBeenActivated(policyState, policyInfo)) {
379
- revert ErrorPolicyServicePolicyNotActive(policyNftId, policyState);
380
- }
381
-
382
- // check that policy has not already been closed
383
- if (policyInfo.closedAt.gtz()) {
384
- revert ErrorPolicyServicePolicyAlreadyClosed(policyNftId);
385
- }
386
-
387
- // check that policy does not have any open claims
388
- if (policyInfo.openClaimsCount > 0) {
389
- revert ErrorPolicyServiceOpenClaims(policyNftId, policyInfo.openClaimsCount);
390
- }
391
-
392
- // TODO consider to allow for underpaid premiums (with the effects of reducing max payouts accordingly)
393
- // TODO consider to remove requirement for fully paid premiums altogether
394
- if (! instanceReader.getPremiumInfoState(policyNftId).eq(PAID())) {
395
- revert ErrorPolicyServicePremiumNotPaid(policyNftId, policyInfo.premiumAmount);
396
- }
397
-
398
- // release (remaining) collateral that was blocked by policy
399
- _poolService.releaseCollateral(
400
- instance,
401
- address(instanceReader.getComponentInfo(policyInfo.productNftId).token),
402
- policyNftId,
403
- policyInfo);
404
-
405
- // TODO consider to also set expiredAt to current block timestamp if that timestamp is still in the futue
406
-
407
- // update policy state to closed
408
- policyInfo.closedAt = TimestampLib.blockTimestamp();
409
- instance.getInstanceStore().updatePolicy(policyNftId, policyInfo, CLOSED());
410
-
411
- emit LogPolicyServicePolicyClosed(policyNftId);
412
- }
413
-
414
-
415
- /// @dev calculates the premium and updates all counters in the other services
416
- function _processPremium(
417
- IInstance instance,
418
- NftId applicationNftId,
419
- IPolicy.PolicyInfo memory applicationInfo,
420
- IPolicy.PremiumInfo memory premium
421
- )
422
- internal
423
- virtual
424
- {
425
- NftId productNftId = applicationInfo.productNftId;
426
- InstanceReader instanceReader = instance.getInstanceReader();
427
-
428
- // check if premium balance and allowance of policy holder is sufficient
429
- {
430
- TokenHandler tokenHandler = _getTokenHandler(instanceReader, productNftId);
431
- address policyHolder = getRegistry().ownerOf(applicationNftId);
432
-
433
- _checkPremiumBalanceAndAllowance(
434
- tokenHandler.getToken(),
435
- address(tokenHandler),
436
- policyHolder,
437
- premium.premiumAmount);
438
- }
439
-
440
- // update the counters
441
- _processSale(
442
- instanceReader,
443
- instance.getInstanceStore(),
444
- productNftId,
445
- applicationInfo.bundleNftId,
446
- applicationInfo.referralId,
447
- premium);
448
- }
449
463
 
450
464
  function _activate(
451
465
  NftId policyNftId,
@@ -485,7 +499,7 @@ contract PolicyService is
485
499
  internal
486
500
  virtual
487
501
  {
488
- (NftId distributionNftId, , , ) = _getDistributionNftAndWallets(
502
+ (NftId distributionNftId,,,) = _getDistributionNftAndWallets(
489
503
  instanceReader,
490
504
  productNftId);
491
505
 
@@ -671,17 +685,45 @@ contract PolicyService is
671
685
  )
672
686
  {
673
687
  IComponents.ProductInfo memory productInfo = instanceReader.getProductInfo(productNftId);
674
- distributionNftId = productInfo.distributionNftId;
675
- distributionWallet = instanceReader.getComponentInfo(distributionNftId).wallet;
676
- poolWallet = instanceReader.getComponentInfo(productInfo.poolNftId).wallet;
677
- productWallet = instanceReader.getComponentInfo(productNftId).wallet;
688
+ productWallet = instanceReader.getComponentInfo(productNftId).tokenHandler.getWallet();
689
+ poolWallet = instanceReader.getComponentInfo(productInfo.poolNftId).tokenHandler.getWallet();
690
+
691
+ if (productInfo.hasDistribution) {
692
+ distributionNftId = productInfo.distributionNftId;
693
+ distributionWallet = instanceReader.getComponentInfo(distributionNftId).tokenHandler.getWallet();
694
+ }
678
695
  }
679
696
 
680
697
 
681
- function _getAndVerifyInstanceAndProduct() internal view returns (Product product) {
682
- IRegistry.ObjectInfo memory productInfo;
683
- (, productInfo,) = _getAndVerifyActiveComponent(PRODUCT());
684
- product = Product(productInfo.objectAddress);
698
+ function _getAndVerifyCallerForPolicy(NftId policyNftId)
699
+ internal
700
+ virtual
701
+ view
702
+ returns (
703
+ IInstance instance,
704
+ NftId productNftId,
705
+ IPolicy.PolicyInfo memory policyInfo
706
+ )
707
+ {
708
+ (
709
+ IRegistry.ObjectInfo memory productInfo,
710
+ address instanceAddress
711
+ ) = ContractLib.getAndVerifyComponent(
712
+ getRegistry(),
713
+ msg.sender, // caller contract
714
+ PRODUCT(), // caller must be product
715
+ true); // only active caller
716
+
717
+ productNftId = productInfo.nftId;
718
+ instance = IInstance(instanceAddress);
719
+ policyInfo = instance.getInstanceReader().getPolicyInfo(policyNftId);
720
+
721
+ if (policyInfo.productNftId != productNftId) {
722
+ revert ErrorPolicyServicePolicyProductMismatch(
723
+ policyNftId,
724
+ productNftId,
725
+ policyInfo.productNftId);
726
+ }
685
727
  }
686
728
 
687
729