@etherisc/gif-next 0.0.2-e83e4a5-207 → 0.0.2-e876b87-961

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (490) hide show
  1. package/README.md +32 -3
  2. package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.dbg.json +1 -1
  3. package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.json +105 -65
  4. package/artifacts/contracts/authorization/AccessManagerCloneable.sol/AccessManagerCloneable.dbg.json +1 -1
  5. package/artifacts/contracts/authorization/AccessManagerCloneable.sol/AccessManagerCloneable.json +2 -2
  6. package/artifacts/contracts/authorization/Authorization.sol/Authorization.dbg.json +1 -1
  7. package/artifacts/contracts/authorization/Authorization.sol/Authorization.json +67 -11
  8. package/artifacts/contracts/authorization/IAccess.sol/IAccess.dbg.json +1 -1
  9. package/artifacts/contracts/authorization/IAccessAdmin.sol/IAccessAdmin.dbg.json +1 -1
  10. package/artifacts/contracts/authorization/IAccessAdmin.sol/IAccessAdmin.json +60 -32
  11. package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.dbg.json +1 -1
  12. package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.json +40 -3
  13. package/artifacts/contracts/authorization/IServiceAuthorization.sol/IServiceAuthorization.dbg.json +1 -1
  14. package/artifacts/contracts/authorization/IServiceAuthorization.sol/IServiceAuthorization.json +19 -0
  15. package/artifacts/contracts/authorization/ReleaseAccessManager.sol/ReleaseAccessManager.dbg.json +4 -0
  16. package/artifacts/contracts/authorization/ReleaseAccessManager.sol/ReleaseAccessManager.json +1196 -0
  17. package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.dbg.json +1 -1
  18. package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.json +68 -5
  19. package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.dbg.json +1 -1
  20. package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.json +206 -309
  21. package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.dbg.json +1 -1
  22. package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.json +82 -22
  23. package/artifacts/contracts/distribution/Distribution.sol/Distribution.dbg.json +1 -1
  24. package/artifacts/contracts/distribution/Distribution.sol/Distribution.json +134 -277
  25. package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.dbg.json +1 -1
  26. package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.json +284 -223
  27. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
  28. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.json +116 -104
  29. package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
  30. package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.json +121 -92
  31. package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.dbg.json +1 -1
  32. package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.json +149 -31
  33. package/artifacts/contracts/examples/fire/DamageLevel.sol/DamageLevelLib.dbg.json +4 -0
  34. package/artifacts/contracts/examples/fire/DamageLevel.sol/DamageLevelLib.json +22 -0
  35. package/artifacts/contracts/examples/fire/FirePool.sol/FirePool.dbg.json +4 -0
  36. package/artifacts/contracts/examples/fire/FirePool.sol/FirePool.json +1538 -0
  37. package/artifacts/contracts/examples/fire/FirePoolAuthorization.sol/FirePoolAuthorization.dbg.json +4 -0
  38. package/artifacts/contracts/examples/fire/FirePoolAuthorization.sol/FirePoolAuthorization.json +470 -0
  39. package/artifacts/contracts/examples/fire/FireProduct.sol/FireProduct.dbg.json +4 -0
  40. package/artifacts/contracts/examples/fire/FireProduct.sol/FireProduct.json +2072 -0
  41. package/artifacts/contracts/examples/fire/FireProductAuthorization.sol/FireProductAuthorization.dbg.json +4 -0
  42. package/artifacts/contracts/examples/fire/FireProductAuthorization.sol/FireProductAuthorization.json +470 -0
  43. package/artifacts/contracts/examples/fire/FireUSD.sol/FireUSD.dbg.json +4 -0
  44. package/artifacts/contracts/examples/fire/FireUSD.sol/FireUSD.json +376 -0
  45. package/artifacts/contracts/examples/unpermissioned/SimpleDistribution.sol/SimpleDistribution.dbg.json +4 -0
  46. package/artifacts/contracts/examples/unpermissioned/SimpleDistribution.sol/SimpleDistribution.json +1471 -0
  47. package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.dbg.json +4 -0
  48. package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.json +1231 -0
  49. package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.dbg.json +4 -0
  50. package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.json +1592 -0
  51. package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.dbg.json +4 -0
  52. package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.json +2095 -0
  53. package/artifacts/contracts/instance/BundleSet.sol/BundleSet.dbg.json +4 -0
  54. package/artifacts/contracts/instance/BundleSet.sol/BundleSet.json +703 -0
  55. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  56. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +59 -37
  57. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
  58. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +34 -89
  59. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  60. package/artifacts/contracts/instance/Instance.sol/Instance.json +63 -130
  61. package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.dbg.json +1 -1
  62. package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.json +167 -140
  63. package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.dbg.json +1 -1
  64. package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.json +58 -98
  65. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
  66. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +459 -136
  67. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
  68. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +82 -247
  69. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
  70. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +75 -87
  71. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.dbg.json +1 -1
  72. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.json +330 -243
  73. package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.dbg.json +1 -1
  74. package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.json +2 -2
  75. package/artifacts/contracts/instance/base/Cloneable.sol/Cloneable.dbg.json +1 -1
  76. package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.dbg.json +1 -1
  77. package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.json +2 -2
  78. package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.dbg.json +1 -1
  79. package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.json +46 -5
  80. package/artifacts/contracts/instance/base/ObjectSet.sol/ObjectSet.dbg.json +4 -0
  81. package/artifacts/contracts/instance/base/{ObjectManager.sol/ObjectManager.json → ObjectSet.sol/ObjectSet.json} +6 -6
  82. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +1 -1
  83. package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
  84. package/artifacts/contracts/instance/module/IComponents.sol/IComponents.dbg.json +1 -1
  85. package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +1 -1
  86. package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +1 -1
  87. package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +1 -1
  88. package/artifacts/contracts/mock/Dip.sol/Dip.dbg.json +1 -1
  89. package/artifacts/contracts/mock/Dip.sol/Dip.json +2 -2
  90. package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.dbg.json +1 -1
  91. package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.json +164 -280
  92. package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.dbg.json +1 -1
  93. package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.json +84 -24
  94. package/artifacts/contracts/oracle/IOracle.sol/IOracle.dbg.json +1 -1
  95. package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.dbg.json +1 -1
  96. package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.json +96 -80
  97. package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.dbg.json +1 -1
  98. package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.json +43 -9
  99. package/artifacts/contracts/oracle/Oracle.sol/Oracle.dbg.json +1 -1
  100. package/artifacts/contracts/oracle/Oracle.sol/Oracle.json +106 -262
  101. package/artifacts/contracts/oracle/OracleService.sol/OracleService.dbg.json +1 -1
  102. package/artifacts/contracts/oracle/OracleService.sol/OracleService.json +91 -159
  103. package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.dbg.json +1 -1
  104. package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.json +75 -83
  105. package/artifacts/contracts/pool/BasicPool.sol/BasicPool.dbg.json +1 -1
  106. package/artifacts/contracts/pool/BasicPool.sol/BasicPool.json +152 -330
  107. package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.dbg.json +1 -1
  108. package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.json +82 -22
  109. package/artifacts/contracts/pool/BundleService.sol/BundleService.dbg.json +1 -1
  110. package/artifacts/contracts/pool/BundleService.sol/BundleService.json +498 -167
  111. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.dbg.json +1 -1
  112. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.json +169 -89
  113. package/artifacts/contracts/pool/IBundleService.sol/IBundleService.dbg.json +1 -1
  114. package/artifacts/contracts/pool/IBundleService.sol/IBundleService.json +258 -1
  115. package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
  116. package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.json +131 -130
  117. package/artifacts/contracts/pool/IPoolService.sol/IPoolService.dbg.json +1 -1
  118. package/artifacts/contracts/pool/IPoolService.sol/IPoolService.json +384 -179
  119. package/artifacts/contracts/pool/Pool.sol/Pool.dbg.json +1 -1
  120. package/artifacts/contracts/pool/Pool.sol/Pool.json +142 -313
  121. package/artifacts/contracts/pool/PoolService.sol/PoolService.dbg.json +1 -1
  122. package/artifacts/contracts/pool/PoolService.sol/PoolService.json +506 -334
  123. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
  124. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.json +111 -87
  125. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.dbg.json +1 -1
  126. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.json +76 -168
  127. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +1 -1
  128. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.json +72 -92
  129. package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.dbg.json +1 -1
  130. package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.json +155 -281
  131. package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.dbg.json +1 -1
  132. package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.json +82 -22
  133. package/artifacts/contracts/product/ClaimService.sol/ClaimService.dbg.json +1 -1
  134. package/artifacts/contracts/product/ClaimService.sol/ClaimService.json +303 -187
  135. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +1 -1
  136. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.json +119 -103
  137. package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.dbg.json +1 -1
  138. package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.json +34 -0
  139. package/artifacts/contracts/product/IClaimService.sol/IClaimService.dbg.json +1 -1
  140. package/artifacts/contracts/product/IClaimService.sol/IClaimService.json +176 -6
  141. package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.dbg.json +1 -1
  142. package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.json +323 -118
  143. package/artifacts/contracts/product/IPricingService.sol/IPricingService.dbg.json +1 -1
  144. package/artifacts/contracts/product/IPricingService.sol/IPricingService.json +114 -85
  145. package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.dbg.json +1 -1
  146. package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.json +143 -97
  147. package/artifacts/contracts/product/IRiskService.sol/IRiskService.dbg.json +4 -0
  148. package/artifacts/contracts/product/{IProductService.sol/IProductService.json → IRiskService.sol/IRiskService.json} +31 -2
  149. package/artifacts/contracts/product/PolicyService.sol/PolicyService.dbg.json +1 -1
  150. package/artifacts/contracts/product/PolicyService.sol/PolicyService.json +444 -325
  151. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +1 -1
  152. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.json +119 -103
  153. package/artifacts/contracts/product/PricingService.sol/PricingService.dbg.json +1 -1
  154. package/artifacts/contracts/product/PricingService.sol/PricingService.json +202 -307
  155. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.dbg.json +1 -1
  156. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.json +96 -120
  157. package/artifacts/contracts/product/Product.sol/Product.dbg.json +1 -1
  158. package/artifacts/contracts/product/Product.sol/Product.json +155 -281
  159. package/artifacts/contracts/product/RiskService.sol/RiskService.dbg.json +4 -0
  160. package/artifacts/contracts/product/RiskService.sol/RiskService.json +622 -0
  161. package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.dbg.json +4 -0
  162. package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.json +694 -0
  163. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  164. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +59 -16
  165. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  166. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +322 -22
  167. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
  168. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +42 -146
  169. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
  170. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.json +5 -18
  171. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  172. package/artifacts/contracts/registry/Registry.sol/Registry.json +549 -80
  173. package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.dbg.json +1 -1
  174. package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.json +285 -145
  175. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
  176. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +78 -284
  177. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
  178. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +67 -75
  179. package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.dbg.json +1 -1
  180. package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.json +47 -6
  181. package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.dbg.json +4 -0
  182. package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.json +1067 -0
  183. package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.dbg.json +1 -1
  184. package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.json +66 -8
  185. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
  186. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +2 -2
  187. package/artifacts/contracts/shared/Component.sol/Component.dbg.json +1 -1
  188. package/artifacts/contracts/shared/Component.sol/Component.json +65 -236
  189. package/artifacts/contracts/shared/ComponentService.sol/ComponentService.dbg.json +1 -1
  190. package/artifacts/contracts/shared/ComponentService.sol/ComponentService.json +546 -248
  191. package/artifacts/contracts/shared/ComponentServiceHelperLib.sol/ComponentServiceHelperLib.dbg.json +4 -0
  192. package/artifacts/contracts/shared/ComponentServiceHelperLib.sol/ComponentServiceHelperLib.json +206 -0
  193. package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.dbg.json +1 -1
  194. package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.json +136 -110
  195. package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.dbg.json +1 -1
  196. package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.json +47 -112
  197. package/artifacts/contracts/shared/ContractLib.sol/ContractLib.dbg.json +4 -0
  198. package/artifacts/contracts/shared/ContractLib.sol/ContractLib.json +92 -0
  199. package/artifacts/contracts/shared/IComponent.sol/IComponent.dbg.json +1 -1
  200. package/artifacts/contracts/shared/IComponent.sol/IComponent.json +55 -54
  201. package/artifacts/contracts/shared/IComponentService.sol/IComponentService.dbg.json +1 -1
  202. package/artifacts/contracts/shared/IComponentService.sol/IComponentService.json +499 -19
  203. package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.dbg.json +1 -1
  204. package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.json +85 -80
  205. package/artifacts/contracts/shared/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
  206. package/artifacts/contracts/shared/IKeyValueStore.sol/IKeyValueStore.json +36 -0
  207. package/artifacts/contracts/shared/ILifecycle.sol/ILifecycle.dbg.json +1 -1
  208. package/artifacts/contracts/shared/ILifecycle.sol/ILifecycle.json +36 -0
  209. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
  210. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.json +16 -0
  211. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +1 -1
  212. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.json +15 -47
  213. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  214. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +29 -0
  215. package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +1 -1
  216. package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
  217. package/artifacts/contracts/shared/IService.sol/IService.json +29 -0
  218. package/artifacts/contracts/shared/InitializableERC165.sol/InitializableERC165.dbg.json +4 -0
  219. package/artifacts/contracts/shared/InitializableERC165.sol/InitializableERC165.json +53 -0
  220. package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.dbg.json +1 -1
  221. package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.json +98 -265
  222. package/artifacts/contracts/shared/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
  223. package/artifacts/contracts/shared/KeyValueStore.sol/KeyValueStore.json +42 -1
  224. package/artifacts/contracts/shared/Lifecycle.sol/Lifecycle.dbg.json +1 -1
  225. package/artifacts/contracts/shared/Lifecycle.sol/Lifecycle.json +42 -1
  226. package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.dbg.json +4 -0
  227. package/artifacts/contracts/shared/{NftIdSetManager.sol/NftIdSetManager.json → NftIdSet.sol/NftIdSet.json} +4 -4
  228. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
  229. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +22 -57
  230. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +1 -1
  231. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +19 -141
  232. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  233. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +58 -89
  234. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +1 -1
  235. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +2 -15
  236. package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
  237. package/artifacts/contracts/shared/Service.sol/Service.json +47 -112
  238. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
  239. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +407 -11
  240. package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.dbg.json +4 -0
  241. package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.json +132 -0
  242. package/artifacts/contracts/staking/IStaking.sol/IStaking.dbg.json +1 -1
  243. package/artifacts/contracts/staking/IStaking.sol/IStaking.json +82 -55
  244. package/artifacts/contracts/staking/IStakingService.sol/IStakingService.dbg.json +1 -1
  245. package/artifacts/contracts/staking/IStakingService.sol/IStakingService.json +29 -21
  246. package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.dbg.json +1 -1
  247. package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.json +73 -93
  248. package/artifacts/contracts/staking/Staking.sol/Staking.dbg.json +1 -1
  249. package/artifacts/contracts/staking/Staking.sol/Staking.json +174 -291
  250. package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.dbg.json +1 -1
  251. package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.json +46 -5
  252. package/artifacts/contracts/staking/StakingManager.sol/StakingManager.dbg.json +1 -1
  253. package/artifacts/contracts/staking/StakingManager.sol/StakingManager.json +106 -91
  254. package/artifacts/contracts/staking/StakingReader.sol/StakingReader.dbg.json +1 -1
  255. package/artifacts/contracts/staking/StakingReader.sol/StakingReader.json +6 -11
  256. package/artifacts/contracts/staking/StakingService.sol/StakingService.dbg.json +1 -1
  257. package/artifacts/contracts/staking/StakingService.sol/StakingService.json +71 -165
  258. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.dbg.json +1 -1
  259. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.json +71 -79
  260. package/artifacts/contracts/staking/StakingStore.sol/StakingStore.dbg.json +1 -1
  261. package/artifacts/contracts/staking/StakingStore.sol/StakingStore.json +177 -131
  262. package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.dbg.json +1 -1
  263. package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.json +59 -23
  264. package/artifacts/contracts/type/AddressSet.sol/LibAddressSet.dbg.json +1 -1
  265. package/artifacts/contracts/type/Amount.sol/AmountLib.dbg.json +1 -1
  266. package/artifacts/contracts/type/Amount.sol/AmountLib.json +61 -8
  267. package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
  268. package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.json +2 -2
  269. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.dbg.json +1 -1
  270. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.json +28 -4
  271. package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.dbg.json +1 -1
  272. package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.json +2 -2
  273. package/artifacts/contracts/type/Fee.sol/FeeLib.dbg.json +1 -1
  274. package/artifacts/contracts/type/Fee.sol/FeeLib.json +7 -2
  275. package/artifacts/contracts/type/Key32.sol/Key32Lib.dbg.json +1 -1
  276. package/artifacts/contracts/type/Key32.sol/Key32Lib.json +2 -2
  277. package/artifacts/contracts/type/NftId.sol/NftIdLib.dbg.json +1 -1
  278. package/artifacts/contracts/type/NftId.sol/NftIdLib.json +2 -2
  279. package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
  280. package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.json +2 -2
  281. package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
  282. package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.json +2 -2
  283. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.dbg.json +1 -1
  284. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.json +19 -19
  285. package/artifacts/contracts/type/Referral.sol/ReferralLib.dbg.json +1 -1
  286. package/artifacts/contracts/type/Referral.sol/ReferralLib.json +2 -2
  287. package/artifacts/contracts/type/RequestId.sol/RequestIdLib.dbg.json +1 -1
  288. package/artifacts/contracts/type/RequestId.sol/RequestIdLib.json +2 -2
  289. package/artifacts/contracts/type/RiskId.sol/RiskIdLib.dbg.json +1 -1
  290. package/artifacts/contracts/type/RiskId.sol/RiskIdLib.json +60 -4
  291. package/artifacts/contracts/type/RoleId.sol/RoleIdLib.dbg.json +1 -1
  292. package/artifacts/contracts/type/RoleId.sol/RoleIdLib.json +2 -2
  293. package/artifacts/contracts/type/Seconds.sol/SecondsLib.dbg.json +1 -1
  294. package/artifacts/contracts/type/Seconds.sol/SecondsLib.json +50 -2
  295. package/artifacts/contracts/type/Selector.sol/SelectorLib.dbg.json +1 -1
  296. package/artifacts/contracts/type/Selector.sol/SelectorSetLib.dbg.json +1 -1
  297. package/artifacts/contracts/type/StateId.sol/StateIdLib.dbg.json +1 -1
  298. package/artifacts/contracts/type/StateId.sol/StateIdLib.json +15 -2
  299. package/artifacts/contracts/type/String.sol/StrLib.dbg.json +1 -1
  300. package/artifacts/contracts/type/Timestamp.sol/TimestampLib.dbg.json +1 -1
  301. package/artifacts/contracts/type/Timestamp.sol/TimestampLib.json +23 -4
  302. package/artifacts/contracts/type/UFixed.sol/MathLib.dbg.json +1 -1
  303. package/artifacts/contracts/type/UFixed.sol/MathLib.json +9 -3
  304. package/artifacts/contracts/type/UFixed.sol/UFixedLib.dbg.json +1 -1
  305. package/artifacts/contracts/type/UFixed.sol/UFixedLib.json +52 -2
  306. package/artifacts/contracts/type/Version.sol/VersionLib.dbg.json +1 -1
  307. package/artifacts/contracts/type/Version.sol/VersionLib.json +2 -2
  308. package/artifacts/contracts/type/Version.sol/VersionPartLib.dbg.json +1 -1
  309. package/artifacts/contracts/type/Version.sol/VersionPartLib.json +21 -2
  310. package/artifacts/contracts/upgradeability/IVersionable.sol/IVersionable.dbg.json +4 -0
  311. package/artifacts/contracts/{shared → upgradeability}/IVersionable.sol/IVersionable.json +1 -1
  312. package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.dbg.json +4 -0
  313. package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.json +602 -0
  314. package/artifacts/contracts/upgradeability/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +4 -0
  315. package/artifacts/contracts/{shared → upgradeability}/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +3 -3
  316. package/artifacts/contracts/upgradeability/Versionable.sol/Versionable.dbg.json +4 -0
  317. package/artifacts/contracts/{shared → upgradeability}/Versionable.sol/Versionable.json +1 -1
  318. package/contracts/authorization/AccessAdmin.sol +64 -59
  319. package/contracts/authorization/Authorization.sol +111 -40
  320. package/contracts/authorization/IAccess.sol +1 -0
  321. package/contracts/authorization/IAccessAdmin.sol +4 -3
  322. package/contracts/authorization/IAuthorization.sol +13 -7
  323. package/contracts/authorization/IServiceAuthorization.sol +3 -1
  324. package/contracts/authorization/ReleaseAccessManager.sol +38 -0
  325. package/contracts/authorization/ServiceAuthorization.sol +26 -10
  326. package/contracts/distribution/BasicDistribution.sol +6 -16
  327. package/contracts/distribution/BasicDistributionAuthorization.sol +5 -1
  328. package/contracts/distribution/Distribution.sol +28 -26
  329. package/contracts/distribution/DistributionService.sol +128 -75
  330. package/contracts/distribution/DistributionServiceManager.sol +8 -11
  331. package/contracts/distribution/IDistributionComponent.sol +9 -5
  332. package/contracts/distribution/IDistributionService.sol +18 -2
  333. package/contracts/examples/fire/DamageLevel.sol +59 -0
  334. package/contracts/examples/fire/FirePool.sol +73 -0
  335. package/contracts/examples/fire/FirePoolAuthorization.sol +34 -0
  336. package/contracts/examples/fire/FireProduct.sol +415 -0
  337. package/contracts/examples/fire/FireProductAuthorization.sol +44 -0
  338. package/contracts/examples/fire/FireUSD.sol +26 -0
  339. package/contracts/examples/unpermissioned/SimpleDistribution.sol +50 -0
  340. package/contracts/examples/unpermissioned/SimpleOracle.sol +137 -0
  341. package/contracts/examples/unpermissioned/SimplePool.sol +76 -0
  342. package/contracts/examples/unpermissioned/SimpleProduct.sol +351 -0
  343. package/contracts/instance/{BundleManager.sol → BundleSet.sol} +23 -23
  344. package/contracts/instance/IInstance.sol +14 -34
  345. package/contracts/instance/IInstanceService.sol +5 -25
  346. package/contracts/instance/Instance.sol +32 -54
  347. package/contracts/instance/InstanceAdmin.sol +47 -34
  348. package/contracts/instance/InstanceAuthorizationV3.sol +24 -32
  349. package/contracts/instance/InstanceReader.sol +115 -25
  350. package/contracts/instance/InstanceService.sol +75 -105
  351. package/contracts/instance/InstanceServiceManager.sol +8 -13
  352. package/contracts/instance/InstanceStore.sol +12 -1
  353. package/contracts/instance/base/ObjectLifecycle.sol +9 -4
  354. package/contracts/instance/base/{ObjectManager.sol → ObjectSet.sol} +5 -5
  355. package/contracts/instance/module/IBundle.sol +1 -1
  356. package/contracts/instance/module/IComponents.sol +10 -11
  357. package/contracts/instance/module/IDistribution.sol +0 -1
  358. package/contracts/instance/module/IPolicy.sol +24 -24
  359. package/contracts/mock/Dip.sol +1 -1
  360. package/contracts/oracle/BasicOracle.sol +0 -1
  361. package/contracts/oracle/IOracleComponent.sol +2 -1
  362. package/contracts/oracle/IOracleService.sol +2 -1
  363. package/contracts/oracle/Oracle.sol +21 -22
  364. package/contracts/oracle/OracleService.sol +47 -34
  365. package/contracts/oracle/OracleServiceManager.sol +8 -11
  366. package/contracts/pool/BasicPool.sol +21 -31
  367. package/contracts/pool/BasicPoolAuthorization.sol +11 -3
  368. package/contracts/pool/BundleService.sol +267 -70
  369. package/contracts/pool/BundleServiceManager.sol +8 -11
  370. package/contracts/pool/IBundleService.sol +42 -5
  371. package/contracts/pool/IPoolComponent.sol +24 -8
  372. package/contracts/pool/IPoolService.sol +56 -39
  373. package/contracts/pool/Pool.sol +73 -49
  374. package/contracts/pool/PoolService.sol +256 -164
  375. package/contracts/pool/PoolServiceManager.sol +6 -9
  376. package/contracts/product/ApplicationService.sol +70 -65
  377. package/contracts/product/ApplicationServiceManager.sol +6 -6
  378. package/contracts/product/BasicProduct.sol +9 -38
  379. package/contracts/product/BasicProductAuthorization.sol +2 -0
  380. package/contracts/product/ClaimService.sol +316 -146
  381. package/contracts/product/ClaimServiceManager.sol +6 -6
  382. package/contracts/product/IApplicationService.sol +1 -0
  383. package/contracts/product/IClaimService.sol +31 -7
  384. package/contracts/product/IPolicyService.sol +34 -32
  385. package/contracts/product/IPricingService.sol +10 -10
  386. package/contracts/product/IProductComponent.sol +24 -4
  387. package/contracts/product/{IProductService.sol → IRiskService.sol} +1 -1
  388. package/contracts/product/PolicyService.sol +419 -203
  389. package/contracts/product/PolicyServiceManager.sol +6 -9
  390. package/contracts/product/PricingService.sol +54 -54
  391. package/contracts/product/PricingServiceManager.sol +5 -8
  392. package/contracts/product/Product.sol +134 -71
  393. package/contracts/product/{ProductService.sol → RiskService.sol} +13 -41
  394. package/contracts/product/RiskServiceManager.sol +39 -0
  395. package/contracts/registry/ChainNft.sol +68 -38
  396. package/contracts/registry/IRegistry.sol +69 -19
  397. package/contracts/registry/IRegistryService.sol +3 -10
  398. package/contracts/registry/ITransferInterceptor.sol +1 -2
  399. package/contracts/registry/Registry.sol +354 -215
  400. package/contracts/registry/RegistryAdmin.sol +155 -72
  401. package/contracts/registry/RegistryService.sol +39 -64
  402. package/contracts/registry/RegistryServiceManager.sol +4 -4
  403. package/contracts/registry/ReleaseLifecycle.sol +6 -3
  404. package/contracts/registry/ReleaseRegistry.sol +501 -0
  405. package/contracts/registry/ServiceAuthorizationV3.sol +16 -22
  406. package/contracts/registry/TokenRegistry.sol +2 -2
  407. package/contracts/shared/Component.sol +52 -62
  408. package/contracts/shared/ComponentService.sol +299 -179
  409. package/contracts/shared/ComponentServiceHelperLib.sol +118 -0
  410. package/contracts/shared/ComponentServiceManager.sol +10 -7
  411. package/contracts/shared/ComponentVerifyingService.sol +23 -14
  412. package/contracts/shared/ContractLib.sol +38 -0
  413. package/contracts/shared/IComponent.sol +10 -6
  414. package/contracts/shared/IComponentService.sol +39 -20
  415. package/contracts/shared/IInstanceLinkedComponent.sol +8 -17
  416. package/contracts/shared/ILifecycle.sol +3 -1
  417. package/contracts/shared/INftOwnable.sol +2 -0
  418. package/contracts/shared/IPolicyHolder.sol +12 -22
  419. package/contracts/shared/IRegisterable.sol +11 -0
  420. package/contracts/shared/IService.sol +1 -1
  421. package/contracts/shared/{ERC165.sol → InitializableERC165.sol} +3 -3
  422. package/contracts/shared/InstanceLinkedComponent.sol +85 -23
  423. package/contracts/shared/KeyValueStore.sol +1 -1
  424. package/contracts/shared/Lifecycle.sol +15 -4
  425. package/contracts/shared/{NftIdSetManager.sol → NftIdSet.sol} +1 -1
  426. package/contracts/shared/NftOwnable.sol +29 -9
  427. package/contracts/shared/PolicyHolder.sol +17 -57
  428. package/contracts/shared/Registerable.sol +19 -9
  429. package/contracts/shared/RegistryLinked.sol +3 -2
  430. package/contracts/shared/Service.sol +23 -22
  431. package/contracts/shared/TokenHandler.sol +144 -19
  432. package/contracts/shared/TokenHandlerDeployerLib.sol +12 -0
  433. package/contracts/staking/IStaking.sol +3 -3
  434. package/contracts/staking/IStakingService.sol +12 -8
  435. package/contracts/staking/StakeManagerLib.sol +18 -25
  436. package/contracts/staking/Staking.sol +29 -45
  437. package/contracts/staking/StakingManager.sol +10 -12
  438. package/contracts/staking/StakingReader.sol +23 -20
  439. package/contracts/staking/StakingService.sol +25 -29
  440. package/contracts/staking/StakingServiceManager.sol +4 -4
  441. package/contracts/staking/StakingStore.sol +12 -22
  442. package/contracts/staking/TargetManagerLib.sol +7 -3
  443. package/contracts/type/Amount.sol +27 -5
  444. package/contracts/type/Blocknumber.sol +7 -1
  445. package/contracts/type/ClaimId.sol +6 -1
  446. package/contracts/type/NftId.sol +1 -0
  447. package/contracts/type/ObjectType.sol +19 -18
  448. package/contracts/type/PayoutId.sol +10 -10
  449. package/contracts/type/Referral.sol +1 -0
  450. package/contracts/type/RiskId.sol +15 -1
  451. package/contracts/type/RoleId.sol +0 -12
  452. package/contracts/type/Seconds.sol +21 -1
  453. package/contracts/type/StateId.sol +15 -1
  454. package/contracts/type/Timestamp.sol +11 -1
  455. package/contracts/type/UFixed.sol +33 -10
  456. package/contracts/type/Version.sol +3 -1
  457. package/contracts/{shared → upgradeability}/ProxyManager.sol +71 -38
  458. package/contracts/{shared → upgradeability}/UpgradableProxyWithAdmin.sol +1 -3
  459. package/contracts/{shared → upgradeability}/Versionable.sol +2 -2
  460. package/package.json +4 -3
  461. package/artifacts/contracts/authorization/IModuleAuthorization.sol/IModuleAuthorization.dbg.json +0 -4
  462. package/artifacts/contracts/authorization/IModuleAuthorization.sol/IModuleAuthorization.json +0 -290
  463. package/artifacts/contracts/authorization/ModuleAuthorization.sol/ModuleAuthorization.dbg.json +0 -4
  464. package/artifacts/contracts/authorization/ModuleAuthorization.sol/ModuleAuthorization.json +0 -390
  465. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.dbg.json +0 -4
  466. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.json +0 -703
  467. package/artifacts/contracts/instance/base/ObjectManager.sol/ObjectManager.dbg.json +0 -4
  468. package/artifacts/contracts/product/IProductService.sol/IProductService.dbg.json +0 -4
  469. package/artifacts/contracts/product/ProductService.sol/ProductService.dbg.json +0 -4
  470. package/artifacts/contracts/product/ProductService.sol/ProductService.json +0 -708
  471. package/artifacts/contracts/product/ProductServiceManager.sol/ProductServiceManager.dbg.json +0 -4
  472. package/artifacts/contracts/product/ProductServiceManager.sol/ProductServiceManager.json +0 -702
  473. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.dbg.json +0 -4
  474. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.json +0 -1159
  475. package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +0 -4
  476. package/artifacts/contracts/shared/ERC165.sol/ERC165.json +0 -73
  477. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +0 -4
  478. package/artifacts/contracts/shared/InitializableCustom.sol/InitializableCustom.dbg.json +0 -4
  479. package/artifacts/contracts/shared/InitializableCustom.sol/InitializableCustom.json +0 -39
  480. package/artifacts/contracts/shared/NftIdSetManager.sol/NftIdSetManager.dbg.json +0 -4
  481. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +0 -4
  482. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +0 -617
  483. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +0 -4
  484. package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +0 -4
  485. package/contracts/authorization/IModuleAuthorization.sol +0 -21
  486. package/contracts/authorization/ModuleAuthorization.sol +0 -78
  487. package/contracts/product/ProductServiceManager.sol +0 -42
  488. package/contracts/registry/ReleaseManager.sol +0 -487
  489. package/contracts/shared/InitializableCustom.sol +0 -177
  490. /package/contracts/{shared → upgradeability}/IVersionable.sol +0 -0
@@ -6,13 +6,13 @@ import {ShortString, ShortStrings} from "@openzeppelin/contracts/utils/ShortStri
6
6
 
7
7
  import {AccessManagerCloneable} from "../authorization/AccessManagerCloneable.sol";
8
8
  import {Amount} from "../type/Amount.sol";
9
- import {BundleManager} from "./BundleManager.sol";
9
+ import {BundleSet} from "./BundleSet.sol";
10
10
  import {ChainNft} from "../registry/ChainNft.sol";
11
11
  import {NftId} from "../type/NftId.sol";
12
12
  import {RoleId} from "../type/RoleId.sol";
13
13
  import {SecondsLib} from "../type/Seconds.sol";
14
14
  import {UFixed, UFixedLib} from "../type/UFixed.sol";
15
- import {ADMIN_ROLE, DISTRIBUTION_OWNER_ROLE, ORACLE_OWNER_ROLE, POOL_OWNER_ROLE, PRODUCT_OWNER_ROLE} from "../type/RoleId.sol";
15
+ import {ADMIN_ROLE} from "../type/RoleId.sol";
16
16
  import {ObjectType, INSTANCE, BUNDLE, APPLICATION, CLAIM, DISTRIBUTION, INSTANCE, POLICY, POOL, PRODUCT, REGISTRY, STAKING} from "../type/ObjectType.sol";
17
17
 
18
18
  import {Service} from "../shared/Service.sol";
@@ -29,7 +29,6 @@ import {IStakingService} from "../staking/IStakingService.sol";
29
29
  import {TargetManagerLib} from "../staking/TargetManagerLib.sol";
30
30
 
31
31
  import {Instance} from "./Instance.sol";
32
- import {IModuleAuthorization} from "../authorization/IModuleAuthorization.sol";
33
32
  import {IInstance} from "./IInstance.sol";
34
33
  import {InstanceAdmin} from "./InstanceAdmin.sol";
35
34
  import {IInstanceService} from "./IInstanceService.sol";
@@ -54,13 +53,13 @@ contract InstanceService is
54
53
  address internal _masterInstanceAdmin;
55
54
  address internal _masterInstance;
56
55
  address internal _masterInstanceReader;
57
- address internal _masterInstanceBundleManager;
56
+ address internal _masterInstanceBundleSet;
58
57
  address internal _masterInstanceStore;
59
58
 
60
59
 
61
60
  modifier onlyInstance() {
62
61
  address instanceAddress = msg.sender;
63
- NftId instanceNftId = getRegistry().getNftId(msg.sender);
62
+ NftId instanceNftId = getRegistry().getNftIdForAddress(msg.sender);
64
63
  if (instanceNftId.eqz()) {
65
64
  revert ErrorInstanceServiceNotRegistered(instanceAddress);
66
65
  }
@@ -70,7 +69,7 @@ contract InstanceService is
70
69
  revert ErrorInstanceServiceNotInstance(instanceAddress, objectType);
71
70
  }
72
71
 
73
- VersionPart instanceVersion = IInstance(instanceAddress).getMajorVersion();
72
+ VersionPart instanceVersion = IInstance(instanceAddress).getRelease();
74
73
  if (instanceVersion != getVersion().toMajorPart()) {
75
74
  revert ErrorInstanceServiceInstanceVersionMismatch(instanceAddress, instanceVersion);
76
75
  }
@@ -94,7 +93,7 @@ contract InstanceService is
94
93
  _;
95
94
  }
96
95
 
97
- function createInstanceClone()
96
+ function createInstance()
98
97
  external
99
98
  returns (
100
99
  Instance clonedInstance,
@@ -104,32 +103,9 @@ contract InstanceService is
104
103
  // tx sender will become instance owner
105
104
  address instanceOwner = msg.sender;
106
105
 
107
- // start with setting up a new OZ access manager
108
- AccessManagerCloneable clonedAccessManager = AccessManagerCloneable(
109
- Clones.clone(_masterAccessManager));
110
-
111
- // set up the instance admin
112
- InstanceAdmin clonedInstanceAdmin = InstanceAdmin(Clones.clone(_masterInstanceAdmin));
113
- clonedAccessManager.initialize(
114
- address(clonedInstanceAdmin)); // grant ADMIN_ROLE to instance admin
115
-
116
- clonedInstanceAdmin.initialize(
117
- clonedAccessManager,
118
- InstanceAdmin(_masterInstanceAdmin).getInstanceAuthorization());
119
-
120
- InstanceStore clonedInstanceStore = InstanceStore(Clones.clone(address(_masterInstanceStore)));
121
- BundleManager clonedBundleManager = BundleManager(Clones.clone(_masterInstanceBundleManager));
122
- InstanceReader clonedInstanceReader = InstanceReader(Clones.clone(address(_masterInstanceReader)));
123
-
124
- // clone instance
125
- clonedInstance = Instance(Clones.clone(_masterInstance));
126
- clonedInstance.initialize(
127
- clonedInstanceAdmin,
128
- clonedInstanceStore,
129
- clonedBundleManager,
130
- clonedInstanceReader,
131
- getRegistry(),
132
- instanceOwner);
106
+ // create instance admin and instance
107
+ InstanceAdmin instanceAdmin = _createInstanceAdmin();
108
+ clonedInstance = _createInstance(instanceAdmin, instanceOwner);
133
109
 
134
110
  // register cloned instance with registry
135
111
  clonedInstanceNftId = _registryService.registerInstance(
@@ -142,7 +118,7 @@ contract InstanceService is
142
118
  TargetManagerLib.getDefaultRewardRate());
143
119
 
144
120
  // MUST be set after instance is set up and registered
145
- clonedInstanceAdmin.initializeInstanceAuthorization(address(clonedInstance));
121
+ instanceAdmin.initializeInstanceAuthorization(address(clonedInstance));
146
122
 
147
123
  emit LogInstanceCloned(
148
124
  clonedInstanceNftId,
@@ -155,7 +131,7 @@ contract InstanceService is
155
131
  virtual
156
132
  onlyInstance()
157
133
  {
158
- NftId instanceNftId = getRegistry().getNftId(msg.sender);
134
+ NftId instanceNftId = getRegistry().getNftIdForAddress(msg.sender);
159
135
  _stakingService.setInstanceLockingPeriod(
160
136
  instanceNftId,
161
137
  stakeLockingPeriod);
@@ -167,7 +143,7 @@ contract InstanceService is
167
143
  virtual
168
144
  onlyInstance()
169
145
  {
170
- NftId instanceNftId = getRegistry().getNftId(msg.sender);
146
+ NftId instanceNftId = getRegistry().getNftIdForAddress(msg.sender);
171
147
  _stakingService.setInstanceRewardRate(
172
148
  instanceNftId,
173
149
  rewardRate);
@@ -179,7 +155,7 @@ contract InstanceService is
179
155
  virtual
180
156
  onlyInstance()
181
157
  {
182
- NftId instanceNftId = getRegistry().getNftId(msg.sender);
158
+ NftId instanceNftId = getRegistry().getNftIdForAddress(msg.sender);
183
159
  _stakingService.refillInstanceRewardReserves(
184
160
  instanceNftId,
185
161
  rewardProvider,
@@ -193,7 +169,7 @@ contract InstanceService is
193
169
  onlyInstance()
194
170
  returns (Amount newBalance)
195
171
  {
196
- NftId instanceNftId = getRegistry().getNftId(msg.sender);
172
+ NftId instanceNftId = getRegistry().getNftIdForAddress(msg.sender);
197
173
  _stakingService.withdrawInstanceRewardReserves(
198
174
  instanceNftId,
199
175
  dipAmount);
@@ -216,8 +192,7 @@ contract InstanceService is
216
192
  NftId instanceNftId = registry.getObjectInfo(componentAddress).parentNftId;
217
193
 
218
194
  IInstance instance = IInstance(
219
- registry.getObjectInfo(
220
- instanceNftId).objectAddress);
195
+ registry.getObjectAddress(instanceNftId));
221
196
 
222
197
  // no revert in case already locked
223
198
  // TODO refactor/implement
@@ -238,7 +213,7 @@ contract InstanceService is
238
213
  {
239
214
  if(_masterInstance != address(0)) { revert ErrorInstanceServiceMasterInstanceAlreadySet(); }
240
215
  if(_masterInstanceAdmin != address(0)) { revert ErrorInstanceServiceMasterInstanceAdminAlreadySet(); }
241
- if(_masterInstanceBundleManager != address(0)) { revert ErrorInstanceServiceMasterBundleManagerAlreadySet(); }
216
+ if(_masterInstanceBundleSet != address(0)) { revert ErrorInstanceServiceMasterBundleSetAlreadySet(); }
242
217
 
243
218
  if(instanceAddress == address(0)) { revert ErrorInstanceServiceInstanceAddressZero(); }
244
219
 
@@ -248,7 +223,7 @@ contract InstanceService is
248
223
  address instanceAdminAddress = address(instanceAdmin);
249
224
  InstanceReader instanceReader = instance.getInstanceReader();
250
225
  address instanceReaderAddress = address(instanceReader);
251
- BundleManager bundleManager = instance.getBundleManager();
226
+ BundleSet bundleManager = instance.getBundleSet();
252
227
  address bundleManagerAddress = address(bundleManager);
253
228
  InstanceStore instanceStore = instance.getInstanceStore();
254
229
  address instanceStoreAddress = address(instanceStore);
@@ -256,11 +231,11 @@ contract InstanceService is
256
231
  if(accessManagerAddress == address(0)) { revert ErrorInstanceServiceAccessManagerZero(); }
257
232
  if(instanceAdminAddress == address(0)) { revert ErrorInstanceServiceInstanceAdminZero(); }
258
233
  if(instanceReaderAddress == address(0)) { revert ErrorInstanceServiceInstanceReaderZero(); }
259
- if(bundleManagerAddress == address(0)) { revert ErrorInstanceServiceBundleManagerZero(); }
234
+ if(bundleManagerAddress == address(0)) { revert ErrorInstanceServiceBundleSetZero(); }
260
235
  if(instanceStoreAddress == address(0)) { revert ErrorInstanceServiceInstanceStoreZero(); }
261
236
 
262
237
  if(instance.authority() != instanceAdmin.authority()) { revert ErrorInstanceServiceInstanceAuthorityMismatch(); }
263
- if(bundleManager.authority() != instanceAdmin.authority()) { revert ErrorInstanceServiceBundleManagerAuthorityMismatch(); }
238
+ if(bundleManager.authority() != instanceAdmin.authority()) { revert ErrorInstanceServiceBundleSetAuthorityMismatch(); }
264
239
  if(instanceStore.authority() != instanceAdmin.authority()) { revert ErrorInstanceServiceInstanceStoreAuthorityMismatch(); }
265
240
  if(bundleManager.getInstance() != instance) { revert ErrorInstanceServiceBundleMangerInstanceMismatch(); }
266
241
  if(instanceReader.getInstance() != instance) { revert ErrorInstanceServiceInstanceReaderInstanceMismatch2(); }
@@ -269,7 +244,7 @@ contract InstanceService is
269
244
  _masterInstanceAdmin = instanceAdminAddress;
270
245
  _masterInstance = instanceAddress;
271
246
  _masterInstanceReader = instanceReaderAddress;
272
- _masterInstanceBundleManager = bundleManagerAddress;
247
+ _masterInstanceBundleSet = bundleManagerAddress;
273
248
  _masterInstanceStore = instanceStoreAddress;
274
249
 
275
250
  IInstance masterInstance = IInstance(_masterInstance);
@@ -291,6 +266,7 @@ contract InstanceService is
291
266
  function upgradeInstanceReader(NftId instanceNftId)
292
267
  external
293
268
  onlyInstanceOwner(instanceNftId)
269
+ onlyNftOfType(instanceNftId, INSTANCE())
294
270
  {
295
271
  IRegistry registry = getRegistry();
296
272
  IRegistry.ObjectInfo memory instanceInfo = registry.getObjectInfo(instanceNftId);
@@ -301,65 +277,53 @@ contract InstanceService is
301
277
  instance.setInstanceReader(upgradedInstanceReaderClone);
302
278
  }
303
279
 
304
-
305
- function createGifTarget(
306
- NftId instanceNftId,
307
- address targetAddress,
308
- string memory targetName,
309
- bytes4[][] memory selectors,
310
- RoleId[] memory roles
311
- )
312
- external
313
- virtual
314
- restricted()
315
- {
316
- _createGifTarget(
317
- instanceNftId,
318
- targetAddress,
319
- targetName,
320
- roles,
321
- selectors
322
- );
323
- }
324
-
325
-
326
- function initializeAuthorization(
327
- NftId instanceNftId,
328
- IInstanceLinkedComponent component
329
- )
330
- external
280
+ /// @dev create new cloned instance admin
281
+ /// function used to setup a new instance
282
+ function _createInstanceAdmin()
283
+ internal
331
284
  virtual
332
- restricted()
285
+ returns (InstanceAdmin clonedInstanceAdmin)
333
286
  {
334
- (IInstance instance, ) = _validateInstanceAndComponent(
335
- instanceNftId,
336
- address(component));
287
+ // start with setting up a new OZ access manager
288
+ AccessManagerCloneable clonedAccessManager = AccessManagerCloneable(
289
+ Clones.clone(_masterAccessManager));
290
+
291
+ // set up the instance admin
292
+ clonedInstanceAdmin = InstanceAdmin(Clones.clone(_masterInstanceAdmin));
293
+ clonedAccessManager.initialize(
294
+ address(clonedInstanceAdmin)); // grant ADMIN_ROLE to instance admin
337
295
 
338
- InstanceAdmin instanceAdmin = instance.getInstanceAdmin();
339
- instanceAdmin.initializeComponentAuthorization(
340
- address(component),
341
- component.getAuthorization());
296
+ address authorization = address(
297
+ InstanceAdmin(_masterInstanceAdmin).getInstanceAuthorization());
298
+ clonedInstanceAdmin.initialize(
299
+ clonedAccessManager,
300
+ authorization);
342
301
  }
343
302
 
344
303
 
345
- function createComponentTarget(
346
- NftId instanceNftId,
347
- address targetAddress,
348
- string memory targetName,
349
- bytes4[][] memory selectors,
350
- RoleId[] memory roles
304
+ /// @dev create new cloned instance
305
+ /// function used to setup a new instance
306
+ function _createInstance(
307
+ InstanceAdmin instanceAdmin,
308
+ address instanceOwner
351
309
  )
352
- external
310
+ internal
353
311
  virtual
354
- restricted()
312
+ returns (Instance clonedInstance)
355
313
  {
356
- _createGifTarget(
357
- instanceNftId,
358
- targetAddress,
359
- targetName,
360
- roles,
361
- selectors
362
- );
314
+ InstanceStore clonedInstanceStore = InstanceStore(Clones.clone(address(_masterInstanceStore)));
315
+ BundleSet clonedBundleSet = BundleSet(Clones.clone(_masterInstanceBundleSet));
316
+ InstanceReader clonedInstanceReader = InstanceReader(Clones.clone(address(_masterInstanceReader)));
317
+
318
+ // clone instance
319
+ clonedInstance = Instance(Clones.clone(_masterInstance));
320
+ clonedInstance.initialize(
321
+ instanceAdmin,
322
+ clonedInstanceStore,
323
+ clonedBundleSet,
324
+ clonedInstanceReader,
325
+ getRegistry(),
326
+ instanceOwner);
363
327
  }
364
328
 
365
329
 
@@ -398,21 +362,20 @@ contract InstanceService is
398
362
  bytes memory data
399
363
  )
400
364
  internal
401
- initializer
402
365
  virtual override
366
+ initializer()
403
367
  {
404
368
  (
405
- address registryAddress,,
406
- //address managerAddress
369
+ address registryAddress,
407
370
  address authority
408
- ) = abi.decode(data, (address, address, address));
371
+ ) = abi.decode(data, (address, address));
409
372
 
410
- initializeService(registryAddress, authority, owner);
373
+ _initializeService(registryAddress, authority, owner);
411
374
 
412
375
  _registryService = IRegistryService(_getServiceAddress(REGISTRY()));
413
376
  _stakingService = IStakingService(_getServiceAddress(STAKING()));
414
377
 
415
- registerInterface(type(IInstanceService).interfaceId);
378
+ _registerInterface(type(IInstanceService).interfaceId);
416
379
  }
417
380
 
418
381
 
@@ -427,13 +390,20 @@ contract InstanceService is
427
390
  revert ErrorInstanceServiceNotInstanceNftId(instanceNftId);
428
391
  }
429
392
 
430
- IRegistry.ObjectInfo memory componentInfo = registry.getObjectInfo(componentAddress);
431
- if(componentInfo.parentNftId != instanceNftId) {
432
- revert ErrorInstanceServiceInstanceComponentMismatch(instanceNftId, componentInfo.nftId);
393
+ if (registry.getNftIdForAddress(componentAddress).gtz()) {
394
+ IRegistry.ObjectInfo memory componentInfo = registry.getObjectInfo(componentAddress);
395
+
396
+ if(componentInfo.parentNftId != instanceNftId) {
397
+ revert ErrorInstanceServiceInstanceComponentMismatch(instanceNftId, componentInfo.nftId);
398
+ }
399
+
400
+ componentNftId = componentInfo.nftId;
401
+ } else {
402
+
433
403
  }
434
404
 
435
405
  instance = Instance(instanceInfo.objectAddress);
436
- componentNftId = componentInfo.nftId;
406
+
437
407
  }
438
408
 
439
409
  // From IService
@@ -1,13 +1,9 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
2
  pragma solidity ^0.8.20;
3
3
 
4
- import {Instance} from "./Instance.sol";
5
- import {IVersionable} from "../shared/IVersionable.sol";
6
- import {ProxyManager} from "../shared/ProxyManager.sol";
4
+ import {IVersionable} from "../upgradeability/IVersionable.sol";
5
+ import {ProxyManager} from "../upgradeability/ProxyManager.sol";
7
6
  import {InstanceService} from "./InstanceService.sol";
8
- import {Registry} from "../registry/Registry.sol";
9
- import {RegistryService} from "../registry/RegistryService.sol";
10
- import {REGISTRY} from "../type/ObjectType.sol";
11
7
 
12
8
  contract InstanceServiceManager is ProxyManager {
13
9
 
@@ -16,16 +12,15 @@ contract InstanceServiceManager is ProxyManager {
16
12
  /// @dev initializes proxy manager with instance service implementation
17
13
  constructor(
18
14
  address authority,
19
- address registryAddress,
15
+ address registry,
20
16
  bytes32 salt
21
17
  )
22
- ProxyManager(registryAddress)
23
18
  {
24
- InstanceService instSrv = new InstanceService{salt: salt}();
25
- // bytes memory initCode = type(InstanceService).creationCode;
26
- bytes memory data = abi.encode(registryAddress, address(this), authority);
27
- IVersionable versionable = deployDetermenistic(
28
- address(instSrv),
19
+ InstanceService svc = new InstanceService{salt: salt}();
20
+ bytes memory data = abi.encode(registry, authority);
21
+ IVersionable versionable = initialize(
22
+ registry,
23
+ address(svc),
29
24
  data,
30
25
  salt);
31
26
 
@@ -7,7 +7,7 @@ import {Amount} from "../type/Amount.sol";
7
7
  import {Key32} from "../type/Key32.sol";
8
8
  import {NftId} from "../type/NftId.sol";
9
9
  import {ClaimId} from "../type/ClaimId.sol";
10
- import {ObjectType, BUNDLE, POLICY, POOL, PRODUCT, COMPONENT, DISTRIBUTOR, DISTRIBUTOR_TYPE} from "../type/ObjectType.sol";
10
+ import {ObjectType, BUNDLE, POLICY, POOL, PREMIUM, PRODUCT, COMPONENT, DISTRIBUTOR} from "../type/ObjectType.sol";
11
11
  import {RequestId} from "../type/RequestId.sol";
12
12
  import {RiskId} from "../type/RiskId.sol";
13
13
  import {StateId} from "../type/StateId.sol";
@@ -116,6 +116,7 @@ contract InstanceStore is
116
116
 
117
117
  //--- Distributor -------------------------------------------------------//
118
118
  function createDistributor(NftId distributorNftId, IDistribution.DistributorInfo memory info) external restricted() {
119
+ _registerBalanceTarget(distributorNftId);
119
120
  _create(_toNftKey32(distributorNftId, DISTRIBUTOR()), abi.encode(info));
120
121
  }
121
122
 
@@ -194,6 +195,16 @@ contract InstanceStore is
194
195
  _updateState(_toNftKey32(policyNftId, POLICY()), newState);
195
196
  }
196
197
 
198
+
199
+ //--- Premium (Policy) ----------------------------------------------//
200
+ function createPremium(NftId policyNftId, IPolicy.PremiumInfo memory premium) external restricted() {
201
+ _create(_toNftKey32(policyNftId, PREMIUM()), abi.encode(premium));
202
+ }
203
+
204
+ function updatePremiumState(NftId policyNftId, StateId newState) external restricted() {
205
+ _updateState(_toNftKey32(policyNftId, PREMIUM()), newState);
206
+ }
207
+
197
208
  //--- Claim -------------------------------------------------------------//
198
209
  function createClaim(NftId policyNftId, ClaimId claimId, IPolicy.ClaimInfo memory claim) external restricted() {
199
210
  _create(_toClaimKey32(policyNftId, claimId), abi.encode(claim));
@@ -3,7 +3,7 @@ pragma solidity ^0.8.20;
3
3
 
4
4
  import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
5
5
 
6
- import {COMPONENT, BUNDLE, POLICY, REQUEST, RISK, CLAIM, PAYOUT, POOL, PRODUCT, DISTRIBUTION, DISTRIBUTOR, DISTRIBUTOR_TYPE, REFERRAL} from "../../type/ObjectType.sol";
6
+ import {COMPONENT, BUNDLE, POLICY, REQUEST, RISK, CLAIM, PAYOUT, POOL, PREMIUM, PRODUCT, DISTRIBUTION, DISTRIBUTOR, DISTRIBUTOR_TYPE, REFERRAL} from "../../type/ObjectType.sol";
7
7
  import {ACTIVE, PAUSED, ARCHIVED, CLOSED, APPLIED, COLLATERALIZED, REVOKED, SUBMITTED, CONFIRMED, DECLINED, EXPECTED, PAID, FULFILLED, FAILED, CANCELLED} from "../../type/StateId.sol";
8
8
  import {Lifecycle} from "../../shared/Lifecycle.sol";
9
9
 
@@ -23,6 +23,7 @@ contract ObjectLifecycle is
23
23
  _setupBundleLifecycle();
24
24
  _setupComponentLifecycle();
25
25
  _setupPolicyLifecycle();
26
+ _setupPremiumLifecycle();
26
27
  _setupClaimLifecycle();
27
28
  _setupPayoutLifecycle();
28
29
  _setupRiskLifecycle();
@@ -54,9 +55,12 @@ contract ObjectLifecycle is
54
55
  setStateTransition(POLICY(), APPLIED(), REVOKED());
55
56
  setStateTransition(POLICY(), APPLIED(), DECLINED());
56
57
  setStateTransition(POLICY(), APPLIED(), COLLATERALIZED());
57
- setStateTransition(POLICY(), APPLIED(), ACTIVE());
58
- setStateTransition(POLICY(), COLLATERALIZED(), ACTIVE());
59
- setStateTransition(POLICY(), ACTIVE(), CLOSED());
58
+ setStateTransition(POLICY(), COLLATERALIZED(), CLOSED());
59
+ }
60
+
61
+ function _setupPremiumLifecycle() private {
62
+ setInitialState(PREMIUM(), EXPECTED());
63
+ setStateTransition(PREMIUM(), EXPECTED(), PAID());
60
64
  }
61
65
 
62
66
  function _setupClaimLifecycle() private {
@@ -68,6 +72,7 @@ contract ObjectLifecycle is
68
72
 
69
73
  function _setupPayoutLifecycle() private {
70
74
  setInitialState(PAYOUT(), EXPECTED());
75
+ // TODO: add state cancelled
71
76
  setStateTransition(PAYOUT(), EXPECTED(), PAID());
72
77
  }
73
78
 
@@ -10,17 +10,17 @@ import {IRegistry} from "../../registry/IRegistry.sol";
10
10
  import {LibNftIdSet} from "../../type/NftIdSet.sol";
11
11
  import {NftId} from "../../type/NftId.sol";
12
12
 
13
- contract ObjectManager is
13
+ contract ObjectSet is
14
14
  Cloneable
15
15
  {
16
16
 
17
- event LogObjectManagerInitialized(address instance);
17
+ event LogObjectSetInitialized(address instance);
18
18
 
19
- error ErrorObjectManagerNftIdInvalid(NftId instanceNftId);
19
+ error ErrorObjectSetNftIdInvalid(NftId instanceNftId);
20
20
 
21
21
  mapping(NftId compnentNftId => LibNftIdSet.Set objects) internal _activeObjects;
22
22
  mapping(NftId compnentNftId => LibNftIdSet.Set objects) internal _allObjects;
23
- IInstance internal _instance; // store instance address -> more flexible, instance may not be registered during ObjectManager initialization
23
+ IInstance internal _instance; // store instance address -> more flexible, instance may not be registered during ObjectSet initialization
24
24
 
25
25
  /// @dev This initializer needs to be called from the instance itself.
26
26
  function initialize()
@@ -30,7 +30,7 @@ contract ObjectManager is
30
30
  _instance = IInstance(msg.sender);
31
31
  __Cloneable_init(_instance.authority(), address(_instance.getRegistry()));
32
32
 
33
- emit LogObjectManagerInitialized(address(_instance));
33
+ emit LogObjectSetInitialized(address(_instance));
34
34
  }
35
35
 
36
36
  function getInstance() external view returns (IInstance) {
@@ -13,7 +13,7 @@ interface IBundle {
13
13
  NftId poolNftId;
14
14
  Fee fee; // bundle fee on net premium amounts
15
15
  bytes filter; // required conditions for applications to be considered for collateralization by this bundle
16
- Seconds lifetime; // lifetime of bundle after creation
16
+ Timestamp activatedAt;
17
17
  Timestamp expiredAt; // no new policies starting with this timestamp
18
18
  Timestamp closedAt; // no open policies, locked amount = 0
19
19
  }
@@ -14,17 +14,20 @@ interface IComponents {
14
14
 
15
15
  struct ComponentInfo {
16
16
  string name; // component name (needs to be unique per instance)
17
- NftId productNftId;
18
17
  IERC20Metadata token;
19
18
  TokenHandler tokenHandler;
20
19
  address wallet;
21
20
  bytes data; // will hold component type specific additional info (eg encoded pool info)
22
21
  }
23
22
 
24
-
25
23
  struct ProductInfo {
26
- NftId distributionNftId;
27
- NftId poolNftId;
24
+ bool isProcessingFundedClaims; // custom logic to react to pool events for funded claims
25
+ bool hasDistribution; // flag to indicate if distribution is enabled
26
+ uint8 expectedNumberOfOracles; // expected number of oracles
27
+ uint8 numberOfOracles; // actual number of oracles
28
+ NftId poolNftId; // mandatory
29
+ NftId distributionNftId; // 0..1 (optional)
30
+ NftId [] oracleNftId; // 0..n (optional)
28
31
  Fee productFee; // product fee on net premium
29
32
  Fee processingFee; // product fee on payout amounts
30
33
  Fee distributionFee; // distribution fee for sales that do not include commissions
@@ -36,17 +39,13 @@ interface IComponents {
36
39
 
37
40
 
38
41
  struct PoolInfo {
39
- NftId productNftId; // the nft of the product this pool is linked to
42
+ Amount maxBalanceAmount; // max balance amount allowed for pool
40
43
  RoleId bundleOwnerRole; // the required role for bundle owners
41
- // TODO maxCapitalAmount -> maxBalanceAmount
42
- Amount maxCapitalAmount; // max capital amount allowed for pool
43
- bool isInterceptingBundleTransfers; // intercepts nft transfers for bundles
44
+ bool isInterceptingBundleTransfers; // custom logic for bundle nft transfers
45
+ bool isProcessingConfirmedClaims; // custom logic for claims confirmation
44
46
  bool isExternallyManaged; // funding bundles is restricted to book keeping, actual funds may be provided as needed to support payouts
45
47
  bool isVerifyingApplications; // underwriting requires the pool component checks/confirms the applications
46
48
  UFixed collateralizationLevel; // factor to calculate collateral for sum insurance (default 100%)
47
49
  UFixed retentionLevel; // amount of collateral held in pool (default 100%)
48
- Fee poolFee; // pool fee on net premium
49
- Fee stakingFee; // pool fee on staked capital from investor
50
- Fee performanceFee; // pool fee on profits from capital investors
51
50
  }
52
51
  }
@@ -25,7 +25,6 @@ interface IDistribution {
25
25
  DistributorType distributorType;
26
26
  bool active;
27
27
  bytes data;
28
- Amount commissionAmount;
29
28
  uint32 numPoliciesSold;
30
29
  }
31
30
 
@@ -11,7 +11,7 @@ import {Timestamp} from "../../type/Timestamp.sol";
11
11
 
12
12
  interface IPolicy {
13
13
 
14
- struct Premium {
14
+ struct PremiumInfo {
15
15
  // premium splitting per target wallet
16
16
  Amount productFeeAmount;
17
17
  Amount distributionFeeAndCommissionAmount;
@@ -19,26 +19,26 @@ interface IPolicy {
19
19
 
20
20
  // detailed positions
21
21
  // this is the net premium calculated by the product
22
- uint256 netPremiumAmount;
22
+ Amount netPremiumAmount;
23
23
  // fullPremium = netPremium + all fixed amounts + all variable amounts (excl commission and minDistribtuionOwnerFee variable part)
24
- uint256 fullPremiumAmount;
25
- // premium = fullPremium - discount
26
- uint256 premiumAmount;
27
- uint256 productFeeFixAmount;
28
- uint256 poolFeeFixAmount;
29
- uint256 bundleFeeFixAmount;
30
- uint256 distributionFeeFixAmount;
31
- uint256 productFeeVarAmount;
32
- uint256 poolFeeVarAmount;
33
- uint256 bundleFeeVarAmount;
34
- uint256 distributionFeeVarAmount;
35
- uint256 distributionOwnerFeeFixAmount;
24
+ Amount fullPremiumAmount;
25
+ // effective premium = fullPremium - discount
26
+ Amount premiumAmount;
27
+ Amount productFeeFixAmount;
28
+ Amount poolFeeFixAmount;
29
+ Amount bundleFeeFixAmount;
30
+ Amount distributionFeeFixAmount;
31
+ Amount productFeeVarAmount;
32
+ Amount poolFeeVarAmount;
33
+ Amount bundleFeeVarAmount;
34
+ Amount distributionFeeVarAmount;
35
+ Amount distributionOwnerFeeFixAmount;
36
36
  // this is the remaining amount when the commission and discount are subtracted from the distribution fee variable part (must be at least the minDistributionOwnerFee)
37
- uint256 distributionOwnerFeeVarAmount;
37
+ Amount distributionOwnerFeeVarAmount;
38
38
  // this value is based on distributor type referenced in the referral
39
- uint256 commissionAmount;
39
+ Amount commissionAmount;
40
40
  // this is based on referral used
41
- uint256 discountAmount;
41
+ Amount discountAmount;
42
42
  }
43
43
 
44
44
  /// @dev policy data for the full policy lifecycle
@@ -49,7 +49,6 @@ interface IPolicy {
49
49
  RiskId riskId;
50
50
  Amount sumInsuredAmount;
51
51
  Amount premiumAmount; // expected premium at application time
52
- Amount premiumPaidAmount; // actual paid premium
53
52
  Seconds lifetime;
54
53
  // policy application data, no changes after applying for a policy
55
54
  bytes applicationData;
@@ -67,10 +66,10 @@ interface IPolicy {
67
66
  struct ClaimInfo {
68
67
  Amount claimAmount;
69
68
  Amount paidAmount;
70
- uint8 payoutsCount;
71
- uint8 openPayoutsCount;
72
- bytes submissionData; // claim submission data, no changes after submitting the claim
73
- bytes processData; // data that may include information supporting confirm or decline
69
+ uint24 payoutsCount;
70
+ uint24 openPayoutsCount;
71
+ bytes submissionData; // use case specific claim submission data, no changes after submitting the claim
72
+ bytes processData; // use case specific data that may include information supporting confirm or decline
74
73
  Timestamp closedAt; // payment of confirmed claim amount (or declinedAt)
75
74
  }
76
75
 
@@ -78,7 +77,8 @@ interface IPolicy {
78
77
  struct PayoutInfo {
79
78
  ClaimId claimId;
80
79
  Amount amount;
81
- bytes data;
82
- Timestamp paidAt; // payoment of confirmed claim amount (or declinedAt)
80
+ address beneficiary; // for address(0) beneficiary is policy nft owner
81
+ bytes data; // use case specific supporting data
82
+ Timestamp paidAt; // timestamp for actual payout
83
83
  }
84
84
  }
@@ -1,7 +1,7 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
2
  pragma solidity ^0.8.20;
3
3
 
4
- import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
4
+ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
5
5
 
6
6
  contract Dip is ERC20 {
7
7