@etherisc/gif-next 0.0.2-bf51045-496 → 0.0.2-bf9f7e6-880

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 (469) hide show
  1. package/README.md +44 -0
  2. package/artifacts/contracts/accounting/AccountingService.sol/AccountingService.dbg.json +1 -1
  3. package/artifacts/contracts/accounting/AccountingService.sol/AccountingService.json +69 -62
  4. package/artifacts/contracts/accounting/AccountingServiceManager.sol/AccountingServiceManager.dbg.json +1 -1
  5. package/artifacts/contracts/accounting/AccountingServiceManager.sol/AccountingServiceManager.json +29 -31
  6. package/artifacts/contracts/accounting/IAccountingService.sol/IAccountingService.dbg.json +1 -1
  7. package/artifacts/contracts/accounting/IAccountingService.sol/IAccountingService.json +33 -9
  8. package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.dbg.json +1 -1
  9. package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.json +454 -253
  10. package/artifacts/contracts/authorization/AccessAdmin.sol/IAccessManagedChecker.dbg.json +1 -1
  11. package/artifacts/contracts/authorization/AccessAdminLib.sol/AccessAdminLib.dbg.json +4 -0
  12. package/artifacts/contracts/authorization/AccessAdminLib.sol/AccessAdminLib.json +673 -0
  13. package/artifacts/contracts/authorization/AccessManagerCloneable.sol/AccessManagerCloneable.dbg.json +1 -1
  14. package/artifacts/contracts/authorization/AccessManagerCloneable.sol/AccessManagerCloneable.json +202 -5
  15. package/artifacts/contracts/authorization/Authorization.sol/Authorization.dbg.json +1 -1
  16. package/artifacts/contracts/authorization/Authorization.sol/Authorization.json +227 -26
  17. package/artifacts/contracts/authorization/IAccess.sol/IAccess.dbg.json +1 -1
  18. package/artifacts/contracts/authorization/IAccessAdmin.sol/IAccessAdmin.dbg.json +1 -1
  19. package/artifacts/contracts/authorization/IAccessAdmin.sol/IAccessAdmin.json +353 -189
  20. package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.dbg.json +1 -1
  21. package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.json +105 -18
  22. package/artifacts/contracts/authorization/IServiceAuthorization.sol/IServiceAuthorization.dbg.json +1 -1
  23. package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.dbg.json +1 -1
  24. package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.json +2 -2
  25. package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.dbg.json +1 -1
  26. package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.json +74 -157
  27. package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.dbg.json +1 -1
  28. package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.json +212 -38
  29. package/artifacts/contracts/distribution/Distribution.sol/Distribution.dbg.json +1 -1
  30. package/artifacts/contracts/distribution/Distribution.sol/Distribution.json +39 -95
  31. package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.dbg.json +1 -1
  32. package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.json +271 -185
  33. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
  34. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.json +66 -60
  35. package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
  36. package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.json +26 -82
  37. package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.dbg.json +1 -1
  38. package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.json +159 -72
  39. package/artifacts/contracts/examples/fire/DamageLevel.sol/DamageLevelLib.dbg.json +1 -1
  40. package/artifacts/contracts/examples/fire/FirePool.sol/FirePool.dbg.json +1 -1
  41. package/artifacts/contracts/examples/fire/FirePool.sol/FirePool.json +92 -88
  42. package/artifacts/contracts/examples/fire/FirePoolAuthorization.sol/FirePoolAuthorization.dbg.json +1 -1
  43. package/artifacts/contracts/examples/fire/FirePoolAuthorization.sol/FirePoolAuthorization.json +193 -51
  44. package/artifacts/contracts/examples/fire/FireProduct.sol/FireProduct.dbg.json +1 -1
  45. package/artifacts/contracts/examples/fire/FireProduct.sol/FireProduct.json +248 -237
  46. package/artifacts/contracts/examples/fire/FireProductAuthorization.sol/FireProductAuthorization.dbg.json +1 -1
  47. package/artifacts/contracts/examples/fire/FireProductAuthorization.sol/FireProductAuthorization.json +212 -38
  48. package/artifacts/contracts/examples/fire/FireUSD.sol/FireUSD.dbg.json +1 -1
  49. package/artifacts/contracts/examples/unpermissioned/SimpleDistribution.sol/SimpleDistribution.dbg.json +1 -1
  50. package/artifacts/contracts/examples/unpermissioned/SimpleDistribution.sol/SimpleDistribution.json +132 -173
  51. package/artifacts/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol/SimpleDistributionAuthorization.dbg.json +1 -1
  52. package/artifacts/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol/SimpleDistributionAuthorization.json +212 -38
  53. package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.dbg.json +1 -1
  54. package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.json +75 -68
  55. package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.dbg.json +1 -1
  56. package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.json +123 -116
  57. package/artifacts/contracts/examples/unpermissioned/SimplePoolAuthorization.sol/SimplePoolAuthorization.dbg.json +1 -1
  58. package/artifacts/contracts/examples/unpermissioned/SimplePoolAuthorization.sol/SimplePoolAuthorization.json +193 -51
  59. package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.dbg.json +1 -1
  60. package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.json +338 -242
  61. package/artifacts/contracts/examples/unpermissioned/SimpleProductAuthorization.sol/SimpleProductAuthorization.dbg.json +1 -1
  62. package/artifacts/contracts/examples/unpermissioned/SimpleProductAuthorization.sol/SimpleProductAuthorization.json +212 -38
  63. package/artifacts/contracts/instance/BundleSet.sol/BundleSet.dbg.json +1 -1
  64. package/artifacts/contracts/instance/BundleSet.sol/BundleSet.json +88 -45
  65. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  66. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +158 -29
  67. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
  68. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +108 -9
  69. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  70. package/artifacts/contracts/instance/Instance.sol/Instance.json +187 -54
  71. package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.dbg.json +1 -1
  72. package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.json +677 -325
  73. package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.dbg.json +1 -1
  74. package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.json +193 -51
  75. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
  76. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +496 -324
  77. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
  78. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +121 -85
  79. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
  80. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +26 -38
  81. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.dbg.json +1 -1
  82. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.json +619 -559
  83. package/artifacts/contracts/instance/RiskSet.sol/RiskSet.dbg.json +1 -1
  84. package/artifacts/contracts/instance/RiskSet.sol/RiskSet.json +96 -53
  85. package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.dbg.json +1 -1
  86. package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.json +2 -2
  87. package/artifacts/contracts/instance/base/Cloneable.sol/Cloneable.dbg.json +1 -1
  88. package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.dbg.json +1 -1
  89. package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.json +2 -2
  90. package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.dbg.json +1 -1
  91. package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.json +2 -2
  92. package/artifacts/contracts/instance/base/ObjectSet.sol/ObjectSet.dbg.json +1 -1
  93. package/artifacts/contracts/instance/base/ObjectSet.sol/ObjectSet.json +16 -5
  94. package/artifacts/contracts/instance/base/ObjectSetHelperLib.sol/ObjectSetHelperLib.dbg.json +4 -0
  95. package/artifacts/contracts/instance/base/ObjectSetHelperLib.sol/ObjectSetHelperLib.json +168 -0
  96. package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
  97. package/artifacts/contracts/instance/module/IComponents.sol/IComponents.dbg.json +1 -1
  98. package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +1 -1
  99. package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +1 -1
  100. package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +1 -1
  101. package/artifacts/contracts/mock/Dip.sol/Dip.dbg.json +1 -1
  102. package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.dbg.json +1 -1
  103. package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.json +60 -51
  104. package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.dbg.json +1 -1
  105. package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.json +194 -40
  106. package/artifacts/contracts/oracle/IOracle.sol/IOracle.dbg.json +1 -1
  107. package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.dbg.json +1 -1
  108. package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.json +30 -21
  109. package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.dbg.json +1 -1
  110. package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.json +27 -3
  111. package/artifacts/contracts/oracle/Oracle.sol/Oracle.dbg.json +1 -1
  112. package/artifacts/contracts/oracle/Oracle.sol/Oracle.json +44 -35
  113. package/artifacts/contracts/oracle/OracleService.sol/OracleService.dbg.json +1 -1
  114. package/artifacts/contracts/oracle/OracleService.sol/OracleService.json +75 -68
  115. package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.dbg.json +1 -1
  116. package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.json +34 -36
  117. package/artifacts/contracts/pool/BasicPool.sol/BasicPool.dbg.json +1 -1
  118. package/artifacts/contracts/pool/BasicPool.sol/BasicPool.json +65 -56
  119. package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.dbg.json +1 -1
  120. package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.json +193 -51
  121. package/artifacts/contracts/pool/BundleService.sol/BundleService.dbg.json +1 -1
  122. package/artifacts/contracts/pool/BundleService.sol/BundleService.json +108 -207
  123. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.dbg.json +1 -1
  124. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.json +42 -64
  125. package/artifacts/contracts/pool/IBundleService.sol/IBundleService.dbg.json +1 -1
  126. package/artifacts/contracts/pool/IBundleService.sol/IBundleService.json +44 -86
  127. package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
  128. package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.json +40 -31
  129. package/artifacts/contracts/pool/IPoolService.sol/IPoolService.dbg.json +1 -1
  130. package/artifacts/contracts/pool/IPoolService.sol/IPoolService.json +138 -193
  131. package/artifacts/contracts/pool/Pool.sol/Pool.dbg.json +1 -1
  132. package/artifacts/contracts/pool/Pool.sol/Pool.json +53 -44
  133. package/artifacts/contracts/pool/PoolLib.sol/PoolLib.dbg.json +4 -0
  134. package/artifacts/contracts/pool/PoolLib.sol/PoolLib.json +456 -0
  135. package/artifacts/contracts/pool/PoolService.sol/PoolService.dbg.json +1 -1
  136. package/artifacts/contracts/pool/PoolService.sol/PoolService.json +254 -299
  137. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
  138. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.json +70 -56
  139. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.dbg.json +1 -1
  140. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.json +123 -50
  141. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +1 -1
  142. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.json +37 -27
  143. package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.dbg.json +1 -1
  144. package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.json +176 -152
  145. package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.dbg.json +1 -1
  146. package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.json +212 -38
  147. package/artifacts/contracts/product/ClaimService.sol/ClaimService.dbg.json +1 -1
  148. package/artifacts/contracts/product/ClaimService.sol/ClaimService.json +244 -187
  149. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +1 -1
  150. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.json +64 -74
  151. package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.dbg.json +1 -1
  152. package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.json +69 -3
  153. package/artifacts/contracts/product/IClaimService.sol/IClaimService.dbg.json +1 -1
  154. package/artifacts/contracts/product/IClaimService.sol/IClaimService.json +142 -20
  155. package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.dbg.json +1 -1
  156. package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.json +105 -68
  157. package/artifacts/contracts/product/IPricingService.sol/IPricingService.dbg.json +1 -1
  158. package/artifacts/contracts/product/IPricingService.sol/IPricingService.json +48 -3
  159. package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.dbg.json +1 -1
  160. package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.json +157 -133
  161. package/artifacts/contracts/product/IRiskService.sol/IRiskService.dbg.json +1 -1
  162. package/artifacts/contracts/product/IRiskService.sol/IRiskService.json +58 -7
  163. package/artifacts/contracts/product/PolicyService.sol/PolicyService.dbg.json +1 -1
  164. package/artifacts/contracts/product/PolicyService.sol/PolicyService.json +193 -173
  165. package/artifacts/contracts/product/PolicyServiceLib.sol/PolicyServiceLib.dbg.json +4 -0
  166. package/artifacts/contracts/product/PolicyServiceLib.sol/PolicyServiceLib.json +293 -0
  167. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +1 -1
  168. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.json +54 -56
  169. package/artifacts/contracts/product/PricingService.sol/PricingService.dbg.json +1 -1
  170. package/artifacts/contracts/product/PricingService.sol/PricingService.json +96 -108
  171. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.dbg.json +1 -1
  172. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.json +35 -57
  173. package/artifacts/contracts/product/Product.sol/Product.dbg.json +1 -1
  174. package/artifacts/contracts/product/Product.sol/Product.json +170 -146
  175. package/artifacts/contracts/product/RiskService.sol/RiskService.dbg.json +1 -1
  176. package/artifacts/contracts/product/RiskService.sol/RiskService.json +131 -81
  177. package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.dbg.json +1 -1
  178. package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.json +46 -28
  179. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  180. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  181. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +36 -12
  182. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
  183. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +31 -7
  184. package/artifacts/contracts/registry/IRelease.sol/IRelease.dbg.json +4 -0
  185. package/artifacts/contracts/registry/IRelease.sol/IRelease.json +24 -0
  186. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
  187. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  188. package/artifacts/contracts/registry/Registry.sol/Registry.json +74 -50
  189. package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.dbg.json +1 -1
  190. package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.json +553 -434
  191. package/artifacts/contracts/registry/RegistryAuthorization.sol/RegistryAuthorization.dbg.json +4 -0
  192. package/artifacts/contracts/registry/RegistryAuthorization.sol/RegistryAuthorization.json +878 -0
  193. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
  194. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +51 -44
  195. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
  196. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +22 -24
  197. package/artifacts/contracts/registry/ReleaseAdmin.sol/ReleaseAdmin.dbg.json +4 -0
  198. package/artifacts/contracts/registry/ReleaseAdmin.sol/ReleaseAdmin.json +1954 -0
  199. package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.dbg.json +1 -1
  200. package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.json +2 -2
  201. package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.dbg.json +1 -1
  202. package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.json +333 -63
  203. package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.dbg.json +1 -1
  204. package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.json +6 -6
  205. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
  206. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +4 -4
  207. package/artifacts/contracts/shared/Component.sol/Component.dbg.json +1 -1
  208. package/artifacts/contracts/shared/Component.sol/Component.json +43 -34
  209. package/artifacts/contracts/shared/ComponentService.sol/ComponentService.dbg.json +1 -1
  210. package/artifacts/contracts/shared/ComponentService.sol/ComponentService.json +147 -165
  211. package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.dbg.json +1 -1
  212. package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.json +48 -50
  213. package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.dbg.json +1 -1
  214. package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.json +27 -16
  215. package/artifacts/contracts/shared/ContractLib.sol/ContractLib.dbg.json +1 -1
  216. package/artifacts/contracts/shared/ContractLib.sol/ContractLib.json +113 -4
  217. package/artifacts/contracts/shared/ContractLib.sol/IInstanceAdminHelper.dbg.json +1 -1
  218. package/artifacts/contracts/shared/ContractLib.sol/ITargetHelper.dbg.json +1 -1
  219. package/artifacts/contracts/shared/ContractLib.sol/ITokenRegistryHelper.dbg.json +4 -0
  220. package/artifacts/contracts/shared/ContractLib.sol/ITokenRegistryHelper.json +40 -0
  221. package/artifacts/contracts/shared/IComponent.sol/IComponent.dbg.json +1 -1
  222. package/artifacts/contracts/shared/IComponent.sol/IComponent.json +30 -21
  223. package/artifacts/contracts/shared/IComponentService.sol/IComponentService.dbg.json +1 -1
  224. package/artifacts/contracts/shared/IComponentService.sol/IComponentService.json +71 -72
  225. package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.dbg.json +1 -1
  226. package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.json +30 -21
  227. package/artifacts/contracts/shared/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
  228. package/artifacts/contracts/shared/ILifecycle.sol/ILifecycle.dbg.json +1 -1
  229. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
  230. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +1 -1
  231. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  232. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +120 -1
  233. package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +1 -1
  234. package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
  235. package/artifacts/contracts/shared/IService.sol/IService.json +27 -3
  236. package/artifacts/contracts/shared/InitializableERC165.sol/InitializableERC165.dbg.json +1 -1
  237. package/artifacts/contracts/shared/InitializableERC165.sol/InitializableERC165.json +2 -2
  238. package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.dbg.json +1 -1
  239. package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.json +43 -34
  240. package/artifacts/contracts/shared/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
  241. package/artifacts/contracts/shared/Lifecycle.sol/Lifecycle.dbg.json +1 -1
  242. package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.dbg.json +1 -1
  243. package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.json +2 -2
  244. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
  245. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +2 -2
  246. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +1 -1
  247. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +2 -2
  248. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  249. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +118 -62
  250. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +1 -1
  251. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +2 -2
  252. package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
  253. package/artifacts/contracts/shared/Service.sol/Service.json +27 -16
  254. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
  255. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +63 -162
  256. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandlerBase.dbg.json +1 -1
  257. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandlerBase.json +118 -29
  258. package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.dbg.json +1 -1
  259. package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.json +32 -32
  260. package/artifacts/contracts/staking/IStaking.sol/IStaking.dbg.json +1 -1
  261. package/artifacts/contracts/staking/IStaking.sol/IStaking.json +113 -39
  262. package/artifacts/contracts/staking/IStakingService.sol/IStakingService.dbg.json +1 -1
  263. package/artifacts/contracts/staking/IStakingService.sol/IStakingService.json +131 -7
  264. package/artifacts/contracts/staking/Staking.sol/Staking.dbg.json +1 -1
  265. package/artifacts/contracts/staking/Staking.sol/Staking.json +169 -97
  266. package/artifacts/contracts/staking/StakingLib.sol/StakingLib.dbg.json +4 -0
  267. package/artifacts/contracts/staking/StakingLib.sol/StakingLib.json +469 -0
  268. package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.dbg.json +1 -1
  269. package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.json +2 -2
  270. package/artifacts/contracts/staking/StakingManager.sol/StakingManager.dbg.json +1 -1
  271. package/artifacts/contracts/staking/StakingManager.sol/StakingManager.json +44 -32
  272. package/artifacts/contracts/staking/StakingReader.sol/StakingReader.dbg.json +1 -1
  273. package/artifacts/contracts/staking/StakingReader.sol/StakingReader.json +34 -61
  274. package/artifacts/contracts/staking/StakingService.sol/StakingService.dbg.json +1 -1
  275. package/artifacts/contracts/staking/StakingService.sol/StakingService.json +168 -53
  276. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.dbg.json +1 -1
  277. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.json +31 -29
  278. package/artifacts/contracts/staking/StakingStore.sol/StakingStore.dbg.json +1 -1
  279. package/artifacts/contracts/staking/StakingStore.sol/StakingStore.json +148 -134
  280. package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.dbg.json +1 -1
  281. package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.json +47 -37
  282. package/artifacts/contracts/type/AddressSet.sol/LibAddressSet.dbg.json +1 -1
  283. package/artifacts/contracts/type/Amount.sol/AmountLib.dbg.json +1 -1
  284. package/artifacts/contracts/type/Amount.sol/AmountLib.json +10 -10
  285. package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
  286. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.dbg.json +1 -1
  287. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.json +2 -2
  288. package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.dbg.json +1 -1
  289. package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.json +2 -2
  290. package/artifacts/contracts/type/Fee.sol/FeeLib.dbg.json +1 -1
  291. package/artifacts/contracts/type/Fee.sol/FeeLib.json +93 -37
  292. package/artifacts/contracts/type/Key32.sol/Key32Lib.dbg.json +1 -1
  293. package/artifacts/contracts/type/Key32.sol/Key32Lib.json +2 -2
  294. package/artifacts/contracts/type/Key32Set.sol/LibKey32Set.dbg.json +1 -1
  295. package/artifacts/contracts/type/Key32Set.sol/LibKey32Set.json +2 -2
  296. package/artifacts/contracts/type/NftId.sol/NftIdLib.dbg.json +1 -1
  297. package/artifacts/contracts/type/NftId.sol/NftIdLib.json +2 -2
  298. package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
  299. package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.json +2 -2
  300. package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
  301. package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.json +33 -31
  302. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.dbg.json +1 -1
  303. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.json +2 -2
  304. package/artifacts/contracts/type/Referral.sol/ReferralLib.dbg.json +1 -1
  305. package/artifacts/contracts/type/Referral.sol/ReferralLib.json +2 -2
  306. package/artifacts/contracts/type/RequestId.sol/RequestIdLib.dbg.json +1 -1
  307. package/artifacts/contracts/type/RequestId.sol/RequestIdLib.json +2 -2
  308. package/artifacts/contracts/type/RiskId.sol/RiskIdLib.dbg.json +1 -1
  309. package/artifacts/contracts/type/RiskId.sol/RiskIdLib.json +30 -6
  310. package/artifacts/contracts/type/RoleId.sol/RoleIdLib.dbg.json +1 -1
  311. package/artifacts/contracts/type/RoleId.sol/RoleIdLib.json +79 -15
  312. package/artifacts/contracts/type/Seconds.sol/SecondsLib.dbg.json +1 -1
  313. package/artifacts/contracts/type/Selector.sol/SelectorLib.dbg.json +1 -1
  314. package/artifacts/contracts/type/Selector.sol/SelectorLib.json +21 -2
  315. package/artifacts/contracts/type/Selector.sol/SelectorSetLib.dbg.json +1 -1
  316. package/artifacts/contracts/type/Selector.sol/SelectorSetLib.json +2 -2
  317. package/artifacts/contracts/type/StateId.sol/StateIdLib.dbg.json +1 -1
  318. package/artifacts/contracts/type/String.sol/StrLib.dbg.json +1 -1
  319. package/artifacts/contracts/type/Timestamp.sol/TimestampLib.dbg.json +1 -1
  320. package/artifacts/contracts/type/Timestamp.sol/TimestampLib.json +2 -2
  321. package/artifacts/contracts/type/UFixed.sol/UFixedLib.dbg.json +1 -1
  322. package/artifacts/contracts/type/UFixed.sol/UFixedLib.json +60 -36
  323. package/artifacts/contracts/type/Version.sol/VersionLib.dbg.json +1 -1
  324. package/artifacts/contracts/type/Version.sol/VersionLib.json +2 -21
  325. package/artifacts/contracts/type/Version.sol/VersionPartLib.dbg.json +1 -1
  326. package/artifacts/contracts/type/Version.sol/VersionPartLib.json +101 -2
  327. package/artifacts/contracts/upgradeability/IVersionable.sol/IVersionable.dbg.json +1 -1
  328. package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.dbg.json +1 -1
  329. package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.json +4 -4
  330. package/artifacts/contracts/upgradeability/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
  331. package/artifacts/contracts/upgradeability/Versionable.sol/Versionable.dbg.json +1 -1
  332. package/contracts/accounting/AccountingService.sol +3 -4
  333. package/contracts/accounting/AccountingServiceManager.sol +1 -1
  334. package/contracts/accounting/IAccountingService.sol +2 -2
  335. package/contracts/authorization/AccessAdmin.sol +293 -204
  336. package/contracts/authorization/AccessAdminLib.sol +183 -0
  337. package/contracts/authorization/AccessManagerCloneable.sol +146 -4
  338. package/contracts/authorization/Authorization.sol +307 -231
  339. package/contracts/authorization/IAccess.sol +13 -5
  340. package/contracts/authorization/IAccessAdmin.sol +69 -36
  341. package/contracts/authorization/IAuthorization.sol +21 -1
  342. package/contracts/distribution/BasicDistribution.sol +13 -11
  343. package/contracts/distribution/BasicDistributionAuthorization.sol +21 -8
  344. package/contracts/distribution/Distribution.sol +13 -56
  345. package/contracts/distribution/DistributionService.sol +83 -55
  346. package/contracts/distribution/DistributionServiceManager.sol +1 -1
  347. package/contracts/distribution/IDistributionComponent.sol +0 -9
  348. package/contracts/distribution/IDistributionService.sol +18 -15
  349. package/contracts/examples/fire/FirePool.sol +0 -4
  350. package/contracts/examples/fire/FirePoolAuthorization.sol +1 -1
  351. package/contracts/examples/fire/FireProduct.sol +4 -7
  352. package/contracts/examples/fire/FireProductAuthorization.sol +1 -1
  353. package/contracts/examples/unpermissioned/SimpleDistribution.sol +32 -8
  354. package/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol +1 -1
  355. package/contracts/examples/unpermissioned/SimpleOracle.sol +4 -8
  356. package/contracts/examples/unpermissioned/SimplePool.sol +0 -5
  357. package/contracts/examples/unpermissioned/SimplePoolAuthorization.sol +1 -1
  358. package/contracts/examples/unpermissioned/SimpleProduct.sol +29 -8
  359. package/contracts/examples/unpermissioned/SimpleProductAuthorization.sol +1 -1
  360. package/contracts/instance/BundleSet.sol +4 -4
  361. package/contracts/instance/IInstance.sol +51 -16
  362. package/contracts/instance/IInstanceService.sol +20 -2
  363. package/contracts/instance/Instance.sol +90 -25
  364. package/contracts/instance/InstanceAdmin.sol +261 -99
  365. package/contracts/instance/InstanceAuthorizationV3.sol +49 -36
  366. package/contracts/instance/InstanceReader.sol +103 -34
  367. package/contracts/instance/InstanceService.sol +154 -87
  368. package/contracts/instance/InstanceServiceManager.sol +1 -1
  369. package/contracts/instance/InstanceStore.sol +13 -2
  370. package/contracts/instance/RiskSet.sol +11 -12
  371. package/contracts/instance/base/ObjectLifecycle.sol +4 -2
  372. package/contracts/instance/base/ObjectSet.sol +7 -8
  373. package/contracts/instance/base/ObjectSetHelperLib.sol +30 -0
  374. package/contracts/instance/module/IBundle.sol +6 -5
  375. package/contracts/instance/module/IComponents.sol +19 -7
  376. package/contracts/instance/module/IDistribution.sol +21 -8
  377. package/contracts/instance/module/IPolicy.sol +28 -8
  378. package/contracts/instance/module/IRisk.sol +4 -0
  379. package/contracts/oracle/BasicOracle.sol +1 -3
  380. package/contracts/oracle/BasicOracleAuthorization.sol +3 -12
  381. package/contracts/oracle/IOracle.sol +9 -4
  382. package/contracts/oracle/Oracle.sol +1 -3
  383. package/contracts/oracle/OracleService.sol +16 -15
  384. package/contracts/oracle/OracleServiceManager.sol +1 -1
  385. package/contracts/pool/BasicPool.sol +0 -2
  386. package/contracts/pool/BasicPoolAuthorization.sol +21 -13
  387. package/contracts/pool/BundleService.sol +28 -58
  388. package/contracts/pool/BundleServiceManager.sol +1 -1
  389. package/contracts/pool/IBundleService.sol +13 -19
  390. package/contracts/pool/IPoolService.sol +50 -38
  391. package/contracts/pool/Pool.sol +9 -11
  392. package/contracts/pool/PoolLib.sol +216 -0
  393. package/contracts/pool/PoolService.sol +294 -154
  394. package/contracts/pool/PoolServiceManager.sol +1 -1
  395. package/contracts/product/ApplicationService.sol +24 -9
  396. package/contracts/product/ApplicationServiceManager.sol +1 -1
  397. package/contracts/product/BasicProduct.sol +2 -2
  398. package/contracts/product/BasicProductAuthorization.sol +23 -8
  399. package/contracts/product/ClaimService.sol +157 -139
  400. package/contracts/product/ClaimServiceManager.sol +1 -1
  401. package/contracts/product/IApplicationService.sol +3 -0
  402. package/contracts/product/IClaimService.sol +14 -2
  403. package/contracts/product/IPolicyService.sol +11 -6
  404. package/contracts/product/IPricingService.sol +1 -0
  405. package/contracts/product/IProductComponent.sol +4 -1
  406. package/contracts/product/IRiskService.sol +7 -7
  407. package/contracts/product/PolicyService.sol +86 -158
  408. package/contracts/product/PolicyServiceLib.sol +65 -0
  409. package/contracts/product/PolicyServiceManager.sol +1 -1
  410. package/contracts/product/PricingService.sol +30 -21
  411. package/contracts/product/PricingServiceManager.sol +3 -3
  412. package/contracts/product/Product.sol +55 -15
  413. package/contracts/product/RiskService.sol +76 -29
  414. package/contracts/product/RiskServiceManager.sol +1 -1
  415. package/contracts/registry/IRegistry.sol +12 -15
  416. package/contracts/registry/IRelease.sol +29 -0
  417. package/contracts/registry/Registry.sol +7 -2
  418. package/contracts/registry/RegistryAdmin.sol +143 -342
  419. package/contracts/registry/RegistryAuthorization.sol +267 -0
  420. package/contracts/registry/RegistryService.sol +3 -3
  421. package/contracts/registry/RegistryServiceManager.sol +1 -1
  422. package/contracts/registry/ReleaseAdmin.sol +253 -0
  423. package/contracts/registry/ReleaseLifecycle.sol +2 -0
  424. package/contracts/registry/ReleaseRegistry.sol +146 -115
  425. package/contracts/registry/ServiceAuthorizationV3.sol +126 -2
  426. package/contracts/registry/TokenRegistry.sol +6 -8
  427. package/contracts/shared/Component.sol +17 -26
  428. package/contracts/shared/ComponentService.sol +141 -129
  429. package/contracts/shared/ComponentServiceManager.sol +1 -1
  430. package/contracts/shared/ComponentVerifyingService.sol +1 -1
  431. package/contracts/shared/ContractLib.sol +60 -3
  432. package/contracts/shared/IComponent.sol +0 -4
  433. package/contracts/shared/IComponentService.sol +9 -13
  434. package/contracts/shared/IRegisterable.sol +15 -4
  435. package/contracts/shared/IService.sol +3 -5
  436. package/contracts/shared/InitializableERC165.sol +9 -1
  437. package/contracts/shared/InstanceLinkedComponent.sol +2 -4
  438. package/contracts/shared/NftOwnable.sol +5 -5
  439. package/contracts/shared/PolicyHolder.sol +1 -1
  440. package/contracts/shared/Registerable.sol +42 -19
  441. package/contracts/shared/RegistryLinked.sol +1 -1
  442. package/contracts/shared/Service.sol +8 -27
  443. package/contracts/shared/TokenHandler.sol +45 -92
  444. package/contracts/staking/IStaking.sol +12 -10
  445. package/contracts/staking/IStakingService.sol +16 -1
  446. package/contracts/staking/Staking.sol +59 -28
  447. package/contracts/staking/{StakeManagerLib.sol → StakingLib.sol} +80 -23
  448. package/contracts/staking/StakingReader.sol +6 -16
  449. package/contracts/staking/StakingService.sol +68 -44
  450. package/contracts/staking/StakingServiceManager.sol +5 -4
  451. package/contracts/staking/StakingStore.sol +2 -1
  452. package/contracts/type/Fee.sol +8 -8
  453. package/contracts/type/ObjectType.sol +47 -39
  454. package/contracts/type/RiskId.sol +9 -3
  455. package/contracts/type/RoleId.sol +24 -4
  456. package/contracts/type/Selector.sol +5 -0
  457. package/contracts/type/Timestamp.sol +0 -5
  458. package/contracts/type/UFixed.sol +27 -10
  459. package/contracts/type/Version.sol +54 -5
  460. package/contracts/upgradeability/ProxyManager.sol +1 -1
  461. package/package.json +2 -2
  462. package/artifacts/contracts/authorization/ReleaseAccessManager.sol/ReleaseAccessManager.dbg.json +0 -4
  463. package/artifacts/contracts/authorization/ReleaseAccessManager.sol/ReleaseAccessManager.json +0 -1196
  464. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +0 -4
  465. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.json +0 -129
  466. package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.dbg.json +0 -4
  467. package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.json +0 -440
  468. package/contracts/authorization/ReleaseAccessManager.sol +0 -38
  469. package/contracts/instance/module/IAccess.sol +0 -46
@@ -1,144 +1,183 @@
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";
12
- import {ObjectType} from "../type/ObjectType.sol";
9
+
10
+ import {AccessAdmin} from "../authorization/AccessAdmin.sol";
11
+ import {AccessManagerCloneable} from "../authorization/AccessManagerCloneable.sol";
12
+ import {NftId} from "../type/NftId.sol";
13
+ import {ObjectType, INSTANCE, ORACLE} 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
20
21
  AccessAdmin
21
22
  {
22
23
  string public constant INSTANCE_TARGET_NAME = "Instance";
23
- string public constant INSTANCE_STORE_TARGET_NAME = "InstanceStore";
24
24
  string public constant INSTANCE_ADMIN_TARGET_NAME = "InstanceAdmin";
25
+ string public constant INSTANCE_STORE_TARGET_NAME = "InstanceStore";
25
26
  string public constant BUNDLE_SET_TARGET_NAME = "BundleSet";
26
- string public constant RISK_SET_TAGET_NAME = "RiskSet";
27
+ string public constant RISK_SET_TARGET_NAME = "RiskSet";
27
28
 
28
29
  uint64 public constant CUSTOM_ROLE_ID_MIN = 10000; // MUST be even
29
30
 
30
- error ErrorInstanceAdminNotRegistered(address target);
31
- error ErrorInstanceAdminAlreadyAuthorized(address target);
31
+ error ErrorInstanceAdminNotInstanceService(address caller);
32
+
33
+ error ErrorInstanceAdminNotRegistered(address instance);
34
+ error ErrorInstanceAdminNotInstance(address instance);
35
+ error ErrorInstanceAdminAlreadyAuthorized(address instance);
36
+
37
+ error ErrorInstanceAdminNotComponentRole(RoleId roleId);
38
+ error ErrorInstanceAdminRoleAlreadyExists(RoleId roleId);
39
+ error ErrorInstanceAdminRoleTypeNotContract(RoleId roleId, IAccess.RoleType roleType);
40
+
32
41
  error ErrorInstanceAdminReleaseMismatch();
33
42
  error ErrorInstanceAdminExpectedTargetMissing(string targetName);
34
43
 
35
44
  IInstance internal _instance;
36
45
  IRegistry internal _registry;
37
- uint64 internal _idNext;
46
+ VersionPart internal _release;
47
+ uint64 internal _customIdNext;
48
+
49
+ mapping(address target => RoleId roleId) internal _targetRoleId;
50
+ uint64 internal _components;
38
51
 
39
- IAuthorization internal _instanceAuthorization;
52
+ modifier onlyInstanceService() {
53
+ if (msg.sender != _registry.getServiceAddress(INSTANCE(), getRelease())) {
54
+ revert ErrorInstanceAdminNotInstanceService(msg.sender);
55
+ }
56
+ _;
57
+ }
40
58
 
41
59
  /// @dev Only used for master instance admin.
42
- /// Contracts created via constructor come with disabled initializers.
43
- constructor(
44
- address instanceAuthorization
45
- )
46
- AccessAdmin()
47
- {
48
- _instanceAuthorization = IAuthorization(instanceAuthorization);
60
+ constructor(address accessManager) {
61
+ initialize(
62
+ accessManager,
63
+ "MasterInstanceAdmin");
49
64
  }
50
65
 
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.
55
- function initialize(
56
- AccessManagerCloneable accessManager,
57
- address instanceAuthorization
66
+
67
+ /// @dev Completes the initialization of this instance admin using the provided instance, registry and version.
68
+ /// Important: Initialization of instance admin is only complete after calling this function.
69
+ /// Important: The instance MUST be registered and all instance supporting contracts must be wired to this instance.
70
+ function completeSetup(
71
+ address registry,
72
+ address instance,
73
+ address authorization,
74
+ VersionPart release
58
75
  )
59
76
  external
60
- initializer()
77
+ reinitializer(uint64(release.toInt()))
78
+ onlyDeployer()
61
79
  {
62
- // create new access manager for this instance admin
63
- _initializeAuthority(address(accessManager));
80
+ // checks
81
+ _checkRegistry(registry);
82
+ _checkIsRegistered(registry, instance, INSTANCE());
64
83
 
65
- // create basic instance independent setup
66
- _createAdminAndPublicRoles();
84
+ AccessManagerCloneable(
85
+ authority()).completeSetup(
86
+ registry,
87
+ release);
67
88
 
68
- // store instance authorization specification
69
- _instanceAuthorization = IAuthorization(instanceAuthorization);
70
- }
89
+ _checkAuthorization(authorization, INSTANCE(), release, true);
71
90
 
72
- /// @dev Completes the initialization of this instance admin using the provided instance.
73
- /// Important: The instance MUST be registered and all instance supporting contracts must be wired to this instance.
74
- function initializeInstanceAuthorization(address instanceAddress)
75
- external
76
- {
77
- _checkTargetIsReadyForAuthorization(instanceAddress);
91
+ // effects
92
+ _registry = IRegistry(registry);
93
+ _release = release;
78
94
 
79
- _idNext = CUSTOM_ROLE_ID_MIN;
80
- _instance = IInstance(instanceAddress);
81
- _registry = _instance.getRegistry();
95
+ _instance = IInstance(instance);
96
+ _authorization = IAuthorization(authorization);
97
+ _components = 0;
98
+ _customIdNext = CUSTOM_ROLE_ID_MIN;
82
99
 
83
- // check matching releases
84
- if (_instanceAuthorization.getRelease() != _instance.getRelease()) {
85
- revert ErrorInstanceAdminReleaseMismatch();
86
- }
100
+ // link nft ownability to instance
101
+ _linkToNftOwnable(instance);
102
+
103
+ // create instance role and target
104
+ _setupInstance(instance);
87
105
 
88
106
  // add instance authorization
89
- _createRoles(_instanceAuthorization);
90
- _createModuleTargetsWithRoles();
91
- _createTargetAuthorizations(_instanceAuthorization);
107
+ _createRoles(_authorization);
108
+ // _createTargets(_authorization);
109
+ _setupInstanceHelperTargetsWithRoles();
110
+ _createTargetAuthorizations(_authorization);
111
+ }
112
+
113
+
114
+ function _createTargets(IAuthorization authorization)
115
+ internal
116
+ {
117
+ _createTargetWithRole(address(this), INSTANCE_ADMIN_TARGET_NAME, authorization.getTargetRole(StrLib.toStr(INSTANCE_ADMIN_TARGET_NAME)));
118
+ _createTargetWithRole(address(_instance.getInstanceStore()), INSTANCE_STORE_TARGET_NAME, authorization.getTargetRole(StrLib.toStr(INSTANCE_STORE_TARGET_NAME)));
119
+ _createTargetWithRole(address(_instance.getBundleSet()), BUNDLE_SET_TARGET_NAME, authorization.getTargetRole(StrLib.toStr(BUNDLE_SET_TARGET_NAME)));
120
+ _createTargetWithRole(address(_instance.getRiskSet()), RISK_SET_TARGET_NAME, authorization.getTargetRole(StrLib.toStr(RISK_SET_TARGET_NAME)));
92
121
  }
93
122
 
94
123
 
95
124
  /// @dev Initializes the authorization for the specified component.
96
125
  /// Important: The component MUST be registered.
97
126
  function initializeComponentAuthorization(
98
- IInstanceLinkedComponent component
127
+ address componentAddress,
128
+ ObjectType expectedType
99
129
  )
100
130
  external
131
+ restricted()
101
132
  {
102
133
  // checks
103
- // get authorization specification
134
+ _checkIsRegistered(address(getRegistry()), componentAddress, expectedType);
135
+
136
+ IInstanceLinkedComponent component = IInstanceLinkedComponent(componentAddress);
104
137
  IAuthorization authorization = component.getAuthorization();
105
- string memory targetName = authorization.getTargetName();
106
- _checkTargetIsReadyForAuthorization(address(component));
138
+ _checkAuthorization(address(authorization), expectedType, getRelease(), false);
107
139
 
140
+ // effects
141
+ // setup target and role for component (including token handler if applicable)
142
+ _setupComponentAndTokenHandler(component, expectedType);
108
143
 
109
- // create roles
144
+ // create other roles and function authorizations
110
145
  _createRoles(authorization);
146
+ _createTargetAuthorizations(authorization);
147
+ }
148
+
149
+ function getRelease()
150
+ public
151
+ view
152
+ override
153
+ returns (VersionPart release)
154
+ {
155
+ return _release;
156
+ }
111
157
 
112
- // create component target
158
+
159
+ // create instance role and target
160
+ function _setupInstance(address instance) internal {
161
+
162
+ // create instance role
163
+ RoleId instanceRoleId = _authorization.getTargetRole(
164
+ _authorization.getMainTarget());
165
+
166
+ _createRole(
167
+ instanceRoleId,
168
+ _authorization.getRoleInfo(instanceRoleId));
169
+
170
+ // create instance target
113
171
  _createTarget(
114
- address(component),
115
- targetName,
172
+ instance,
173
+ _authorization.getMainTargetName(),
116
174
  true, // checkAuthority
117
175
  false); // custom
118
176
 
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
-
177
+ // assign instance role to instance
136
178
  _grantRoleToAccount(
137
- authorization.getTargetRole(
138
- authorization.getMainTarget()),
139
- address(component));
140
-
141
- _createTargetAuthorizations(authorization);
179
+ instanceRoleId,
180
+ instance);
142
181
  }
143
182
 
144
183
  /// @dev Creates a custom role
@@ -160,14 +199,41 @@ contract InstanceAdmin is
160
199
  _grantRoleToAccount(roleId, account);
161
200
  }
162
201
 
202
+
203
+ function setInstanceLocked(bool locked)
204
+ external
205
+ // not restricted(): need to operate on locked instances to unlock instance
206
+ onlyInstanceService()
207
+ {
208
+ AccessManagerCloneable accessManager = AccessManagerCloneable(authority());
209
+ accessManager.setLocked(locked);
210
+ }
211
+
212
+
163
213
  function setTargetLocked(address target, bool locked)
164
214
  external
165
- restricted()
215
+ // not restricted(): might need to operate on targets while instance is locked
216
+ onlyInstanceService()
166
217
  {
167
- _setTargetClosed(target, locked);
218
+ _setTargetLocked(target, locked);
168
219
  }
169
220
 
170
221
 
222
+ function setComponentLocked(address target, bool locked)
223
+ external
224
+ restricted()
225
+ {
226
+ _setTargetLocked(target, locked);
227
+ }
228
+
229
+ /// @dev Returns the number of components that have been registered with this instance.
230
+ function components()
231
+ external
232
+ view
233
+ returns (uint64)
234
+ {
235
+ return _components;
236
+ }
171
237
 
172
238
  /// @dev Returns the instance authorization specification used to set up this instance admin.
173
239
  function getInstanceAuthorization()
@@ -175,21 +241,102 @@ contract InstanceAdmin is
175
241
  view
176
242
  returns (IAuthorization instanceAuthorizaion)
177
243
  {
178
- return _instanceAuthorization;
244
+ return _authorization;
179
245
  }
180
246
 
247
+ // ------------------- Internal functions ------------------- //
181
248
 
182
- function _checkTargetIsReadyForAuthorization(address target)
249
+ function _setupComponentAndTokenHandler(
250
+ IInstanceLinkedComponent component,
251
+ ObjectType componentType
252
+ )
183
253
  internal
184
- view
185
254
  {
186
- if (address(_registry) != address(0) && !_registry.isRegistered(target)) {
187
- revert ErrorInstanceAdminNotRegistered(target);
255
+
256
+ IAuthorization authorization = component.getAuthorization();
257
+ string memory targetName = authorization.getMainTargetName();
258
+
259
+ // create component role and target
260
+ RoleId componentRoleId = _createComponentRoleId(component, authorization);
261
+
262
+ // create component's target
263
+ _createTarget(
264
+ address(component),
265
+ targetName,
266
+ true, // checkAuthority
267
+ false); // custom
268
+
269
+ // create component's token handler target if app
270
+ if (componentType != ORACLE()) {
271
+ NftId componentNftId = _registry.getNftIdForAddress(address(component));
272
+ address tokenHandler = address(
273
+ _instance.getInstanceReader().getComponentInfo(
274
+ componentNftId).tokenHandler);
275
+
276
+ _createTarget(
277
+ tokenHandler,
278
+ authorization.getTokenHandlerName(),
279
+ true,
280
+ false);
281
+
282
+ // token handler does not require its own role
283
+ // token handler is not calling other components
284
+ }
285
+
286
+ // assign component role to component
287
+ _grantRoleToAccount(
288
+ componentRoleId,
289
+ address(component));
290
+ }
291
+
292
+
293
+ function _createComponentRoleId(
294
+ IInstanceLinkedComponent component,
295
+ IAuthorization authorization
296
+ )
297
+ internal
298
+ returns (RoleId componentRoleId)
299
+ {
300
+ // checks
301
+ // check component is not yet authorized
302
+ if (_targetRoleId[address(component)].gtz()) {
303
+ revert ErrorInstanceAdminAlreadyAuthorized(address(component));
304
+ }
305
+
306
+ // check generic component role
307
+ RoleId genericComponentRoleId = authorization.getTargetRole(
308
+ authorization.getMainTarget());
309
+
310
+ if (!genericComponentRoleId.isComponentRole()) {
311
+ revert ErrorInstanceAdminNotComponentRole(genericComponentRoleId);
312
+ }
313
+
314
+ // check component role does not exist
315
+ componentRoleId = toComponentRole(
316
+ genericComponentRoleId,
317
+ _components);
318
+
319
+ if (roleExists(componentRoleId)) {
320
+ revert ErrorInstanceAdminRoleAlreadyExists(componentRoleId);
188
321
  }
189
322
 
190
- if (targetExists(target)) {
191
- revert ErrorInstanceAdminAlreadyAuthorized(target);
323
+ // check role info
324
+ IAccess.RoleInfo memory roleInfo = authorization.getRoleInfo(
325
+ genericComponentRoleId);
326
+
327
+ if (roleInfo.roleType != IAccess.RoleType.Contract) {
328
+ revert ErrorInstanceAdminRoleTypeNotContract(
329
+ componentRoleId,
330
+ roleInfo.roleType);
192
331
  }
332
+
333
+ // effects
334
+ _targetRoleId[address(component)] = componentRoleId;
335
+ _components++;
336
+
337
+ _createRole(
338
+ componentRoleId,
339
+ roleInfo);
193
340
  }
194
341
 
195
342
 
@@ -197,13 +344,18 @@ contract InstanceAdmin is
197
344
  internal
198
345
  {
199
346
  RoleId[] memory roles = authorization.getRoles();
347
+ RoleId mainTargetRoleId = authorization.getTargetRole(
348
+ authorization.getMainTarget());
349
+
200
350
  RoleId roleId;
201
351
  RoleInfo memory roleInfo;
202
352
 
203
353
  for(uint256 i = 0; i < roles.length; i++) {
354
+
204
355
  roleId = roles[i];
205
356
 
206
- if (!roleExists(roleId)) {
357
+ // skip main target role, create role if not exists
358
+ if (roleId != mainTargetRoleId && !roleExists(roleId)) {
207
359
  _createRole(
208
360
  roleId,
209
361
  authorization.getRoleInfo(roleId));
@@ -212,6 +364,16 @@ contract InstanceAdmin is
212
364
  }
213
365
 
214
366
 
367
+ function toComponentRole(RoleId roleId, uint64 componentIdx)
368
+ internal
369
+ pure
370
+ returns (RoleId)
371
+ {
372
+ return RoleIdLib.toRoleId(
373
+ RoleIdLib.toInt(roleId) + componentIdx);
374
+ }
375
+
376
+
215
377
  function _createTargetAuthorizations(IAuthorization authorization)
216
378
  internal
217
379
  {
@@ -244,7 +406,7 @@ contract InstanceAdmin is
244
406
  {
245
407
  // check that target name is defined in authorization specification
246
408
  Str name = StrLib.toStr(targetName);
247
- if (!_instanceAuthorization.targetExists(name)) {
409
+ if (!_authorization.targetExists(name)) {
248
410
  revert ErrorInstanceAdminExpectedTargetMissing(targetName);
249
411
  }
250
412
 
@@ -256,25 +418,25 @@ contract InstanceAdmin is
256
418
  false);
257
419
 
258
420
  // assign target role if defined
259
- RoleId targetRoleId = _instanceAuthorization.getTargetRole(name);
421
+ RoleId targetRoleId = _authorization.getTargetRole(name);
260
422
  if (targetRoleId != RoleIdLib.zero()) {
261
423
  _grantRoleToAccount(targetRoleId, target);
262
424
  }
263
425
  }
264
426
 
265
- function _createModuleTargetsWithRoles()
427
+ function _setupInstanceHelperTargetsWithRoles()
266
428
  internal
267
429
  {
430
+
268
431
  // create module targets
269
- _checkAndCreateTargetWithRole(address(_instance), INSTANCE_TARGET_NAME);
270
432
  _checkAndCreateTargetWithRole(address(_instance.getInstanceStore()), INSTANCE_STORE_TARGET_NAME);
271
433
  _checkAndCreateTargetWithRole(address(_instance.getInstanceAdmin()), INSTANCE_ADMIN_TARGET_NAME);
272
434
  _checkAndCreateTargetWithRole(address(_instance.getBundleSet()), BUNDLE_SET_TARGET_NAME);
273
- _checkAndCreateTargetWithRole(address(_instance.getRiskSet()), RISK_SET_TAGET_NAME);
435
+ _checkAndCreateTargetWithRole(address(_instance.getRiskSet()), RISK_SET_TARGET_NAME);
274
436
 
275
- // create targets for services that need to access the module targets
276
- ObjectType[] memory serviceDomains = _instanceAuthorization.getServiceDomains();
277
- VersionPart release = _instanceAuthorization.getRelease();
437
+ // create targets for services that need to access the instance targets
438
+ ObjectType[] memory serviceDomains = _authorization.getServiceDomains();
439
+ VersionPart release = _authorization.getRelease();
278
440
  ObjectType serviceDomain;
279
441
 
280
442
  for (uint256 i = 0; i < serviceDomains.length; i++) {
@@ -282,7 +444,7 @@ contract InstanceAdmin is
282
444
 
283
445
  _checkAndCreateTargetWithRole(
284
446
  _registry.getServiceAddress(serviceDomain, release),
285
- _instanceAuthorization.getServiceTarget(serviceDomain).toString());
447
+ _authorization.getServiceTarget(serviceDomain).toString());
286
448
  }
287
449
  }
288
450
  }
@@ -1,17 +1,16 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
2
  pragma solidity ^0.8.20;
3
3
 
4
- import {
5
- ACCOUNTING, ORACLE, POOL, INSTANCE, COMPONENT, DISTRIBUTION, APPLICATION, POLICY, CLAIM, BUNDLE, RISK
6
- } from "../../contracts/type/ObjectType.sol";
4
+ import {IAccess} from "../authorization/IAccess.sol";
7
5
 
6
+ import {Authorization} from "../authorization/Authorization.sol";
7
+ import {ACCOUNTING, ORACLE, POOL, INSTANCE, COMPONENT, DISTRIBUTION, APPLICATION, POLICY, CLAIM, BUNDLE, RISK} from "../../contracts/type/ObjectType.sol";
8
8
  import {BundleSet} from "../instance/BundleSet.sol";
9
- import {RiskSet} from "../instance/RiskSet.sol";
10
- import {IAccess} from "../authorization/IAccess.sol";
11
9
  import {Instance} from "../instance/Instance.sol";
12
10
  import {InstanceAdmin} from "../instance/InstanceAdmin.sol";
13
11
  import {InstanceStore} from "../instance/InstanceStore.sol";
14
- import {Authorization} from "../authorization/Authorization.sol";
12
+ import {PUBLIC_ROLE} from "../type/RoleId.sol";
13
+ import {RiskSet} from "../instance/RiskSet.sol";
15
14
 
16
15
 
17
16
  contract InstanceAuthorizationV3
@@ -26,33 +25,11 @@ contract InstanceAuthorizationV3
26
25
  string public constant BUNDLE_SET_TARGET_NAME = "BundleSet";
27
26
  string public constant RISK_SET_TARGET_NAME = "RiskSet";
28
27
 
29
- constructor() Authorization(INSTANCE_TARGET_NAME) {}
30
-
31
-
32
- function _setupRoles()
33
- internal
34
- override
35
- {
36
- // empty implementation
37
- }
38
-
39
-
40
- function _setupTargets()
41
- internal
42
- override
43
- {
44
- // instance target
45
- _addTargetWithRole(
46
- INSTANCE_TARGET_NAME,
47
- _toTargetRoleId(INSTANCE()),
48
- INSTANCE_ROLE_NAME);
49
-
50
- // instance supporting targets
51
- _addTarget(INSTANCE_STORE_TARGET_NAME);
52
- _addTarget(INSTANCE_ADMIN_TARGET_NAME);
53
- _addTarget(BUNDLE_SET_TARGET_NAME);
54
- _addTarget(RISK_SET_TARGET_NAME);
28
+ constructor()
29
+ Authorization(INSTANCE_TARGET_NAME, INSTANCE(), false, false)
30
+ { }
55
31
 
32
+ function _setupServiceTargets() internal virtual override {
56
33
  // service targets relevant to instance
57
34
  _addServiceTargetWithRole(INSTANCE());
58
35
  _addServiceTargetWithRole(ACCOUNTING());
@@ -67,6 +44,19 @@ contract InstanceAuthorizationV3
67
44
  _addServiceTargetWithRole(CLAIM());
68
45
  }
69
46
 
47
+ function _setupTargets()
48
+ internal
49
+ override
50
+ {
51
+ // instance supporting targets
52
+ // _addGifContractTarget(INSTANCE_ADMIN_TARGET_NAME);
53
+ _addTarget(INSTANCE_ADMIN_TARGET_NAME);
54
+ _addTarget(INSTANCE_STORE_TARGET_NAME);
55
+ _addTarget(BUNDLE_SET_TARGET_NAME);
56
+ _addTarget(RISK_SET_TARGET_NAME);
57
+
58
+ }
59
+
70
60
 
71
61
  function _setupTargetAuthorizations()
72
62
  internal
@@ -120,6 +110,24 @@ contract InstanceAuthorizationV3
120
110
  {
121
111
  IAccess.FunctionInfo[] storage functions;
122
112
 
113
+ // authorize instance service role
114
+ functions = _authorizeForTarget(INSTANCE_TARGET_NAME, PUBLIC_ROLE());
115
+ _authorize(functions, Instance.registerProduct.selector, "registerProduct");
116
+ _authorize(functions, Instance.upgradeInstanceReader.selector, "upgradeInstanceReader");
117
+
118
+ // staking
119
+ _authorize(functions, Instance.setStakingLockingPeriod.selector, "setStakingLockingPeriod");
120
+ _authorize(functions, Instance.setStakingRewardRate.selector, "setStakingRewardRate");
121
+ _authorize(functions, Instance.refillStakingRewardReserves.selector, "refillStakingRewardReserves");
122
+ _authorize(functions, Instance.withdrawStakingRewardReserves.selector, "withdrawStakingRewardReserves");
123
+
124
+ // custom authz
125
+ _authorize(functions, Instance.createRole.selector, "createRole");
126
+ _authorize(functions, Instance.grantRole.selector, "grantRole");
127
+ _authorize(functions, Instance.revokeRole.selector, "revokeRole");
128
+ _authorize(functions, Instance.createTarget.selector, "createTarget");
129
+ _authorize(functions, Instance.setTargetFunctionRole.selector, "setTargetFunctionRole");
130
+
123
131
  // authorize instance service role
124
132
  functions = _authorizeForTarget(INSTANCE_TARGET_NAME, getServiceRole(INSTANCE()));
125
133
  _authorize(functions, Instance.setInstanceReader.selector, "setInstanceReader");
@@ -131,13 +139,15 @@ contract InstanceAuthorizationV3
131
139
  {
132
140
  IAccess.FunctionInfo[] storage functions;
133
141
 
134
- // authorize instance role
135
- functions = _authorizeForTarget(INSTANCE_ADMIN_TARGET_NAME, _toTargetRoleId(INSTANCE()));
136
- _authorize(functions, InstanceAdmin.grantRole.selector, "grantRole");
142
+ // authorize component service role
143
+ functions = _authorizeForTarget(INSTANCE_ADMIN_TARGET_NAME, getServiceRole(INSTANCE()));
144
+ _authorize(functions, InstanceAdmin.setInstanceLocked.selector, "setInstanceLocked");
145
+ _authorize(functions, InstanceAdmin.setTargetLocked.selector, "setTargetLocked");
137
146
 
138
147
  // authorize component service role
139
148
  functions = _authorizeForTarget(INSTANCE_ADMIN_TARGET_NAME, getServiceRole(COMPONENT()));
140
- _authorize(functions, InstanceAdmin.setTargetLocked.selector, "setTargetLocked");
149
+ _authorize(functions, InstanceAdmin.initializeComponentAuthorization.selector, "initializeComponentAuthoriz");
150
+ _authorize(functions, InstanceAdmin.setComponentLocked.selector, "setComponentLocked");
141
151
  }
142
152
 
143
153
 
@@ -160,6 +170,8 @@ contract InstanceAuthorizationV3
160
170
  _authorize(functions, InstanceStore.createPool.selector, "createPool");
161
171
  _authorize(functions, InstanceStore.createProduct.selector, "createProduct");
162
172
  _authorize(functions, InstanceStore.updateProduct.selector, "updateProduct");
173
+ _authorize(functions, InstanceStore.createFee.selector, "createFee");
174
+ _authorize(functions, InstanceStore.updateFee.selector, "updateFee");
163
175
 
164
176
  // authorize distribution service role
165
177
  functions = _authorizeForTarget(INSTANCE_STORE_TARGET_NAME, getServiceRole(DISTRIBUTION()));
@@ -217,6 +229,7 @@ contract InstanceAuthorizationV3
217
229
  _authorize(functions, InstanceStore.updateClaim.selector, "updateClaim");
218
230
  _authorize(functions, InstanceStore.createPayout.selector, "createPayout");
219
231
  _authorize(functions, InstanceStore.updatePayout.selector, "updatePayout");
232
+ _authorize(functions, InstanceStore.updatePayoutState.selector, "updatePayoutState");
220
233
  }
221
234
  }
222
235