@etherisc/gif-next 0.0.2-f634e5c-828 → 0.0.2-f689687-279

Sign up to get free protection for your applications and to get access to all the features.
Files changed (433) hide show
  1. package/artifacts/contracts/accounting/AccountingService.sol/AccountingService.dbg.json +4 -0
  2. package/artifacts/contracts/accounting/AccountingService.sol/AccountingService.json +1007 -0
  3. package/artifacts/contracts/accounting/AccountingServiceManager.sol/AccountingServiceManager.dbg.json +4 -0
  4. package/artifacts/contracts/accounting/AccountingServiceManager.sol/AccountingServiceManager.json +744 -0
  5. package/artifacts/contracts/accounting/IAccountingService.sol/IAccountingService.dbg.json +4 -0
  6. package/artifacts/contracts/accounting/IAccountingService.sol/IAccountingService.json +791 -0
  7. package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.dbg.json +1 -1
  8. package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.json +148 -62
  9. package/artifacts/contracts/authorization/AccessAdmin.sol/IAccessManagedChecker.dbg.json +1 -1
  10. package/artifacts/contracts/authorization/AccessManagerCloneable.sol/AccessManagerCloneable.dbg.json +1 -1
  11. package/artifacts/contracts/authorization/AccessManagerCloneable.sol/AccessManagerCloneable.json +233 -5
  12. package/artifacts/contracts/authorization/Authorization.sol/Authorization.dbg.json +1 -1
  13. package/artifacts/contracts/authorization/Authorization.sol/Authorization.json +149 -21
  14. package/artifacts/contracts/authorization/IAccess.sol/IAccess.dbg.json +1 -1
  15. package/artifacts/contracts/authorization/IAccessAdmin.sol/IAccessAdmin.dbg.json +1 -1
  16. package/artifacts/contracts/authorization/IAccessAdmin.sol/IAccessAdmin.json +82 -12
  17. package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.dbg.json +1 -1
  18. package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.json +68 -13
  19. package/artifacts/contracts/authorization/IServiceAuthorization.sol/IServiceAuthorization.dbg.json +1 -1
  20. package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.dbg.json +1 -1
  21. package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.json +2 -2
  22. package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.dbg.json +1 -1
  23. package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.json +77 -65
  24. package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.dbg.json +1 -1
  25. package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.json +152 -33
  26. package/artifacts/contracts/distribution/Distribution.sol/Distribution.dbg.json +1 -1
  27. package/artifacts/contracts/distribution/Distribution.sol/Distribution.json +51 -39
  28. package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.dbg.json +1 -1
  29. package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.json +117 -110
  30. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
  31. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.json +46 -48
  32. package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
  33. package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.json +38 -26
  34. package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.dbg.json +1 -1
  35. package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.json +27 -3
  36. package/artifacts/contracts/examples/fire/DamageLevel.sol/DamageLevelLib.dbg.json +1 -1
  37. package/artifacts/contracts/examples/fire/FirePool.sol/FirePool.dbg.json +1 -1
  38. package/artifacts/contracts/examples/fire/FirePool.sol/FirePool.json +102 -42
  39. package/artifacts/contracts/examples/fire/FirePoolAuthorization.sol/FirePoolAuthorization.dbg.json +1 -1
  40. package/artifacts/contracts/examples/fire/FirePoolAuthorization.sol/FirePoolAuthorization.json +127 -40
  41. package/artifacts/contracts/examples/fire/FireProduct.sol/FireProduct.dbg.json +1 -1
  42. package/artifacts/contracts/examples/fire/FireProduct.sol/FireProduct.json +259 -184
  43. package/artifacts/contracts/examples/fire/FireProductAuthorization.sol/FireProductAuthorization.dbg.json +1 -1
  44. package/artifacts/contracts/examples/fire/FireProductAuthorization.sol/FireProductAuthorization.json +152 -33
  45. package/artifacts/contracts/examples/fire/FireUSD.sol/FireUSD.dbg.json +1 -1
  46. package/artifacts/contracts/examples/unpermissioned/SimpleDistribution.sol/SimpleDistribution.dbg.json +1 -1
  47. package/artifacts/contracts/examples/unpermissioned/SimpleDistribution.sol/SimpleDistribution.json +104 -54
  48. package/artifacts/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol/SimpleDistributionAuthorization.dbg.json +4 -0
  49. package/artifacts/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol/SimpleDistributionAuthorization.json +589 -0
  50. package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.dbg.json +1 -1
  51. package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.json +95 -63
  52. package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.dbg.json +1 -1
  53. package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.json +111 -48
  54. package/artifacts/contracts/examples/unpermissioned/SimplePoolAuthorization.sol/SimplePoolAuthorization.dbg.json +4 -0
  55. package/artifacts/contracts/examples/unpermissioned/SimplePoolAuthorization.sol/SimplePoolAuthorization.json +589 -0
  56. package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.dbg.json +1 -1
  57. package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.json +288 -147
  58. package/artifacts/contracts/instance/BundleSet.sol/BundleSet.dbg.json +1 -1
  59. package/artifacts/contracts/instance/BundleSet.sol/BundleSet.json +88 -45
  60. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  61. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +54 -21
  62. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
  63. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +53 -3
  64. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  65. package/artifacts/contracts/instance/Instance.sol/Instance.json +80 -40
  66. package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.dbg.json +1 -1
  67. package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.json +331 -99
  68. package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.dbg.json +1 -1
  69. package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.json +127 -40
  70. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
  71. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +294 -196
  72. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
  73. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +65 -58
  74. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
  75. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +20 -22
  76. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.dbg.json +1 -1
  77. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.json +403 -353
  78. package/artifacts/contracts/instance/RiskSet.sol/RiskSet.dbg.json +1 -1
  79. package/artifacts/contracts/instance/RiskSet.sol/RiskSet.json +96 -53
  80. package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.dbg.json +1 -1
  81. package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.json +2 -2
  82. package/artifacts/contracts/instance/base/Cloneable.sol/Cloneable.dbg.json +1 -1
  83. package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.dbg.json +1 -1
  84. package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.json +2 -2
  85. package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.dbg.json +1 -1
  86. package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.json +2 -2
  87. package/artifacts/contracts/instance/base/ObjectSet.sol/ObjectSet.dbg.json +1 -1
  88. package/artifacts/contracts/instance/base/ObjectSet.sol/ObjectSet.json +16 -5
  89. package/artifacts/contracts/instance/base/ObjectSetHelperLib.sol/ObjectSetHelperLib.dbg.json +4 -0
  90. package/artifacts/contracts/instance/base/ObjectSetHelperLib.sol/ObjectSetHelperLib.json +168 -0
  91. package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
  92. package/artifacts/contracts/instance/module/IComponents.sol/IComponents.dbg.json +1 -1
  93. package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +1 -1
  94. package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +1 -1
  95. package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +1 -1
  96. package/artifacts/contracts/mock/Dip.sol/Dip.dbg.json +1 -1
  97. package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.dbg.json +1 -1
  98. package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.json +68 -56
  99. package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.dbg.json +1 -1
  100. package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.json +126 -35
  101. package/artifacts/contracts/oracle/IOracle.sol/IOracle.dbg.json +1 -1
  102. package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.dbg.json +1 -1
  103. package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.json +38 -26
  104. package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.dbg.json +1 -1
  105. package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.json +27 -3
  106. package/artifacts/contracts/oracle/Oracle.sol/Oracle.dbg.json +1 -1
  107. package/artifacts/contracts/oracle/Oracle.sol/Oracle.json +52 -40
  108. package/artifacts/contracts/oracle/OracleService.sol/OracleService.dbg.json +1 -1
  109. package/artifacts/contracts/oracle/OracleService.sol/OracleService.json +75 -68
  110. package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.dbg.json +1 -1
  111. package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.json +25 -27
  112. package/artifacts/contracts/pool/BasicPool.sol/BasicPool.dbg.json +1 -1
  113. package/artifacts/contracts/pool/BasicPool.sol/BasicPool.json +51 -39
  114. package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.dbg.json +1 -1
  115. package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.json +127 -40
  116. package/artifacts/contracts/pool/BundleService.sol/BundleService.dbg.json +1 -1
  117. package/artifacts/contracts/pool/BundleService.sol/BundleService.json +102 -201
  118. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.dbg.json +1 -1
  119. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.json +33 -55
  120. package/artifacts/contracts/pool/IBundleService.sol/IBundleService.dbg.json +1 -1
  121. package/artifacts/contracts/pool/IBundleService.sol/IBundleService.json +38 -80
  122. package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
  123. package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.json +38 -26
  124. package/artifacts/contracts/pool/IPoolService.sol/IPoolService.dbg.json +1 -1
  125. package/artifacts/contracts/pool/IPoolService.sol/IPoolService.json +120 -175
  126. package/artifacts/contracts/pool/Pool.sol/Pool.dbg.json +1 -1
  127. package/artifacts/contracts/pool/Pool.sol/Pool.json +51 -39
  128. package/artifacts/contracts/pool/PoolLib.sol/PoolLib.dbg.json +4 -0
  129. package/artifacts/contracts/pool/PoolLib.sol/PoolLib.json +456 -0
  130. package/artifacts/contracts/pool/PoolService.sol/PoolService.dbg.json +1 -1
  131. package/artifacts/contracts/pool/PoolService.sol/PoolService.json +236 -281
  132. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
  133. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.json +61 -47
  134. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.dbg.json +1 -1
  135. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.json +57 -50
  136. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +1 -1
  137. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.json +16 -18
  138. package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.dbg.json +1 -1
  139. package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.json +157 -130
  140. package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.dbg.json +1 -1
  141. package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.json +152 -33
  142. package/artifacts/contracts/product/ClaimService.sol/ClaimService.dbg.json +1 -1
  143. package/artifacts/contracts/product/ClaimService.sol/ClaimService.json +244 -187
  144. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +1 -1
  145. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.json +55 -65
  146. package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.dbg.json +1 -1
  147. package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.json +27 -3
  148. package/artifacts/contracts/product/IClaimService.sol/IClaimService.dbg.json +1 -1
  149. package/artifacts/contracts/product/IClaimService.sol/IClaimService.json +142 -20
  150. package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.dbg.json +1 -1
  151. package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.json +27 -50
  152. package/artifacts/contracts/product/IPricingService.sol/IPricingService.dbg.json +1 -1
  153. package/artifacts/contracts/product/IPricingService.sol/IPricingService.json +27 -3
  154. package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.dbg.json +1 -1
  155. package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.json +144 -117
  156. package/artifacts/contracts/product/IRiskService.sol/IRiskService.dbg.json +1 -1
  157. package/artifacts/contracts/product/IRiskService.sol/IRiskService.json +27 -3
  158. package/artifacts/contracts/product/PolicyService.sol/PolicyService.dbg.json +1 -1
  159. package/artifacts/contracts/product/PolicyService.sol/PolicyService.json +105 -137
  160. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +1 -1
  161. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.json +40 -38
  162. package/artifacts/contracts/product/PricingService.sol/PricingService.dbg.json +1 -1
  163. package/artifacts/contracts/product/PricingService.sol/PricingService.json +85 -78
  164. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.dbg.json +1 -1
  165. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.json +31 -33
  166. package/artifacts/contracts/product/Product.sol/Product.dbg.json +1 -1
  167. package/artifacts/contracts/product/Product.sol/Product.json +157 -130
  168. package/artifacts/contracts/product/RiskService.sol/RiskService.dbg.json +1 -1
  169. package/artifacts/contracts/product/RiskService.sol/RiskService.json +76 -77
  170. package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.dbg.json +1 -1
  171. package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.json +25 -19
  172. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  173. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  174. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +26 -2
  175. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
  176. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +31 -7
  177. package/artifacts/contracts/registry/IRelease.sol/IRelease.dbg.json +4 -0
  178. package/artifacts/contracts/registry/IRelease.sol/IRelease.json +24 -0
  179. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
  180. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  181. package/artifacts/contracts/registry/Registry.sol/Registry.json +64 -40
  182. package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.dbg.json +1 -1
  183. package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.json +250 -221
  184. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
  185. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +51 -44
  186. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
  187. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +11 -13
  188. package/artifacts/contracts/registry/ReleaseAdmin.sol/ReleaseAdmin.dbg.json +4 -0
  189. package/artifacts/contracts/registry/ReleaseAdmin.sol/ReleaseAdmin.json +1849 -0
  190. package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.dbg.json +1 -1
  191. package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.json +2 -2
  192. package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.dbg.json +1 -1
  193. package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.json +315 -49
  194. package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.dbg.json +1 -1
  195. package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.json +6 -6
  196. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
  197. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +4 -4
  198. package/artifacts/contracts/shared/Component.sol/Component.dbg.json +1 -1
  199. package/artifacts/contracts/shared/Component.sol/Component.json +51 -39
  200. package/artifacts/contracts/shared/ComponentService.sol/ComponentService.dbg.json +1 -1
  201. package/artifacts/contracts/shared/ComponentService.sol/ComponentService.json +105 -442
  202. package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.dbg.json +1 -1
  203. package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.json +40 -70
  204. package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.dbg.json +1 -1
  205. package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.json +27 -16
  206. package/artifacts/contracts/shared/ContractLib.sol/ContractLib.dbg.json +1 -1
  207. package/artifacts/contracts/shared/ContractLib.sol/ContractLib.json +57 -4
  208. package/artifacts/contracts/shared/ContractLib.sol/IInstanceAdminHelper.dbg.json +1 -1
  209. package/artifacts/contracts/shared/ContractLib.sol/ITargetHelper.dbg.json +1 -1
  210. package/artifacts/contracts/shared/ContractLib.sol/ITokenRegistryHelper.dbg.json +4 -0
  211. package/artifacts/contracts/shared/ContractLib.sol/ITokenRegistryHelper.json +40 -0
  212. package/artifacts/contracts/shared/IComponent.sol/IComponent.dbg.json +1 -1
  213. package/artifacts/contracts/shared/IComponent.sol/IComponent.json +38 -26
  214. package/artifacts/contracts/shared/IComponentService.sol/IComponentService.dbg.json +1 -1
  215. package/artifacts/contracts/shared/IComponentService.sol/IComponentService.json +27 -291
  216. package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.dbg.json +1 -1
  217. package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.json +38 -26
  218. package/artifacts/contracts/shared/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
  219. package/artifacts/contracts/shared/ILifecycle.sol/ILifecycle.dbg.json +1 -1
  220. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
  221. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +1 -1
  222. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  223. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +120 -1
  224. package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +1 -1
  225. package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
  226. package/artifacts/contracts/shared/IService.sol/IService.json +27 -3
  227. package/artifacts/contracts/shared/InitializableERC165.sol/InitializableERC165.dbg.json +1 -1
  228. package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.dbg.json +1 -1
  229. package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.json +51 -39
  230. package/artifacts/contracts/shared/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
  231. package/artifacts/contracts/shared/Lifecycle.sol/Lifecycle.dbg.json +1 -1
  232. package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.dbg.json +1 -1
  233. package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.json +2 -2
  234. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
  235. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +2 -2
  236. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +1 -1
  237. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +2 -2
  238. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  239. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +118 -62
  240. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +1 -1
  241. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +2 -2
  242. package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
  243. package/artifacts/contracts/shared/Service.sol/Service.json +27 -16
  244. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
  245. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +63 -162
  246. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandlerBase.dbg.json +1 -1
  247. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandlerBase.json +118 -29
  248. package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.dbg.json +1 -1
  249. package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.json +32 -32
  250. package/artifacts/contracts/staking/IStaking.sol/IStaking.dbg.json +1 -1
  251. package/artifacts/contracts/staking/IStaking.sol/IStaking.json +38 -26
  252. package/artifacts/contracts/staking/IStakingService.sol/IStakingService.dbg.json +1 -1
  253. package/artifacts/contracts/staking/IStakingService.sol/IStakingService.json +56 -3
  254. package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.dbg.json +1 -1
  255. package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.json +32 -32
  256. package/artifacts/contracts/staking/Staking.sol/Staking.dbg.json +1 -1
  257. package/artifacts/contracts/staking/Staking.sol/Staking.json +90 -57
  258. package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.dbg.json +1 -1
  259. package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.json +2 -2
  260. package/artifacts/contracts/staking/StakingManager.sol/StakingManager.dbg.json +1 -1
  261. package/artifacts/contracts/staking/StakingManager.sol/StakingManager.json +27 -19
  262. package/artifacts/contracts/staking/StakingReader.sol/StakingReader.dbg.json +1 -1
  263. package/artifacts/contracts/staking/StakingReader.sol/StakingReader.json +4 -4
  264. package/artifacts/contracts/staking/StakingService.sol/StakingService.dbg.json +1 -1
  265. package/artifacts/contracts/staking/StakingService.sol/StakingService.json +87 -51
  266. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.dbg.json +1 -1
  267. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.json +18 -20
  268. package/artifacts/contracts/staking/StakingStore.sol/StakingStore.dbg.json +1 -1
  269. package/artifacts/contracts/staking/StakingStore.sol/StakingStore.json +128 -128
  270. package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.dbg.json +1 -1
  271. package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.json +22 -22
  272. package/artifacts/contracts/type/AddressSet.sol/LibAddressSet.dbg.json +1 -1
  273. package/artifacts/contracts/type/Amount.sol/AmountLib.dbg.json +1 -1
  274. package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
  275. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.dbg.json +1 -1
  276. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.json +2 -2
  277. package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.dbg.json +1 -1
  278. package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.json +2 -2
  279. package/artifacts/contracts/type/Fee.sol/FeeLib.dbg.json +1 -1
  280. package/artifacts/contracts/type/Key32.sol/Key32Lib.dbg.json +1 -1
  281. package/artifacts/contracts/type/Key32.sol/Key32Lib.json +2 -2
  282. package/artifacts/contracts/type/Key32Set.sol/LibKey32Set.dbg.json +1 -1
  283. package/artifacts/contracts/type/Key32Set.sol/LibKey32Set.json +2 -2
  284. package/artifacts/contracts/type/NftId.sol/NftIdLib.dbg.json +1 -1
  285. package/artifacts/contracts/type/NftId.sol/NftIdLib.json +2 -2
  286. package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
  287. package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.json +2 -2
  288. package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
  289. package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.json +2 -2
  290. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.dbg.json +1 -1
  291. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.json +2 -2
  292. package/artifacts/contracts/type/Referral.sol/ReferralLib.dbg.json +1 -1
  293. package/artifacts/contracts/type/Referral.sol/ReferralLib.json +2 -2
  294. package/artifacts/contracts/type/RequestId.sol/RequestIdLib.dbg.json +1 -1
  295. package/artifacts/contracts/type/RequestId.sol/RequestIdLib.json +2 -2
  296. package/artifacts/contracts/type/RiskId.sol/RiskIdLib.dbg.json +1 -1
  297. package/artifacts/contracts/type/RiskId.sol/RiskIdLib.json +23 -4
  298. package/artifacts/contracts/type/RoleId.sol/RoleIdLib.dbg.json +1 -1
  299. package/artifacts/contracts/type/RoleId.sol/RoleIdLib.json +79 -15
  300. package/artifacts/contracts/type/Seconds.sol/SecondsLib.dbg.json +1 -1
  301. package/artifacts/contracts/type/Selector.sol/SelectorLib.dbg.json +1 -1
  302. package/artifacts/contracts/type/Selector.sol/SelectorLib.json +21 -2
  303. package/artifacts/contracts/type/Selector.sol/SelectorSetLib.dbg.json +1 -1
  304. package/artifacts/contracts/type/Selector.sol/SelectorSetLib.json +2 -2
  305. package/artifacts/contracts/type/StateId.sol/StateIdLib.dbg.json +1 -1
  306. package/artifacts/contracts/type/String.sol/StrLib.dbg.json +1 -1
  307. package/artifacts/contracts/type/Timestamp.sol/TimestampLib.dbg.json +1 -1
  308. package/artifacts/contracts/type/Timestamp.sol/TimestampLib.json +2 -2
  309. package/artifacts/contracts/type/UFixed.sol/UFixedLib.dbg.json +1 -1
  310. package/artifacts/contracts/type/Version.sol/VersionLib.dbg.json +1 -1
  311. package/artifacts/contracts/type/Version.sol/VersionLib.json +2 -21
  312. package/artifacts/contracts/type/Version.sol/VersionPartLib.dbg.json +1 -1
  313. package/artifacts/contracts/type/Version.sol/VersionPartLib.json +47 -2
  314. package/artifacts/contracts/upgradeability/IVersionable.sol/IVersionable.dbg.json +1 -1
  315. package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.dbg.json +1 -1
  316. package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.json +2 -2
  317. package/artifacts/contracts/upgradeability/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
  318. package/artifacts/contracts/upgradeability/Versionable.sol/Versionable.dbg.json +1 -1
  319. package/contracts/accounting/AccountingService.sol +262 -0
  320. package/contracts/accounting/AccountingServiceManager.sol +38 -0
  321. package/contracts/accounting/IAccountingService.sol +45 -0
  322. package/contracts/authorization/AccessAdmin.sol +156 -82
  323. package/contracts/authorization/AccessManagerCloneable.sol +136 -3
  324. package/contracts/authorization/Authorization.sol +277 -229
  325. package/contracts/authorization/IAccessAdmin.sol +13 -7
  326. package/contracts/authorization/IAuthorization.sol +15 -1
  327. package/contracts/distribution/BasicDistribution.sol +4 -4
  328. package/contracts/distribution/BasicDistributionAuthorization.sol +21 -8
  329. package/contracts/distribution/Distribution.sol +27 -24
  330. package/contracts/distribution/DistributionService.sol +18 -15
  331. package/contracts/distribution/DistributionServiceManager.sol +1 -1
  332. package/contracts/examples/fire/FirePool.sol +6 -2
  333. package/contracts/examples/fire/FirePoolAuthorization.sol +2 -1
  334. package/contracts/examples/fire/FireProduct.sol +8 -1
  335. package/contracts/examples/fire/FireProductAuthorization.sol +2 -1
  336. package/contracts/examples/unpermissioned/SimpleDistribution.sol +6 -14
  337. package/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol +28 -0
  338. package/contracts/examples/unpermissioned/SimplePool.sol +7 -9
  339. package/contracts/examples/unpermissioned/SimplePoolAuthorization.sol +28 -0
  340. package/contracts/examples/unpermissioned/SimpleProduct.sol +25 -0
  341. package/contracts/instance/BundleSet.sol +4 -4
  342. package/contracts/instance/IInstance.sol +6 -7
  343. package/contracts/instance/IInstanceService.sol +2 -0
  344. package/contracts/instance/Instance.sol +19 -11
  345. package/contracts/instance/InstanceAdmin.sol +216 -62
  346. package/contracts/instance/InstanceAuthorizationV3.sol +18 -23
  347. package/contracts/instance/InstanceReader.sol +79 -35
  348. package/contracts/instance/InstanceService.sol +43 -31
  349. package/contracts/instance/InstanceServiceManager.sol +1 -1
  350. package/contracts/instance/InstanceStore.sol +13 -2
  351. package/contracts/instance/RiskSet.sol +11 -12
  352. package/contracts/instance/base/ObjectLifecycle.sol +4 -2
  353. package/contracts/instance/base/ObjectSet.sol +7 -8
  354. package/contracts/instance/base/ObjectSetHelperLib.sol +30 -0
  355. package/contracts/instance/module/IComponents.sol +3 -2
  356. package/contracts/instance/module/IRisk.sol +2 -0
  357. package/contracts/oracle/BasicOracleAuthorization.sol +3 -12
  358. package/contracts/oracle/Oracle.sol +1 -1
  359. package/contracts/oracle/OracleService.sol +16 -15
  360. package/contracts/oracle/OracleServiceManager.sol +1 -1
  361. package/contracts/pool/BasicPoolAuthorization.sol +21 -13
  362. package/contracts/pool/BundleService.sol +35 -63
  363. package/contracts/pool/BundleServiceManager.sol +1 -1
  364. package/contracts/pool/IBundleService.sol +13 -20
  365. package/contracts/pool/IPoolService.sol +50 -38
  366. package/contracts/pool/Pool.sol +9 -9
  367. package/contracts/pool/PoolLib.sol +216 -0
  368. package/contracts/pool/PoolService.sol +307 -162
  369. package/contracts/pool/PoolServiceManager.sol +1 -1
  370. package/contracts/product/ApplicationService.sol +3 -3
  371. package/contracts/product/ApplicationServiceManager.sol +1 -1
  372. package/contracts/product/BasicProduct.sol +2 -0
  373. package/contracts/product/BasicProductAuthorization.sol +24 -10
  374. package/contracts/product/ClaimService.sol +157 -139
  375. package/contracts/product/ClaimServiceManager.sol +1 -1
  376. package/contracts/product/IClaimService.sol +14 -2
  377. package/contracts/product/IPolicyService.sol +3 -2
  378. package/contracts/product/IProductComponent.sol +4 -1
  379. package/contracts/product/PolicyService.sol +74 -82
  380. package/contracts/product/PolicyServiceManager.sol +1 -1
  381. package/contracts/product/PricingService.sol +23 -19
  382. package/contracts/product/PricingServiceManager.sol +3 -3
  383. package/contracts/product/Product.sol +36 -0
  384. package/contracts/product/RiskService.sol +61 -23
  385. package/contracts/product/RiskServiceManager.sol +1 -1
  386. package/contracts/registry/IRegistry.sol +8 -15
  387. package/contracts/registry/IRelease.sol +26 -0
  388. package/contracts/registry/Registry.sol +7 -2
  389. package/contracts/registry/RegistryAdmin.sol +129 -226
  390. package/contracts/registry/RegistryService.sol +3 -3
  391. package/contracts/registry/RegistryServiceManager.sol +1 -1
  392. package/contracts/registry/ReleaseAdmin.sol +245 -0
  393. package/contracts/registry/ReleaseLifecycle.sol +2 -0
  394. package/contracts/registry/ReleaseRegistry.sol +124 -99
  395. package/contracts/registry/ServiceAuthorizationV3.sol +85 -14
  396. package/contracts/registry/TokenRegistry.sol +6 -8
  397. package/contracts/shared/Component.sol +32 -27
  398. package/contracts/shared/ComponentService.sol +89 -266
  399. package/contracts/shared/ComponentServiceManager.sol +1 -1
  400. package/contracts/shared/ComponentVerifyingService.sol +1 -1
  401. package/contracts/shared/ContractLib.sol +32 -3
  402. package/contracts/shared/IComponent.sol +3 -9
  403. package/contracts/shared/IComponentService.sol +1 -23
  404. package/contracts/shared/IRegisterable.sol +15 -4
  405. package/contracts/shared/IService.sol +3 -5
  406. package/contracts/shared/InstanceLinkedComponent.sol +3 -3
  407. package/contracts/shared/NftOwnable.sol +4 -4
  408. package/contracts/shared/PolicyHolder.sol +1 -1
  409. package/contracts/shared/Registerable.sol +45 -19
  410. package/contracts/shared/RegistryLinked.sol +1 -1
  411. package/contracts/shared/Service.sol +8 -27
  412. package/contracts/shared/TokenHandler.sol +40 -88
  413. package/contracts/staking/IStaking.sol +0 -8
  414. package/contracts/staking/IStakingService.sol +8 -0
  415. package/contracts/staking/StakeManagerLib.sol +1 -1
  416. package/contracts/staking/Staking.sol +34 -13
  417. package/contracts/staking/StakingReader.sol +1 -1
  418. package/contracts/staking/StakingService.sol +32 -42
  419. package/contracts/staking/StakingServiceManager.sol +5 -4
  420. package/contracts/type/ObjectType.sol +46 -21
  421. package/contracts/type/RiskId.sol +5 -0
  422. package/contracts/type/RoleId.sol +24 -4
  423. package/contracts/type/Selector.sol +5 -0
  424. package/contracts/type/Timestamp.sol +0 -5
  425. package/contracts/type/Version.sol +15 -5
  426. package/contracts/upgradeability/ProxyManager.sol +1 -1
  427. package/package.json +1 -1
  428. package/artifacts/contracts/authorization/ReleaseAccessManager.sol/ReleaseAccessManager.dbg.json +0 -4
  429. package/artifacts/contracts/authorization/ReleaseAccessManager.sol/ReleaseAccessManager.json +0 -1196
  430. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +0 -4
  431. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.json +0 -129
  432. package/contracts/authorization/ReleaseAccessManager.sol +0 -38
  433. package/contracts/instance/module/IAccess.sol +0 -46
@@ -3,6 +3,7 @@ pragma solidity ^0.8.20;
3
3
 
4
4
  import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
5
5
 
6
+ import {IAccountingService} from "../accounting/IAccountingService.sol";
6
7
  import {IComponentService} from "../shared/IComponentService.sol";
7
8
  import {IComponents} from "../instance/module/IComponents.sol";
8
9
  import {IDistributionService} from "../distribution/IDistributionService.sol";
@@ -20,7 +21,7 @@ import {Amount} from "../type/Amount.sol";
20
21
  import {APPLIED, COLLATERALIZED, KEEP_STATE, CLOSED, DECLINED, PAID} from "../type/StateId.sol";
21
22
  import {ContractLib} from "../shared/ContractLib.sol";
22
23
  import {NftId} from "../type/NftId.sol";
23
- import {ObjectType, COMPONENT, DISTRIBUTION, PRODUCT, POOL, POLICY, PRICE} from "../type/ObjectType.sol";
24
+ import {ObjectType, ACCOUNTING, COMPONENT, DISTRIBUTION, PRODUCT, POOL, POLICY, PRICE} from "../type/ObjectType.sol";
24
25
  import {ReferralId} from "../type/Referral.sol";
25
26
  import {RiskId} from "../type/RiskId.sol";
26
27
  import {Service} from "../shared/Service.sol";
@@ -34,6 +35,7 @@ contract PolicyService is
34
35
  Service,
35
36
  IPolicyService
36
37
  {
38
+ IAccountingService private _accountingService;
37
39
  IComponentService internal _componentService;
38
40
  IDistributionService internal _distributionService;
39
41
  IPoolService internal _poolService;
@@ -48,13 +50,14 @@ contract PolicyService is
48
50
  initializer
49
51
  {
50
52
  (
51
- address registryAddress,
52
- address authority
53
+ address authority,
54
+ address registry
53
55
  ) = abi.decode(data, (address, address));
54
56
 
55
- _initializeService(registryAddress, authority, owner);
57
+ __Service_init(authority, registry, owner);
56
58
 
57
59
  VersionPart majorVersion = getVersion().toMajorPart();
60
+ _accountingService = IAccountingService(getRegistry().getServiceAddress(ACCOUNTING(), majorVersion));
58
61
  _componentService = IComponentService(getRegistry().getServiceAddress(COMPONENT(), majorVersion));
59
62
  _poolService = IPoolService(getRegistry().getServiceAddress(POOL(), majorVersion));
60
63
  _distributionService = IDistributionService(getRegistry().getServiceAddress(DISTRIBUTION(), majorVersion));
@@ -116,14 +119,14 @@ contract PolicyService is
116
119
  // actual collateralizaion
117
120
  _poolService.lockCollateral(
118
121
  instance,
119
- address(instanceReader.getComponentInfo(productNftId).token),
122
+ address(instanceReader.getToken(productNftId)),
120
123
  productNftId,
121
124
  applicationNftId,
122
125
  applicationInfo.bundleNftId,
123
126
  applicationInfo.sumInsuredAmount);
124
127
 
125
128
  // optional activation of policy
126
- if(activateAt > TimestampLib.zero()) {
129
+ if(activateAt.gtz()) {
127
130
  applicationInfo = _activate(applicationNftId, applicationInfo, activateAt);
128
131
  }
129
132
 
@@ -162,7 +165,7 @@ contract PolicyService is
162
165
  }
163
166
 
164
167
  // link policy to risk and bundle
165
- NftId poolNftId = getRegistry().getObjectInfo(bundleNftId).parentNftId;
168
+ NftId poolNftId = getRegistry().getParentNftId(bundleNftId);
166
169
  instance.getRiskSet().linkPolicy(productNftId, riskId, applicationNftId);
167
170
  instance.getBundleSet().linkPolicy(poolNftId, bundleNftId, applicationNftId);
168
171
 
@@ -204,12 +207,18 @@ contract PolicyService is
204
207
 
205
208
  // check funds and allowance of policy holder
206
209
  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);
210
+ instanceReader.getTokenHandler(
211
+ productNftId).checkBalanceAndAllowance(
212
+ getRegistry().ownerOf(policyNftId),
213
+ premium.premiumAmount,
214
+ false);
215
+
216
+ // )
217
+ // _checkPremiumBalanceAndAllowance(
218
+ // tokenHandler.TOKEN(),
219
+ // address(tokenHandler),
220
+ // getRegistry().ownerOf(policyNftId),
221
+ // premium.premiumAmount);
213
222
 
214
223
  // effects
215
224
  _processSale(
@@ -232,7 +241,7 @@ contract PolicyService is
232
241
  emit LogPolicyServicePolicyPremiumCollected(policyNftId, premium.premiumAmount);
233
242
 
234
243
  // interactions
235
- _transferFunds(instanceReader, policyNftId, policyInfo.productNftId, premium);
244
+ _transferPremiumAmounts(instanceReader, policyNftId, policyInfo.productNftId, premium);
236
245
  }
237
246
 
238
247
 
@@ -346,7 +355,6 @@ contract PolicyService is
346
355
  // release (remaining) collateral that was blocked by policy
347
356
  _poolService.releaseCollateral(
348
357
  instance,
349
- address(instanceReader.getComponentInfo(productNftId).token),
350
358
  policyNftId,
351
359
  policyInfo);
352
360
 
@@ -357,7 +365,7 @@ contract PolicyService is
357
365
  instance.getInstanceStore().updatePolicy(policyNftId, policyInfo, CLOSED());
358
366
 
359
367
  // unlink policy from risk and bundle
360
- NftId poolNftId = getRegistry().getObjectInfo(bundleNftId).parentNftId;
368
+ NftId poolNftId = getRegistry().getParentNftId(bundleNftId);
361
369
  instance.getRiskSet().unlinkPolicy(productNftId, riskId, policyNftId);
362
370
  instance.getBundleSet().unlinkPolicy(poolNftId, bundleNftId, policyNftId);
363
371
 
@@ -438,28 +446,6 @@ contract PolicyService is
438
446
  _policyHolderPolicyExpired(policyNftId, expiredAt);
439
447
  }
440
448
 
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
- // }
462
-
463
449
 
464
450
  function _activate(
465
451
  NftId policyNftId,
@@ -504,7 +490,7 @@ contract PolicyService is
504
490
  productNftId);
505
491
 
506
492
  // update product fees, distribution and pool fees
507
- _componentService.increaseProductFees(
493
+ _accountingService.increaseProductFees(
508
494
  instanceStore,
509
495
  productNftId,
510
496
  premium.productFeeVarAmount + premium.productFeeFixAmount);
@@ -525,7 +511,7 @@ contract PolicyService is
525
511
 
526
512
 
527
513
  /// @dev transfer the premium to the wallets the premium is distributed to
528
- function _transferFunds(
514
+ function _transferPremiumAmounts(
529
515
  InstanceReader instanceReader,
530
516
  NftId policyNftId,
531
517
  NftId productNftId,
@@ -534,7 +520,6 @@ contract PolicyService is
534
520
  internal
535
521
  virtual
536
522
  {
537
- TokenHandler tokenHandler = _getTokenHandler(instanceReader, productNftId);
538
523
  address policyHolder = getRegistry().ownerOf(policyNftId);
539
524
 
540
525
  (
@@ -546,14 +531,19 @@ contract PolicyService is
546
531
  instanceReader,
547
532
  productNftId);
548
533
 
549
- tokenHandler.collectTokensToThreeRecipients(
550
- policyHolder,
551
- productWallet,
552
- premium.productFeeAmount,
553
- distributionWallet,
554
- premium.distributionFeeAndCommissionAmount,
555
- poolWallet,
556
- premium.poolPremiumAndFeeAmount);
534
+ // step 1: collect premium amount from policy holder
535
+ TokenHandler tokenHandler = instanceReader.getTokenHandler(productNftId);
536
+ tokenHandler.pullToken(policyHolder, premium.premiumAmount);
537
+
538
+ // step 2: push distribution fee to distribution wallet
539
+ if (premium.distributionFeeAndCommissionAmount.gtz()) {
540
+ tokenHandler.pushToken(distributionWallet, premium.distributionFeeAndCommissionAmount);
541
+ }
542
+
543
+ // step 3: push pool fee, bundle fee and pool premium to pool wallet
544
+ if (premium.poolPremiumAndFeeAmount.gtz()) {
545
+ tokenHandler.pushToken(poolWallet, premium.poolPremiumAndFeeAmount);
546
+ }
557
547
  }
558
548
 
559
549
 
@@ -573,29 +563,30 @@ contract PolicyService is
573
563
  }
574
564
 
575
565
 
566
+ // TODO cleanup
576
567
  /// @dev checks the balance and allowance of the policy holder
577
- function _checkPremiumBalanceAndAllowance(
578
- IERC20Metadata token,
579
- address tokenHandlerAddress,
580
- address policyHolder,
581
- Amount premiumAmount
582
- )
583
- internal
584
- virtual
585
- view
586
- {
587
- uint256 premium = premiumAmount.toInt();
588
- uint256 balance = token.balanceOf(policyHolder);
589
- uint256 allowance = token.allowance(policyHolder, tokenHandlerAddress);
568
+ // function _checkPremiumBalanceAndAllowance(
569
+ // IERC20Metadata token,
570
+ // address tokenHandlerAddress,
571
+ // address policyHolder,
572
+ // Amount premiumAmount
573
+ // )
574
+ // internal
575
+ // virtual
576
+ // view
577
+ // {
578
+ // uint256 premium = premiumAmount.toInt();
579
+ // uint256 balance = token.balanceOf(policyHolder);
580
+ // uint256 allowance = token.allowance(policyHolder, tokenHandlerAddress);
590
581
 
591
- if (balance < premium) {
592
- revert ErrorPolicyServiceBalanceInsufficient(policyHolder, premium, balance);
593
- }
582
+ // if (balance < premium) {
583
+ // revert ErrorPolicyServiceBalanceInsufficient(policyHolder, premium, balance);
584
+ // }
594
585
 
595
- if (allowance < premium) {
596
- revert ErrorPolicyServiceAllowanceInsufficient(policyHolder, tokenHandlerAddress, premium, allowance);
597
- }
598
- }
586
+ // if (allowance < premium) {
587
+ // revert ErrorPolicyServiceAllowanceInsufficient(policyHolder, tokenHandlerAddress, premium, allowance);
588
+ // }
589
+ // }
599
590
 
600
591
 
601
592
  function _policyHolderPolicyActivated(
@@ -656,19 +647,20 @@ contract PolicyService is
656
647
  }
657
648
 
658
649
 
659
- function _getTokenHandler(
660
- InstanceReader instanceReader,
661
- NftId productNftId
662
- )
663
- internal
664
- virtual
665
- view
666
- returns (
667
- TokenHandler tokenHandler
668
- )
669
- {
670
- tokenHandler = instanceReader.getComponentInfo(productNftId).tokenHandler;
671
- }
650
+ // TODO cleanup
651
+ // function _getTokenHandler(
652
+ // InstanceReader instanceReader,
653
+ // NftId productNftId
654
+ // )
655
+ // internal
656
+ // virtual
657
+ // view
658
+ // returns (
659
+ // TokenHandler tokenHandler
660
+ // )
661
+ // {
662
+ // tokenHandler = instanceReader.getTokenHandler(productNftId).tokenHandler;
663
+ // }
672
664
 
673
665
 
674
666
  function _getDistributionNftAndWallets(
@@ -17,7 +17,7 @@ contract PolicyServiceManager is ProxyManager {
17
17
  )
18
18
  {
19
19
  PolicyService svc = new PolicyService{salt: salt}();
20
- bytes memory data = abi.encode(registry, authority);
20
+ bytes memory data = abi.encode(authority, registry);
21
21
  IVersionable versionable = initialize(
22
22
  registry,
23
23
  address(svc),
@@ -42,14 +42,15 @@ contract PricingService is
42
42
  initializer()
43
43
  {
44
44
  (
45
- address registryAddress,
46
- address authority
45
+ address authority,
46
+ address registry
47
47
  ) = abi.decode(data, (address, address));
48
48
 
49
- _initializeService(registryAddress, authority, owner);
50
- _registerInterface(type(IPricingService).interfaceId);
49
+ __Service_init(authority, registry, owner);
51
50
 
52
51
  _distributionService = IDistributionService(_getServiceAddress(DISTRIBUTION()));
52
+
53
+ _registerInterface(type(IPricingService).interfaceId);
53
54
  }
54
55
 
55
56
  /// @dev calculates the premium amount for the specified attributes
@@ -98,6 +99,7 @@ contract PricingService is
98
99
  {
99
100
  // get configurations for all involed objects
100
101
  IComponents.ProductInfo memory productInfo = reader.getProductInfo(productNftId);
102
+ IComponents.FeeInfo memory feeInfo = reader.getFeeInfo(productNftId);
101
103
 
102
104
  IBundle.BundleInfo memory bundleInfo = reader.getBundleInfo(bundleNftId);
103
105
  if(bundleInfo.poolNftId != productInfo.poolNftId) {
@@ -107,21 +109,22 @@ contract PricingService is
107
109
  // calculate fixed fees for product, pool, bundle
108
110
  premium = _getFixedFeeAmounts(
109
111
  netPremiumAmount,
110
- productInfo,
112
+ feeInfo,
111
113
  bundleInfo
112
114
  );
113
115
 
114
116
  // calculate variable fees for product, pool, bundle
115
117
  premium = _calculateVariableFeeAmounts(
116
118
  premium,
117
- productInfo,
119
+ feeInfo,
118
120
  bundleInfo
119
121
  );
120
122
 
121
123
  // calculate distribution fee and (if applicable) commission
122
124
  premium = _calculateDistributionOwnerFeeAmount(
123
125
  premium,
124
- productInfo,
126
+ feeInfo,
127
+ productInfo.distributionNftId,
125
128
  referralId,
126
129
  reader
127
130
  );
@@ -137,7 +140,7 @@ contract PricingService is
137
140
  revert ErrorPricingServiceTargetWalletAmountsMismatch();
138
141
  }
139
142
 
140
- if (premium.distributionOwnerFeeFixAmount.toInt() < productInfo.minDistributionOwnerFee.fixedFee) {
143
+ if (premium.distributionOwnerFeeFixAmount.toInt() < feeInfo.minDistributionOwnerFee.fixedFee) {
141
144
  revert ErrorPricingServiceFeeCalculationMismatch(
142
145
  premium.distributionFeeFixAmount,
143
146
  premium.distributionFeeVarAmount,
@@ -164,7 +167,7 @@ contract PricingService is
164
167
  // internal functions
165
168
  function _getFixedFeeAmounts(
166
169
  Amount netPremiumAmount,
167
- IComponents.ProductInfo memory productInfo,
170
+ IComponents.FeeInfo memory feeInfo,
168
171
  IBundle.BundleInfo memory bundleInfo
169
172
  )
170
173
  internal
@@ -177,11 +180,11 @@ contract PricingService is
177
180
  premium.netPremiumAmount = netPremiumAmount;
178
181
  premium.fullPremiumAmount = netPremiumAmount;
179
182
 
180
- Amount t = AmountLib.toAmount(productInfo.productFee.fixedFee);
183
+ Amount t = AmountLib.toAmount(feeInfo.productFee.fixedFee);
181
184
  premium.productFeeFixAmount = t;
182
185
  premium.fullPremiumAmount = premium.fullPremiumAmount + t;
183
186
 
184
- t = AmountLib.toAmount(productInfo.poolFee.fixedFee);
187
+ t = AmountLib.toAmount(feeInfo.poolFee.fixedFee);
185
188
  premium.poolFeeFixAmount = t;
186
189
  premium.fullPremiumAmount = premium.fullPremiumAmount + t;
187
190
 
@@ -189,14 +192,14 @@ contract PricingService is
189
192
  premium.bundleFeeFixAmount = t;
190
193
  premium.fullPremiumAmount = premium.fullPremiumAmount + t;
191
194
 
192
- t = AmountLib.toAmount(productInfo.distributionFee.fixedFee);
195
+ t = AmountLib.toAmount(feeInfo.distributionFee.fixedFee);
193
196
  premium.distributionFeeFixAmount = t;
194
197
  premium.fullPremiumAmount = premium.fullPremiumAmount + t;
195
198
  }
196
199
 
197
200
  function _calculateVariableFeeAmounts(
198
201
  IPolicy.PremiumInfo memory premium,
199
- IComponents.ProductInfo memory productInfo,
202
+ IComponents.FeeInfo memory feeInfo,
200
203
  IBundle.BundleInfo memory bundleInfo
201
204
  )
202
205
  internal
@@ -207,11 +210,11 @@ contract PricingService is
207
210
  {
208
211
  Amount netPremiumAmount = premium.netPremiumAmount;
209
212
 
210
- Amount t = netPremiumAmount.multiplyWith(productInfo.productFee.fractionalFee);
213
+ Amount t = netPremiumAmount.multiplyWith(feeInfo.productFee.fractionalFee);
211
214
  premium.productFeeVarAmount = t;
212
215
  premium.fullPremiumAmount = premium.fullPremiumAmount + t;
213
216
 
214
- t = netPremiumAmount.multiplyWith(productInfo.poolFee.fractionalFee);
217
+ t = netPremiumAmount.multiplyWith(feeInfo.poolFee.fractionalFee);
215
218
  premium.poolFeeVarAmount = t;
216
219
  premium.fullPremiumAmount = premium.fullPremiumAmount + t;
217
220
 
@@ -219,7 +222,7 @@ contract PricingService is
219
222
  premium.bundleFeeVarAmount = t;
220
223
  premium.fullPremiumAmount = premium.fullPremiumAmount + t;
221
224
 
222
- t = netPremiumAmount.multiplyWith(productInfo.distributionFee.fractionalFee);
225
+ t = netPremiumAmount.multiplyWith(feeInfo.distributionFee.fractionalFee);
223
226
  premium.distributionFeeVarAmount = t;
224
227
  premium.fullPremiumAmount = premium.fullPremiumAmount + t;
225
228
 
@@ -228,7 +231,8 @@ contract PricingService is
228
231
 
229
232
  function _calculateDistributionOwnerFeeAmount(
230
233
  IPolicy.PremiumInfo memory premium,
231
- IComponents.ProductInfo memory productInfo,
234
+ IComponents.FeeInfo memory feeInfo,
235
+ NftId distributionNftId,
232
236
  // ISetup.DistributionSetupInfo memory distInfo,
233
237
  ReferralId referralId,
234
238
  InstanceReader reader
@@ -239,14 +243,14 @@ contract PricingService is
239
243
  {
240
244
 
241
245
  // if the referral is not valid, then the distribution owner gets everything
242
- if (productInfo.distributionNftId.eqz() || ! _distributionService.referralIsValid(productInfo.distributionNftId, referralId)) {
246
+ if (distributionNftId.eqz() || ! _distributionService.referralIsValid(distributionNftId, referralId)) {
243
247
  premium.distributionOwnerFeeFixAmount = premium.distributionFeeFixAmount;
244
248
  premium.distributionOwnerFeeVarAmount = premium.distributionFeeVarAmount;
245
249
  premium.premiumAmount = premium.fullPremiumAmount;
246
250
  return premium;
247
251
  }
248
252
 
249
- Fee memory minDistributionOwnerFee = productInfo.minDistributionOwnerFee;
253
+ Fee memory minDistributionOwnerFee = feeInfo.minDistributionOwnerFee;
250
254
 
251
255
  // if the referral is valid, the the commission and discount are calculated based in the full premium
252
256
  // the remaing amount goes to the distribution owner
@@ -12,14 +12,14 @@ contract PricingServiceManager is ProxyManager {
12
12
  /// @dev initializes proxy manager with pricing service implementation and deploys instance
13
13
  constructor(
14
14
  address authority,
15
- address registryAddress,
15
+ address registry,
16
16
  bytes32 salt
17
17
  )
18
18
  {
19
19
  PricingService pricingSrv = new PricingService{salt: salt}();
20
- bytes memory data = abi.encode(registryAddress, authority);
20
+ bytes memory data = abi.encode(authority, registry);
21
21
  IVersionable versionable = initialize(
22
- registryAddress,
22
+ registry,
23
23
  address(pricingSrv),
24
24
  data,
25
25
  salt);
@@ -41,6 +41,7 @@ abstract contract Product is
41
41
 
42
42
  struct ProductStorage {
43
43
  IComponents.ProductInfo _productInfo;
44
+ IComponents.FeeInfo _feeInfo;
44
45
  IComponentService _componentService;
45
46
  IRiskService _riskService;
46
47
  IApplicationService _applicationService;
@@ -126,6 +127,15 @@ abstract contract Product is
126
127
  return _getProductStorage()._productInfo;
127
128
  }
128
129
 
130
+ function getInitialFeeInfo()
131
+ public
132
+ virtual
133
+ view
134
+ returns (IComponents.FeeInfo memory feeInfo)
135
+ {
136
+ return _getProductStorage()._feeInfo;
137
+ }
138
+
129
139
 
130
140
  function _initializeProduct(
131
141
  address registry,
@@ -133,6 +143,7 @@ abstract contract Product is
133
143
  string memory name,
134
144
  address token,
135
145
  IComponents.ProductInfo memory productInfo,
146
+ IComponents.FeeInfo memory feeInfo,
136
147
  IAuthorization authorization,
137
148
  address initialOwner,
138
149
  bytes memory componentData // writeonly data that will saved in the object info record of the registry
@@ -154,6 +165,7 @@ abstract contract Product is
154
165
 
155
166
  ProductStorage storage $ = _getProductStorage();
156
167
  $._productInfo = productInfo;
168
+ $._feeInfo = feeInfo;
157
169
  $._riskService = IRiskService(_getServiceAddress(RISK()));
158
170
  $._applicationService = IApplicationService(_getServiceAddress(APPLICATION()));
159
171
  $._policyService = IPolicyService(_getServiceAddress(POLICY()));
@@ -325,6 +337,18 @@ abstract contract Product is
325
337
  claimData);
326
338
  }
327
339
 
340
+ function _revokeClaim(
341
+ NftId policyNftId,
342
+ ClaimId claimId
343
+ )
344
+ internal
345
+ virtual
346
+ {
347
+ _getProductStorage()._claimService.revoke(
348
+ policyNftId,
349
+ claimId);
350
+ }
351
+
328
352
  function _confirmClaim(
329
353
  NftId policyNftId,
330
354
  ClaimId claimId,
@@ -415,6 +439,18 @@ abstract contract Product is
415
439
  payoutId);
416
440
  }
417
441
 
442
+ function _cancelPayout(
443
+ NftId policyNftId,
444
+ PayoutId payoutId
445
+ )
446
+ internal
447
+ virtual
448
+ {
449
+ _getProductStorage()._claimService.cancelPayout(
450
+ policyNftId,
451
+ payoutId);
452
+ }
453
+
418
454
  function _toRiskId(string memory riskName) internal virtual pure returns (RiskId riskId) {
419
455
  return RiskIdLib.toRiskId(riskName);
420
456
  }
@@ -4,26 +4,26 @@ pragma solidity ^0.8.20;
4
4
  import {IInstance} from "../instance/IInstance.sol";
5
5
  import {IInstanceService} from "../instance/IInstanceService.sol";
6
6
  import {IPoolService} from "../pool/PoolService.sol";
7
- import {IRiskService} from "./IRiskService.sol";
7
+ import {IRegistry} from "../registry/IRegistry.sol";
8
8
  import {IRegistryService} from "../registry/IRegistryService.sol";
9
9
  import {IRisk} from "../instance/module/IRisk.sol";
10
+ import {IRiskService} from "./IRiskService.sol";
10
11
 
12
+ import {ContractLib} from "../shared/ContractLib.sol";
11
13
  import {InstanceReader} from "../instance/InstanceReader.sol";
12
- import {ObjectType, INSTANCE, PRODUCT, POOL, POLICY, REGISTRY, RISK} from "../type/ObjectType.sol";
14
+ import {ObjectType, COMPONENT, INSTANCE, PRODUCT, POOL, POLICY, REGISTRY, RISK} from "../type/ObjectType.sol";
13
15
  import {ACTIVE, PAUSED, KEEP_STATE} from "../type/StateId.sol";
14
16
  import {NftId} from "../type/NftId.sol";
15
17
  import {RiskId} from "../type/RiskId.sol";
16
18
  import {StateId} from "../type/StateId.sol";
17
19
  import {RiskSet} from "../instance/RiskSet.sol";
18
- import {ComponentVerifyingService} from "../shared/ComponentVerifyingService.sol";
20
+ import {Service} from "../shared/Service.sol";
21
+ import {TimestampLib} from "../type/Timestamp.sol";
19
22
 
20
23
  contract RiskService is
21
- ComponentVerifyingService,
24
+ Service,
22
25
  IRiskService
23
26
  {
24
- IInstanceService private _instanceService;
25
- IPoolService internal _poolService;
26
- IRegistryService private _registryService;
27
27
 
28
28
  function _initialize(
29
29
  address owner,
@@ -34,16 +34,11 @@ contract RiskService is
34
34
  virtual override
35
35
  {
36
36
  (
37
- address registryAddress,
38
- address authority
37
+ address authority,
38
+ address registry
39
39
  ) = abi.decode(data, (address, address));
40
40
 
41
- _initializeService(registryAddress, authority, owner);
42
-
43
- _instanceService = IInstanceService(_getServiceAddress(INSTANCE()));
44
- _poolService = IPoolService(getRegistry().getServiceAddress(POOL(), getVersion().toMajorPart()));
45
- _registryService = IRegistryService(_getServiceAddress(REGISTRY()));
46
-
41
+ __Service_init(authority, registry, owner);
47
42
  _registerInterface(type(IRiskService).interfaceId);
48
43
  }
49
44
 
@@ -53,10 +48,16 @@ contract RiskService is
53
48
  bytes memory data
54
49
  )
55
50
  external
56
- override
51
+ restricted()
57
52
  {
58
- (NftId productNftId,, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
59
- IRisk.RiskInfo memory riskInfo = IRisk.RiskInfo(productNftId, data);
53
+ // checks
54
+ (NftId productNftId, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
55
+
56
+ // effects
57
+ IRisk.RiskInfo memory riskInfo = IRisk.RiskInfo({
58
+ productNftId: productNftId,
59
+ createdAt: TimestampLib.blockTimestamp(),
60
+ data: data});
60
61
 
61
62
  instance.getInstanceStore().createRisk(
62
63
  riskId,
@@ -73,11 +74,14 @@ contract RiskService is
73
74
  RiskId riskId,
74
75
  bytes memory data
75
76
  )
76
- external
77
+ external
78
+ restricted()
77
79
  {
78
- (,, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
79
- InstanceReader instanceReader = instance.getInstanceReader();
80
+ // checks
81
+ (NftId productNftId, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
80
82
 
83
+ // effects
84
+ InstanceReader instanceReader = instance.getInstanceReader();
81
85
  IRisk.RiskInfo memory riskInfo = instanceReader.getRiskInfo(riskId);
82
86
  riskInfo.data = data;
83
87
  instance.getInstanceStore().updateRisk(riskId, riskInfo, KEEP_STATE());
@@ -88,9 +92,13 @@ contract RiskService is
88
92
  RiskId riskId,
89
93
  StateId state
90
94
  )
91
- external
95
+ external
96
+ restricted()
92
97
  {
93
- (,, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
98
+ // checks
99
+ (NftId productNftId, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
100
+
101
+ // effects
94
102
  instance.getInstanceStore().updateRiskState(riskId, state);
95
103
 
96
104
  if (state == ACTIVE()) {
@@ -100,6 +108,36 @@ contract RiskService is
100
108
  }
101
109
  }
102
110
 
111
+ function _getAndVerifyActiveComponent(ObjectType expectedType)
112
+ internal
113
+ view
114
+ returns (
115
+ NftId componentNftId,
116
+ IInstance instance
117
+ )
118
+ {
119
+ IRegistry.ObjectInfo memory info;
120
+ address instanceAddress;
121
+ bool isActive = true;
122
+
123
+ if (expectedType != COMPONENT()) {
124
+ (info, instanceAddress) = ContractLib.getAndVerifyComponent(
125
+ getRegistry(),
126
+ msg.sender, // caller
127
+ expectedType,
128
+ isActive);
129
+ } else {
130
+ (info, instanceAddress) = ContractLib.getAndVerifyAnyComponent(
131
+ getRegistry(),
132
+ msg.sender,
133
+ isActive);
134
+ }
135
+
136
+ // get component nft id and instance
137
+ componentNftId = info.nftId;
138
+ instance = IInstance(instanceAddress);
139
+ }
140
+
103
141
 
104
142
  function _getDomain() internal pure override returns(ObjectType) {
105
143
  return RISK();