@etherisc/gif-next 0.0.2-e9a637d-547 → 0.0.2-e9c5694-914

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 (673) hide show
  1. package/README.md +57 -17
  2. package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.dbg.json +4 -0
  3. package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.json +1293 -0
  4. package/artifacts/contracts/authorization/AccessManagerCloneable.sol/AccessManagerCloneable.dbg.json +4 -0
  5. package/artifacts/contracts/authorization/AccessManagerCloneable.sol/AccessManagerCloneable.json +1206 -0
  6. package/artifacts/contracts/authorization/Authorization.sol/Authorization.dbg.json +4 -0
  7. package/artifacts/contracts/authorization/Authorization.sol/Authorization.json +414 -0
  8. package/artifacts/contracts/authorization/IAccess.sol/IAccess.dbg.json +4 -0
  9. package/artifacts/contracts/{instance/module/ISetup.sol/ISetup.json → authorization/IAccess.sol/IAccess.json} +2 -2
  10. package/artifacts/contracts/authorization/IAccessAdmin.sol/IAccessAdmin.dbg.json +4 -0
  11. package/artifacts/contracts/authorization/IAccessAdmin.sol/IAccessAdmin.json +1060 -0
  12. package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.dbg.json +4 -0
  13. package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.json +295 -0
  14. package/artifacts/contracts/authorization/IServiceAuthorization.sol/IServiceAuthorization.dbg.json +4 -0
  15. package/artifacts/contracts/authorization/IServiceAuthorization.sol/IServiceAuthorization.json +167 -0
  16. package/artifacts/contracts/authorization/ReleaseAccessManager.sol/ReleaseAccessManager.dbg.json +4 -0
  17. package/artifacts/contracts/authorization/ReleaseAccessManager.sol/ReleaseAccessManager.json +1196 -0
  18. package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.dbg.json +4 -0
  19. package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.json +253 -0
  20. package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.dbg.json +4 -0
  21. package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.json +1402 -0
  22. package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.dbg.json +4 -0
  23. package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.json +470 -0
  24. package/artifacts/contracts/distribution/Distribution.sol/Distribution.dbg.json +4 -0
  25. package/artifacts/contracts/{components → distribution}/Distribution.sol/Distribution.json +272 -553
  26. package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.dbg.json +4 -0
  27. package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.json +1455 -0
  28. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +4 -0
  29. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.json +838 -0
  30. package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.dbg.json +4 -0
  31. package/artifacts/contracts/{components → distribution}/IDistributionComponent.sol/IDistributionComponent.json +252 -292
  32. package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.dbg.json +4 -0
  33. package/artifacts/contracts/{instance/service → distribution}/IDistributionService.sol/IDistributionService.json +207 -336
  34. package/artifacts/contracts/examples/fire/DamageLevel.sol/DamageLevelLib.dbg.json +4 -0
  35. package/artifacts/contracts/examples/fire/DamageLevel.sol/DamageLevelLib.json +22 -0
  36. package/artifacts/contracts/examples/fire/FirePool.sol/FirePool.dbg.json +4 -0
  37. package/artifacts/contracts/examples/fire/FirePool.sol/FirePool.json +1538 -0
  38. package/artifacts/contracts/examples/fire/FirePoolAuthorization.sol/FirePoolAuthorization.dbg.json +4 -0
  39. package/artifacts/contracts/examples/fire/FirePoolAuthorization.sol/FirePoolAuthorization.json +470 -0
  40. package/artifacts/contracts/examples/fire/FireProduct.sol/FireProduct.dbg.json +4 -0
  41. package/artifacts/contracts/examples/fire/FireProduct.sol/FireProduct.json +2072 -0
  42. package/artifacts/contracts/examples/fire/FireProductAuthorization.sol/FireProductAuthorization.dbg.json +4 -0
  43. package/artifacts/contracts/examples/fire/FireProductAuthorization.sol/FireProductAuthorization.json +470 -0
  44. package/artifacts/contracts/examples/fire/FireUSD.sol/FireUSD.dbg.json +4 -0
  45. package/artifacts/contracts/examples/fire/FireUSD.sol/FireUSD.json +376 -0
  46. package/artifacts/contracts/examples/unpermissioned/SimpleDistribution.sol/SimpleDistribution.dbg.json +4 -0
  47. package/artifacts/contracts/examples/unpermissioned/SimpleDistribution.sol/SimpleDistribution.json +1471 -0
  48. package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.dbg.json +4 -0
  49. package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.json +1231 -0
  50. package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.dbg.json +4 -0
  51. package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.json +1592 -0
  52. package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.dbg.json +4 -0
  53. package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.json +2095 -0
  54. package/artifacts/contracts/instance/BundleSet.sol/BundleSet.dbg.json +4 -0
  55. package/artifacts/contracts/instance/BundleSet.sol/BundleSet.json +703 -0
  56. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  57. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +201 -100
  58. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
  59. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +168 -120
  60. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  61. package/artifacts/contracts/instance/Instance.sol/Instance.json +209 -229
  62. package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.dbg.json +4 -0
  63. package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.json +1653 -0
  64. package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.dbg.json +4 -0
  65. package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.json +561 -0
  66. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
  67. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +1078 -309
  68. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
  69. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +230 -443
  70. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
  71. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +140 -163
  72. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.dbg.json +1 -1
  73. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.json +1535 -534
  74. package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.dbg.json +4 -0
  75. package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.json +318 -0
  76. package/artifacts/contracts/instance/base/Cloneable.sol/Cloneable.dbg.json +4 -0
  77. package/artifacts/contracts/instance/{Cloneable.sol → base/Cloneable.sol}/Cloneable.json +1 -54
  78. package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.dbg.json +4 -0
  79. package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.json +10 -0
  80. package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.dbg.json +4 -0
  81. package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.json +223 -0
  82. package/artifacts/contracts/instance/base/ObjectSet.sol/ObjectSet.dbg.json +4 -0
  83. package/artifacts/contracts/instance/base/ObjectSet.sol/ObjectSet.json +181 -0
  84. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +1 -1
  85. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.json +8 -116
  86. package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
  87. package/artifacts/contracts/instance/module/IComponents.sol/IComponents.dbg.json +1 -1
  88. package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +1 -1
  89. package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +1 -1
  90. package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +1 -1
  91. package/artifacts/contracts/mock/Dip.sol/Dip.dbg.json +4 -0
  92. package/artifacts/contracts/mock/Dip.sol/Dip.json +376 -0
  93. package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.dbg.json +4 -0
  94. package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.json +1039 -0
  95. package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.dbg.json +4 -0
  96. package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.json +478 -0
  97. package/artifacts/contracts/oracle/IOracle.sol/IOracle.dbg.json +4 -0
  98. package/artifacts/contracts/oracle/IOracle.sol/IOracle.json +52 -0
  99. package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.dbg.json +4 -0
  100. package/artifacts/contracts/{components/IProductComponent.sol/IProductComponent.json → oracle/IOracleComponent.sol/IOracleComponent.json} +231 -273
  101. package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.dbg.json +4 -0
  102. package/artifacts/contracts/{instance/service/IBundleService.sol/IBundleService.json → oracle/IOracleService.sol/IOracleService.json} +281 -231
  103. package/artifacts/contracts/oracle/Oracle.sol/Oracle.dbg.json +4 -0
  104. package/artifacts/contracts/oracle/Oracle.sol/Oracle.json +907 -0
  105. package/artifacts/contracts/oracle/OracleService.sol/OracleService.dbg.json +4 -0
  106. package/artifacts/contracts/oracle/OracleService.sol/OracleService.json +966 -0
  107. package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.dbg.json +4 -0
  108. package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.json +722 -0
  109. package/artifacts/contracts/pool/BasicPool.sol/BasicPool.dbg.json +4 -0
  110. package/artifacts/contracts/{components/Pool.sol/Pool.json → pool/BasicPool.sol/BasicPool.json} +337 -414
  111. package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.dbg.json +4 -0
  112. package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.json +470 -0
  113. package/artifacts/contracts/pool/BundleService.sol/BundleService.dbg.json +4 -0
  114. package/artifacts/contracts/pool/BundleService.sol/BundleService.json +1465 -0
  115. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.dbg.json +4 -0
  116. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.json +834 -0
  117. package/artifacts/contracts/pool/IBundleService.sol/IBundleService.dbg.json +4 -0
  118. package/artifacts/contracts/{instance/service/IPoolService.sol/IPoolService.json → pool/IBundleService.sol/IBundleService.json} +420 -304
  119. package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.dbg.json +4 -0
  120. package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.json +960 -0
  121. package/artifacts/contracts/pool/IPoolService.sol/IPoolService.dbg.json +4 -0
  122. package/artifacts/contracts/pool/IPoolService.sol/IPoolService.json +1283 -0
  123. package/artifacts/contracts/pool/Pool.sol/Pool.dbg.json +4 -0
  124. package/artifacts/contracts/{components/IPoolComponent.sol/IPoolComponent.json → pool/Pool.sol/Pool.json} +411 -377
  125. package/artifacts/contracts/pool/PoolService.sol/PoolService.dbg.json +4 -0
  126. package/artifacts/contracts/pool/PoolService.sol/PoolService.json +1625 -0
  127. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.dbg.json +4 -0
  128. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.json +766 -0
  129. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.dbg.json +4 -0
  130. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.json +771 -0
  131. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +4 -0
  132. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.json +710 -0
  133. package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.dbg.json +4 -0
  134. package/artifacts/contracts/{components/Product.sol/Product.json → product/BasicProduct.sol/BasicProduct.json} +423 -417
  135. package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.dbg.json +4 -0
  136. package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.json +470 -0
  137. package/artifacts/contracts/product/ClaimService.sol/ClaimService.dbg.json +4 -0
  138. package/artifacts/contracts/product/ClaimService.sol/ClaimService.json +1431 -0
  139. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +4 -0
  140. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.json +838 -0
  141. package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.dbg.json +4 -0
  142. package/artifacts/contracts/{instance/service → product}/IApplicationService.sol/IApplicationService.json +91 -167
  143. package/artifacts/contracts/product/IClaimService.sol/IClaimService.dbg.json +4 -0
  144. package/artifacts/contracts/product/IClaimService.sol/IClaimService.json +942 -0
  145. package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.dbg.json +4 -0
  146. package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.json +925 -0
  147. package/artifacts/contracts/product/IPricingService.sol/IPricingService.dbg.json +4 -0
  148. package/artifacts/contracts/{instance/service/IPolicyService.sol/IPolicyService.json → product/IPricingService.sol/IPricingService.json} +201 -229
  149. package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.dbg.json +4 -0
  150. package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.json +1012 -0
  151. package/artifacts/contracts/product/IRiskService.sol/IRiskService.dbg.json +4 -0
  152. package/artifacts/contracts/{instance/service/IProductService.sol/IProductService.json → product/IRiskService.sol/IRiskService.json} +41 -62
  153. package/artifacts/contracts/product/PolicyService.sol/PolicyService.dbg.json +4 -0
  154. package/artifacts/contracts/product/PolicyService.sol/PolicyService.json +1302 -0
  155. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +4 -0
  156. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.json +782 -0
  157. package/artifacts/contracts/product/PricingService.sol/PricingService.dbg.json +4 -0
  158. package/artifacts/contracts/product/PricingService.sol/PricingService.json +907 -0
  159. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.dbg.json +4 -0
  160. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.json +762 -0
  161. package/artifacts/contracts/product/Product.sol/Product.dbg.json +4 -0
  162. package/artifacts/contracts/product/Product.sol/Product.json +1131 -0
  163. package/artifacts/contracts/product/RiskService.sol/RiskService.dbg.json +4 -0
  164. package/artifacts/contracts/product/RiskService.sol/RiskService.json +622 -0
  165. package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.dbg.json +4 -0
  166. package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.json +694 -0
  167. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  168. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +59 -16
  169. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  170. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +435 -29
  171. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
  172. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +263 -110
  173. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
  174. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.json +5 -18
  175. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  176. package/artifacts/contracts/registry/Registry.sol/Registry.json +865 -68
  177. package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.dbg.json +4 -0
  178. package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.json +1886 -0
  179. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
  180. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +333 -245
  181. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
  182. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +138 -95
  183. package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.dbg.json +4 -0
  184. package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.json +205 -0
  185. package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.dbg.json +4 -0
  186. package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.json +1067 -0
  187. package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.dbg.json +4 -0
  188. package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.json +272 -0
  189. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
  190. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +316 -153
  191. package/artifacts/contracts/shared/Component.sol/Component.dbg.json +4 -0
  192. package/artifacts/contracts/{instance/base/ComponentService.sol/ComponentService.json → shared/Component.sol/Component.json} +314 -196
  193. package/artifacts/contracts/shared/ComponentService.sol/ComponentService.dbg.json +4 -0
  194. package/artifacts/contracts/shared/ComponentService.sol/ComponentService.json +1768 -0
  195. package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.dbg.json +4 -0
  196. package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.json +814 -0
  197. package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.dbg.json +4 -0
  198. package/artifacts/contracts/{instance/service/IClaimService.sol/IClaimService.json → shared/ComponentVerifyingService.sol/ComponentVerifyingService.json} +124 -125
  199. package/artifacts/contracts/shared/ContractLib.sol/ContractLib.dbg.json +4 -0
  200. package/artifacts/contracts/shared/ContractLib.sol/ContractLib.json +92 -0
  201. package/artifacts/contracts/shared/IComponent.sol/IComponent.dbg.json +4 -0
  202. package/artifacts/contracts/{components → shared}/IComponent.sol/IComponent.json +142 -115
  203. package/artifacts/contracts/shared/IComponentService.sol/IComponentService.dbg.json +4 -0
  204. package/artifacts/contracts/shared/IComponentService.sol/IComponentService.json +1335 -0
  205. package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.dbg.json +4 -0
  206. package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.json +723 -0
  207. package/artifacts/contracts/shared/IKeyValueStore.sol/IKeyValueStore.dbg.json +4 -0
  208. package/artifacts/contracts/{instance/base → shared}/IKeyValueStore.sol/IKeyValueStore.json +95 -14
  209. package/artifacts/contracts/shared/ILifecycle.sol/ILifecycle.dbg.json +4 -0
  210. package/artifacts/contracts/{instance/base → shared}/ILifecycle.sol/ILifecycle.json +35 -4
  211. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
  212. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.json +19 -10
  213. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +1 -1
  214. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.json +59 -13
  215. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  216. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +28 -6
  217. package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +1 -1
  218. package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.json +0 -13
  219. package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
  220. package/artifacts/contracts/shared/IService.sol/IService.json +46 -6
  221. package/artifacts/contracts/shared/InitializableERC165.sol/InitializableERC165.dbg.json +4 -0
  222. package/artifacts/contracts/shared/InitializableERC165.sol/InitializableERC165.json +53 -0
  223. package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.dbg.json +4 -0
  224. package/artifacts/contracts/{components/Component.sol/Component.json → shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.json} +239 -252
  225. package/artifacts/contracts/shared/KeyValueStore.sol/KeyValueStore.dbg.json +4 -0
  226. package/artifacts/contracts/shared/KeyValueStore.sol/KeyValueStore.json +538 -0
  227. package/artifacts/contracts/shared/Lifecycle.sol/Lifecycle.dbg.json +4 -0
  228. package/artifacts/contracts/shared/Lifecycle.sol/Lifecycle.json +174 -0
  229. package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.dbg.json +4 -0
  230. package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.json +306 -0
  231. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
  232. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +28 -70
  233. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +1 -1
  234. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +35 -85
  235. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  236. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +69 -99
  237. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +1 -1
  238. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +2 -28
  239. package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
  240. package/artifacts/contracts/shared/Service.sol/Service.json +58 -112
  241. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
  242. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +382 -9
  243. package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.dbg.json +4 -0
  244. package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.json +108 -0
  245. package/artifacts/contracts/staking/IStaking.sol/IStaking.dbg.json +4 -0
  246. package/artifacts/contracts/staking/IStaking.sol/IStaking.json +1465 -0
  247. package/artifacts/contracts/staking/IStakingService.sol/IStakingService.dbg.json +4 -0
  248. package/artifacts/contracts/staking/IStakingService.sol/IStakingService.json +1043 -0
  249. package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.dbg.json +4 -0
  250. package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.json +440 -0
  251. package/artifacts/contracts/staking/Staking.sol/Staking.dbg.json +4 -0
  252. package/artifacts/contracts/staking/Staking.sol/Staking.json +1888 -0
  253. package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.dbg.json +4 -0
  254. package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.json +205 -0
  255. package/artifacts/contracts/staking/StakingManager.sol/StakingManager.dbg.json +4 -0
  256. package/artifacts/contracts/staking/StakingManager.sol/StakingManager.json +776 -0
  257. package/artifacts/contracts/staking/StakingReader.sol/StakingReader.dbg.json +4 -0
  258. package/artifacts/contracts/staking/StakingReader.sol/StakingReader.json +587 -0
  259. package/artifacts/contracts/staking/StakingService.sol/StakingService.dbg.json +4 -0
  260. package/artifacts/contracts/staking/StakingService.sol/StakingService.json +1249 -0
  261. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.dbg.json +4 -0
  262. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.json +710 -0
  263. package/artifacts/contracts/staking/StakingStore.sol/StakingStore.dbg.json +4 -0
  264. package/artifacts/contracts/staking/StakingStore.sol/StakingStore.json +2283 -0
  265. package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.dbg.json +4 -0
  266. package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.json +607 -0
  267. package/artifacts/contracts/type/AddressSet.sol/LibAddressSet.dbg.json +4 -0
  268. package/artifacts/contracts/type/AddressSet.sol/LibAddressSet.json +10 -0
  269. package/artifacts/contracts/type/Amount.sol/AmountLib.dbg.json +4 -0
  270. package/artifacts/contracts/type/Amount.sol/AmountLib.json +398 -0
  271. package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.dbg.json +4 -0
  272. package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.json +225 -0
  273. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.dbg.json +4 -0
  274. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.json +203 -0
  275. package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.dbg.json +4 -0
  276. package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.json +104 -0
  277. package/artifacts/contracts/type/Fee.sol/FeeLib.dbg.json +4 -0
  278. package/artifacts/contracts/type/Fee.sol/FeeLib.json +317 -0
  279. package/artifacts/contracts/type/Key32.sol/Key32Lib.dbg.json +4 -0
  280. package/artifacts/contracts/type/Key32.sol/Key32Lib.json +125 -0
  281. package/artifacts/contracts/type/NftId.sol/NftIdLib.dbg.json +4 -0
  282. package/artifacts/contracts/type/NftId.sol/NftIdLib.json +209 -0
  283. package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.dbg.json +4 -0
  284. package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.json +33 -0
  285. package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.dbg.json +4 -0
  286. package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.json +239 -0
  287. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.dbg.json +4 -0
  288. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.json +209 -0
  289. package/artifacts/contracts/type/Referral.sol/ReferralLib.dbg.json +4 -0
  290. package/artifacts/contracts/type/Referral.sol/ReferralLib.json +142 -0
  291. package/artifacts/contracts/type/RequestId.sol/RequestIdLib.dbg.json +4 -0
  292. package/artifacts/contracts/type/RequestId.sol/RequestIdLib.json +204 -0
  293. package/artifacts/contracts/type/RiskId.sol/RiskIdLib.dbg.json +4 -0
  294. package/artifacts/contracts/type/RiskId.sol/RiskIdLib.json +142 -0
  295. package/artifacts/contracts/type/RoleId.sol/RoleIdLib.dbg.json +4 -0
  296. package/artifacts/contracts/type/RoleId.sol/RoleIdLib.json +369 -0
  297. package/artifacts/contracts/type/Seconds.sol/SecondsLib.dbg.json +4 -0
  298. package/artifacts/contracts/type/Seconds.sol/SecondsLib.json +246 -0
  299. package/artifacts/contracts/type/Selector.sol/SelectorLib.dbg.json +4 -0
  300. package/artifacts/contracts/type/Selector.sol/SelectorLib.json +129 -0
  301. package/artifacts/contracts/type/Selector.sol/SelectorSetLib.dbg.json +4 -0
  302. package/artifacts/contracts/type/Selector.sol/SelectorSetLib.json +10 -0
  303. package/artifacts/contracts/type/StateId.sol/StateIdLib.dbg.json +4 -0
  304. package/artifacts/contracts/type/StateId.sol/StateIdLib.json +105 -0
  305. package/artifacts/contracts/type/String.sol/StrLib.dbg.json +4 -0
  306. package/artifacts/contracts/type/String.sol/StrLib.json +132 -0
  307. package/artifacts/contracts/type/Timestamp.sol/TimestampLib.dbg.json +4 -0
  308. package/artifacts/contracts/type/Timestamp.sol/TimestampLib.json +312 -0
  309. package/artifacts/contracts/type/UFixed.sol/MathLib.dbg.json +4 -0
  310. package/artifacts/contracts/type/UFixed.sol/MathLib.json +16 -0
  311. package/artifacts/contracts/type/UFixed.sol/UFixedLib.dbg.json +4 -0
  312. package/artifacts/contracts/type/UFixed.sol/UFixedLib.json +548 -0
  313. package/artifacts/contracts/type/Version.sol/VersionLib.dbg.json +4 -0
  314. package/artifacts/contracts/type/Version.sol/VersionLib.json +177 -0
  315. package/artifacts/contracts/type/Version.sol/VersionPartLib.dbg.json +4 -0
  316. package/artifacts/contracts/type/Version.sol/VersionPartLib.json +68 -0
  317. package/artifacts/contracts/upgradeability/IVersionable.sol/IVersionable.dbg.json +4 -0
  318. package/artifacts/contracts/{shared → upgradeability}/IVersionable.sol/IVersionable.json +1 -1
  319. package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.dbg.json +4 -0
  320. package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.json +602 -0
  321. package/artifacts/contracts/upgradeability/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +4 -0
  322. package/artifacts/contracts/upgradeability/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +129 -0
  323. package/artifacts/contracts/upgradeability/Versionable.sol/Versionable.dbg.json +4 -0
  324. package/artifacts/contracts/{shared → upgradeability}/Versionable.sol/Versionable.json +1 -1
  325. package/contracts/authorization/AccessAdmin.sol +596 -0
  326. package/contracts/authorization/AccessManagerCloneable.sol +16 -0
  327. package/contracts/authorization/Authorization.sol +289 -0
  328. package/contracts/authorization/IAccess.sol +49 -0
  329. package/contracts/authorization/IAccessAdmin.sol +137 -0
  330. package/contracts/authorization/IAuthorization.sol +60 -0
  331. package/contracts/authorization/IServiceAuthorization.sol +40 -0
  332. package/contracts/authorization/ReleaseAccessManager.sol +38 -0
  333. package/contracts/authorization/ServiceAuthorization.sol +106 -0
  334. package/contracts/distribution/BasicDistribution.sol +139 -0
  335. package/contracts/distribution/BasicDistributionAuthorization.sol +47 -0
  336. package/contracts/{components → distribution}/Distribution.sol +170 -165
  337. package/contracts/distribution/DistributionService.sol +355 -0
  338. package/contracts/distribution/DistributionServiceManager.sol +39 -0
  339. package/contracts/distribution/IDistributionComponent.sol +52 -0
  340. package/contracts/{instance/service → distribution}/IDistributionService.sol +40 -38
  341. package/contracts/examples/fire/DamageLevel.sol +59 -0
  342. package/contracts/examples/fire/FirePool.sol +73 -0
  343. package/contracts/examples/fire/FirePoolAuthorization.sol +34 -0
  344. package/contracts/examples/fire/FireProduct.sol +415 -0
  345. package/contracts/examples/fire/FireProductAuthorization.sol +44 -0
  346. package/contracts/examples/fire/FireUSD.sol +26 -0
  347. package/contracts/examples/unpermissioned/SimpleDistribution.sol +50 -0
  348. package/contracts/examples/unpermissioned/SimpleOracle.sol +137 -0
  349. package/contracts/examples/unpermissioned/SimplePool.sol +76 -0
  350. package/contracts/examples/unpermissioned/SimpleProduct.sol +351 -0
  351. package/contracts/instance/{BundleManager.sol → BundleSet.sol} +30 -31
  352. package/contracts/instance/IInstance.sol +40 -34
  353. package/contracts/instance/IInstanceService.sol +35 -47
  354. package/contracts/instance/Instance.sol +136 -103
  355. package/contracts/instance/InstanceAdmin.sol +277 -0
  356. package/contracts/instance/InstanceAuthorizationV3.sol +194 -0
  357. package/contracts/instance/InstanceReader.sol +261 -59
  358. package/contracts/instance/InstanceService.sol +244 -361
  359. package/contracts/instance/InstanceServiceManager.sol +14 -29
  360. package/contracts/instance/InstanceStore.sol +165 -97
  361. package/contracts/instance/base/BalanceStore.sol +123 -0
  362. package/contracts/instance/base/Cloneable.sol +28 -0
  363. package/contracts/instance/base/ObjectCounter.sol +21 -0
  364. package/contracts/instance/base/ObjectLifecycle.sol +111 -0
  365. package/contracts/instance/{ObjectManager.sol → base/ObjectSet.sol} +18 -21
  366. package/contracts/instance/module/IAccess.sol +4 -12
  367. package/contracts/instance/module/IBundle.sol +6 -9
  368. package/contracts/instance/module/IComponents.sol +26 -16
  369. package/contracts/instance/module/IDistribution.sol +6 -6
  370. package/contracts/instance/module/IPolicy.sol +47 -35
  371. package/contracts/instance/module/IRisk.sol +1 -1
  372. package/contracts/{test/Usdc.sol → mock/Dip.sol} +6 -6
  373. package/contracts/oracle/BasicOracle.sol +47 -0
  374. package/contracts/oracle/BasicOracleAuthorization.sol +46 -0
  375. package/contracts/oracle/IOracle.sol +36 -0
  376. package/contracts/oracle/IOracleComponent.sol +33 -0
  377. package/contracts/oracle/IOracleService.sol +66 -0
  378. package/contracts/oracle/Oracle.sol +156 -0
  379. package/contracts/oracle/OracleService.sol +291 -0
  380. package/contracts/oracle/OracleServiceManager.sol +39 -0
  381. package/contracts/pool/BasicPool.sol +154 -0
  382. package/contracts/pool/BasicPoolAuthorization.sol +57 -0
  383. package/contracts/pool/BundleService.sol +493 -0
  384. package/contracts/pool/BundleServiceManager.sol +39 -0
  385. package/contracts/pool/IBundleService.sol +143 -0
  386. package/contracts/pool/IPoolComponent.sol +68 -0
  387. package/contracts/pool/IPoolService.sol +167 -0
  388. package/contracts/pool/Pool.sol +335 -0
  389. package/contracts/pool/PoolService.sol +544 -0
  390. package/contracts/pool/PoolServiceManager.sol +39 -0
  391. package/contracts/product/ApplicationService.sol +259 -0
  392. package/contracts/{instance/service → product}/ApplicationServiceManager.sol +12 -9
  393. package/contracts/product/BasicProduct.sol +53 -0
  394. package/contracts/product/BasicProductAuthorization.sol +42 -0
  395. package/contracts/product/ClaimService.sol +612 -0
  396. package/contracts/{instance/service → product}/ClaimServiceManager.sol +12 -9
  397. package/contracts/{instance/service → product}/IApplicationService.sol +16 -35
  398. package/contracts/product/IClaimService.sol +123 -0
  399. package/contracts/product/IPolicyService.sol +80 -0
  400. package/contracts/product/IPricingService.sol +39 -0
  401. package/contracts/product/IProductComponent.sol +59 -0
  402. package/contracts/product/IRiskService.sol +33 -0
  403. package/contracts/product/PolicyService.sol +691 -0
  404. package/contracts/product/PolicyServiceManager.sol +39 -0
  405. package/contracts/product/PricingService.sol +300 -0
  406. package/contracts/product/PricingServiceManager.sol +39 -0
  407. package/contracts/product/Product.sol +455 -0
  408. package/contracts/product/RiskService.sol +96 -0
  409. package/contracts/product/RiskServiceManager.sol +39 -0
  410. package/contracts/registry/ChainNft.sol +75 -38
  411. package/contracts/registry/IRegistry.sol +96 -26
  412. package/contracts/registry/IRegistryService.sol +34 -40
  413. package/contracts/registry/ITransferInterceptor.sol +1 -2
  414. package/contracts/registry/Registry.sol +445 -195
  415. package/contracts/registry/RegistryAdmin.sol +448 -0
  416. package/contracts/registry/RegistryService.sol +87 -128
  417. package/contracts/registry/RegistryServiceManager.sol +23 -32
  418. package/contracts/registry/ReleaseLifecycle.sol +30 -0
  419. package/contracts/registry/ReleaseRegistry.sol +501 -0
  420. package/contracts/registry/ServiceAuthorizationV3.sol +194 -0
  421. package/contracts/registry/TokenRegistry.sol +261 -62
  422. package/contracts/shared/Component.sol +265 -0
  423. package/contracts/shared/ComponentService.sol +745 -0
  424. package/contracts/shared/ComponentServiceManager.sol +38 -0
  425. package/contracts/shared/ComponentVerifyingService.sol +126 -0
  426. package/contracts/shared/ContractLib.sol +38 -0
  427. package/contracts/shared/IComponent.sol +74 -0
  428. package/contracts/shared/IComponentService.sol +120 -0
  429. package/contracts/shared/IInstanceLinkedComponent.sol +41 -0
  430. package/contracts/{instance/base → shared}/IKeyValueStore.sol +16 -11
  431. package/contracts/{instance/base → shared}/ILifecycle.sol +5 -4
  432. package/contracts/shared/INftOwnable.sol +4 -2
  433. package/contracts/shared/IPolicyHolder.sol +23 -14
  434. package/contracts/shared/IRegisterable.sol +11 -0
  435. package/contracts/shared/IRegistryLinked.sol +0 -1
  436. package/contracts/shared/IService.sol +12 -3
  437. package/contracts/shared/{ERC165.sol → InitializableERC165.sol} +4 -4
  438. package/contracts/shared/InstanceLinkedComponent.sol +213 -0
  439. package/contracts/shared/KeyValueStore.sol +131 -0
  440. package/contracts/shared/Lifecycle.sol +88 -0
  441. package/contracts/shared/NftIdSet.sol +65 -0
  442. package/contracts/shared/NftOwnable.sol +32 -25
  443. package/contracts/shared/PolicyHolder.sol +22 -41
  444. package/contracts/shared/Registerable.sol +32 -21
  445. package/contracts/shared/RegistryLinked.sol +3 -7
  446. package/contracts/shared/Service.sol +48 -36
  447. package/contracts/shared/TokenHandler.sol +115 -9
  448. package/contracts/shared/TokenHandlerDeployerLib.sol +12 -0
  449. package/contracts/staking/IStaking.sol +168 -0
  450. package/contracts/staking/IStakingService.sol +157 -0
  451. package/contracts/staking/StakeManagerLib.sol +224 -0
  452. package/contracts/staking/Staking.sol +497 -0
  453. package/contracts/staking/StakingLifecycle.sol +23 -0
  454. package/contracts/staking/StakingManager.sol +52 -0
  455. package/contracts/staking/StakingReader.sol +190 -0
  456. package/contracts/staking/StakingService.sol +407 -0
  457. package/contracts/staking/StakingServiceManager.sol +44 -0
  458. package/contracts/staking/StakingStore.sol +605 -0
  459. package/contracts/staking/TargetManagerLib.sol +211 -0
  460. package/contracts/{types → type}/AddressSet.sol +1 -1
  461. package/contracts/type/Amount.sol +150 -0
  462. package/contracts/{types → type}/Blocknumber.sol +26 -3
  463. package/contracts/{types → type}/ClaimId.sol +31 -3
  464. package/contracts/{types → type}/Fee.sol +24 -22
  465. package/contracts/{types → type}/NftId.sol +15 -16
  466. package/contracts/{types → type}/NftIdSet.sol +2 -2
  467. package/contracts/type/ObjectType.sol +276 -0
  468. package/contracts/type/PayoutId.sol +82 -0
  469. package/contracts/{types → type}/Referral.sol +2 -1
  470. package/contracts/type/RequestId.sol +75 -0
  471. package/contracts/{types → type}/RiskId.sol +16 -2
  472. package/contracts/type/RoleId.sol +162 -0
  473. package/contracts/type/Seconds.sol +101 -0
  474. package/contracts/type/Selector.sol +102 -0
  475. package/contracts/{types → type}/StateId.sol +47 -4
  476. package/contracts/type/String.sol +53 -0
  477. package/contracts/{types → type}/Timestamp.sol +21 -2
  478. package/contracts/{types → type}/UFixed.sol +38 -9
  479. package/contracts/{types → type}/Version.sol +4 -2
  480. package/contracts/{shared → upgradeability}/IVersionable.sol +1 -1
  481. package/contracts/{shared → upgradeability}/ProxyManager.sol +93 -30
  482. package/contracts/{shared → upgradeability}/UpgradableProxyWithAdmin.sol +1 -3
  483. package/contracts/{shared → upgradeability}/Versionable.sol +3 -3
  484. package/package.json +9 -5
  485. package/artifacts/contracts/components/Component.sol/Component.dbg.json +0 -4
  486. package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +0 -4
  487. package/artifacts/contracts/components/IComponent.sol/IComponent.dbg.json +0 -4
  488. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +0 -4
  489. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +0 -4
  490. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +0 -4
  491. package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +0 -4
  492. package/artifacts/contracts/components/Product.sol/Product.dbg.json +0 -4
  493. package/artifacts/contracts/instance/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.dbg.json +0 -4
  494. package/artifacts/contracts/instance/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.json +0 -1206
  495. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.dbg.json +0 -4
  496. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.json +0 -778
  497. package/artifacts/contracts/instance/Cloneable.sol/Cloneable.dbg.json +0 -4
  498. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +0 -4
  499. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +0 -1348
  500. package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.dbg.json +0 -4
  501. package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.json +0 -256
  502. package/artifacts/contracts/instance/base/ComponentService.sol/ComponentService.dbg.json +0 -4
  503. package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.dbg.json +0 -4
  504. package/artifacts/contracts/instance/base/ILifecycle.sol/ILifecycle.dbg.json +0 -4
  505. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.dbg.json +0 -4
  506. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.json +0 -532
  507. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json +0 -4
  508. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.json +0 -194
  509. package/artifacts/contracts/instance/module/ISetup.sol/ISetup.dbg.json +0 -4
  510. package/artifacts/contracts/instance/module/ITreasury.sol/ITreasury.dbg.json +0 -4
  511. package/artifacts/contracts/instance/module/ITreasury.sol/ITreasury.json +0 -10
  512. package/artifacts/contracts/instance/service/ApplicationService.sol/ApplicationService.dbg.json +0 -4
  513. package/artifacts/contracts/instance/service/ApplicationService.sol/ApplicationService.json +0 -1039
  514. package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +0 -4
  515. package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.json +0 -673
  516. package/artifacts/contracts/instance/service/BundleService.sol/BundleService.dbg.json +0 -4
  517. package/artifacts/contracts/instance/service/BundleService.sol/BundleService.json +0 -1231
  518. package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.dbg.json +0 -4
  519. package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.json +0 -721
  520. package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.dbg.json +0 -4
  521. package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.json +0 -817
  522. package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +0 -4
  523. package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.json +0 -641
  524. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +0 -4
  525. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +0 -1798
  526. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +0 -4
  527. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.json +0 -805
  528. package/artifacts/contracts/instance/service/IApplicationService.sol/IApplicationService.dbg.json +0 -4
  529. package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.dbg.json +0 -4
  530. package/artifacts/contracts/instance/service/IClaimService.sol/IClaimService.dbg.json +0 -4
  531. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +0 -4
  532. package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.dbg.json +0 -4
  533. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +0 -4
  534. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +0 -4
  535. package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.dbg.json +0 -4
  536. package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.json +0 -1092
  537. package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +0 -4
  538. package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.json +0 -697
  539. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +0 -4
  540. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +0 -1237
  541. package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.dbg.json +0 -4
  542. package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.json +0 -661
  543. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +0 -4
  544. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +0 -840
  545. package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.dbg.json +0 -4
  546. package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.json +0 -653
  547. package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.dbg.json +0 -4
  548. package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.json +0 -285
  549. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.dbg.json +0 -4
  550. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.json +0 -559
  551. package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.dbg.json +0 -4
  552. package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.json +0 -107
  553. package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +0 -4
  554. package/artifacts/contracts/shared/ERC165.sol/ERC165.json +0 -73
  555. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +0 -4
  556. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +0 -4
  557. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +0 -582
  558. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +0 -4
  559. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +0 -129
  560. package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +0 -4
  561. package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json +0 -4
  562. package/artifacts/contracts/test/TestFee.sol/TestFee.json +0 -119
  563. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json +0 -4
  564. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +0 -383
  565. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +0 -4
  566. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.json +0 -116
  567. package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +0 -4
  568. package/artifacts/contracts/test/TestService.sol/TestService.json +0 -596
  569. package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json +0 -4
  570. package/artifacts/contracts/test/TestToken.sol/TestUsdc.json +0 -376
  571. package/artifacts/contracts/test/TestVersion.sol/TestVersion.dbg.json +0 -4
  572. package/artifacts/contracts/test/TestVersion.sol/TestVersion.json +0 -218
  573. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json +0 -4
  574. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.json +0 -104
  575. package/artifacts/contracts/test/Usdc.sol/USDC.dbg.json +0 -4
  576. package/artifacts/contracts/test/Usdc.sol/USDC.json +0 -376
  577. package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.dbg.json +0 -4
  578. package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.json +0 -10
  579. package/artifacts/contracts/types/Amount.sol/AmountLib.dbg.json +0 -4
  580. package/artifacts/contracts/types/Amount.sol/AmountLib.json +0 -161
  581. package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +0 -4
  582. package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.json +0 -174
  583. package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +0 -4
  584. package/artifacts/contracts/types/ChainId.sol/ChainIdLib.json +0 -10
  585. package/artifacts/contracts/types/ClaimId.sol/ClaimIdLib.dbg.json +0 -4
  586. package/artifacts/contracts/types/ClaimId.sol/ClaimIdLib.json +0 -100
  587. package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.dbg.json +0 -4
  588. package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.json +0 -104
  589. package/artifacts/contracts/types/Fee.sol/FeeLib.dbg.json +0 -4
  590. package/artifacts/contracts/types/Fee.sol/FeeLib.json +0 -288
  591. package/artifacts/contracts/types/Key32.sol/Key32Lib.dbg.json +0 -4
  592. package/artifacts/contracts/types/Key32.sol/Key32Lib.json +0 -125
  593. package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +0 -4
  594. package/artifacts/contracts/types/NftId.sol/NftIdLib.json +0 -166
  595. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.dbg.json +0 -4
  596. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.json +0 -33
  597. package/artifacts/contracts/types/NumberId.sol/NumberIdLib.dbg.json +0 -4
  598. package/artifacts/contracts/types/NumberId.sol/NumberIdLib.json +0 -100
  599. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.dbg.json +0 -4
  600. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.json +0 -92
  601. package/artifacts/contracts/types/PayoutId.sol/PayoutIdLib.dbg.json +0 -4
  602. package/artifacts/contracts/types/PayoutId.sol/PayoutIdLib.json +0 -100
  603. package/artifacts/contracts/types/Referral.sol/ReferralLib.dbg.json +0 -4
  604. package/artifacts/contracts/types/Referral.sol/ReferralLib.json +0 -142
  605. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.dbg.json +0 -4
  606. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.json +0 -86
  607. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.dbg.json +0 -4
  608. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.json +0 -156
  609. package/artifacts/contracts/types/Seconds.sol/SecondsLib.dbg.json +0 -4
  610. package/artifacts/contracts/types/Seconds.sol/SecondsLib.json +0 -124
  611. package/artifacts/contracts/types/StateId.sol/StateIdLib.dbg.json +0 -4
  612. package/artifacts/contracts/types/StateId.sol/StateIdLib.json +0 -92
  613. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json +0 -4
  614. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.json +0 -267
  615. package/artifacts/contracts/types/UFixed.sol/MathLib.dbg.json +0 -4
  616. package/artifacts/contracts/types/UFixed.sol/MathLib.json +0 -10
  617. package/artifacts/contracts/types/UFixed.sol/UFixedLib.dbg.json +0 -4
  618. package/artifacts/contracts/types/UFixed.sol/UFixedLib.json +0 -479
  619. package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +0 -4
  620. package/artifacts/contracts/types/Version.sol/VersionLib.json +0 -177
  621. package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +0 -4
  622. package/artifacts/contracts/types/Version.sol/VersionPartLib.json +0 -49
  623. package/contracts/components/Component.sol +0 -253
  624. package/contracts/components/IComponent.sol +0 -76
  625. package/contracts/components/IDistributionComponent.sol +0 -71
  626. package/contracts/components/IPoolComponent.sol +0 -113
  627. package/contracts/components/IProductComponent.sol +0 -40
  628. package/contracts/components/Pool.sol +0 -303
  629. package/contracts/components/Product.sol +0 -293
  630. package/contracts/instance/AccessManagerUpgradeableInitializeable.sol +0 -13
  631. package/contracts/instance/Cloneable.sol +0 -51
  632. package/contracts/instance/InstanceAccessManager.sol +0 -540
  633. package/contracts/instance/base/ComponentService.sol +0 -121
  634. package/contracts/instance/base/KeyValueStore.sol +0 -180
  635. package/contracts/instance/base/Lifecycle.sol +0 -109
  636. package/contracts/instance/module/ISetup.sol +0 -33
  637. package/contracts/instance/module/ITreasury.sol +0 -23
  638. package/contracts/instance/service/ApplicationService.sol +0 -351
  639. package/contracts/instance/service/BundleService.sol +0 -431
  640. package/contracts/instance/service/BundleServiceManager.sol +0 -51
  641. package/contracts/instance/service/ClaimService.sol +0 -151
  642. package/contracts/instance/service/DistributionService.sol +0 -437
  643. package/contracts/instance/service/DistributionServiceManager.sol +0 -51
  644. package/contracts/instance/service/IBundleService.sol +0 -93
  645. package/contracts/instance/service/IClaimService.sol +0 -61
  646. package/contracts/instance/service/IPolicyService.sol +0 -72
  647. package/contracts/instance/service/IPoolService.sol +0 -99
  648. package/contracts/instance/service/IProductService.sol +0 -40
  649. package/contracts/instance/service/PolicyService.sol +0 -362
  650. package/contracts/instance/service/PolicyServiceManager.sol +0 -54
  651. package/contracts/instance/service/PoolService.sol +0 -303
  652. package/contracts/instance/service/PoolServiceManager.sol +0 -51
  653. package/contracts/instance/service/ProductService.sol +0 -209
  654. package/contracts/instance/service/ProductServiceManager.sol +0 -54
  655. package/contracts/registry/RegistryAccessManager.sol +0 -216
  656. package/contracts/registry/ReleaseManager.sol +0 -324
  657. package/contracts/shared/ContractDeployerLib.sol +0 -72
  658. package/contracts/test/TestFee.sol +0 -25
  659. package/contracts/test/TestRegisterable.sol +0 -18
  660. package/contracts/test/TestRoleId.sol +0 -14
  661. package/contracts/test/TestService.sol +0 -25
  662. package/contracts/test/TestToken.sol +0 -26
  663. package/contracts/test/TestVersion.sol +0 -44
  664. package/contracts/test/TestVersionable.sol +0 -17
  665. package/contracts/types/Amount.sol +0 -60
  666. package/contracts/types/ChainId.sol +0 -38
  667. package/contracts/types/NumberId.sol +0 -52
  668. package/contracts/types/ObjectType.sol +0 -157
  669. package/contracts/types/PayoutId.sol +0 -54
  670. package/contracts/types/RoleId.sol +0 -97
  671. package/contracts/types/Seconds.sol +0 -54
  672. /package/contracts/{types → type}/DistributorType.sol +0 -0
  673. /package/contracts/{types → type}/Key32.sol +0 -0
@@ -4,61 +4,88 @@ pragma solidity ^0.8.20;
4
4
  import {Clones} from "@openzeppelin/contracts/proxy/Clones.sol";
5
5
  import {ShortString, ShortStrings} from "@openzeppelin/contracts/utils/ShortStrings.sol";
6
6
 
7
- import {NftId} from "../../contracts/types/NftId.sol";
8
- import {RoleId} from "../types/RoleId.sol";
9
- import {ADMIN_ROLE, INSTANCE_OWNER_ROLE, DISTRIBUTION_OWNER_ROLE, POOL_OWNER_ROLE, PRODUCT_OWNER_ROLE, INSTANCE_SERVICE_ROLE, DISTRIBUTION_SERVICE_ROLE, POOL_SERVICE_ROLE, PRODUCT_SERVICE_ROLE, APPLICATION_SERVICE_ROLE, POLICY_SERVICE_ROLE, CLAIM_SERVICE_ROLE, BUNDLE_SERVICE_ROLE, INSTANCE_ROLE} from "../types/RoleId.sol";
10
- import {ObjectType, INSTANCE, BUNDLE, APPLICATION, POLICY, CLAIM, PRODUCT, DISTRIBUTION, REGISTRY, POOL} from "../types/ObjectType.sol";
7
+ import {AccessManagerCloneable} from "../authorization/AccessManagerCloneable.sol";
8
+ import {Amount} from "../type/Amount.sol";
9
+ import {BundleSet} from "./BundleSet.sol";
10
+ import {ChainNft} from "../registry/ChainNft.sol";
11
+ import {NftId} from "../type/NftId.sol";
12
+ import {RoleId} from "../type/RoleId.sol";
13
+ import {SecondsLib} from "../type/Seconds.sol";
14
+ import {UFixed, UFixedLib} from "../type/UFixed.sol";
15
+ import {ADMIN_ROLE} from "../type/RoleId.sol";
16
+ import {ObjectType, INSTANCE, BUNDLE, APPLICATION, CLAIM, DISTRIBUTION, INSTANCE, POLICY, POOL, PRODUCT, REGISTRY, STAKING} from "../type/ObjectType.sol";
11
17
 
12
18
  import {Service} from "../shared/Service.sol";
19
+ import {IInstanceLinkedComponent} from "../shared/IInstanceLinkedComponent.sol";
13
20
  import {IService} from "../shared/IService.sol";
14
21
 
15
- import {IDistributionComponent} from "../components/IDistributionComponent.sol";
16
- import {IPoolComponent} from "../components/IPoolComponent.sol";
17
- import {IProductComponent} from "../components/IProductComponent.sol";
22
+ import {IDistributionComponent} from "../distribution/IDistributionComponent.sol";
23
+ import {IPoolComponent} from "../pool/IPoolComponent.sol";
24
+ import {IProductComponent} from "../product/IProductComponent.sol";
18
25
 
19
26
  import {IRegistry} from "../registry/IRegistry.sol";
20
27
  import {IRegistryService} from "../registry/IRegistryService.sol";
21
- import {ChainNft} from "../registry/ChainNft.sol";
28
+ import {IStakingService} from "../staking/IStakingService.sol";
29
+ import {TargetManagerLib} from "../staking/TargetManagerLib.sol";
22
30
 
23
31
  import {Instance} from "./Instance.sol";
24
32
  import {IInstance} from "./IInstance.sol";
25
- import {InstanceAccessManager} from "./InstanceAccessManager.sol";
33
+ import {InstanceAdmin} from "./InstanceAdmin.sol";
26
34
  import {IInstanceService} from "./IInstanceService.sol";
27
35
  import {InstanceReader} from "./InstanceReader.sol";
28
- import {BundleManager} from "./BundleManager.sol";
29
- import {AccessManagerUpgradeableInitializeable} from "./AccessManagerUpgradeableInitializeable.sol";
30
36
  import {InstanceStore} from "./InstanceStore.sol";
37
+ import {Seconds} from "../type/Seconds.sol";
38
+ import {VersionPart, VersionPartLib} from "../type/Version.sol";
31
39
 
32
40
 
33
41
  contract InstanceService is
34
42
  Service,
35
43
  IInstanceService
36
44
  {
37
- address internal _masterOzAccessManager;
38
- address internal _masterInstanceAccessManager;
39
- address internal _masterInstance;
40
- address internal _masterInstanceReader;
41
- address internal _masterInstanceBundleManager;
42
- address internal _masterInstanceStore;
43
45
 
44
46
  // TODO update to real hash when instance is stable
45
47
  bytes32 public constant INSTANCE_CREATION_CODE_HASH = bytes32(0);
46
48
 
47
- modifier onlyInstanceOwner(NftId instanceNftId) {
48
- if(msg.sender != getRegistry().ownerOf(instanceNftId)) {
49
- revert ErrorInstanceServiceRequestUnauhorized(msg.sender);
49
+ IRegistryService internal _registryService;
50
+ IStakingService internal _stakingService;
51
+
52
+ address internal _masterAccessManager;
53
+ address internal _masterInstanceAdmin;
54
+ address internal _masterInstance;
55
+ address internal _masterInstanceReader;
56
+ address internal _masterInstanceBundleSet;
57
+ address internal _masterInstanceStore;
58
+
59
+
60
+ modifier onlyInstance() {
61
+ address instanceAddress = msg.sender;
62
+ NftId instanceNftId = getRegistry().getNftIdForAddress(msg.sender);
63
+ if (instanceNftId.eqz()) {
64
+ revert ErrorInstanceServiceNotRegistered(instanceAddress);
65
+ }
66
+
67
+ ObjectType objectType = getRegistry().getObjectInfo(instanceNftId).objectType;
68
+ if (objectType != INSTANCE()) {
69
+ revert ErrorInstanceServiceNotInstance(instanceAddress, objectType);
50
70
  }
71
+
72
+ VersionPart instanceVersion = IInstance(instanceAddress).getRelease();
73
+ if (instanceVersion != getVersion().toMajorPart()) {
74
+ revert ErrorInstanceServiceInstanceVersionMismatch(instanceAddress, instanceVersion);
75
+ }
76
+
51
77
  _;
52
78
  }
53
- // TODO check service domain?
54
- // TODO check release version?
55
- modifier onlyRegisteredService() {
56
- if (! getRegistry().isRegisteredService(msg.sender)) {
79
+
80
+
81
+ modifier onlyInstanceOwner(NftId instanceNftId) {
82
+ if(msg.sender != getRegistry().ownerOf(instanceNftId)) {
57
83
  revert ErrorInstanceServiceRequestUnauhorized(msg.sender);
58
84
  }
59
85
  _;
60
86
  }
61
- // TODO check release version?
87
+
88
+ // TODO check component - service - instance version match
62
89
  modifier onlyComponent() {
63
90
  if (! getRegistry().isRegisteredComponent(msg.sender)) {
64
91
  revert ErrorInstanceServiceRequestUnauhorized(msg.sender);
@@ -66,291 +93,117 @@ contract InstanceService is
66
93
  _;
67
94
  }
68
95
 
69
- function createInstanceClone()
96
+ function createInstance()
70
97
  external
71
98
  returns (
72
- AccessManagerUpgradeableInitializeable clonedOzAccessManager,
73
- InstanceAccessManager clonedInstanceAccessManager,
74
99
  Instance clonedInstance,
75
- NftId clonedInstanceNftId,
76
- InstanceReader clonedInstanceReader,
77
- BundleManager clonedBundleManager,
78
- InstanceStore clonedInstanceStore
100
+ NftId clonedInstanceNftId
79
101
  )
80
102
  {
103
+ // tx sender will become instance owner
81
104
  address instanceOwner = msg.sender;
82
- IRegistry registry = getRegistry();
83
- NftId registryNftId = registry.getNftId(address(registry));
84
- IRegistryService registryService = IRegistryService(
85
- registry.getServiceAddress(REGISTRY(), getVersion().toMajorPart())
86
- );
87
105
 
88
- clonedOzAccessManager = AccessManagerUpgradeableInitializeable(Clones.clone(_masterOzAccessManager));
106
+ // create instance admin and instance
107
+ InstanceAdmin instanceAdmin = _createInstanceAdmin();
108
+ clonedInstance = _createInstance(instanceAdmin, instanceOwner);
89
109
 
90
- // initially grants ADMIN_ROLE to this (being the instance service).
91
- // This will allow the instance service to bootstrap the authorizations of the instance.
92
- // Instance service will not use oz access manager directlly but through instance access manager instead
93
- // Instance service will renounce ADMIN_ROLE when bootstraping is finished
94
- clonedOzAccessManager.initialize(address(this));
95
-
96
- clonedInstance = Instance(Clones.clone(_masterInstance));
97
- clonedInstance.initialize(
98
- address(clonedOzAccessManager),
99
- address(registry),
100
- instanceOwner);
101
- // initialize and set before instance reader
102
- clonedInstanceStore = InstanceStore(Clones.clone(address(_masterInstanceStore)));
103
- clonedInstanceStore.initialize(address(clonedInstance));
104
- clonedInstance.setInstanceStore(clonedInstanceStore);
105
-
106
- clonedInstanceReader = InstanceReader(Clones.clone(address(_masterInstanceReader)));
107
- clonedInstanceReader.initialize(address(clonedInstance));
108
- clonedInstance.setInstanceReader(clonedInstanceReader);
110
+ // register cloned instance with registry
111
+ clonedInstanceNftId = _registryService.registerInstance(
112
+ clonedInstance, instanceOwner).nftId;
109
113
 
110
- clonedBundleManager = BundleManager(Clones.clone(_masterInstanceBundleManager));
111
- clonedBundleManager.initialize(address(clonedInstance));
112
- clonedInstance.setBundleManager(clonedBundleManager);
114
+ // register cloned instance as staking target
115
+ _stakingService.createInstanceTarget(
116
+ clonedInstanceNftId,
117
+ TargetManagerLib.getDefaultLockingPeriod(),
118
+ TargetManagerLib.getDefaultRewardRate());
113
119
 
114
- clonedInstanceAccessManager = InstanceAccessManager(Clones.clone(_masterInstanceAccessManager));
115
- clonedOzAccessManager.grantRole(ADMIN_ROLE().toInt(), address(clonedInstanceAccessManager), 0);
116
- clonedInstanceAccessManager.initialize(address(clonedInstance));
117
- clonedInstance.setInstanceAccessManager(clonedInstanceAccessManager);
118
-
119
- // TODO amend setters with instance specific , policy manager ...
120
-
121
- _grantInitialAuthorizations(clonedInstanceAccessManager, clonedInstance, clonedBundleManager, clonedInstanceStore, instanceOwner);
122
-
123
- clonedOzAccessManager.renounceRole(ADMIN_ROLE().toInt(), address(this));
124
-
125
- IRegistry.ObjectInfo memory info = registryService.registerInstance(clonedInstance, instanceOwner);
126
- clonedInstanceNftId = info.nftId;
120
+ // MUST be set after instance is set up and registered
121
+ instanceAdmin.initializeInstanceAuthorization(address(clonedInstance));
127
122
 
128
123
  emit LogInstanceCloned(
129
- address(clonedOzAccessManager),
130
- address(clonedInstanceAccessManager),
131
- address(clonedInstance),
132
- address(clonedInstanceStore),
133
- address(clonedBundleManager),
134
- address(clonedInstanceReader),
135
- clonedInstanceNftId);
124
+ clonedInstanceNftId,
125
+ address(clonedInstance));
136
126
  }
137
127
 
138
- function _grantInitialAuthorizations(
139
- InstanceAccessManager clonedAccessManager,
140
- Instance clonedInstance,
141
- BundleManager clonedBundleManager,
142
- InstanceStore clonedInstanceStore,
143
- address instanceOwner)
144
- internal
128
+
129
+ function setStakingLockingPeriod(Seconds stakeLockingPeriod)
130
+ external
131
+ virtual
132
+ onlyInstance()
145
133
  {
146
- _createCoreAndGifRoles(clonedAccessManager);
147
- _createCoreTargets(clonedAccessManager, clonedInstance, clonedBundleManager, clonedInstanceStore);
148
- _grantDistributionServiceAuthorizations(clonedAccessManager, clonedInstanceStore);
149
- _grantPoolServiceAuthorizations(clonedAccessManager, clonedInstanceStore);
150
- _grantProductServiceAuthorizations(clonedAccessManager, clonedInstanceStore);
151
- _grantApplicationServiceAuthorizations(clonedAccessManager, clonedInstanceStore);
152
- _grantPolicyServiceAuthorizations(clonedAccessManager, clonedInstanceStore);
153
- _grantClaimServiceAuthorizations(clonedAccessManager, clonedInstanceStore);
154
- _grantBundleServiceAuthorizations(clonedAccessManager, clonedInstanceStore, clonedBundleManager);
155
- _grantInstanceServiceAuthorizations(clonedAccessManager, clonedInstance);
156
- _grantInstanceAuthorizations(clonedAccessManager);
157
- _grantInstanceOwnerAuthorizations(clonedAccessManager, clonedInstance);
134
+ NftId instanceNftId = getRegistry().getNftIdForAddress(msg.sender);
135
+ _stakingService.setInstanceLockingPeriod(
136
+ instanceNftId,
137
+ stakeLockingPeriod);
158
138
  }
159
139
 
160
- function _createCoreAndGifRoles(InstanceAccessManager clonedAccessManager) internal {
161
- // default roles controlled by ADMIN_ROLE -> core roles
162
- // all set/granted only once during cloning (the only exception is INSTANCE_OWNER_ROLE, hooked to instance nft)
163
- clonedAccessManager.createCoreRole(INSTANCE_SERVICE_ROLE(), "InstanceServiceRole");
164
- clonedAccessManager.createCoreRole(DISTRIBUTION_SERVICE_ROLE(), "DistributionServiceRole");
165
- clonedAccessManager.createCoreRole(POOL_SERVICE_ROLE(), "PoolServiceRole");
166
- clonedAccessManager.createCoreRole(APPLICATION_SERVICE_ROLE(), "ApplicationServiceRole");
167
- clonedAccessManager.createCoreRole(PRODUCT_SERVICE_ROLE(), "ProductServiceRole");
168
- clonedAccessManager.createCoreRole(CLAIM_SERVICE_ROLE(), "ClaimServiceRole");
169
- clonedAccessManager.createCoreRole(POLICY_SERVICE_ROLE(), "PolicyServiceRole");
170
- clonedAccessManager.createCoreRole(BUNDLE_SERVICE_ROLE(), "BundleServiceRole");
171
- // default roles controlled by INSTANCE_OWNER_ROLE -> gif roles
172
- clonedAccessManager.createGifRole(DISTRIBUTION_OWNER_ROLE(), "DistributionOwnerRole", INSTANCE_OWNER_ROLE());
173
- clonedAccessManager.createGifRole(POOL_OWNER_ROLE(), "PoolOwnerRole", INSTANCE_OWNER_ROLE());
174
- clonedAccessManager.createGifRole(PRODUCT_OWNER_ROLE(), "ProductOwnerRole", INSTANCE_OWNER_ROLE());
175
- }
176
140
 
177
- function _createCoreTargets(
178
- InstanceAccessManager clonedAccessManager,
179
- Instance clonedInstance,
180
- BundleManager clonedBundleManager,
181
- InstanceStore clonedInstanceStore)
182
- internal
141
+ function setStakingRewardRate(UFixed rewardRate)
142
+ external
143
+ virtual
144
+ onlyInstance()
183
145
  {
184
- clonedAccessManager.createCoreTarget(address(clonedAccessManager), "InstanceAccessManager");// TODO create in instance access manager initializer?
185
- clonedAccessManager.createCoreTarget(address(clonedInstance), "Instance");// TODO create in instance access manager initializer?
186
- clonedAccessManager.createCoreTarget(address(clonedBundleManager), "BundleManager");
187
- clonedAccessManager.createCoreTarget(address(clonedInstanceStore), "InstanceStore");
146
+ NftId instanceNftId = getRegistry().getNftIdForAddress(msg.sender);
147
+ _stakingService.setInstanceRewardRate(
148
+ instanceNftId,
149
+ rewardRate);
188
150
  }
189
151
 
190
- function _grantDistributionServiceAuthorizations(InstanceAccessManager clonedAccessManager, InstanceStore clonedInstanceStore) internal {
191
- // configure authorization for distribution service on instance
192
- address distributionServiceAddress = getRegistry().getServiceAddress(DISTRIBUTION(), getVersion().toMajorPart());
193
- clonedAccessManager.grantRole(DISTRIBUTION_SERVICE_ROLE(), distributionServiceAddress);
194
- bytes4[] memory instanceDistributionServiceSelectors = new bytes4[](11);
195
- instanceDistributionServiceSelectors[0] = clonedInstanceStore.createDistributionSetup.selector;
196
- instanceDistributionServiceSelectors[1] = clonedInstanceStore.updateDistributionSetup.selector;
197
- instanceDistributionServiceSelectors[2] = clonedInstanceStore.createDistributorType.selector;
198
- instanceDistributionServiceSelectors[3] = clonedInstanceStore.updateDistributorType.selector;
199
- instanceDistributionServiceSelectors[4] = clonedInstanceStore.updateDistributorTypeState.selector;
200
- instanceDistributionServiceSelectors[5] = clonedInstanceStore.createDistributor.selector;
201
- instanceDistributionServiceSelectors[6] = clonedInstanceStore.updateDistributor.selector;
202
- instanceDistributionServiceSelectors[7] = clonedInstanceStore.updateDistributorState.selector;
203
- instanceDistributionServiceSelectors[8] = clonedInstanceStore.createReferral.selector;
204
- instanceDistributionServiceSelectors[9] = clonedInstanceStore.updateReferral.selector;
205
- instanceDistributionServiceSelectors[10] = clonedInstanceStore.updateReferralState.selector;
206
- clonedAccessManager.setCoreTargetFunctionRole(
207
- "InstanceStore",
208
- instanceDistributionServiceSelectors,
209
- DISTRIBUTION_SERVICE_ROLE());
210
- }
211
152
 
212
- function _grantPoolServiceAuthorizations(InstanceAccessManager clonedAccessManager, InstanceStore clonedInstanceStore) internal {
213
- // configure authorization for pool service on instance
214
- address poolServiceAddress = getRegistry().getServiceAddress(POOL(), getVersion().toMajorPart());
215
- clonedAccessManager.grantRole(POOL_SERVICE_ROLE(), address(poolServiceAddress));
216
- bytes4[] memory instancePoolServiceSelectors = new bytes4[](4);
217
- instancePoolServiceSelectors[0] = clonedInstanceStore.createPoolSetup.selector;
218
- instancePoolServiceSelectors[1] = clonedInstanceStore.updatePoolSetup.selector;
219
- clonedAccessManager.setCoreTargetFunctionRole(
220
- "InstanceStore",
221
- instancePoolServiceSelectors,
222
- POOL_SERVICE_ROLE());
153
+ function refillStakingRewardReserves(address rewardProvider, Amount dipAmount)
154
+ external
155
+ virtual
156
+ onlyInstance()
157
+ {
158
+ NftId instanceNftId = getRegistry().getNftIdForAddress(msg.sender);
159
+ _stakingService.refillInstanceRewardReserves(
160
+ instanceNftId,
161
+ rewardProvider,
162
+ dipAmount);
223
163
  }
224
164
 
225
- function _grantProductServiceAuthorizations(InstanceAccessManager clonedAccessManager, InstanceStore clonedInstanceStore) internal {
226
- // configure authorization for product service on instance
227
- address productServiceAddress = getRegistry().getServiceAddress(PRODUCT(), getVersion().toMajorPart());
228
- clonedAccessManager.grantRole(PRODUCT_SERVICE_ROLE(), address(productServiceAddress));
229
- bytes4[] memory instanceProductServiceSelectors = new bytes4[](5);
230
- instanceProductServiceSelectors[0] = clonedInstanceStore.createProductSetup.selector;
231
- instanceProductServiceSelectors[1] = clonedInstanceStore.updateProductSetup.selector;
232
- instanceProductServiceSelectors[2] = clonedInstanceStore.createRisk.selector;
233
- instanceProductServiceSelectors[3] = clonedInstanceStore.updateRisk.selector;
234
- instanceProductServiceSelectors[4] = clonedInstanceStore.updateRiskState.selector;
235
- clonedAccessManager.setCoreTargetFunctionRole(
236
- "InstanceStore",
237
- instanceProductServiceSelectors,
238
- PRODUCT_SERVICE_ROLE());
239
- }
240
165
 
241
- function _grantApplicationServiceAuthorizations(InstanceAccessManager clonedAccessManager, InstanceStore clonedInstanceStore) internal {
242
- // configure authorization for application services on instance
243
- address applicationServiceAddress = getRegistry().getServiceAddress(APPLICATION(), getVersion().toMajorPart());
244
- clonedAccessManager.grantRole(APPLICATION_SERVICE_ROLE(), applicationServiceAddress);
245
- bytes4[] memory instanceApplicationServiceSelectors = new bytes4[](3);
246
- instanceApplicationServiceSelectors[0] = clonedInstanceStore.createApplication.selector;
247
- instanceApplicationServiceSelectors[1] = clonedInstanceStore.updateApplication.selector;
248
- instanceApplicationServiceSelectors[2] = clonedInstanceStore.updateApplicationState.selector;
249
- clonedAccessManager.setCoreTargetFunctionRole(
250
- "InstanceStore",
251
- instanceApplicationServiceSelectors,
252
- APPLICATION_SERVICE_ROLE());
166
+ function withdrawStakingRewardReserves(Amount dipAmount)
167
+ external
168
+ virtual
169
+ onlyInstance()
170
+ returns (Amount newBalance)
171
+ {
172
+ NftId instanceNftId = getRegistry().getNftIdForAddress(msg.sender);
173
+ _stakingService.withdrawInstanceRewardReserves(
174
+ instanceNftId,
175
+ dipAmount);
253
176
  }
254
177
 
255
- function _grantPolicyServiceAuthorizations(InstanceAccessManager clonedAccessManager, InstanceStore clonedInstanceStore) internal {
256
- // configure authorization for policy services on instance
257
- address policyServiceAddress = getRegistry().getServiceAddress(POLICY(), getVersion().toMajorPart());
258
- clonedAccessManager.grantRole(POLICY_SERVICE_ROLE(), policyServiceAddress);
259
- bytes4[] memory instancePolicyServiceSelectors = new bytes4[](2);
260
- instancePolicyServiceSelectors[0] = clonedInstanceStore.updatePolicy.selector;
261
- instancePolicyServiceSelectors[1] = clonedInstanceStore.updatePolicyState.selector;
262
- clonedAccessManager.setCoreTargetFunctionRole(
263
- "InstanceStore",
264
- instancePolicyServiceSelectors,
265
- POLICY_SERVICE_ROLE());
266
- }
267
178
 
268
- function _grantClaimServiceAuthorizations(InstanceAccessManager clonedAccessManager, InstanceStore clonedInstanceStore) internal {
269
- // configure authorization for claim/payout services on instance
270
- address claimServiceAddress = getRegistry().getServiceAddress(CLAIM(), getVersion().toMajorPart());
271
- clonedAccessManager.grantRole(POLICY_SERVICE_ROLE(), claimServiceAddress);
272
- // TODO add claims function authz
273
- bytes4[] memory instanceClaimServiceSelectors = new bytes4[](0);
274
- // instanceClaimServiceSelectors[0] = clonedInstanceStore.updatePolicy.selector;
275
- // instanceClaimServiceSelectors[1] = clonedInstanceStore.updatePolicyState.selector;
276
- clonedAccessManager.setCoreTargetFunctionRole(
277
- "InstanceStore",
278
- instanceClaimServiceSelectors,
279
- CLAIM_SERVICE_ROLE());
280
- }
179
+ function setComponentLocked(bool locked)
180
+ external
181
+ virtual
182
+ onlyComponent()
183
+ {
184
+ // checks
185
+ address componentAddress = msg.sender;
281
186
 
282
- function _grantBundleServiceAuthorizations(InstanceAccessManager clonedAccessManager, InstanceStore clonedInstanceStore, BundleManager clonedBundleManager) internal {
283
- // configure authorization for bundle service on instance
284
- address bundleServiceAddress = getRegistry().getServiceAddress(BUNDLE(), getVersion().toMajorPart());
285
- clonedAccessManager.grantRole(BUNDLE_SERVICE_ROLE(), address(bundleServiceAddress));
286
- bytes4[] memory instanceBundleServiceSelectors = new bytes4[](3);
287
- instanceBundleServiceSelectors[0] = clonedInstanceStore.createBundle.selector;
288
- instanceBundleServiceSelectors[1] = clonedInstanceStore.updateBundle.selector;
289
- instanceBundleServiceSelectors[2] = clonedInstanceStore.updateBundleState.selector;
290
- clonedAccessManager.setCoreTargetFunctionRole(
291
- "InstanceStore",
292
- instanceBundleServiceSelectors,
293
- BUNDLE_SERVICE_ROLE());
294
-
295
- // configure authorization for bundle service on bundle manager
296
- bytes4[] memory bundleManagerBundleServiceSelectors = new bytes4[](5);
297
- bundleManagerBundleServiceSelectors[0] = clonedBundleManager.linkPolicy.selector;
298
- bundleManagerBundleServiceSelectors[1] = clonedBundleManager.unlinkPolicy.selector;
299
- bundleManagerBundleServiceSelectors[2] = clonedBundleManager.add.selector;
300
- bundleManagerBundleServiceSelectors[3] = clonedBundleManager.lock.selector;
301
- bundleManagerBundleServiceSelectors[4] = clonedBundleManager.unlock.selector;
302
- clonedAccessManager.setCoreTargetFunctionRole(
303
- "BundleManager",
304
- bundleManagerBundleServiceSelectors,
305
- BUNDLE_SERVICE_ROLE());
306
- }
187
+ if (!IInstanceLinkedComponent(componentAddress).supportsInterface(type(IInstanceLinkedComponent).interfaceId)) {
188
+ revert ErrorInstanceServiceComponentNotInstanceLinked(componentAddress);
189
+ }
307
190
 
308
- function _grantInstanceServiceAuthorizations(InstanceAccessManager clonedAccessManager, Instance clonedInstance) internal {
309
- // configure authorization for instance service on instance
310
- address instanceServiceAddress = getRegistry().getServiceAddress(INSTANCE(), getVersion().toMajorPart());
311
- clonedAccessManager.grantRole(INSTANCE_SERVICE_ROLE(), instanceServiceAddress);
312
- bytes4[] memory instanceInstanceServiceSelectors = new bytes4[](1);
313
- instanceInstanceServiceSelectors[0] = clonedInstance.setInstanceReader.selector;
314
- clonedAccessManager.setCoreTargetFunctionRole(
315
- "Instance",
316
- instanceInstanceServiceSelectors,
317
- INSTANCE_SERVICE_ROLE());
318
-
319
- // configure authorizations for instance service on instance access manager
320
- bytes4[] memory accessManagerInstanceServiceSelectors = new bytes4[](3);
321
- accessManagerInstanceServiceSelectors[0] = clonedAccessManager.createGifTarget.selector;
322
- accessManagerInstanceServiceSelectors[1] = clonedAccessManager.setTargetLockedByService.selector;
323
- accessManagerInstanceServiceSelectors[2] = clonedAccessManager.setCoreTargetFunctionRole.selector;
324
- clonedAccessManager.setCoreTargetFunctionRole(
325
- "InstanceAccessManager",
326
- accessManagerInstanceServiceSelectors,
327
- INSTANCE_SERVICE_ROLE());
328
- }
191
+ IRegistry registry = getRegistry();
192
+ NftId instanceNftId = registry.getObjectInfo(componentAddress).parentNftId;
329
193
 
330
- function _grantInstanceAuthorizations(InstanceAccessManager clonedAccessManager) internal {
331
- bytes4[] memory accessManagerInstanceSelectors = new bytes4[](4);
332
- accessManagerInstanceSelectors[0] = clonedAccessManager.createRole.selector;
333
- accessManagerInstanceSelectors[1] = clonedAccessManager.createTarget.selector;
334
- accessManagerInstanceSelectors[2] = clonedAccessManager.setTargetFunctionRole.selector;
335
- accessManagerInstanceSelectors[3] = clonedAccessManager.setTargetLockedByInstance.selector;
336
- clonedAccessManager.setCoreTargetFunctionRole(
337
- "InstanceAccessManager",
338
- accessManagerInstanceSelectors,
339
- INSTANCE_ROLE());
194
+ IInstance instance = IInstance(
195
+ registry.getObjectAddress(instanceNftId));
196
+
197
+ // no revert in case already locked
198
+ // TODO refactor/implement
199
+ // instance.getInstanceAdmin().setTargetLockedByService(
200
+ // componentAddress,
201
+ // locked);
340
202
  }
341
203
 
342
- function _grantInstanceOwnerAuthorizations(InstanceAccessManager clonedAccessManager, Instance clonedInstance) internal {
343
- // configure authorization for instance owner on instance access manager
344
- // instance owner role is granted/revoked ONLY by INSTANCE_ROLE
345
- bytes4[] memory instanceInstanceOwnerSelectors = new bytes4[](4);
346
- instanceInstanceOwnerSelectors[0] = clonedInstance.createRole.selector;
347
- instanceInstanceOwnerSelectors[1] = clonedInstance.createTarget.selector;
348
- instanceInstanceOwnerSelectors[2] = clonedInstance.setTargetFunctionRole.selector;
349
- instanceInstanceOwnerSelectors[3] = clonedInstance.setTargetLocked.selector;
350
- clonedAccessManager.setCoreTargetFunctionRole(
351
- "Instance",
352
- instanceInstanceOwnerSelectors,
353
- INSTANCE_OWNER_ROLE());
204
+
205
+ function getMasterInstanceReader() external view returns (address) {
206
+ return _masterInstanceReader;
354
207
  }
355
208
 
356
209
  function setAndRegisterMasterInstance(address instanceAddress)
@@ -359,50 +212,47 @@ contract InstanceService is
359
212
  returns(NftId masterInstanceNftId)
360
213
  {
361
214
  if(_masterInstance != address(0)) { revert ErrorInstanceServiceMasterInstanceAlreadySet(); }
362
- if(_masterOzAccessManager != address(0)) { revert ErrorInstanceServiceMasterOzAccessManagerAlreadySet(); }
363
- if(_masterInstanceAccessManager != address(0)) { revert ErrorInstanceServiceMasterInstanceAccessManagerAlreadySet(); }
364
- if(_masterInstanceBundleManager != address(0)) { revert ErrorInstanceServiceMasterBundleManagerAlreadySet(); }
215
+ if(_masterInstanceAdmin != address(0)) { revert ErrorInstanceServiceMasterInstanceAdminAlreadySet(); }
216
+ if(_masterInstanceBundleSet != address(0)) { revert ErrorInstanceServiceMasterBundleSetAlreadySet(); }
365
217
 
366
218
  if(instanceAddress == address(0)) { revert ErrorInstanceServiceInstanceAddressZero(); }
367
219
 
368
220
  IInstance instance = IInstance(instanceAddress);
369
- AccessManagerUpgradeableInitializeable ozAccessManager = AccessManagerUpgradeableInitializeable(instance.authority());
370
- address ozAccessManagerAddress = address(ozAccessManager);
371
- InstanceAccessManager instanceAccessManager = instance.getInstanceAccessManager();
372
- address instanceAccessManagerAddress = address(instanceAccessManager);
221
+ address accessManagerAddress = instance.authority();
222
+ InstanceAdmin instanceAdmin = instance.getInstanceAdmin();
223
+ address instanceAdminAddress = address(instanceAdmin);
373
224
  InstanceReader instanceReader = instance.getInstanceReader();
374
225
  address instanceReaderAddress = address(instanceReader);
375
- BundleManager bundleManager = instance.getBundleManager();
226
+ BundleSet bundleManager = instance.getBundleSet();
376
227
  address bundleManagerAddress = address(bundleManager);
377
228
  InstanceStore instanceStore = instance.getInstanceStore();
378
229
  address instanceStoreAddress = address(instanceStore);
379
230
 
380
- if(ozAccessManagerAddress == address(0)) { revert ErrorInstanceServiceOzAccessManagerZero();}
381
- if(instanceAccessManagerAddress == address(0)) { revert ErrorInstanceServiceInstanceAccessManagerZero(); }
231
+ if(accessManagerAddress == address(0)) { revert ErrorInstanceServiceAccessManagerZero(); }
232
+ if(instanceAdminAddress == address(0)) { revert ErrorInstanceServiceInstanceAdminZero(); }
382
233
  if(instanceReaderAddress == address(0)) { revert ErrorInstanceServiceInstanceReaderZero(); }
383
- if(bundleManagerAddress == address(0)) { revert ErrorInstanceServiceBundleManagerZero(); }
234
+ if(bundleManagerAddress == address(0)) { revert ErrorInstanceServiceBundleSetZero(); }
384
235
  if(instanceStoreAddress == address(0)) { revert ErrorInstanceServiceInstanceStoreZero(); }
385
236
 
386
- if(instance.authority() != instanceAccessManager.authority()) { revert ErrorInstanceServiceInstanceAuthorityMismatch(); }
387
- if(bundleManager.authority() != instanceAccessManager.authority()) { revert ErrorInstanceServiceBundleManagerAuthorityMismatch(); }
388
- if(instanceStore.authority() != instanceAccessManager.authority()) { revert ErrorInstanceServiceInstanceStoreAuthorityMismatch(); }
389
- if(instanceReader.getInstance() != instance) { revert ErrorInstanceServiceInstanceReaderInstanceMismatch2(); }
237
+ if(instance.authority() != instanceAdmin.authority()) { revert ErrorInstanceServiceInstanceAuthorityMismatch(); }
238
+ if(bundleManager.authority() != instanceAdmin.authority()) { revert ErrorInstanceServiceBundleSetAuthorityMismatch(); }
239
+ if(instanceStore.authority() != instanceAdmin.authority()) { revert ErrorInstanceServiceInstanceStoreAuthorityMismatch(); }
390
240
  if(bundleManager.getInstance() != instance) { revert ErrorInstanceServiceBundleMangerInstanceMismatch(); }
241
+ if(instanceReader.getInstance() != instance) { revert ErrorInstanceServiceInstanceReaderInstanceMismatch2(); }
391
242
 
392
- _masterOzAccessManager = ozAccessManagerAddress;
393
- _masterInstanceAccessManager = instanceAccessManagerAddress;
243
+ _masterAccessManager = accessManagerAddress;
244
+ _masterInstanceAdmin = instanceAdminAddress;
394
245
  _masterInstance = instanceAddress;
395
246
  _masterInstanceReader = instanceReaderAddress;
396
- _masterInstanceBundleManager = bundleManagerAddress;
247
+ _masterInstanceBundleSet = bundleManagerAddress;
397
248
  _masterInstanceStore = instanceStoreAddress;
398
249
 
399
- IRegistryService registryService = IRegistryService(getRegistry().getServiceAddress(REGISTRY(), getVersion().toMajorPart()));
400
250
  IInstance masterInstance = IInstance(_masterInstance);
401
- IRegistry.ObjectInfo memory info = registryService.registerInstance(masterInstance, getOwner());
251
+ IRegistry.ObjectInfo memory info = _registryService.registerInstance(masterInstance, getOwner());
402
252
  masterInstanceNftId = info.nftId;
403
253
  }
404
254
 
405
- function setMasterInstanceReader(address instanceReaderAddress) external onlyOwner {
255
+ function upgradeMasterInstanceReader(address instanceReaderAddress) external onlyOwner {
406
256
  if(_masterInstanceReader == address(0)) { revert ErrorInstanceServiceMasterInstanceReaderNotSet(); }
407
257
  if(instanceReaderAddress == address(0)) { revert ErrorInstanceServiceInstanceReaderAddressZero(); }
408
258
  if(instanceReaderAddress == _masterInstanceReader) { revert ErrorInstanceServiceInstanceReaderSameAsMasterInstanceReader(); }
@@ -416,98 +266,119 @@ contract InstanceService is
416
266
  function upgradeInstanceReader(NftId instanceNftId)
417
267
  external
418
268
  onlyInstanceOwner(instanceNftId)
269
+ onlyNftOfType(instanceNftId, INSTANCE())
419
270
  {
420
271
  IRegistry registry = getRegistry();
421
272
  IRegistry.ObjectInfo memory instanceInfo = registry.getObjectInfo(instanceNftId);
422
273
  Instance instance = Instance(instanceInfo.objectAddress);
423
274
 
424
275
  InstanceReader upgradedInstanceReaderClone = InstanceReader(Clones.clone(address(_masterInstanceReader)));
425
- upgradedInstanceReaderClone.initialize(address(instance));
276
+ upgradedInstanceReaderClone.initializeWithInstance(address(instance));
426
277
  instance.setInstanceReader(upgradedInstanceReaderClone);
427
278
  }
428
279
 
429
- function getMasterInstanceReader() external view returns (address) {
430
- return _masterInstanceReader;
431
- }
432
-
433
- function getMasterInstance() external view returns (address) {
434
- return _masterInstance;
435
- }
436
-
437
- function getMasterInstanceAccessManager() external view returns (address) {
438
- return _masterInstanceAccessManager;
280
+ /// @dev create new cloned instance admin
281
+ /// function used to setup a new instance
282
+ function _createInstanceAdmin()
283
+ internal
284
+ virtual
285
+ returns (InstanceAdmin clonedInstanceAdmin)
286
+ {
287
+ // start with setting up a new OZ access manager
288
+ AccessManagerCloneable clonedAccessManager = AccessManagerCloneable(
289
+ Clones.clone(_masterAccessManager));
290
+
291
+ // set up the instance admin
292
+ clonedInstanceAdmin = InstanceAdmin(Clones.clone(_masterInstanceAdmin));
293
+ clonedAccessManager.initialize(
294
+ address(clonedInstanceAdmin)); // grant ADMIN_ROLE to instance admin
295
+
296
+ address authorization = address(
297
+ InstanceAdmin(_masterInstanceAdmin).getInstanceAuthorization());
298
+ clonedInstanceAdmin.initialize(
299
+ clonedAccessManager,
300
+ authorization);
439
301
  }
440
302
 
441
- function getMasterInstanceBundleManager() external view returns (address) {
442
- return _masterInstanceBundleManager;
443
- }
444
303
 
445
- // From IService
446
- function getDomain() public pure override returns(ObjectType) {
447
- return INSTANCE();
448
- }
449
-
450
- /// @dev top level initializer
451
- function _initialize(
452
- address owner,
453
- bytes memory data
304
+ /// @dev create new cloned instance
305
+ /// function used to setup a new instance
306
+ function _createInstance(
307
+ InstanceAdmin instanceAdmin,
308
+ address instanceOwner
454
309
  )
455
310
  internal
456
- initializer
457
- virtual override
311
+ virtual
312
+ returns (Instance clonedInstance)
458
313
  {
459
- address initialOwner;
460
- address registryAddress;
461
- (registryAddress, initialOwner) = abi.decode(data, (address, address));
462
- // TODO while InstanceService is not deployed in InstanceServiceManager constructor
463
- // owner is InstanceServiceManager deployer
464
- initializeService(registryAddress, address(0), owner);
465
- registerInterface(type(IInstanceService).interfaceId);
314
+ InstanceStore clonedInstanceStore = InstanceStore(Clones.clone(address(_masterInstanceStore)));
315
+ BundleSet clonedBundleSet = BundleSet(Clones.clone(_masterInstanceBundleSet));
316
+ InstanceReader clonedInstanceReader = InstanceReader(Clones.clone(address(_masterInstanceReader)));
317
+
318
+ // clone instance
319
+ clonedInstance = Instance(Clones.clone(_masterInstance));
320
+ clonedInstance.initialize(
321
+ instanceAdmin,
322
+ clonedInstanceStore,
323
+ clonedBundleSet,
324
+ clonedInstanceReader,
325
+ getRegistry(),
326
+ instanceOwner);
466
327
  }
467
328
 
468
- // all gif targets MUST be childs of instanceNftId
469
- function createGifTarget(
329
+
330
+ /// all gif targets MUST be children of instanceNftId
331
+ function _createGifTarget(
470
332
  NftId instanceNftId,
471
333
  address targetAddress,
472
334
  string memory targetName,
473
- bytes4[][] memory selectors,
474
- RoleId[] memory roles
335
+ RoleId[] memory roles,
336
+ bytes4[][] memory selectors
475
337
  )
476
- external
477
- onlyRegisteredService
338
+ internal
339
+ virtual
478
340
  {
341
+ // TODO instanceAdmin will check target instance match anyway
479
342
  (
480
343
  IInstance instance, // or instanceInfo
481
- NftId targetNftId // or targetInfo
344
+ // or targetInfo
482
345
  ) = _validateInstanceAndComponent(instanceNftId, targetAddress);
483
346
 
484
- InstanceAccessManager accessManager = instance.getInstanceAccessManager();
485
- accessManager.createGifTarget(targetAddress, targetName);
347
+ InstanceAdmin instanceAdmin = instance.getInstanceAdmin();
348
+
349
+ // TODO refactor/implement
350
+ // instanceAdmin.createGifTarget(targetAddress, targetName);
351
+
486
352
  // set proposed target config
487
- // TODO restriction: gif targets are set only once and only here?
488
- // assume config is a mix of gif and custom roles and no further configuration by INSTANCE_OWNER_ROLE is ever needed?
489
- for(uint roleIdx = 0; roleIdx < roles.length; roleIdx++)
490
- {
491
- accessManager.setCoreTargetFunctionRole(targetName, selectors[roleIdx], roles[roleIdx]);
353
+ for(uint roleIdx = 0; roleIdx < roles.length; roleIdx++) {
354
+ // TODO refactor/implement
355
+ // instanceAdmin.setTargetFunctionRoleByService(targetName, selectors[roleIdx], roles[roleIdx]);
492
356
  }
493
357
  }
358
+
359
+ /// @dev top level initializer
360
+ function _initialize(
361
+ address owner,
362
+ bytes memory data
363
+ )
364
+ internal
365
+ virtual override
366
+ initializer()
367
+ {
368
+ (
369
+ address registryAddress,
370
+ address authority
371
+ ) = abi.decode(data, (address, address));
494
372
 
495
- // TODO called by component, but target can be component helper...so needs target name
496
- // TODO check that targetName associated with component...how???
497
- function setComponentLocked(bool locked) onlyComponent external {
498
- address componentAddress = msg.sender;
499
- IRegistry registry = getRegistry();
500
- NftId instanceNftId = registry.getObjectInfo(componentAddress).parentNftId;
373
+ _initializeService(registryAddress, authority, owner);
501
374
 
502
- IInstance instance = IInstance(
503
- registry.getObjectInfo(
504
- instanceNftId).objectAddress);
375
+ _registryService = IRegistryService(_getServiceAddress(REGISTRY()));
376
+ _stakingService = IStakingService(_getServiceAddress(STAKING()));
505
377
 
506
- instance.getInstanceAccessManager().setTargetLockedByService(
507
- componentAddress,
508
- locked);
378
+ _registerInterface(type(IInstanceService).interfaceId);
509
379
  }
510
380
 
381
+
511
382
  function _validateInstanceAndComponent(NftId instanceNftId, address componentAddress)
512
383
  internal
513
384
  view
@@ -516,15 +387,27 @@ contract InstanceService is
516
387
  IRegistry registry = getRegistry();
517
388
  IRegistry.ObjectInfo memory instanceInfo = registry.getObjectInfo(instanceNftId);
518
389
  if(instanceInfo.objectType != INSTANCE()) {
519
- revert ErrorInstanceServiceNotInstance(instanceNftId);
390
+ revert ErrorInstanceServiceNotInstanceNftId(instanceNftId);
520
391
  }
521
392
 
522
- IRegistry.ObjectInfo memory componentInfo = registry.getObjectInfo(componentAddress);
523
- if(componentInfo.parentNftId != instanceNftId) {
524
- revert ErrorInstanceServiceInstanceComponentMismatch(instanceNftId, componentInfo.nftId);
393
+ if (registry.getNftIdForAddress(componentAddress).gtz()) {
394
+ IRegistry.ObjectInfo memory componentInfo = registry.getObjectInfo(componentAddress);
395
+
396
+ if(componentInfo.parentNftId != instanceNftId) {
397
+ revert ErrorInstanceServiceInstanceComponentMismatch(instanceNftId, componentInfo.nftId);
398
+ }
399
+
400
+ componentNftId = componentInfo.nftId;
401
+ } else {
402
+
525
403
  }
526
404
 
527
405
  instance = Instance(instanceInfo.objectAddress);
528
- componentNftId = componentInfo.nftId;
406
+
407
+ }
408
+
409
+ // From IService
410
+ function _getDomain() internal pure override returns(ObjectType) {
411
+ return INSTANCE();
529
412
  }
530
413
  }