@etherisc/gif-next 0.0.2-de9ede4-391 → 0.0.2-deb924b-641

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 (438) hide show
  1. package/artifacts/contracts/accounting/AccountingService.sol/AccountingService.dbg.json +1 -1
  2. package/artifacts/contracts/accounting/AccountingService.sol/AccountingService.json +65 -58
  3. package/artifacts/contracts/accounting/AccountingServiceManager.sol/AccountingServiceManager.dbg.json +1 -1
  4. package/artifacts/contracts/accounting/AccountingServiceManager.sol/AccountingServiceManager.json +20 -22
  5. package/artifacts/contracts/accounting/IAccountingService.sol/IAccountingService.dbg.json +1 -1
  6. package/artifacts/contracts/accounting/IAccountingService.sol/IAccountingService.json +27 -3
  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 +79 -49
  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 -21
  28. package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.dbg.json +1 -1
  29. package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.json +207 -192
  30. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
  31. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.json +53 -51
  32. package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
  33. package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.json +38 -8
  34. package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.dbg.json +1 -1
  35. package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.json +97 -73
  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 +76 -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 +233 -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 +106 -56
  48. package/artifacts/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol/SimpleDistributionAuthorization.dbg.json +1 -1
  49. package/artifacts/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol/SimpleDistributionAuthorization.json +152 -33
  50. package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.dbg.json +1 -1
  51. package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.json +95 -45
  52. package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.dbg.json +1 -1
  53. package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.json +98 -48
  54. package/artifacts/contracts/examples/unpermissioned/SimplePoolAuthorization.sol/SimplePoolAuthorization.dbg.json +1 -1
  55. package/artifacts/contracts/examples/unpermissioned/SimplePoolAuthorization.sol/SimplePoolAuthorization.json +127 -40
  56. package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.dbg.json +1 -1
  57. package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.json +280 -147
  58. package/artifacts/contracts/examples/unpermissioned/SimpleProductAuthorization.sol/SimpleProductAuthorization.dbg.json +1 -1
  59. package/artifacts/contracts/examples/unpermissioned/SimpleProductAuthorization.sol/SimpleProductAuthorization.json +152 -33
  60. package/artifacts/contracts/instance/BundleSet.sol/BundleSet.dbg.json +1 -1
  61. package/artifacts/contracts/instance/BundleSet.sol/BundleSet.json +88 -45
  62. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  63. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +54 -21
  64. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
  65. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +53 -3
  66. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  67. package/artifacts/contracts/instance/Instance.sol/Instance.json +80 -40
  68. package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.dbg.json +1 -1
  69. package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.json +344 -99
  70. package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.dbg.json +1 -1
  71. package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.json +127 -40
  72. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
  73. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +175 -199
  74. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
  75. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +65 -58
  76. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
  77. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +20 -22
  78. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.dbg.json +1 -1
  79. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.json +44 -272
  80. package/artifacts/contracts/instance/RiskSet.sol/RiskSet.dbg.json +1 -1
  81. package/artifacts/contracts/instance/RiskSet.sol/RiskSet.json +96 -53
  82. package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.dbg.json +1 -1
  83. package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.json +2 -2
  84. package/artifacts/contracts/instance/base/Cloneable.sol/Cloneable.dbg.json +1 -1
  85. package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.dbg.json +1 -1
  86. package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.json +2 -2
  87. package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.dbg.json +1 -1
  88. package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.json +2 -2
  89. package/artifacts/contracts/instance/base/ObjectSet.sol/ObjectSet.dbg.json +1 -1
  90. package/artifacts/contracts/instance/base/ObjectSet.sol/ObjectSet.json +16 -5
  91. package/artifacts/contracts/instance/base/ObjectSetHelperLib.sol/ObjectSetHelperLib.dbg.json +4 -0
  92. package/artifacts/contracts/instance/base/ObjectSetHelperLib.sol/ObjectSetHelperLib.json +168 -0
  93. package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
  94. package/artifacts/contracts/instance/module/IComponents.sol/IComponents.dbg.json +1 -1
  95. package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +1 -1
  96. package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +1 -1
  97. package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +1 -1
  98. package/artifacts/contracts/mock/Dip.sol/Dip.dbg.json +1 -1
  99. package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.dbg.json +1 -1
  100. package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.json +68 -38
  101. package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.dbg.json +1 -1
  102. package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.json +126 -35
  103. package/artifacts/contracts/oracle/IOracle.sol/IOracle.dbg.json +1 -1
  104. package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.dbg.json +1 -1
  105. package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.json +38 -8
  106. package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.dbg.json +1 -1
  107. package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.json +27 -3
  108. package/artifacts/contracts/oracle/Oracle.sol/Oracle.dbg.json +1 -1
  109. package/artifacts/contracts/oracle/Oracle.sol/Oracle.json +52 -22
  110. package/artifacts/contracts/oracle/OracleService.sol/OracleService.dbg.json +1 -1
  111. package/artifacts/contracts/oracle/OracleService.sol/OracleService.json +75 -68
  112. package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.dbg.json +1 -1
  113. package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.json +25 -27
  114. package/artifacts/contracts/pool/BasicPool.sol/BasicPool.dbg.json +1 -1
  115. package/artifacts/contracts/pool/BasicPool.sol/BasicPool.json +51 -21
  116. package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.dbg.json +1 -1
  117. package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.json +127 -40
  118. package/artifacts/contracts/pool/BundleService.sol/BundleService.dbg.json +1 -1
  119. package/artifacts/contracts/pool/BundleService.sol/BundleService.json +102 -201
  120. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.dbg.json +1 -1
  121. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.json +33 -55
  122. package/artifacts/contracts/pool/IBundleService.sol/IBundleService.dbg.json +1 -1
  123. package/artifacts/contracts/pool/IBundleService.sol/IBundleService.json +38 -80
  124. package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
  125. package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.json +38 -8
  126. package/artifacts/contracts/pool/IPoolService.sol/IPoolService.dbg.json +1 -1
  127. package/artifacts/contracts/pool/IPoolService.sol/IPoolService.json +120 -175
  128. package/artifacts/contracts/pool/Pool.sol/Pool.dbg.json +1 -1
  129. package/artifacts/contracts/pool/Pool.sol/Pool.json +51 -21
  130. package/artifacts/contracts/pool/PoolLib.sol/PoolLib.dbg.json +4 -0
  131. package/artifacts/contracts/pool/PoolLib.sol/PoolLib.json +456 -0
  132. package/artifacts/contracts/pool/PoolService.sol/PoolService.dbg.json +1 -1
  133. package/artifacts/contracts/pool/PoolService.sol/PoolService.json +236 -281
  134. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
  135. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.json +61 -47
  136. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.dbg.json +1 -1
  137. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.json +57 -50
  138. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +1 -1
  139. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.json +16 -18
  140. package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.dbg.json +1 -1
  141. package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.json +157 -112
  142. package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.dbg.json +1 -1
  143. package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.json +152 -33
  144. package/artifacts/contracts/product/ClaimService.sol/ClaimService.dbg.json +1 -1
  145. package/artifacts/contracts/product/ClaimService.sol/ClaimService.json +244 -187
  146. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +1 -1
  147. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.json +55 -65
  148. package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.dbg.json +1 -1
  149. package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.json +27 -3
  150. package/artifacts/contracts/product/IClaimService.sol/IClaimService.dbg.json +1 -1
  151. package/artifacts/contracts/product/IClaimService.sol/IClaimService.json +142 -20
  152. package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.dbg.json +1 -1
  153. package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.json +105 -68
  154. package/artifacts/contracts/product/IPricingService.sol/IPricingService.dbg.json +1 -1
  155. package/artifacts/contracts/product/IPricingService.sol/IPricingService.json +27 -3
  156. package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.dbg.json +1 -1
  157. package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.json +144 -99
  158. package/artifacts/contracts/product/IRiskService.sol/IRiskService.dbg.json +1 -1
  159. package/artifacts/contracts/product/IRiskService.sol/IRiskService.json +27 -3
  160. package/artifacts/contracts/product/PolicyService.sol/PolicyService.dbg.json +1 -1
  161. package/artifacts/contracts/product/PolicyService.sol/PolicyService.json +193 -173
  162. package/artifacts/contracts/product/PolicyServiceLib.sol/PolicyServiceLib.dbg.json +4 -0
  163. package/artifacts/contracts/product/PolicyServiceLib.sol/PolicyServiceLib.json +293 -0
  164. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +1 -1
  165. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.json +45 -47
  166. package/artifacts/contracts/product/PricingService.sol/PricingService.dbg.json +1 -1
  167. package/artifacts/contracts/product/PricingService.sol/PricingService.json +85 -78
  168. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.dbg.json +1 -1
  169. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.json +31 -33
  170. package/artifacts/contracts/product/Product.sol/Product.dbg.json +1 -1
  171. package/artifacts/contracts/product/Product.sol/Product.json +157 -112
  172. package/artifacts/contracts/product/RiskService.sol/RiskService.dbg.json +1 -1
  173. package/artifacts/contracts/product/RiskService.sol/RiskService.json +76 -77
  174. package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.dbg.json +1 -1
  175. package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.json +25 -19
  176. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  177. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  178. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +26 -2
  179. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
  180. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +31 -7
  181. package/artifacts/contracts/registry/IRelease.sol/IRelease.dbg.json +4 -0
  182. package/artifacts/contracts/registry/IRelease.sol/IRelease.json +24 -0
  183. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
  184. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  185. package/artifacts/contracts/registry/Registry.sol/Registry.json +64 -40
  186. package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.dbg.json +1 -1
  187. package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.json +250 -221
  188. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
  189. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +51 -44
  190. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
  191. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +11 -13
  192. package/artifacts/contracts/registry/ReleaseAdmin.sol/ReleaseAdmin.dbg.json +4 -0
  193. package/artifacts/contracts/registry/ReleaseAdmin.sol/ReleaseAdmin.json +1849 -0
  194. package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.dbg.json +1 -1
  195. package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.json +2 -2
  196. package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.dbg.json +1 -1
  197. package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.json +315 -49
  198. package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.dbg.json +1 -1
  199. package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.json +6 -6
  200. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
  201. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +4 -4
  202. package/artifacts/contracts/shared/Component.sol/Component.dbg.json +1 -1
  203. package/artifacts/contracts/shared/Component.sol/Component.json +51 -21
  204. package/artifacts/contracts/shared/ComponentService.sol/ComponentService.dbg.json +1 -1
  205. package/artifacts/contracts/shared/ComponentService.sol/ComponentService.json +105 -108
  206. package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.dbg.json +1 -1
  207. package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.json +40 -38
  208. package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.dbg.json +1 -1
  209. package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.json +27 -16
  210. package/artifacts/contracts/shared/ContractLib.sol/ContractLib.dbg.json +1 -1
  211. package/artifacts/contracts/shared/ContractLib.sol/ContractLib.json +57 -4
  212. package/artifacts/contracts/shared/ContractLib.sol/IInstanceAdminHelper.dbg.json +1 -1
  213. package/artifacts/contracts/shared/ContractLib.sol/ITargetHelper.dbg.json +1 -1
  214. package/artifacts/contracts/shared/ContractLib.sol/ITokenRegistryHelper.dbg.json +4 -0
  215. package/artifacts/contracts/shared/ContractLib.sol/ITokenRegistryHelper.json +40 -0
  216. package/artifacts/contracts/shared/IComponent.sol/IComponent.dbg.json +1 -1
  217. package/artifacts/contracts/shared/IComponent.sol/IComponent.json +38 -8
  218. package/artifacts/contracts/shared/IComponentService.sol/IComponentService.dbg.json +1 -1
  219. package/artifacts/contracts/shared/IComponentService.sol/IComponentService.json +27 -21
  220. package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.dbg.json +1 -1
  221. package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.json +38 -8
  222. package/artifacts/contracts/shared/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
  223. package/artifacts/contracts/shared/ILifecycle.sol/ILifecycle.dbg.json +1 -1
  224. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
  225. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +1 -1
  226. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  227. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +120 -1
  228. package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +1 -1
  229. package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
  230. package/artifacts/contracts/shared/IService.sol/IService.json +27 -3
  231. package/artifacts/contracts/shared/InitializableERC165.sol/InitializableERC165.dbg.json +1 -1
  232. package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.dbg.json +1 -1
  233. package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.json +51 -21
  234. package/artifacts/contracts/shared/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
  235. package/artifacts/contracts/shared/Lifecycle.sol/Lifecycle.dbg.json +1 -1
  236. package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.dbg.json +1 -1
  237. package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.json +2 -2
  238. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
  239. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +2 -2
  240. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +1 -1
  241. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +2 -2
  242. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  243. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +118 -62
  244. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +1 -1
  245. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +2 -2
  246. package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
  247. package/artifacts/contracts/shared/Service.sol/Service.json +27 -16
  248. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
  249. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +63 -162
  250. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandlerBase.dbg.json +1 -1
  251. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandlerBase.json +118 -29
  252. package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.dbg.json +1 -1
  253. package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.json +32 -32
  254. package/artifacts/contracts/staking/IStaking.sol/IStaking.dbg.json +1 -1
  255. package/artifacts/contracts/staking/IStaking.sol/IStaking.json +41 -22
  256. package/artifacts/contracts/staking/IStakingService.sol/IStakingService.dbg.json +1 -1
  257. package/artifacts/contracts/staking/IStakingService.sol/IStakingService.json +98 -3
  258. package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.dbg.json +1 -1
  259. package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.json +48 -43
  260. package/artifacts/contracts/staking/Staking.sol/Staking.dbg.json +1 -1
  261. package/artifacts/contracts/staking/Staking.sol/Staking.json +101 -71
  262. package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.dbg.json +1 -1
  263. package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.json +2 -2
  264. package/artifacts/contracts/staking/StakingManager.sol/StakingManager.dbg.json +1 -1
  265. package/artifacts/contracts/staking/StakingManager.sol/StakingManager.json +31 -19
  266. package/artifacts/contracts/staking/StakingReader.sol/StakingReader.dbg.json +1 -1
  267. package/artifacts/contracts/staking/StakingReader.sol/StakingReader.json +6 -57
  268. package/artifacts/contracts/staking/StakingService.sol/StakingService.dbg.json +1 -1
  269. package/artifacts/contracts/staking/StakingService.sol/StakingService.json +137 -51
  270. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.dbg.json +1 -1
  271. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.json +22 -20
  272. package/artifacts/contracts/staking/StakingStore.sol/StakingStore.dbg.json +1 -1
  273. package/artifacts/contracts/staking/StakingStore.sol/StakingStore.json +128 -128
  274. package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.dbg.json +1 -1
  275. package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.json +22 -22
  276. package/artifacts/contracts/type/AddressSet.sol/LibAddressSet.dbg.json +1 -1
  277. package/artifacts/contracts/type/Amount.sol/AmountLib.dbg.json +1 -1
  278. package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
  279. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.dbg.json +1 -1
  280. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.json +2 -2
  281. package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.dbg.json +1 -1
  282. package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.json +2 -2
  283. package/artifacts/contracts/type/Fee.sol/FeeLib.dbg.json +1 -1
  284. package/artifacts/contracts/type/Key32.sol/Key32Lib.dbg.json +1 -1
  285. package/artifacts/contracts/type/Key32.sol/Key32Lib.json +2 -2
  286. package/artifacts/contracts/type/Key32Set.sol/LibKey32Set.dbg.json +1 -1
  287. package/artifacts/contracts/type/Key32Set.sol/LibKey32Set.json +2 -2
  288. package/artifacts/contracts/type/NftId.sol/NftIdLib.dbg.json +1 -1
  289. package/artifacts/contracts/type/NftId.sol/NftIdLib.json +2 -2
  290. package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
  291. package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.json +2 -2
  292. package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
  293. package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.json +2 -2
  294. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.dbg.json +1 -1
  295. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.json +2 -2
  296. package/artifacts/contracts/type/Referral.sol/ReferralLib.dbg.json +1 -1
  297. package/artifacts/contracts/type/Referral.sol/ReferralLib.json +2 -2
  298. package/artifacts/contracts/type/RequestId.sol/RequestIdLib.dbg.json +1 -1
  299. package/artifacts/contracts/type/RequestId.sol/RequestIdLib.json +2 -2
  300. package/artifacts/contracts/type/RiskId.sol/RiskIdLib.dbg.json +1 -1
  301. package/artifacts/contracts/type/RiskId.sol/RiskIdLib.json +23 -4
  302. package/artifacts/contracts/type/RoleId.sol/RoleIdLib.dbg.json +1 -1
  303. package/artifacts/contracts/type/RoleId.sol/RoleIdLib.json +79 -15
  304. package/artifacts/contracts/type/Seconds.sol/SecondsLib.dbg.json +1 -1
  305. package/artifacts/contracts/type/Selector.sol/SelectorLib.dbg.json +1 -1
  306. package/artifacts/contracts/type/Selector.sol/SelectorLib.json +21 -2
  307. package/artifacts/contracts/type/Selector.sol/SelectorSetLib.dbg.json +1 -1
  308. package/artifacts/contracts/type/Selector.sol/SelectorSetLib.json +2 -2
  309. package/artifacts/contracts/type/StateId.sol/StateIdLib.dbg.json +1 -1
  310. package/artifacts/contracts/type/String.sol/StrLib.dbg.json +1 -1
  311. package/artifacts/contracts/type/Timestamp.sol/TimestampLib.dbg.json +1 -1
  312. package/artifacts/contracts/type/Timestamp.sol/TimestampLib.json +2 -2
  313. package/artifacts/contracts/type/UFixed.sol/UFixedLib.dbg.json +1 -1
  314. package/artifacts/contracts/type/Version.sol/VersionLib.dbg.json +1 -1
  315. package/artifacts/contracts/type/Version.sol/VersionLib.json +2 -21
  316. package/artifacts/contracts/type/Version.sol/VersionPartLib.dbg.json +1 -1
  317. package/artifacts/contracts/type/Version.sol/VersionPartLib.json +47 -2
  318. package/artifacts/contracts/upgradeability/IVersionable.sol/IVersionable.dbg.json +1 -1
  319. package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.dbg.json +1 -1
  320. package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.json +2 -2
  321. package/artifacts/contracts/upgradeability/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
  322. package/artifacts/contracts/upgradeability/Versionable.sol/Versionable.dbg.json +1 -1
  323. package/contracts/accounting/AccountingService.sol +3 -4
  324. package/contracts/accounting/AccountingServiceManager.sol +1 -1
  325. package/contracts/authorization/AccessAdmin.sol +156 -82
  326. package/contracts/authorization/AccessManagerCloneable.sol +136 -3
  327. package/contracts/authorization/Authorization.sol +277 -229
  328. package/contracts/authorization/IAccessAdmin.sol +13 -7
  329. package/contracts/authorization/IAuthorization.sol +15 -1
  330. package/contracts/distribution/BasicDistribution.sol +7 -5
  331. package/contracts/distribution/BasicDistributionAuthorization.sol +21 -8
  332. package/contracts/distribution/Distribution.sol +10 -8
  333. package/contracts/distribution/DistributionService.sol +26 -25
  334. package/contracts/distribution/DistributionServiceManager.sol +1 -1
  335. package/contracts/distribution/IDistributionService.sol +14 -13
  336. package/contracts/examples/fire/FirePoolAuthorization.sol +1 -1
  337. package/contracts/examples/fire/FireProduct.sol +3 -1
  338. package/contracts/examples/fire/FireProductAuthorization.sol +1 -1
  339. package/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol +1 -1
  340. package/contracts/examples/unpermissioned/SimplePool.sol +0 -1
  341. package/contracts/examples/unpermissioned/SimplePoolAuthorization.sol +1 -1
  342. package/contracts/examples/unpermissioned/SimpleProduct.sol +25 -0
  343. package/contracts/examples/unpermissioned/SimpleProductAuthorization.sol +1 -1
  344. package/contracts/instance/BundleSet.sol +4 -4
  345. package/contracts/instance/IInstance.sol +6 -7
  346. package/contracts/instance/IInstanceService.sol +2 -0
  347. package/contracts/instance/Instance.sol +19 -11
  348. package/contracts/instance/InstanceAdmin.sol +213 -64
  349. package/contracts/instance/InstanceAuthorizationV3.sol +8 -17
  350. package/contracts/instance/InstanceReader.sol +75 -34
  351. package/contracts/instance/InstanceService.sol +43 -31
  352. package/contracts/instance/InstanceServiceManager.sol +1 -1
  353. package/contracts/instance/InstanceStore.sol +1 -0
  354. package/contracts/instance/RiskSet.sol +11 -12
  355. package/contracts/instance/base/ObjectLifecycle.sol +2 -1
  356. package/contracts/instance/base/ObjectSet.sol +7 -8
  357. package/contracts/instance/base/ObjectSetHelperLib.sol +30 -0
  358. package/contracts/instance/module/IComponents.sol +0 -8
  359. package/contracts/instance/module/IDistribution.sol +2 -1
  360. package/contracts/instance/module/IRisk.sol +2 -0
  361. package/contracts/oracle/BasicOracleAuthorization.sol +3 -12
  362. package/contracts/oracle/Oracle.sol +1 -1
  363. package/contracts/oracle/OracleService.sol +16 -15
  364. package/contracts/oracle/OracleServiceManager.sol +1 -1
  365. package/contracts/pool/BasicPoolAuthorization.sol +21 -13
  366. package/contracts/pool/BundleService.sol +28 -58
  367. package/contracts/pool/BundleServiceManager.sol +1 -1
  368. package/contracts/pool/IBundleService.sol +13 -19
  369. package/contracts/pool/IPoolService.sol +50 -38
  370. package/contracts/pool/Pool.sol +9 -9
  371. package/contracts/pool/PoolLib.sol +216 -0
  372. package/contracts/pool/PoolService.sol +296 -154
  373. package/contracts/pool/PoolServiceManager.sol +1 -1
  374. package/contracts/product/ApplicationService.sol +3 -3
  375. package/contracts/product/ApplicationServiceManager.sol +1 -1
  376. package/contracts/product/BasicProduct.sol +2 -0
  377. package/contracts/product/BasicProductAuthorization.sol +23 -8
  378. package/contracts/product/ClaimService.sol +157 -139
  379. package/contracts/product/ClaimServiceManager.sol +1 -1
  380. package/contracts/product/IClaimService.sol +14 -2
  381. package/contracts/product/IPolicyService.sol +11 -6
  382. package/contracts/product/IProductComponent.sol +4 -1
  383. package/contracts/product/PolicyService.sol +90 -144
  384. package/contracts/product/PolicyServiceLib.sol +65 -0
  385. package/contracts/product/PolicyServiceManager.sol +1 -1
  386. package/contracts/product/PricingService.sol +23 -19
  387. package/contracts/product/PricingServiceManager.sol +3 -3
  388. package/contracts/product/Product.sol +51 -0
  389. package/contracts/product/RiskService.sol +61 -23
  390. package/contracts/product/RiskServiceManager.sol +1 -1
  391. package/contracts/registry/IRegistry.sol +8 -15
  392. package/contracts/registry/IRelease.sol +26 -0
  393. package/contracts/registry/Registry.sol +7 -2
  394. package/contracts/registry/RegistryAdmin.sol +126 -229
  395. package/contracts/registry/RegistryService.sol +3 -3
  396. package/contracts/registry/RegistryServiceManager.sol +1 -1
  397. package/contracts/registry/ReleaseAdmin.sol +245 -0
  398. package/contracts/registry/ReleaseLifecycle.sol +2 -0
  399. package/contracts/registry/ReleaseRegistry.sol +124 -99
  400. package/contracts/registry/ServiceAuthorizationV3.sol +42 -2
  401. package/contracts/registry/TokenRegistry.sol +6 -8
  402. package/contracts/shared/Component.sol +27 -19
  403. package/contracts/shared/ComponentService.sol +85 -89
  404. package/contracts/shared/ComponentServiceManager.sol +1 -1
  405. package/contracts/shared/ComponentVerifyingService.sol +1 -1
  406. package/contracts/shared/ContractLib.sol +32 -3
  407. package/contracts/shared/IComponent.sol +3 -4
  408. package/contracts/shared/IComponentService.sol +0 -4
  409. package/contracts/shared/IRegisterable.sol +15 -4
  410. package/contracts/shared/IService.sol +3 -5
  411. package/contracts/shared/InstanceLinkedComponent.sol +2 -2
  412. package/contracts/shared/NftOwnable.sol +4 -4
  413. package/contracts/shared/PolicyHolder.sol +1 -1
  414. package/contracts/shared/Registerable.sol +45 -19
  415. package/contracts/shared/RegistryLinked.sol +1 -1
  416. package/contracts/shared/Service.sol +8 -27
  417. package/contracts/shared/TokenHandler.sol +40 -88
  418. package/contracts/staking/IStaking.sol +1 -10
  419. package/contracts/staking/IStakingService.sol +11 -1
  420. package/contracts/staking/StakeManagerLib.sol +67 -16
  421. package/contracts/staking/Staking.sol +35 -20
  422. package/contracts/staking/StakingReader.sol +1 -16
  423. package/contracts/staking/StakingService.sol +53 -44
  424. package/contracts/staking/StakingServiceManager.sol +5 -4
  425. package/contracts/type/ObjectType.sol +41 -27
  426. package/contracts/type/RiskId.sol +5 -0
  427. package/contracts/type/RoleId.sol +24 -4
  428. package/contracts/type/Selector.sol +5 -0
  429. package/contracts/type/Timestamp.sol +0 -5
  430. package/contracts/type/Version.sol +15 -5
  431. package/contracts/upgradeability/ProxyManager.sol +1 -1
  432. package/package.json +1 -1
  433. package/artifacts/contracts/authorization/ReleaseAccessManager.sol/ReleaseAccessManager.dbg.json +0 -4
  434. package/artifacts/contracts/authorization/ReleaseAccessManager.sol/ReleaseAccessManager.json +0 -1196
  435. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +0 -4
  436. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.json +0 -129
  437. package/contracts/authorization/ReleaseAccessManager.sol +0 -38
  438. package/contracts/instance/module/IAccess.sol +0 -46
@@ -1,19 +1,20 @@
1
1
  // SPDX-License-Identifier: UNLICENSED
2
2
  pragma solidity ^0.8.20;
3
3
 
4
-
5
- import {AccessAdmin} from "../authorization/AccessAdmin.sol";
6
- import {AccessManagerCloneable} from "../authorization/AccessManagerCloneable.sol";
4
+ import {IAccess} from "../authorization/IAccess.sol";
7
5
  import {IAuthorization} from "../authorization/IAuthorization.sol";
8
6
  import {IInstanceLinkedComponent} from "../shared/IInstanceLinkedComponent.sol";
9
- import {IAuthorization} from "../authorization/IAuthorization.sol";
10
7
  import {IRegistry} from "../registry/IRegistry.sol";
11
8
  import {IInstance} from "./IInstance.sol";
9
+
10
+ import {AccessAdmin} from "../authorization/AccessAdmin.sol";
11
+ import {AccessManagerCloneable} from "../authorization/AccessManagerCloneable.sol";
12
+ import {NftId} from "../type/NftId.sol";
12
13
  import {ObjectType} from "../type/ObjectType.sol";
13
14
  import {RoleId, RoleIdLib} from "../type/RoleId.sol";
14
15
  import {Str, StrLib} from "../type/String.sol";
15
16
  import {TokenHandler} from "../shared/TokenHandler.sol";
16
- import {VersionPart} from "../type/Version.sol";
17
+ import {VersionPart, VersionPartLib} from "../type/Version.sol";
17
18
 
18
19
 
19
20
  contract InstanceAdmin is
@@ -27,67 +28,95 @@ contract InstanceAdmin is
27
28
 
28
29
  uint64 public constant CUSTOM_ROLE_ID_MIN = 10000; // MUST be even
29
30
 
31
+ error ErrorInstanceAdminCallerNotInstanceOwner(address caller);
32
+ error ErrorInstanceAdminInstanceAlreadyLocked();
30
33
  error ErrorInstanceAdminNotRegistered(address target);
34
+
31
35
  error ErrorInstanceAdminAlreadyAuthorized(address target);
36
+ error ErrorInstanceAdminNotComponentRole(RoleId roleId);
37
+ error ErrorInstanceAdminRoleAlreadyExists(RoleId roleId);
38
+ error ErrorInstanceAdminRoleTypeNotContract(RoleId roleId, IAccess.RoleType roleType);
39
+
32
40
  error ErrorInstanceAdminReleaseMismatch();
33
41
  error ErrorInstanceAdminExpectedTargetMissing(string targetName);
34
42
 
35
43
  IInstance internal _instance;
36
44
  IRegistry internal _registry;
37
- uint64 internal _idNext;
45
+ uint64 internal _customIdNext;
46
+
47
+ mapping(address target => RoleId roleId) internal _targetRoleId;
48
+ uint64 internal _components;
38
49
 
39
50
  IAuthorization internal _instanceAuthorization;
40
51
 
52
+
53
+ modifier onlyInstanceOwner() {
54
+ if(msg.sender != _registry.ownerOf(address(_instance))) {
55
+ revert ErrorInstanceAdminCallerNotInstanceOwner(msg.sender);
56
+ }
57
+ _;
58
+ }
59
+
41
60
  /// @dev Only used for master instance admin.
42
61
  /// Contracts created via constructor come with disabled initializers.
43
62
  constructor(
44
63
  address instanceAuthorization
45
- )
46
- AccessAdmin()
47
- {
64
+ ) {
65
+ initialize(new AccessManagerCloneable());
66
+
48
67
  _instanceAuthorization = IAuthorization(instanceAuthorization);
68
+
69
+ _disableInitializers();
49
70
  }
50
71
 
51
- /// @dev Initializes this instance admin with the provided instances authorization specification.
52
- /// Internally the function creates an instance specific OpenZeppelin AccessManager that is used as the authority
53
- /// for the inststance authorizatios.
54
- /// Important: Initialization of this instance admin is only complete after calling function initializeInstance.
72
+
55
73
  function initialize(
56
- AccessManagerCloneable accessManager,
57
- address instanceAuthorization
74
+ AccessManagerCloneable clonedAccessManager,
75
+ IRegistry registry,
76
+ VersionPart release
58
77
  )
59
78
  external
60
79
  initializer()
61
80
  {
62
- // create new access manager for this instance admin
63
- _initializeAuthority(address(accessManager));
81
+ __AccessAdmin_init(clonedAccessManager);
64
82
 
65
- // create basic instance independent setup
66
- _createAdminAndPublicRoles();
83
+ clonedAccessManager.completeSetup(
84
+ address(registry),
85
+ release);
67
86
 
68
- // store instance authorization specification
69
- _instanceAuthorization = IAuthorization(instanceAuthorization);
87
+ _registry = registry;
70
88
  }
71
89
 
72
- /// @dev Completes the initialization of this instance admin using the provided instance.
90
+ /// @dev Completes the initialization of this instance admin using the provided instance, registry and version.
91
+ /// Important: Initialization of instance admin is only complete after calling this function.
73
92
  /// Important: The instance MUST be registered and all instance supporting contracts must be wired to this instance.
74
- function initializeInstanceAuthorization(address instanceAddress)
93
+ function completeSetup(
94
+ address instance,
95
+ address authorization
96
+ )
75
97
  external
98
+ reinitializer(uint64(getRelease().toInt()))
99
+ onlyDeployer()
76
100
  {
77
- _checkTargetIsReadyForAuthorization(instanceAddress);
101
+ _components = 0;
102
+ _customIdNext = CUSTOM_ROLE_ID_MIN;
103
+ _instance = IInstance(instance);
104
+ _instanceAuthorization = IAuthorization(authorization);
78
105
 
79
- _idNext = CUSTOM_ROLE_ID_MIN;
80
- _instance = IInstance(instanceAddress);
81
- _registry = _instance.getRegistry();
106
+ _checkTargetIsReadyForAuthorization(instance);
82
107
 
83
108
  // check matching releases
84
- if (_instanceAuthorization.getRelease() != _instance.getRelease()) {
109
+ if (_instanceAuthorization.getRelease() != getRelease()) {
85
110
  revert ErrorInstanceAdminReleaseMismatch();
86
111
  }
87
112
 
113
+ // create instance role and target
114
+ _setupInstance(instance);
115
+
88
116
  // add instance authorization
89
117
  _createRoles(_instanceAuthorization);
90
- _createModuleTargetsWithRoles();
118
+
119
+ _setupInstanceHelperTargetsWithRoles();
91
120
  _createTargetAuthorizations(_instanceAuthorization);
92
121
  }
93
122
 
@@ -98,47 +127,41 @@ contract InstanceAdmin is
98
127
  IInstanceLinkedComponent component
99
128
  )
100
129
  external
130
+ restricted()
101
131
  {
102
132
  // checks
103
- // get authorization specification
104
- IAuthorization authorization = component.getAuthorization();
105
- string memory targetName = authorization.getTargetName();
106
133
  _checkTargetIsReadyForAuthorization(address(component));
107
134
 
135
+ // setup target and role for component (including token handler)
136
+ _setupComponentAndTokenHandler(component);
108
137
 
109
- // create roles
110
- _createRoles(authorization);
138
+ // create other roles
139
+ IAuthorization authorization = component.getAuthorization();
140
+ _createRoles(authorization);
141
+ _createTargetAuthorizations(authorization);
142
+ }
111
143
 
112
- // create component target
144
+ // create instance role and target
145
+ function _setupInstance(address instance) internal {
146
+ // create instance role
147
+ RoleId instanceRoleId = _instanceAuthorization.getTargetRole(
148
+ _instanceAuthorization.getMainTarget());
149
+
150
+ _createRole(
151
+ instanceRoleId,
152
+ _instanceAuthorization.getRoleInfo(instanceRoleId));
153
+
154
+ // create instance target
113
155
  _createTarget(
114
- address(component),
115
- targetName,
156
+ instance,
157
+ _instanceAuthorization.getMainTargetName(),
116
158
  true, // checkAuthority
117
159
  false); // custom
118
160
 
119
- _createTarget(
120
- address(component.getTokenHandler()),
121
- string(abi.encodePacked(targetName, "TH")),
122
- true,
123
- false);
124
-
125
- FunctionInfo[] memory functions = new FunctionInfo[](3);
126
- functions[0] = toFunction(TokenHandler.collectTokens.selector, "collectTokens");
127
- functions[1] = toFunction(TokenHandler.collectTokensToThreeRecipients.selector, "collectTokensToThreeRecipients");
128
- functions[2] = toFunction(TokenHandler.distributeTokens.selector, "distributeTokens");
129
-
130
- // FIXME: make this a bit nicer and work with IAuthorization. Use a specific role, not public - access to TokenHandler must be restricted
131
- _authorizeTargetFunctions(
132
- address(component.getTokenHandler()),
133
- getPublicRole(),
134
- functions);
135
-
161
+ // assign instance role to instance
136
162
  _grantRoleToAccount(
137
- authorization.getTargetRole(
138
- authorization.getMainTarget()),
139
- address(component));
140
-
141
- _createTargetAuthorizations(authorization);
163
+ instanceRoleId,
164
+ instance);
142
165
  }
143
166
 
144
167
  /// @dev Creates a custom role
@@ -160,6 +183,19 @@ contract InstanceAdmin is
160
183
  _grantRoleToAccount(roleId, account);
161
184
  }
162
185
 
186
+
187
+ function setInstanceLocked(bool locked)
188
+ external
189
+ onlyInstanceOwner()
190
+ {
191
+ AccessManagerCloneable accessManager = AccessManagerCloneable(authority());
192
+
193
+ if(accessManager.isLocked() == locked) {
194
+ revert ErrorInstanceAdminInstanceAlreadyLocked();
195
+ }
196
+ accessManager.setLocked(locked);
197
+ }
198
+
163
199
  function setTargetLocked(address target, bool locked)
164
200
  external
165
201
  restricted()
@@ -167,7 +203,14 @@ contract InstanceAdmin is
167
203
  _setTargetClosed(target, locked);
168
204
  }
169
205
 
170
-
206
+ /// @dev Returns the number of components that have been registered with this instance.
207
+ function components()
208
+ external
209
+ view
210
+ returns (uint64)
211
+ {
212
+ return _components;
213
+ }
171
214
 
172
215
  /// @dev Returns the instance authorization specification used to set up this instance admin.
173
216
  function getInstanceAuthorization()
@@ -178,12 +221,102 @@ contract InstanceAdmin is
178
221
  return _instanceAuthorization;
179
222
  }
180
223
 
224
+ // ------------------- Internal functions ------------------- //
225
+
226
+ function _setupComponentAndTokenHandler(IInstanceLinkedComponent component)
227
+ internal
228
+ {
229
+
230
+ IAuthorization authorization = component.getAuthorization();
231
+ string memory targetName = authorization.getMainTargetName();
232
+
233
+ // create component role and target
234
+ RoleId componentRoleId = _createComponentRoleId(component, authorization);
235
+
236
+ // create component's target
237
+ _createTarget(
238
+ address(component),
239
+ targetName,
240
+ true, // checkAuthority
241
+ false); // custom
242
+
243
+ // create component's token handler target
244
+ NftId componentNftId = _registry.getNftIdForAddress(address(component));
245
+ address tokenHandler = address(
246
+ _instance.getInstanceReader().getComponentInfo(
247
+ componentNftId).tokenHandler);
248
+
249
+ _createTarget(
250
+ tokenHandler,
251
+ authorization.getTokenHandlerName(),
252
+ true,
253
+ false);
254
+
255
+ // assign component role to component
256
+ _grantRoleToAccount(
257
+ componentRoleId,
258
+ address(component));
259
+
260
+ // token handler does not require its own role
261
+ // token handler is not calling other components
262
+ }
263
+
264
+
265
+ function _createComponentRoleId(
266
+ IInstanceLinkedComponent component,
267
+ IAuthorization authorization
268
+ )
269
+ internal
270
+ returns (RoleId componentRoleId)
271
+ {
272
+ // checks
273
+ // check component is not yet authorized
274
+ if (_targetRoleId[address(component)].gtz()) {
275
+ revert ErrorInstanceAdminAlreadyAuthorized(address(component));
276
+ }
277
+
278
+ // check generic component role
279
+ RoleId genericComponentRoleId = authorization.getTargetRole(
280
+ authorization.getMainTarget());
281
+
282
+ if (!genericComponentRoleId.isComponentRole()) {
283
+ revert ErrorInstanceAdminNotComponentRole(genericComponentRoleId);
284
+ }
285
+
286
+ // check component role does not exist
287
+ componentRoleId = toComponentRole(
288
+ genericComponentRoleId,
289
+ _components);
290
+
291
+ if (roleExists(componentRoleId)) {
292
+ revert ErrorInstanceAdminRoleAlreadyExists(componentRoleId);
293
+ }
294
+
295
+ // check role info
296
+ IAccess.RoleInfo memory roleInfo = authorization.getRoleInfo(
297
+ genericComponentRoleId);
298
+
299
+ if (roleInfo.roleType != IAccess.RoleType.Contract) {
300
+ revert ErrorInstanceAdminRoleTypeNotContract(
301
+ componentRoleId,
302
+ roleInfo.roleType);
303
+ }
304
+
305
+ // effects
306
+ _targetRoleId[address(component)] = componentRoleId;
307
+ _components++;
308
+
309
+ _createRole(
310
+ componentRoleId,
311
+ roleInfo);
312
+ }
313
+
181
314
 
182
315
  function _checkTargetIsReadyForAuthorization(address target)
183
316
  internal
184
317
  view
185
318
  {
186
- if (address(_registry) != address(0) && !_registry.isRegistered(target)) {
319
+ if (!_registry.isRegistered(target)) {
187
320
  revert ErrorInstanceAdminNotRegistered(target);
188
321
  }
189
322
 
@@ -197,13 +330,18 @@ contract InstanceAdmin is
197
330
  internal
198
331
  {
199
332
  RoleId[] memory roles = authorization.getRoles();
333
+ RoleId mainTargetRoleId = authorization.getTargetRole(
334
+ authorization.getMainTarget());
335
+
200
336
  RoleId roleId;
201
337
  RoleInfo memory roleInfo;
202
338
 
203
339
  for(uint256 i = 0; i < roles.length; i++) {
340
+
204
341
  roleId = roles[i];
205
342
 
206
- if (!roleExists(roleId)) {
343
+ // skip main target role, create role if not exists
344
+ if (roleId != mainTargetRoleId && !roleExists(roleId)) {
207
345
  _createRole(
208
346
  roleId,
209
347
  authorization.getRoleInfo(roleId));
@@ -212,6 +350,16 @@ contract InstanceAdmin is
212
350
  }
213
351
 
214
352
 
353
+ function toComponentRole(RoleId roleId, uint64 componentIdx)
354
+ internal
355
+ pure
356
+ returns (RoleId)
357
+ {
358
+ return RoleIdLib.toRoleId(
359
+ RoleIdLib.toInt(roleId) + componentIdx);
360
+ }
361
+
362
+
215
363
  function _createTargetAuthorizations(IAuthorization authorization)
216
364
  internal
217
365
  {
@@ -262,11 +410,12 @@ contract InstanceAdmin is
262
410
  }
263
411
  }
264
412
 
265
- function _createModuleTargetsWithRoles()
413
+ function _setupInstanceHelperTargetsWithRoles()
266
414
  internal
267
415
  {
416
+ // _checkAndCreateTargetWithRole(address(_instance), INSTANCE_TARGET_NAME);
417
+
268
418
  // create module targets
269
- _checkAndCreateTargetWithRole(address(_instance), INSTANCE_TARGET_NAME);
270
419
  _checkAndCreateTargetWithRole(address(_instance.getInstanceStore()), INSTANCE_STORE_TARGET_NAME);
271
420
  _checkAndCreateTargetWithRole(address(_instance.getInstanceAdmin()), INSTANCE_ADMIN_TARGET_NAME);
272
421
  _checkAndCreateTargetWithRole(address(_instance.getBundleSet()), BUNDLE_SET_TARGET_NAME);
@@ -26,27 +26,14 @@ contract InstanceAuthorizationV3
26
26
  string public constant BUNDLE_SET_TARGET_NAME = "BundleSet";
27
27
  string public constant RISK_SET_TARGET_NAME = "RiskSet";
28
28
 
29
- constructor() Authorization(INSTANCE_TARGET_NAME) {}
30
-
31
-
32
- function _setupRoles()
33
- internal
34
- override
35
- {
36
- // empty implementation
37
- }
38
-
29
+ constructor()
30
+ Authorization(INSTANCE_TARGET_NAME, INSTANCE())
31
+ { }
39
32
 
40
33
  function _setupTargets()
41
34
  internal
42
35
  override
43
36
  {
44
- // instance target
45
- _addTargetWithRole(
46
- INSTANCE_TARGET_NAME,
47
- _toTargetRoleId(INSTANCE()),
48
- INSTANCE_ROLE_NAME);
49
-
50
37
  // instance supporting targets
51
38
  _addTarget(INSTANCE_STORE_TARGET_NAME);
52
39
  _addTarget(INSTANCE_ADMIN_TARGET_NAME);
@@ -132,11 +119,12 @@ contract InstanceAuthorizationV3
132
119
  IAccess.FunctionInfo[] storage functions;
133
120
 
134
121
  // authorize instance role
135
- functions = _authorizeForTarget(INSTANCE_ADMIN_TARGET_NAME, _toTargetRoleId(INSTANCE()));
122
+ functions = _authorizeForTarget(INSTANCE_ADMIN_TARGET_NAME, getComponentRole(INSTANCE()));
136
123
  _authorize(functions, InstanceAdmin.grantRole.selector, "grantRole");
137
124
 
138
125
  // authorize component service role
139
126
  functions = _authorizeForTarget(INSTANCE_ADMIN_TARGET_NAME, getServiceRole(COMPONENT()));
127
+ _authorize(functions, InstanceAdmin.initializeComponentAuthorization.selector, "initializeComponentAuthoriz");
140
128
  _authorize(functions, InstanceAdmin.setTargetLocked.selector, "setTargetLocked");
141
129
  }
142
130
 
@@ -160,6 +148,8 @@ contract InstanceAuthorizationV3
160
148
  _authorize(functions, InstanceStore.createPool.selector, "createPool");
161
149
  _authorize(functions, InstanceStore.createProduct.selector, "createProduct");
162
150
  _authorize(functions, InstanceStore.updateProduct.selector, "updateProduct");
151
+ _authorize(functions, InstanceStore.createFee.selector, "createFee");
152
+ _authorize(functions, InstanceStore.updateFee.selector, "updateFee");
163
153
 
164
154
  // authorize distribution service role
165
155
  functions = _authorizeForTarget(INSTANCE_STORE_TARGET_NAME, getServiceRole(DISTRIBUTION()));
@@ -217,6 +207,7 @@ contract InstanceAuthorizationV3
217
207
  _authorize(functions, InstanceStore.updateClaim.selector, "updateClaim");
218
208
  _authorize(functions, InstanceStore.createPayout.selector, "createPayout");
219
209
  _authorize(functions, InstanceStore.updatePayout.selector, "updatePayout");
210
+ _authorize(functions, InstanceStore.updatePayoutState.selector, "updatePayoutState");
220
211
  }
221
212
  }
222
213
 
@@ -1,19 +1,7 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
2
  pragma solidity ^0.8.20;
3
3
 
4
- import {Amount} from "../type/Amount.sol";
5
- import {ClaimId, ClaimIdLib} from "../type/ClaimId.sol";
6
- import {DistributorType} from "../type/DistributorType.sol";
7
- import {Key32} from "../type/Key32.sol";
8
- import {NftId} from "../type/NftId.sol";
9
- import {COMPONENT, DISTRIBUTOR, DISTRIBUTION, FEE, PREMIUM, PRODUCT, POLICY, POOL, BUNDLE} from "../type/ObjectType.sol";
10
- import {PayoutId, PayoutIdLib} from "../type/PayoutId.sol";
11
- import {ReferralId, ReferralStatus, ReferralLib, REFERRAL_OK, REFERRAL_ERROR_UNKNOWN, REFERRAL_ERROR_EXPIRED, REFERRAL_ERROR_EXHAUSTED} from "../type/Referral.sol";
12
- import {RequestId} from "../type/RequestId.sol";
13
- import {RiskId} from "../type/RiskId.sol";
14
- import {RoleId} from "../type/RoleId.sol";
15
- import {StateId} from "../type/StateId.sol";
16
- import {UFixed, UFixedLib} from "../type/UFixed.sol";
4
+ import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
17
5
 
18
6
  import {IBundle} from "../instance/module/IBundle.sol";
19
7
  import {IComponents} from "../instance/module/IComponents.sol";
@@ -22,12 +10,28 @@ import {IInstance} from "./IInstance.sol";
22
10
  import {IKeyValueStore} from "../shared/IKeyValueStore.sol";
23
11
  import {IOracle} from "../oracle/IOracle.sol";
24
12
  import {IPolicy} from "../instance/module/IPolicy.sol";
13
+ import {IRegistry} from "../registry/IRegistry.sol";
25
14
  import {IRisk} from "../instance/module/IRisk.sol";
26
15
  import {TimestampLib} from "../type/Timestamp.sol";
27
16
 
28
- import {InstanceStore} from "./InstanceStore.sol";
17
+ import {Amount} from "../type/Amount.sol";
29
18
  import {BundleSet} from "./BundleSet.sol";
19
+ import {BUNDLE, COMPONENT, DISTRIBUTOR, DISTRIBUTION, FEE, PREMIUM, POLICY, POOL, PRODUCT} from "../type/ObjectType.sol";
20
+ import {ClaimId, ClaimIdLib} from "../type/ClaimId.sol";
21
+ import {DistributorType} from "../type/DistributorType.sol";
22
+ import {InstanceStore} from "./InstanceStore.sol";
23
+ import {Key32} from "../type/Key32.sol";
24
+ import {NftId} from "../type/NftId.sol";
25
+ import {PayoutId, PayoutIdLib} from "../type/PayoutId.sol";
26
+ import {ReferralId, ReferralStatus, ReferralLib, REFERRAL_OK, REFERRAL_ERROR_UNKNOWN, REFERRAL_ERROR_EXPIRED, REFERRAL_ERROR_EXHAUSTED} from "../type/Referral.sol";
27
+ import {RequestId} from "../type/RequestId.sol";
28
+ import {RiskId} from "../type/RiskId.sol";
30
29
  import {RiskSet} from "./RiskSet.sol";
30
+ import {RoleId} from "../type/RoleId.sol";
31
+ import {StateId} from "../type/StateId.sol";
32
+ import {TokenHandler} from "../shared/TokenHandler.sol";
33
+ import {UFixed, UFixedLib} from "../type/UFixed.sol";
34
+
31
35
 
32
36
 
33
37
  contract InstanceReader {
@@ -37,7 +41,9 @@ contract InstanceReader {
37
41
 
38
42
  bool private _initialized = false;
39
43
 
44
+ IRegistry internal _registry;
40
45
  IInstance internal _instance;
46
+
41
47
  InstanceStore internal _store;
42
48
  BundleSet internal _bundleSet;
43
49
  RiskSet internal _riskSet;
@@ -51,7 +57,6 @@ contract InstanceReader {
51
57
  initializeWithInstance(msg.sender);
52
58
  }
53
59
 
54
- /// @dev This initializer needs to be called from the instance itself.
55
60
  function initializeWithInstance(address instanceAddress)
56
61
  public
57
62
  {
@@ -61,12 +66,40 @@ contract InstanceReader {
61
66
 
62
67
  _initialized = true;
63
68
  _instance = IInstance(instanceAddress);
69
+ _registry = _instance.getRegistry();
70
+
64
71
  _store = _instance.getInstanceStore();
65
72
  _bundleSet = _instance.getBundleSet();
66
73
  _riskSet = _instance.getRiskSet();
67
74
  }
68
75
 
69
76
 
77
+ // instance level functions
78
+
79
+ function getRegistry() public view returns (IRegistry registry) {
80
+ return _registry;
81
+ }
82
+
83
+ function getInstanceNftId() public view returns (NftId instanceNftid) {
84
+ return _registry.getNftIdForAddress(address(_instance));
85
+ }
86
+
87
+ function getInstance() public view returns (IInstance instance) {
88
+ return _instance;
89
+ }
90
+
91
+ function components() public view returns (uint256 componentCount) {
92
+ return _instance.getInstanceAdmin().components();
93
+ }
94
+
95
+ function products() public view returns (uint256 productCount) {
96
+ return _instance.products();
97
+ }
98
+
99
+ function getProductNftId(uint256 idx) public view returns (NftId productNftId) {
100
+ return _instance.getProductNftId(idx);
101
+ }
102
+
70
103
  // module specific functions
71
104
 
72
105
  function getPolicyInfo(NftId policyNftId)
@@ -110,7 +143,7 @@ contract InstanceReader {
110
143
  function bundles(NftId poolNftId)
111
144
  public
112
145
  view
113
- returns (uint256 bundles)
146
+ returns (uint256 bundleCount)
114
147
  {
115
148
  return _bundleSet.bundles(poolNftId);
116
149
  }
@@ -118,7 +151,7 @@ contract InstanceReader {
118
151
  function activeBundles(NftId poolNftId)
119
152
  public
120
153
  view
121
- returns (uint256 bundles)
154
+ returns (uint256 bundleCount)
122
155
  {
123
156
  return _bundleSet.activeBundles(poolNftId);
124
157
  }
@@ -166,7 +199,7 @@ contract InstanceReader {
166
199
  function claims(NftId policyNftId)
167
200
  public
168
201
  view
169
- returns (uint16 claims)
202
+ returns (uint16 claimCount)
170
203
  {
171
204
  return getPolicyInfo(policyNftId).claimsCount;
172
205
  }
@@ -204,7 +237,7 @@ contract InstanceReader {
204
237
  function payouts(NftId policyNftId, ClaimId claimId)
205
238
  public
206
239
  view
207
- returns (uint24 payouts)
240
+ returns (uint24 payoutCount)
208
241
  {
209
242
  return getClaimInfo(policyNftId, claimId).payoutsCount;
210
243
  }
@@ -250,7 +283,7 @@ contract InstanceReader {
250
283
  function risks(NftId productNftId)
251
284
  public
252
285
  view
253
- returns (uint256 activeRisks)
286
+ returns (uint256 riskCount)
254
287
  {
255
288
  return _riskSet.risks(productNftId);
256
289
  }
@@ -266,7 +299,7 @@ contract InstanceReader {
266
299
  function activeRisks(NftId productNftId)
267
300
  public
268
301
  view
269
- returns (uint256 activeRisks)
302
+ returns (uint256 activeRiskCount)
270
303
  {
271
304
  return _riskSet.activeRisks(productNftId);
272
305
  }
@@ -315,32 +348,43 @@ contract InstanceReader {
315
348
  return _riskSet.getLinkedPolicyNftId(riskId, idx);
316
349
  }
317
350
 
318
- function getWallet(NftId componentNftId)
351
+
352
+ function getToken(NftId componentNftId)
319
353
  public
320
354
  view
321
- returns (address tokenHandler)
355
+ returns (IERC20Metadata token)
322
356
  {
323
- bytes memory data = _store.getData(toComponentKey(componentNftId));
357
+ TokenHandler tokenHandler = getTokenHandler(componentNftId);
358
+ if (address(tokenHandler) != address(0)) {
359
+ return tokenHandler.TOKEN();
360
+ }
361
+ }
324
362
 
325
- if (data.length > 0) {
326
- IComponents.ComponentInfo memory info = abi.decode(data, (IComponents.ComponentInfo));
327
- return info.tokenHandler.getWallet();
363
+
364
+ function getWallet(NftId componentNftId)
365
+ public
366
+ view
367
+ returns (address wallet)
368
+ {
369
+ TokenHandler tokenHandler = getTokenHandler(componentNftId);
370
+ if (address(tokenHandler) != address(0)) {
371
+ return tokenHandler.getWallet();
328
372
  }
329
373
  }
330
374
 
375
+
331
376
  function getTokenHandler(NftId componentNftId)
332
377
  public
333
378
  view
334
- returns (address tokenHandler)
379
+ returns (TokenHandler tokenHandler)
335
380
  {
336
381
  bytes memory data = _store.getData(toComponentKey(componentNftId));
337
-
338
382
  if (data.length > 0) {
339
- IComponents.ComponentInfo memory info = abi.decode(data, (IComponents.ComponentInfo));
340
- return address(info.tokenHandler);
383
+ return abi.decode(data, (IComponents.ComponentInfo)).tokenHandler;
341
384
  }
342
385
  }
343
386
 
387
+
344
388
  function getBundleInfo(NftId bundleNftId)
345
389
  public
346
390
  view
@@ -570,9 +614,6 @@ contract InstanceReader {
570
614
  }
571
615
 
572
616
  // low level function
573
- function getInstance() external view returns (IInstance instance) {
574
- return _instance;
575
- }
576
617
 
577
618
  function getInstanceStore() external view returns (IKeyValueStore store) {
578
619
  return _store;