@etherisc/gif-next 0.0.2-e9a637d-547 → 0.0.2-ea09fbf-195

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 (714) hide show
  1. package/README.md +83 -22
  2. package/artifacts/contracts/accounting/AccountingService.sol/AccountingService.dbg.json +4 -0
  3. package/artifacts/contracts/accounting/AccountingService.sol/AccountingService.json +1007 -0
  4. package/artifacts/contracts/accounting/AccountingServiceManager.sol/AccountingServiceManager.dbg.json +4 -0
  5. package/artifacts/contracts/accounting/AccountingServiceManager.sol/AccountingServiceManager.json +744 -0
  6. package/artifacts/contracts/accounting/IAccountingService.sol/IAccountingService.dbg.json +4 -0
  7. package/artifacts/contracts/{instance/service/IPoolService.sol/IPoolService.json → accounting/IAccountingService.sol/IAccountingService.json} +327 -380
  8. package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.dbg.json +4 -0
  9. package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.json +1341 -0
  10. package/artifacts/contracts/authorization/AccessAdmin.sol/IAccessManagedChecker.dbg.json +4 -0
  11. package/artifacts/contracts/authorization/AccessAdmin.sol/IAccessManagedChecker.json +24 -0
  12. package/artifacts/contracts/authorization/AccessManagerCloneable.sol/AccessManagerCloneable.dbg.json +4 -0
  13. package/artifacts/contracts/authorization/AccessManagerCloneable.sol/AccessManagerCloneable.json +1434 -0
  14. package/artifacts/contracts/authorization/Authorization.sol/Authorization.dbg.json +4 -0
  15. package/artifacts/contracts/authorization/Authorization.sol/Authorization.json +414 -0
  16. package/artifacts/contracts/authorization/IAccess.sol/IAccess.dbg.json +4 -0
  17. package/artifacts/contracts/{instance/module/ISetup.sol/ISetup.json → authorization/IAccess.sol/IAccess.json} +2 -2
  18. package/artifacts/contracts/authorization/IAccessAdmin.sol/IAccessAdmin.dbg.json +4 -0
  19. package/artifacts/contracts/authorization/IAccessAdmin.sol/IAccessAdmin.json +1092 -0
  20. package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.dbg.json +4 -0
  21. package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.json +295 -0
  22. package/artifacts/contracts/authorization/IServiceAuthorization.sol/IServiceAuthorization.dbg.json +4 -0
  23. package/artifacts/contracts/authorization/IServiceAuthorization.sol/IServiceAuthorization.json +167 -0
  24. package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.dbg.json +4 -0
  25. package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.json +253 -0
  26. package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.dbg.json +4 -0
  27. package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.json +1322 -0
  28. package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.dbg.json +4 -0
  29. package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.json +470 -0
  30. package/artifacts/contracts/distribution/Distribution.sol/Distribution.dbg.json +4 -0
  31. package/artifacts/contracts/{components → distribution}/Distribution.sol/Distribution.json +259 -572
  32. package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.dbg.json +4 -0
  33. package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.json +1501 -0
  34. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +4 -0
  35. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.json +860 -0
  36. package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.dbg.json +4 -0
  37. package/artifacts/contracts/{components → distribution}/IDistributionComponent.sol/IDistributionComponent.json +258 -312
  38. package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.dbg.json +4 -0
  39. package/artifacts/contracts/{instance/service → distribution}/IDistributionService.sol/IDistributionService.json +243 -325
  40. package/artifacts/contracts/examples/fire/DamageLevel.sol/DamageLevelLib.dbg.json +4 -0
  41. package/artifacts/contracts/examples/fire/DamageLevel.sol/DamageLevelLib.json +22 -0
  42. package/artifacts/contracts/examples/fire/FirePool.sol/FirePool.dbg.json +4 -0
  43. package/artifacts/contracts/examples/fire/FirePool.sol/FirePool.json +1475 -0
  44. package/artifacts/contracts/examples/fire/FirePoolAuthorization.sol/FirePoolAuthorization.dbg.json +4 -0
  45. package/artifacts/contracts/examples/fire/FirePoolAuthorization.sol/FirePoolAuthorization.json +502 -0
  46. package/artifacts/contracts/examples/fire/FireProduct.sol/FireProduct.dbg.json +4 -0
  47. package/artifacts/contracts/examples/fire/FireProduct.sol/FireProduct.json +2040 -0
  48. package/artifacts/contracts/examples/fire/FireProductAuthorization.sol/FireProductAuthorization.dbg.json +4 -0
  49. package/artifacts/contracts/examples/fire/FireProductAuthorization.sol/FireProductAuthorization.json +470 -0
  50. package/artifacts/contracts/examples/fire/FireUSD.sol/FireUSD.dbg.json +4 -0
  51. package/artifacts/contracts/examples/fire/FireUSD.sol/FireUSD.json +376 -0
  52. package/artifacts/contracts/examples/unpermissioned/SimpleDistribution.sol/SimpleDistribution.dbg.json +4 -0
  53. package/artifacts/contracts/examples/unpermissioned/SimpleDistribution.sol/SimpleDistribution.json +1479 -0
  54. package/artifacts/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol/SimpleDistributionAuthorization.dbg.json +4 -0
  55. package/artifacts/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol/SimpleDistributionAuthorization.json +470 -0
  56. package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.dbg.json +4 -0
  57. package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.json +1195 -0
  58. package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.dbg.json +4 -0
  59. package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.json +1655 -0
  60. package/artifacts/contracts/examples/unpermissioned/SimplePoolAuthorization.sol/SimplePoolAuthorization.dbg.json +4 -0
  61. package/artifacts/contracts/examples/unpermissioned/SimplePoolAuthorization.sol/SimplePoolAuthorization.json +502 -0
  62. package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.dbg.json +4 -0
  63. package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.json +2408 -0
  64. package/artifacts/contracts/examples/unpermissioned/SimpleProductAuthorization.sol/SimpleProductAuthorization.dbg.json +4 -0
  65. package/artifacts/contracts/examples/unpermissioned/SimpleProductAuthorization.sol/SimpleProductAuthorization.json +470 -0
  66. package/artifacts/contracts/instance/BundleSet.sol/BundleSet.dbg.json +4 -0
  67. package/artifacts/contracts/instance/BundleSet.sol/BundleSet.json +851 -0
  68. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  69. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +263 -115
  70. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
  71. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +228 -123
  72. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  73. package/artifacts/contracts/instance/Instance.sol/Instance.json +288 -233
  74. package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.dbg.json +4 -0
  75. package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.json +1800 -0
  76. package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.dbg.json +4 -0
  77. package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.json +574 -0
  78. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
  79. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +1610 -560
  80. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
  81. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +262 -445
  82. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
  83. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +156 -157
  84. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.dbg.json +1 -1
  85. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.json +1780 -739
  86. package/artifacts/contracts/instance/RiskSet.sol/RiskSet.dbg.json +4 -0
  87. package/artifacts/contracts/instance/RiskSet.sol/RiskSet.json +853 -0
  88. package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.dbg.json +4 -0
  89. package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.json +318 -0
  90. package/artifacts/contracts/instance/base/Cloneable.sol/Cloneable.dbg.json +4 -0
  91. package/artifacts/contracts/instance/{Cloneable.sol → base/Cloneable.sol}/Cloneable.json +1 -54
  92. package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.dbg.json +4 -0
  93. package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.json +10 -0
  94. package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.dbg.json +4 -0
  95. package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.json +223 -0
  96. package/artifacts/contracts/instance/base/ObjectSet.sol/ObjectSet.dbg.json +4 -0
  97. package/artifacts/contracts/instance/base/ObjectSet.sol/ObjectSet.json +192 -0
  98. package/artifacts/contracts/instance/base/ObjectSetHelper.sol/ObjectSetHelperLib.dbg.json +4 -0
  99. package/artifacts/contracts/instance/base/ObjectSetHelper.sol/ObjectSetHelperLib.json +168 -0
  100. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +1 -1
  101. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.json +8 -116
  102. package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
  103. package/artifacts/contracts/instance/module/IComponents.sol/IComponents.dbg.json +1 -1
  104. package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +1 -1
  105. package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +1 -1
  106. package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +1 -1
  107. package/artifacts/contracts/mock/Dip.sol/Dip.dbg.json +4 -0
  108. package/artifacts/contracts/mock/Dip.sol/Dip.json +376 -0
  109. package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.dbg.json +4 -0
  110. package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.json +959 -0
  111. package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.dbg.json +4 -0
  112. package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.json +478 -0
  113. package/artifacts/contracts/oracle/IOracle.sol/IOracle.dbg.json +4 -0
  114. package/artifacts/contracts/oracle/IOracle.sol/IOracle.json +52 -0
  115. package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.dbg.json +4 -0
  116. package/artifacts/contracts/{components/IProductComponent.sol/IProductComponent.json → oracle/IOracleComponent.sol/IOracleComponent.json} +228 -284
  117. package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.dbg.json +4 -0
  118. package/artifacts/contracts/{instance/service/IPolicyService.sol/IPolicyService.json → oracle/IOracleService.sol/IOracleService.json} +302 -175
  119. package/artifacts/contracts/oracle/Oracle.sol/Oracle.dbg.json +4 -0
  120. package/artifacts/contracts/{components/Component.sol/Component.json → oracle/Oracle.sol/Oracle.json} +262 -229
  121. package/artifacts/contracts/oracle/OracleService.sol/OracleService.dbg.json +4 -0
  122. package/artifacts/contracts/oracle/OracleService.sol/OracleService.json +997 -0
  123. package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.dbg.json +4 -0
  124. package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.json +764 -0
  125. package/artifacts/contracts/pool/BasicPool.sol/BasicPool.dbg.json +4 -0
  126. package/artifacts/contracts/{components/Pool.sol/Pool.json → pool/BasicPool.sol/BasicPool.json} +318 -442
  127. package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.dbg.json +4 -0
  128. package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.json +502 -0
  129. package/artifacts/contracts/pool/BundleService.sol/BundleService.dbg.json +4 -0
  130. package/artifacts/contracts/pool/BundleService.sol/BundleService.json +1367 -0
  131. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.dbg.json +4 -0
  132. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.json +820 -0
  133. package/artifacts/contracts/pool/IBundleService.sol/IBundleService.dbg.json +4 -0
  134. package/artifacts/contracts/{instance/service → pool}/IBundleService.sol/IBundleService.json +347 -60
  135. package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.dbg.json +4 -0
  136. package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.json +907 -0
  137. package/artifacts/contracts/pool/IPoolService.sol/IPoolService.dbg.json +4 -0
  138. package/artifacts/contracts/pool/IPoolService.sol/IPoolService.json +1309 -0
  139. package/artifacts/contracts/pool/Pool.sol/Pool.dbg.json +4 -0
  140. package/artifacts/contracts/{components/IPoolComponent.sol/IPoolComponent.json → pool/Pool.sol/Pool.json} +377 -414
  141. package/artifacts/contracts/pool/PoolService.sol/PoolService.dbg.json +4 -0
  142. package/artifacts/contracts/pool/PoolService.sol/PoolService.json +1626 -0
  143. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.dbg.json +4 -0
  144. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.json +792 -0
  145. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.dbg.json +4 -0
  146. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.json +813 -0
  147. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +4 -0
  148. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.json +728 -0
  149. package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.dbg.json +4 -0
  150. package/artifacts/contracts/{components/Product.sol/Product.json → product/BasicProduct.sol/BasicProduct.json} +451 -457
  151. package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.dbg.json +4 -0
  152. package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.json +470 -0
  153. package/artifacts/contracts/product/ClaimService.sol/ClaimService.dbg.json +4 -0
  154. package/artifacts/contracts/product/ClaimService.sol/ClaimService.json +1538 -0
  155. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +4 -0
  156. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.json +860 -0
  157. package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.dbg.json +4 -0
  158. package/artifacts/contracts/{instance/service → product}/IApplicationService.sol/IApplicationService.json +138 -163
  159. package/artifacts/contracts/product/IClaimService.sol/IClaimService.dbg.json +4 -0
  160. package/artifacts/contracts/product/IClaimService.sol/IClaimService.json +1082 -0
  161. package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.dbg.json +4 -0
  162. package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.json +968 -0
  163. package/artifacts/contracts/product/IPricingService.sol/IPricingService.dbg.json +4 -0
  164. package/artifacts/contracts/product/IPricingService.sol/IPricingService.json +602 -0
  165. package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.dbg.json +4 -0
  166. package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.json +1018 -0
  167. package/artifacts/contracts/product/IRiskService.sol/IRiskService.dbg.json +4 -0
  168. package/artifacts/contracts/{instance/service/IProductService.sol/IProductService.json → product/IRiskService.sol/IRiskService.json} +64 -61
  169. package/artifacts/contracts/product/PolicyService.sol/PolicyService.dbg.json +4 -0
  170. package/artifacts/contracts/product/PolicyService.sol/PolicyService.json +1320 -0
  171. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +4 -0
  172. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.json +808 -0
  173. package/artifacts/contracts/product/PricingService.sol/PricingService.dbg.json +4 -0
  174. package/artifacts/contracts/product/PricingService.sol/PricingService.json +930 -0
  175. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.dbg.json +4 -0
  176. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.json +784 -0
  177. package/artifacts/contracts/product/Product.sol/Product.dbg.json +4 -0
  178. package/artifacts/contracts/product/Product.sol/Product.json +1119 -0
  179. package/artifacts/contracts/product/RiskService.sol/RiskService.dbg.json +4 -0
  180. package/artifacts/contracts/product/RiskService.sol/RiskService.json +637 -0
  181. package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.dbg.json +4 -0
  182. package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.json +724 -0
  183. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  184. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +59 -16
  185. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  186. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +464 -29
  187. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
  188. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +286 -109
  189. package/artifacts/contracts/registry/IRelease.sol/IRelease.dbg.json +4 -0
  190. package/artifacts/contracts/registry/IRelease.sol/IRelease.json +24 -0
  191. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
  192. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.json +5 -18
  193. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  194. package/artifacts/contracts/registry/Registry.sol/Registry.json +953 -127
  195. package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.dbg.json +4 -0
  196. package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.json +1861 -0
  197. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
  198. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +360 -249
  199. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
  200. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +164 -99
  201. package/artifacts/contracts/registry/ReleaseAdmin.sol/ReleaseAdmin.dbg.json +4 -0
  202. package/artifacts/contracts/registry/ReleaseAdmin.sol/ReleaseAdmin.json +1795 -0
  203. package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.dbg.json +4 -0
  204. package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.json +205 -0
  205. package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.dbg.json +4 -0
  206. package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.json +1325 -0
  207. package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.dbg.json +4 -0
  208. package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.json +272 -0
  209. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
  210. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +317 -154
  211. package/artifacts/contracts/shared/Component.sol/Component.dbg.json +4 -0
  212. package/artifacts/contracts/{instance/base/ComponentService.sol/ComponentService.json → shared/Component.sol/Component.json} +280 -180
  213. package/artifacts/contracts/shared/ComponentService.sol/ComponentService.dbg.json +4 -0
  214. package/artifacts/contracts/shared/ComponentService.sol/ComponentService.json +1597 -0
  215. package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.dbg.json +4 -0
  216. package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.json +824 -0
  217. package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.dbg.json +4 -0
  218. package/artifacts/contracts/{instance/service/IClaimService.sol/IClaimService.json → shared/ComponentVerifyingService.sol/ComponentVerifyingService.json} +142 -132
  219. package/artifacts/contracts/shared/ContractLib.sol/ContractLib.dbg.json +4 -0
  220. package/artifacts/contracts/shared/ContractLib.sol/ContractLib.json +541 -0
  221. package/artifacts/contracts/shared/ContractLib.sol/IInstanceAdminHelper.dbg.json +4 -0
  222. package/artifacts/contracts/shared/ContractLib.sol/IInstanceAdminHelper.json +24 -0
  223. package/artifacts/contracts/shared/ContractLib.sol/ITargetHelper.dbg.json +4 -0
  224. package/artifacts/contracts/shared/ContractLib.sol/ITargetHelper.json +30 -0
  225. package/artifacts/contracts/shared/ContractLib.sol/ITokenRegistryHelper.dbg.json +4 -0
  226. package/artifacts/contracts/shared/ContractLib.sol/ITokenRegistryHelper.json +40 -0
  227. package/artifacts/contracts/shared/IComponent.sol/IComponent.dbg.json +4 -0
  228. package/artifacts/contracts/{components → shared}/IComponent.sol/IComponent.json +152 -125
  229. package/artifacts/contracts/shared/IComponentService.sol/IComponentService.dbg.json +4 -0
  230. package/artifacts/contracts/shared/IComponentService.sol/IComponentService.json +1221 -0
  231. package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.dbg.json +4 -0
  232. package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.json +709 -0
  233. package/artifacts/contracts/shared/IKeyValueStore.sol/IKeyValueStore.dbg.json +4 -0
  234. package/artifacts/contracts/{instance/base → shared}/IKeyValueStore.sol/IKeyValueStore.json +95 -14
  235. package/artifacts/contracts/shared/ILifecycle.sol/ILifecycle.dbg.json +4 -0
  236. package/artifacts/contracts/{instance/base → shared}/ILifecycle.sol/ILifecycle.json +35 -4
  237. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
  238. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.json +19 -10
  239. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +1 -1
  240. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.json +59 -13
  241. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  242. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +144 -3
  243. package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +1 -1
  244. package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.json +0 -13
  245. package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
  246. package/artifacts/contracts/shared/IService.sol/IService.json +69 -5
  247. package/artifacts/contracts/shared/InitializableERC165.sol/InitializableERC165.dbg.json +4 -0
  248. package/artifacts/contracts/shared/InitializableERC165.sol/InitializableERC165.json +53 -0
  249. package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.dbg.json +4 -0
  250. package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.json +797 -0
  251. package/artifacts/contracts/shared/KeyValueStore.sol/KeyValueStore.dbg.json +4 -0
  252. package/artifacts/contracts/shared/KeyValueStore.sol/KeyValueStore.json +538 -0
  253. package/artifacts/contracts/shared/Lifecycle.sol/Lifecycle.dbg.json +4 -0
  254. package/artifacts/contracts/shared/Lifecycle.sol/Lifecycle.json +174 -0
  255. package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.dbg.json +4 -0
  256. package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.json +306 -0
  257. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
  258. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +28 -70
  259. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +1 -1
  260. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +35 -85
  261. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  262. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +126 -100
  263. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +1 -1
  264. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +2 -28
  265. package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
  266. package/artifacts/contracts/shared/Service.sol/Service.json +66 -109
  267. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
  268. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +734 -8
  269. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandlerBase.dbg.json +4 -0
  270. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandlerBase.json +395 -0
  271. package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.dbg.json +4 -0
  272. package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.json +172 -0
  273. package/artifacts/contracts/staking/IStaking.sol/IStaking.dbg.json +4 -0
  274. package/artifacts/contracts/staking/IStaking.sol/IStaking.json +1447 -0
  275. package/artifacts/contracts/staking/IStakingService.sol/IStakingService.dbg.json +4 -0
  276. package/artifacts/contracts/staking/IStakingService.sol/IStakingService.json +1067 -0
  277. package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.dbg.json +4 -0
  278. package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.json +440 -0
  279. package/artifacts/contracts/staking/Staking.sol/Staking.dbg.json +4 -0
  280. package/artifacts/contracts/staking/Staking.sol/Staking.json +1849 -0
  281. package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.dbg.json +4 -0
  282. package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.json +205 -0
  283. package/artifacts/contracts/staking/StakingManager.sol/StakingManager.dbg.json +4 -0
  284. package/artifacts/contracts/staking/StakingManager.sol/StakingManager.json +788 -0
  285. package/artifacts/contracts/staking/StakingReader.sol/StakingReader.dbg.json +4 -0
  286. package/artifacts/contracts/staking/StakingReader.sol/StakingReader.json +587 -0
  287. package/artifacts/contracts/staking/StakingService.sol/StakingService.dbg.json +4 -0
  288. package/artifacts/contracts/staking/StakingService.sol/StakingService.json +1272 -0
  289. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.dbg.json +4 -0
  290. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.json +732 -0
  291. package/artifacts/contracts/staking/StakingStore.sol/StakingStore.dbg.json +4 -0
  292. package/artifacts/contracts/staking/StakingStore.sol/StakingStore.json +2283 -0
  293. package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.dbg.json +4 -0
  294. package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.json +607 -0
  295. package/artifacts/contracts/type/AddressSet.sol/LibAddressSet.dbg.json +4 -0
  296. package/artifacts/contracts/type/AddressSet.sol/LibAddressSet.json +10 -0
  297. package/artifacts/contracts/type/Amount.sol/AmountLib.dbg.json +4 -0
  298. package/artifacts/contracts/type/Amount.sol/AmountLib.json +398 -0
  299. package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.dbg.json +4 -0
  300. package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.json +225 -0
  301. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.dbg.json +4 -0
  302. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.json +203 -0
  303. package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.dbg.json +4 -0
  304. package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.json +104 -0
  305. package/artifacts/contracts/type/Fee.sol/FeeLib.dbg.json +4 -0
  306. package/artifacts/contracts/type/Fee.sol/FeeLib.json +317 -0
  307. package/artifacts/contracts/type/Key32.sol/Key32Lib.dbg.json +4 -0
  308. package/artifacts/contracts/type/Key32.sol/Key32Lib.json +125 -0
  309. package/artifacts/contracts/type/Key32Set.sol/LibKey32Set.dbg.json +4 -0
  310. package/artifacts/contracts/type/Key32Set.sol/LibKey32Set.json +33 -0
  311. package/artifacts/contracts/type/NftId.sol/NftIdLib.dbg.json +4 -0
  312. package/artifacts/contracts/type/NftId.sol/NftIdLib.json +228 -0
  313. package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.dbg.json +4 -0
  314. package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.json +33 -0
  315. package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.dbg.json +4 -0
  316. package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.json +239 -0
  317. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.dbg.json +4 -0
  318. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.json +209 -0
  319. package/artifacts/contracts/type/Referral.sol/ReferralLib.dbg.json +4 -0
  320. package/artifacts/contracts/type/Referral.sol/ReferralLib.json +142 -0
  321. package/artifacts/contracts/type/RequestId.sol/RequestIdLib.dbg.json +4 -0
  322. package/artifacts/contracts/type/RequestId.sol/RequestIdLib.json +204 -0
  323. package/artifacts/contracts/type/RiskId.sol/RiskIdLib.dbg.json +4 -0
  324. package/artifacts/contracts/type/RiskId.sol/RiskIdLib.json +199 -0
  325. package/artifacts/contracts/type/RoleId.sol/RoleIdLib.dbg.json +4 -0
  326. package/artifacts/contracts/type/RoleId.sol/RoleIdLib.json +369 -0
  327. package/artifacts/contracts/type/Seconds.sol/SecondsLib.dbg.json +4 -0
  328. package/artifacts/contracts/type/Seconds.sol/SecondsLib.json +246 -0
  329. package/artifacts/contracts/type/Selector.sol/SelectorLib.dbg.json +4 -0
  330. package/artifacts/contracts/type/Selector.sol/SelectorLib.json +129 -0
  331. package/artifacts/contracts/type/Selector.sol/SelectorSetLib.dbg.json +4 -0
  332. package/artifacts/contracts/type/Selector.sol/SelectorSetLib.json +10 -0
  333. package/artifacts/contracts/type/StateId.sol/StateIdLib.dbg.json +4 -0
  334. package/artifacts/contracts/type/StateId.sol/StateIdLib.json +105 -0
  335. package/artifacts/contracts/type/String.sol/StrLib.dbg.json +4 -0
  336. package/artifacts/contracts/type/String.sol/StrLib.json +132 -0
  337. package/artifacts/contracts/type/Timestamp.sol/TimestampLib.dbg.json +4 -0
  338. package/artifacts/contracts/type/Timestamp.sol/TimestampLib.json +312 -0
  339. package/artifacts/contracts/type/UFixed.sol/UFixedLib.dbg.json +4 -0
  340. package/artifacts/contracts/type/UFixed.sol/UFixedLib.json +548 -0
  341. package/artifacts/contracts/type/Version.sol/VersionLib.dbg.json +4 -0
  342. package/artifacts/contracts/type/Version.sol/VersionLib.json +158 -0
  343. package/artifacts/contracts/type/Version.sol/VersionPartLib.dbg.json +4 -0
  344. package/artifacts/contracts/type/Version.sol/VersionPartLib.json +113 -0
  345. package/artifacts/contracts/upgradeability/IVersionable.sol/IVersionable.dbg.json +4 -0
  346. package/artifacts/contracts/{shared → upgradeability}/IVersionable.sol/IVersionable.json +1 -1
  347. package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.dbg.json +4 -0
  348. package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.json +618 -0
  349. package/artifacts/contracts/upgradeability/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +4 -0
  350. package/artifacts/contracts/upgradeability/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +129 -0
  351. package/artifacts/contracts/upgradeability/Versionable.sol/Versionable.dbg.json +4 -0
  352. package/artifacts/contracts/{shared → upgradeability}/Versionable.sol/Versionable.json +1 -1
  353. package/contracts/accounting/AccountingService.sol +262 -0
  354. package/contracts/accounting/AccountingServiceManager.sol +38 -0
  355. package/contracts/accounting/IAccountingService.sol +45 -0
  356. package/contracts/authorization/AccessAdmin.sol +659 -0
  357. package/contracts/authorization/AccessManagerCloneable.sol +149 -0
  358. package/contracts/authorization/Authorization.sol +289 -0
  359. package/contracts/authorization/IAccess.sol +49 -0
  360. package/contracts/authorization/IAccessAdmin.sol +140 -0
  361. package/contracts/authorization/IAuthorization.sol +60 -0
  362. package/contracts/authorization/IServiceAuthorization.sol +40 -0
  363. package/contracts/authorization/ServiceAuthorization.sol +106 -0
  364. package/contracts/distribution/BasicDistribution.sol +139 -0
  365. package/contracts/distribution/BasicDistributionAuthorization.sol +47 -0
  366. package/contracts/{components → distribution}/Distribution.sol +170 -163
  367. package/contracts/distribution/DistributionService.sol +357 -0
  368. package/contracts/distribution/DistributionServiceManager.sol +39 -0
  369. package/contracts/distribution/IDistributionComponent.sol +52 -0
  370. package/contracts/{instance/service → distribution}/IDistributionService.sol +35 -34
  371. package/contracts/examples/fire/DamageLevel.sol +59 -0
  372. package/contracts/examples/fire/FirePool.sol +90 -0
  373. package/contracts/examples/fire/FirePoolAuthorization.sol +35 -0
  374. package/contracts/examples/fire/FireProduct.sol +438 -0
  375. package/contracts/examples/fire/FireProductAuthorization.sol +45 -0
  376. package/contracts/examples/fire/FireUSD.sol +26 -0
  377. package/contracts/examples/unpermissioned/SimpleDistribution.sol +57 -0
  378. package/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol +28 -0
  379. package/contracts/examples/unpermissioned/SimpleOracle.sol +137 -0
  380. package/contracts/examples/unpermissioned/SimplePool.sol +107 -0
  381. package/contracts/examples/unpermissioned/SimplePoolAuthorization.sol +28 -0
  382. package/contracts/examples/unpermissioned/SimpleProduct.sol +370 -0
  383. package/contracts/examples/unpermissioned/SimpleProductAuthorization.sol +28 -0
  384. package/contracts/instance/BundleSet.sol +130 -0
  385. package/contracts/instance/IInstance.sol +43 -37
  386. package/contracts/instance/IInstanceService.sol +37 -49
  387. package/contracts/instance/Instance.sol +142 -106
  388. package/contracts/instance/InstanceAdmin.sol +326 -0
  389. package/contracts/instance/InstanceAuthorizationV3.sol +225 -0
  390. package/contracts/instance/InstanceReader.sol +363 -60
  391. package/contracts/instance/InstanceService.sol +258 -384
  392. package/contracts/instance/InstanceServiceManager.sol +14 -29
  393. package/contracts/instance/InstanceStore.sol +174 -95
  394. package/contracts/instance/RiskSet.sol +118 -0
  395. package/contracts/instance/base/BalanceStore.sol +123 -0
  396. package/contracts/instance/base/Cloneable.sol +28 -0
  397. package/contracts/instance/base/ObjectCounter.sol +20 -0
  398. package/contracts/instance/base/ObjectLifecycle.sol +113 -0
  399. package/contracts/instance/base/ObjectSet.sol +77 -0
  400. package/contracts/instance/base/ObjectSetHelper.sol +30 -0
  401. package/contracts/instance/module/IAccess.sol +4 -12
  402. package/contracts/instance/module/IBundle.sol +6 -9
  403. package/contracts/instance/module/IComponents.sol +28 -18
  404. package/contracts/instance/module/IDistribution.sol +6 -6
  405. package/contracts/instance/module/IPolicy.sol +48 -35
  406. package/contracts/instance/module/IRisk.sol +4 -1
  407. package/contracts/{test/Usdc.sol → mock/Dip.sol} +6 -6
  408. package/contracts/oracle/BasicOracle.sol +47 -0
  409. package/contracts/oracle/BasicOracleAuthorization.sol +46 -0
  410. package/contracts/oracle/IOracle.sol +36 -0
  411. package/contracts/oracle/IOracleComponent.sol +33 -0
  412. package/contracts/oracle/IOracleService.sol +66 -0
  413. package/contracts/oracle/Oracle.sol +156 -0
  414. package/contracts/oracle/OracleService.sol +310 -0
  415. package/contracts/oracle/OracleServiceManager.sol +39 -0
  416. package/contracts/pool/BasicPool.sol +175 -0
  417. package/contracts/pool/BasicPoolAuthorization.sol +68 -0
  418. package/contracts/pool/BundleService.sol +425 -0
  419. package/contracts/pool/BundleServiceManager.sol +39 -0
  420. package/contracts/pool/IBundleService.sol +121 -0
  421. package/contracts/pool/IPoolComponent.sol +62 -0
  422. package/contracts/pool/IPoolService.sol +153 -0
  423. package/contracts/pool/Pool.sol +345 -0
  424. package/contracts/pool/PoolService.sol +615 -0
  425. package/contracts/pool/PoolServiceManager.sol +39 -0
  426. package/contracts/product/ApplicationService.sol +259 -0
  427. package/contracts/{instance/service → product}/ApplicationServiceManager.sol +12 -9
  428. package/contracts/product/BasicProduct.sol +51 -0
  429. package/contracts/product/BasicProductAuthorization.sol +41 -0
  430. package/contracts/product/ClaimService.sol +708 -0
  431. package/contracts/{instance/service → product}/ClaimServiceManager.sol +12 -9
  432. package/contracts/{instance/service → product}/IApplicationService.sol +19 -35
  433. package/contracts/product/IClaimService.sol +136 -0
  434. package/contracts/product/IPolicyService.sol +90 -0
  435. package/contracts/product/IPricingService.sol +39 -0
  436. package/contracts/product/IProductComponent.sol +62 -0
  437. package/contracts/product/IRiskService.sol +33 -0
  438. package/contracts/product/PolicyService.sol +736 -0
  439. package/contracts/product/PolicyServiceManager.sol +39 -0
  440. package/contracts/product/PricingService.sol +304 -0
  441. package/contracts/product/PricingServiceManager.sol +39 -0
  442. package/contracts/product/Product.sol +463 -0
  443. package/contracts/product/RiskService.sol +151 -0
  444. package/contracts/product/RiskServiceManager.sol +39 -0
  445. package/contracts/registry/ChainNft.sol +79 -40
  446. package/contracts/registry/IRegistry.sol +93 -30
  447. package/contracts/registry/IRegistryService.sol +34 -40
  448. package/contracts/registry/IRelease.sol +26 -0
  449. package/contracts/registry/ITransferInterceptor.sol +1 -2
  450. package/contracts/registry/Registry.sol +456 -197
  451. package/contracts/registry/RegistryAdmin.sol +344 -0
  452. package/contracts/registry/RegistryService.sol +89 -130
  453. package/contracts/registry/RegistryServiceManager.sol +23 -32
  454. package/contracts/registry/ReleaseAdmin.sol +245 -0
  455. package/contracts/registry/ReleaseLifecycle.sol +32 -0
  456. package/contracts/registry/ReleaseRegistry.sol +511 -0
  457. package/contracts/registry/ServiceAuthorizationV3.sol +242 -0
  458. package/contracts/registry/TokenRegistry.sol +261 -64
  459. package/contracts/shared/Component.sol +226 -0
  460. package/contracts/shared/ComponentService.sol +700 -0
  461. package/contracts/shared/ComponentServiceManager.sol +38 -0
  462. package/contracts/shared/ComponentVerifyingService.sol +128 -0
  463. package/contracts/shared/ContractLib.sol +252 -0
  464. package/contracts/shared/IComponent.sol +61 -0
  465. package/contracts/shared/IComponentService.sol +116 -0
  466. package/contracts/shared/IInstanceLinkedComponent.sol +30 -0
  467. package/contracts/{instance/base → shared}/IKeyValueStore.sol +16 -11
  468. package/contracts/{instance/base → shared}/ILifecycle.sol +5 -4
  469. package/contracts/shared/INftOwnable.sol +4 -2
  470. package/contracts/shared/IPolicyHolder.sol +23 -14
  471. package/contracts/shared/IRegisterable.sol +23 -1
  472. package/contracts/shared/IRegistryLinked.sol +0 -1
  473. package/contracts/shared/IService.sol +12 -5
  474. package/contracts/shared/{ERC165.sol → InitializableERC165.sol} +4 -4
  475. package/contracts/shared/InstanceLinkedComponent.sol +197 -0
  476. package/contracts/shared/KeyValueStore.sol +131 -0
  477. package/contracts/shared/Lifecycle.sol +88 -0
  478. package/contracts/shared/NftIdSet.sol +65 -0
  479. package/contracts/shared/NftOwnable.sol +34 -27
  480. package/contracts/shared/PolicyHolder.sol +22 -41
  481. package/contracts/shared/Registerable.sol +55 -20
  482. package/contracts/shared/RegistryLinked.sol +9 -19
  483. package/contracts/shared/Service.sol +33 -40
  484. package/contracts/shared/TokenHandler.sol +368 -12
  485. package/contracts/shared/TokenHandlerDeployerLib.sol +20 -0
  486. package/contracts/staking/IStaking.sol +173 -0
  487. package/contracts/staking/IStakingService.sol +157 -0
  488. package/contracts/staking/StakeManagerLib.sol +224 -0
  489. package/contracts/staking/Staking.sol +526 -0
  490. package/contracts/staking/StakingLifecycle.sol +23 -0
  491. package/contracts/staking/StakingManager.sol +52 -0
  492. package/contracts/staking/StakingReader.sol +190 -0
  493. package/contracts/staking/StakingService.sol +439 -0
  494. package/contracts/staking/StakingServiceManager.sol +44 -0
  495. package/contracts/staking/StakingStore.sol +605 -0
  496. package/contracts/staking/TargetManagerLib.sol +211 -0
  497. package/contracts/{types → type}/AddressSet.sol +1 -1
  498. package/contracts/type/Amount.sol +150 -0
  499. package/contracts/{types → type}/Blocknumber.sol +26 -3
  500. package/contracts/{types → type}/ClaimId.sol +31 -3
  501. package/contracts/{types → type}/Fee.sol +24 -22
  502. package/contracts/{types → type}/Key32.sol +2 -2
  503. package/contracts/type/Key32Set.sol +62 -0
  504. package/contracts/{types → type}/NftId.sol +21 -16
  505. package/contracts/{types → type}/NftIdSet.sol +2 -2
  506. package/contracts/type/ObjectType.sol +290 -0
  507. package/contracts/type/PayoutId.sol +82 -0
  508. package/contracts/{types → type}/Referral.sol +2 -1
  509. package/contracts/type/RequestId.sol +75 -0
  510. package/contracts/type/RiskId.sol +74 -0
  511. package/contracts/type/RoleId.sol +165 -0
  512. package/contracts/type/Seconds.sol +101 -0
  513. package/contracts/type/Selector.sol +102 -0
  514. package/contracts/{types → type}/StateId.sol +47 -4
  515. package/contracts/type/String.sol +53 -0
  516. package/contracts/{types → type}/Timestamp.sol +20 -6
  517. package/contracts/{types → type}/UFixed.sol +40 -121
  518. package/contracts/{types → type}/Version.sol +19 -7
  519. package/contracts/{shared → upgradeability}/IVersionable.sol +1 -1
  520. package/contracts/{shared → upgradeability}/ProxyManager.sol +93 -30
  521. package/contracts/{shared → upgradeability}/UpgradableProxyWithAdmin.sol +1 -3
  522. package/contracts/{shared → upgradeability}/Versionable.sol +3 -3
  523. package/package.json +11 -7
  524. package/artifacts/contracts/components/Component.sol/Component.dbg.json +0 -4
  525. package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +0 -4
  526. package/artifacts/contracts/components/IComponent.sol/IComponent.dbg.json +0 -4
  527. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +0 -4
  528. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +0 -4
  529. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +0 -4
  530. package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +0 -4
  531. package/artifacts/contracts/components/Product.sol/Product.dbg.json +0 -4
  532. package/artifacts/contracts/instance/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.dbg.json +0 -4
  533. package/artifacts/contracts/instance/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.json +0 -1206
  534. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.dbg.json +0 -4
  535. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.json +0 -778
  536. package/artifacts/contracts/instance/Cloneable.sol/Cloneable.dbg.json +0 -4
  537. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +0 -4
  538. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +0 -1348
  539. package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.dbg.json +0 -4
  540. package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.json +0 -256
  541. package/artifacts/contracts/instance/base/ComponentService.sol/ComponentService.dbg.json +0 -4
  542. package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.dbg.json +0 -4
  543. package/artifacts/contracts/instance/base/ILifecycle.sol/ILifecycle.dbg.json +0 -4
  544. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.dbg.json +0 -4
  545. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.json +0 -532
  546. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json +0 -4
  547. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.json +0 -194
  548. package/artifacts/contracts/instance/module/ISetup.sol/ISetup.dbg.json +0 -4
  549. package/artifacts/contracts/instance/module/ITreasury.sol/ITreasury.dbg.json +0 -4
  550. package/artifacts/contracts/instance/module/ITreasury.sol/ITreasury.json +0 -10
  551. package/artifacts/contracts/instance/service/ApplicationService.sol/ApplicationService.dbg.json +0 -4
  552. package/artifacts/contracts/instance/service/ApplicationService.sol/ApplicationService.json +0 -1039
  553. package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +0 -4
  554. package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.json +0 -673
  555. package/artifacts/contracts/instance/service/BundleService.sol/BundleService.dbg.json +0 -4
  556. package/artifacts/contracts/instance/service/BundleService.sol/BundleService.json +0 -1231
  557. package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.dbg.json +0 -4
  558. package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.json +0 -721
  559. package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.dbg.json +0 -4
  560. package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.json +0 -817
  561. package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +0 -4
  562. package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.json +0 -641
  563. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +0 -4
  564. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +0 -1798
  565. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +0 -4
  566. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.json +0 -805
  567. package/artifacts/contracts/instance/service/IApplicationService.sol/IApplicationService.dbg.json +0 -4
  568. package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.dbg.json +0 -4
  569. package/artifacts/contracts/instance/service/IClaimService.sol/IClaimService.dbg.json +0 -4
  570. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +0 -4
  571. package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.dbg.json +0 -4
  572. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +0 -4
  573. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +0 -4
  574. package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.dbg.json +0 -4
  575. package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.json +0 -1092
  576. package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +0 -4
  577. package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.json +0 -697
  578. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +0 -4
  579. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +0 -1237
  580. package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.dbg.json +0 -4
  581. package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.json +0 -661
  582. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +0 -4
  583. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +0 -840
  584. package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.dbg.json +0 -4
  585. package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.json +0 -653
  586. package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.dbg.json +0 -4
  587. package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.json +0 -285
  588. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.dbg.json +0 -4
  589. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.json +0 -559
  590. package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.dbg.json +0 -4
  591. package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.json +0 -107
  592. package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +0 -4
  593. package/artifacts/contracts/shared/ERC165.sol/ERC165.json +0 -73
  594. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +0 -4
  595. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +0 -4
  596. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +0 -582
  597. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +0 -4
  598. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +0 -129
  599. package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +0 -4
  600. package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json +0 -4
  601. package/artifacts/contracts/test/TestFee.sol/TestFee.json +0 -119
  602. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json +0 -4
  603. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +0 -383
  604. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +0 -4
  605. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.json +0 -116
  606. package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +0 -4
  607. package/artifacts/contracts/test/TestService.sol/TestService.json +0 -596
  608. package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json +0 -4
  609. package/artifacts/contracts/test/TestToken.sol/TestUsdc.json +0 -376
  610. package/artifacts/contracts/test/TestVersion.sol/TestVersion.dbg.json +0 -4
  611. package/artifacts/contracts/test/TestVersion.sol/TestVersion.json +0 -218
  612. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json +0 -4
  613. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.json +0 -104
  614. package/artifacts/contracts/test/Usdc.sol/USDC.dbg.json +0 -4
  615. package/artifacts/contracts/test/Usdc.sol/USDC.json +0 -376
  616. package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.dbg.json +0 -4
  617. package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.json +0 -10
  618. package/artifacts/contracts/types/Amount.sol/AmountLib.dbg.json +0 -4
  619. package/artifacts/contracts/types/Amount.sol/AmountLib.json +0 -161
  620. package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +0 -4
  621. package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.json +0 -174
  622. package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +0 -4
  623. package/artifacts/contracts/types/ChainId.sol/ChainIdLib.json +0 -10
  624. package/artifacts/contracts/types/ClaimId.sol/ClaimIdLib.dbg.json +0 -4
  625. package/artifacts/contracts/types/ClaimId.sol/ClaimIdLib.json +0 -100
  626. package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.dbg.json +0 -4
  627. package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.json +0 -104
  628. package/artifacts/contracts/types/Fee.sol/FeeLib.dbg.json +0 -4
  629. package/artifacts/contracts/types/Fee.sol/FeeLib.json +0 -288
  630. package/artifacts/contracts/types/Key32.sol/Key32Lib.dbg.json +0 -4
  631. package/artifacts/contracts/types/Key32.sol/Key32Lib.json +0 -125
  632. package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +0 -4
  633. package/artifacts/contracts/types/NftId.sol/NftIdLib.json +0 -166
  634. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.dbg.json +0 -4
  635. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.json +0 -33
  636. package/artifacts/contracts/types/NumberId.sol/NumberIdLib.dbg.json +0 -4
  637. package/artifacts/contracts/types/NumberId.sol/NumberIdLib.json +0 -100
  638. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.dbg.json +0 -4
  639. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.json +0 -92
  640. package/artifacts/contracts/types/PayoutId.sol/PayoutIdLib.dbg.json +0 -4
  641. package/artifacts/contracts/types/PayoutId.sol/PayoutIdLib.json +0 -100
  642. package/artifacts/contracts/types/Referral.sol/ReferralLib.dbg.json +0 -4
  643. package/artifacts/contracts/types/Referral.sol/ReferralLib.json +0 -142
  644. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.dbg.json +0 -4
  645. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.json +0 -86
  646. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.dbg.json +0 -4
  647. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.json +0 -156
  648. package/artifacts/contracts/types/Seconds.sol/SecondsLib.dbg.json +0 -4
  649. package/artifacts/contracts/types/Seconds.sol/SecondsLib.json +0 -124
  650. package/artifacts/contracts/types/StateId.sol/StateIdLib.dbg.json +0 -4
  651. package/artifacts/contracts/types/StateId.sol/StateIdLib.json +0 -92
  652. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json +0 -4
  653. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.json +0 -267
  654. package/artifacts/contracts/types/UFixed.sol/MathLib.dbg.json +0 -4
  655. package/artifacts/contracts/types/UFixed.sol/MathLib.json +0 -10
  656. package/artifacts/contracts/types/UFixed.sol/UFixedLib.dbg.json +0 -4
  657. package/artifacts/contracts/types/UFixed.sol/UFixedLib.json +0 -479
  658. package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +0 -4
  659. package/artifacts/contracts/types/Version.sol/VersionLib.json +0 -177
  660. package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +0 -4
  661. package/artifacts/contracts/types/Version.sol/VersionPartLib.json +0 -49
  662. package/contracts/components/Component.sol +0 -253
  663. package/contracts/components/IComponent.sol +0 -76
  664. package/contracts/components/IDistributionComponent.sol +0 -71
  665. package/contracts/components/IPoolComponent.sol +0 -113
  666. package/contracts/components/IProductComponent.sol +0 -40
  667. package/contracts/components/Pool.sol +0 -303
  668. package/contracts/components/Product.sol +0 -293
  669. package/contracts/instance/AccessManagerUpgradeableInitializeable.sol +0 -13
  670. package/contracts/instance/BundleManager.sol +0 -127
  671. package/contracts/instance/Cloneable.sol +0 -51
  672. package/contracts/instance/InstanceAccessManager.sol +0 -540
  673. package/contracts/instance/ObjectManager.sol +0 -82
  674. package/contracts/instance/base/ComponentService.sol +0 -121
  675. package/contracts/instance/base/KeyValueStore.sol +0 -180
  676. package/contracts/instance/base/Lifecycle.sol +0 -109
  677. package/contracts/instance/module/ISetup.sol +0 -33
  678. package/contracts/instance/module/ITreasury.sol +0 -23
  679. package/contracts/instance/service/ApplicationService.sol +0 -351
  680. package/contracts/instance/service/BundleService.sol +0 -431
  681. package/contracts/instance/service/BundleServiceManager.sol +0 -51
  682. package/contracts/instance/service/ClaimService.sol +0 -151
  683. package/contracts/instance/service/DistributionService.sol +0 -437
  684. package/contracts/instance/service/DistributionServiceManager.sol +0 -51
  685. package/contracts/instance/service/IBundleService.sol +0 -93
  686. package/contracts/instance/service/IClaimService.sol +0 -61
  687. package/contracts/instance/service/IPolicyService.sol +0 -72
  688. package/contracts/instance/service/IPoolService.sol +0 -99
  689. package/contracts/instance/service/IProductService.sol +0 -40
  690. package/contracts/instance/service/PolicyService.sol +0 -362
  691. package/contracts/instance/service/PolicyServiceManager.sol +0 -54
  692. package/contracts/instance/service/PoolService.sol +0 -303
  693. package/contracts/instance/service/PoolServiceManager.sol +0 -51
  694. package/contracts/instance/service/ProductService.sol +0 -209
  695. package/contracts/instance/service/ProductServiceManager.sol +0 -54
  696. package/contracts/registry/RegistryAccessManager.sol +0 -216
  697. package/contracts/registry/ReleaseManager.sol +0 -324
  698. package/contracts/shared/ContractDeployerLib.sol +0 -72
  699. package/contracts/test/TestFee.sol +0 -25
  700. package/contracts/test/TestRegisterable.sol +0 -18
  701. package/contracts/test/TestRoleId.sol +0 -14
  702. package/contracts/test/TestService.sol +0 -25
  703. package/contracts/test/TestToken.sol +0 -26
  704. package/contracts/test/TestVersion.sol +0 -44
  705. package/contracts/test/TestVersionable.sol +0 -17
  706. package/contracts/types/Amount.sol +0 -60
  707. package/contracts/types/ChainId.sol +0 -38
  708. package/contracts/types/NumberId.sol +0 -52
  709. package/contracts/types/ObjectType.sol +0 -157
  710. package/contracts/types/PayoutId.sol +0 -54
  711. package/contracts/types/RiskId.sol +0 -43
  712. package/contracts/types/RoleId.sol +0 -97
  713. package/contracts/types/Seconds.sol +0 -54
  714. /package/contracts/{types → type}/DistributorType.sol +0 -0
@@ -2,63 +2,87 @@
2
2
  pragma solidity ^0.8.20;
3
3
 
4
4
  import {Clones} from "@openzeppelin/contracts/proxy/Clones.sol";
5
- import {ShortString, ShortStrings} from "@openzeppelin/contracts/utils/ShortStrings.sol";
6
5
 
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";
6
+ import {IAuthorization} from "../authorization/IAuthorization.sol";
7
+ import {AccessManagerCloneable} from "../authorization/AccessManagerCloneable.sol";
8
+ import {Amount} from "../type/Amount.sol";
9
+ import {BundleSet} from "./BundleSet.sol";
10
+ import {RiskSet} from "./RiskSet.sol";
11
+ import {ChainNft} from "../registry/ChainNft.sol";
12
+ import {NftId} from "../type/NftId.sol";
13
+ import {RoleId} from "../type/RoleId.sol";
14
+ import {UFixed} from "../type/UFixed.sol";
15
+ import {ObjectType, INSTANCE, COMPONENT, INSTANCE, REGISTRY, STAKING} from "../type/ObjectType.sol";
11
16
 
12
17
  import {Service} from "../shared/Service.sol";
13
- import {IService} from "../shared/IService.sol";
14
-
15
- import {IDistributionComponent} from "../components/IDistributionComponent.sol";
16
- import {IPoolComponent} from "../components/IPoolComponent.sol";
17
- import {IProductComponent} from "../components/IProductComponent.sol";
18
18
 
19
19
  import {IRegistry} from "../registry/IRegistry.sol";
20
20
  import {IRegistryService} from "../registry/IRegistryService.sol";
21
- import {ChainNft} from "../registry/ChainNft.sol";
21
+ import {IStakingService} from "../staking/IStakingService.sol";
22
+ import {TargetManagerLib} from "../staking/TargetManagerLib.sol";
22
23
 
24
+ import {IComponentService} from "../shared/IComponentService.sol";
23
25
  import {Instance} from "./Instance.sol";
24
26
  import {IInstance} from "./IInstance.sol";
25
- import {InstanceAccessManager} from "./InstanceAccessManager.sol";
27
+ import {InstanceAdmin} from "./InstanceAdmin.sol";
26
28
  import {IInstanceService} from "./IInstanceService.sol";
27
29
  import {InstanceReader} from "./InstanceReader.sol";
28
- import {BundleManager} from "./BundleManager.sol";
29
- import {AccessManagerUpgradeableInitializeable} from "./AccessManagerUpgradeableInitializeable.sol";
30
30
  import {InstanceStore} from "./InstanceStore.sol";
31
+ import {Seconds} from "../type/Seconds.sol";
32
+ import {VersionPart} from "../type/Version.sol";
31
33
 
32
34
 
33
35
  contract InstanceService is
34
36
  Service,
35
37
  IInstanceService
36
38
  {
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
39
 
44
40
  // TODO update to real hash when instance is stable
45
41
  bytes32 public constant INSTANCE_CREATION_CODE_HASH = bytes32(0);
46
42
 
47
- modifier onlyInstanceOwner(NftId instanceNftId) {
48
- if(msg.sender != getRegistry().ownerOf(instanceNftId)) {
49
- revert ErrorInstanceServiceRequestUnauhorized(msg.sender);
43
+ IRegistryService internal _registryService;
44
+ IStakingService internal _stakingService;
45
+ IComponentService internal _componentService;
46
+
47
+ address internal _masterAccessManager;
48
+ address internal _masterInstanceAdmin;
49
+ address internal _masterInstance;
50
+ address internal _masterInstanceReader;
51
+ address internal _masterInstanceBundleSet;
52
+ address internal _masterInstanceRiskSet;
53
+ address internal _masterInstanceStore;
54
+
55
+
56
+ modifier onlyInstance() {
57
+ address instanceAddress = msg.sender;
58
+ NftId instanceNftId = getRegistry().getNftIdForAddress(msg.sender);
59
+ if (instanceNftId.eqz()) {
60
+ revert ErrorInstanceServiceNotRegistered(instanceAddress);
61
+ }
62
+
63
+ ObjectType objectType = getRegistry().getObjectInfo(instanceNftId).objectType;
64
+ if (objectType != INSTANCE()) {
65
+ revert ErrorInstanceServiceNotInstance(instanceAddress, objectType);
50
66
  }
67
+
68
+ VersionPart instanceVersion = IInstance(instanceAddress).getRelease();
69
+ if (instanceVersion != getVersion().toMajorPart()) {
70
+ revert ErrorInstanceServiceInstanceVersionMismatch(instanceAddress, instanceVersion);
71
+ }
72
+
51
73
  _;
52
74
  }
53
- // TODO check service domain?
54
- // TODO check release version?
55
- modifier onlyRegisteredService() {
56
- if (! getRegistry().isRegisteredService(msg.sender)) {
75
+
76
+
77
+ modifier onlyInstanceOwner(NftId instanceNftId) {
78
+ if(msg.sender != getRegistry().ownerOf(instanceNftId)) {
57
79
  revert ErrorInstanceServiceRequestUnauhorized(msg.sender);
58
80
  }
59
81
  _;
60
82
  }
61
- // TODO check release version?
83
+
84
+
85
+ // TODO check component - service - instance version match
62
86
  modifier onlyComponent() {
63
87
  if (! getRegistry().isRegisteredComponent(msg.sender)) {
64
88
  revert ErrorInstanceServiceRequestUnauhorized(msg.sender);
@@ -66,343 +90,169 @@ contract InstanceService is
66
90
  _;
67
91
  }
68
92
 
69
- function createInstanceClone()
93
+ function createInstance()
70
94
  external
95
+ restricted()
71
96
  returns (
72
- AccessManagerUpgradeableInitializeable clonedOzAccessManager,
73
- InstanceAccessManager clonedInstanceAccessManager,
74
- Instance clonedInstance,
75
- NftId clonedInstanceNftId,
76
- InstanceReader clonedInstanceReader,
77
- BundleManager clonedBundleManager,
78
- InstanceStore clonedInstanceStore
97
+ IInstance instance,
98
+ NftId instanceNftId
79
99
  )
80
100
  {
101
+ // tx sender will become instance owner
81
102
  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
-
88
- clonedOzAccessManager = AccessManagerUpgradeableInitializeable(Clones.clone(_masterOzAccessManager));
89
-
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);
109
103
 
110
- clonedBundleManager = BundleManager(Clones.clone(_masterInstanceBundleManager));
111
- clonedBundleManager.initialize(address(clonedInstance));
112
- clonedInstance.setBundleManager(clonedBundleManager);
104
+ // create instance admin and instance
105
+ InstanceAdmin instanceAdmin = _createInstanceAdmin();
106
+ instance = _createInstance(instanceAdmin, instanceOwner);
113
107
 
114
- clonedInstanceAccessManager = InstanceAccessManager(Clones.clone(_masterInstanceAccessManager));
115
- clonedOzAccessManager.grantRole(ADMIN_ROLE().toInt(), address(clonedInstanceAccessManager), 0);
116
- clonedInstanceAccessManager.initialize(address(clonedInstance));
117
- clonedInstance.setInstanceAccessManager(clonedInstanceAccessManager);
108
+ // register cloned instance with registry
109
+ instanceNftId = _registryService.registerInstance(
110
+ instance, instanceOwner).nftId;
118
111
 
119
- // TODO amend setters with instance specific , policy manager ...
112
+ // register cloned instance as staking target
113
+ _stakingService.createInstanceTarget(
114
+ instanceNftId,
115
+ TargetManagerLib.getDefaultLockingPeriod(),
116
+ TargetManagerLib.getDefaultRewardRate());
120
117
 
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;
118
+ // MUST be set after instance is set up and registered
119
+ IAuthorization instanceAuthorization = InstanceAdmin(_masterInstanceAdmin).getInstanceAuthorization();
120
+ VersionPart release = AccessManagerCloneable(authority()).getRelease();
121
+ instanceAdmin.completeSetup(
122
+ address(instance),
123
+ address(instanceAuthorization));
127
124
 
128
125
  emit LogInstanceCloned(
129
- address(clonedOzAccessManager),
130
- address(clonedInstanceAccessManager),
131
- address(clonedInstance),
132
- address(clonedInstanceStore),
133
- address(clonedBundleManager),
134
- address(clonedInstanceReader),
135
- clonedInstanceNftId);
136
- }
137
-
138
- function _grantInitialAuthorizations(
139
- InstanceAccessManager clonedAccessManager,
140
- Instance clonedInstance,
141
- BundleManager clonedBundleManager,
142
- InstanceStore clonedInstanceStore,
143
- address instanceOwner)
144
- internal
145
- {
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);
126
+ instanceNftId,
127
+ address(instance));
158
128
  }
159
129
 
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
130
 
177
- function _createCoreTargets(
178
- InstanceAccessManager clonedAccessManager,
179
- Instance clonedInstance,
180
- BundleManager clonedBundleManager,
181
- InstanceStore clonedInstanceStore)
182
- internal
131
+ function setStakingLockingPeriod(Seconds stakeLockingPeriod)
132
+ external
133
+ virtual
134
+ restricted()
135
+ onlyInstance()
183
136
  {
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");
137
+ NftId instanceNftId = getRegistry().getNftIdForAddress(msg.sender);
138
+ _stakingService.setInstanceLockingPeriod(
139
+ instanceNftId,
140
+ stakeLockingPeriod);
188
141
  }
189
142
 
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
143
 
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());
223
- }
224
-
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
-
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());
253
- }
254
-
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());
144
+ function setStakingRewardRate(UFixed rewardRate)
145
+ external
146
+ virtual
147
+ restricted()
148
+ onlyInstance()
149
+ {
150
+ NftId instanceNftId = getRegistry().getNftIdForAddress(msg.sender);
151
+ _stakingService.setInstanceRewardRate(
152
+ instanceNftId,
153
+ rewardRate);
266
154
  }
267
155
 
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
- }
281
156
 
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());
157
+ function refillStakingRewardReserves(address rewardProvider, Amount dipAmount)
158
+ external
159
+ virtual
160
+ restricted()
161
+ onlyInstance()
162
+ {
163
+ NftId instanceNftId = getRegistry().getNftIdForAddress(msg.sender);
164
+ _stakingService.refillInstanceRewardReserves(
165
+ instanceNftId,
166
+ rewardProvider,
167
+ dipAmount);
306
168
  }
307
169
 
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
- }
329
170
 
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());
171
+ function withdrawStakingRewardReserves(Amount dipAmount)
172
+ external
173
+ virtual
174
+ restricted()
175
+ onlyInstance()
176
+ returns (Amount newBalance)
177
+ {
178
+ NftId instanceNftId = getRegistry().getNftIdForAddress(msg.sender);
179
+ _stakingService.withdrawInstanceRewardReserves(
180
+ instanceNftId,
181
+ dipAmount);
340
182
  }
341
183
 
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());
184
+ function upgradeInstanceReader(NftId instanceNftId)
185
+ external
186
+ nonReentrant()
187
+ restricted()
188
+ onlyInstanceOwner(instanceNftId)
189
+ onlyNftOfType(instanceNftId, INSTANCE())
190
+ {
191
+ IRegistry registry = getRegistry();
192
+ IRegistry.ObjectInfo memory instanceInfo = registry.getObjectInfo(instanceNftId);
193
+ Instance instance = Instance(instanceInfo.objectAddress);
194
+
195
+ InstanceReader upgradedInstanceReaderClone = InstanceReader(Clones.clone(address(_masterInstanceReader)));
196
+ upgradedInstanceReaderClone.initializeWithInstance(address(instance));
197
+ instance.setInstanceReader(upgradedInstanceReaderClone);
354
198
  }
355
199
 
356
200
  function setAndRegisterMasterInstance(address instanceAddress)
357
- external
358
- onlyOwner
359
- returns(NftId masterInstanceNftId)
201
+ external
202
+ onlyOwner()
203
+ returns(NftId masterInstanceNftId)
360
204
  {
361
205
  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(); }
365
-
206
+ if(_masterInstanceAdmin != address(0)) { revert ErrorInstanceServiceMasterInstanceAdminAlreadySet(); }
207
+ if(_masterInstanceBundleSet != address(0)) { revert ErrorInstanceServiceMasterBundleSetAlreadySet(); }
208
+ if(_masterInstanceRiskSet != address(0)) { revert ErrorInstanceServiceMasterRiskSetAlreadySet(); }
366
209
  if(instanceAddress == address(0)) { revert ErrorInstanceServiceInstanceAddressZero(); }
367
210
 
368
211
  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);
212
+ address accessManagerAddress = instance.authority();
213
+ InstanceAdmin instanceAdmin = instance.getInstanceAdmin();
214
+ address instanceAdminAddress = address(instanceAdmin);
373
215
  InstanceReader instanceReader = instance.getInstanceReader();
374
216
  address instanceReaderAddress = address(instanceReader);
375
- BundleManager bundleManager = instance.getBundleManager();
376
- address bundleManagerAddress = address(bundleManager);
217
+ BundleSet bundleSet = instance.getBundleSet();
218
+ address bundleSetAddress = address(bundleSet);
219
+ RiskSet riskSet = instance.getRiskSet();
220
+ address riskSetAddress = address(riskSet);
377
221
  InstanceStore instanceStore = instance.getInstanceStore();
378
222
  address instanceStoreAddress = address(instanceStore);
379
223
 
380
- if(ozAccessManagerAddress == address(0)) { revert ErrorInstanceServiceOzAccessManagerZero();}
381
- if(instanceAccessManagerAddress == address(0)) { revert ErrorInstanceServiceInstanceAccessManagerZero(); }
224
+ if(accessManagerAddress == address(0)) { revert ErrorInstanceServiceAccessManagerZero(); }
225
+ if(instanceAdminAddress == address(0)) { revert ErrorInstanceServiceInstanceAdminZero(); }
382
226
  if(instanceReaderAddress == address(0)) { revert ErrorInstanceServiceInstanceReaderZero(); }
383
- if(bundleManagerAddress == address(0)) { revert ErrorInstanceServiceBundleManagerZero(); }
227
+ if(bundleSetAddress == address(0)) { revert ErrorInstanceServiceBundleSetZero(); }
228
+ if(riskSetAddress == address(0)) { revert ErrorInstanceServiceRiskSetZero(); }
384
229
  if(instanceStoreAddress == address(0)) { revert ErrorInstanceServiceInstanceStoreZero(); }
385
230
 
386
- if(instance.authority() != instanceAccessManager.authority()) { revert ErrorInstanceServiceInstanceAuthorityMismatch(); }
387
- if(bundleManager.authority() != instanceAccessManager.authority()) { revert ErrorInstanceServiceBundleManagerAuthorityMismatch(); }
388
- if(instanceStore.authority() != instanceAccessManager.authority()) { revert ErrorInstanceServiceInstanceStoreAuthorityMismatch(); }
231
+ if(instance.authority() != instanceAdmin.authority()) { revert ErrorInstanceServiceInstanceAuthorityMismatch(); }
232
+ if(bundleSet.authority() != instanceAdmin.authority()) { revert ErrorInstanceServiceBundleSetAuthorityMismatch(); }
233
+ if(riskSet.authority() != instanceAdmin.authority()) { revert ErrorInstanceServiceRiskSetAuthorityMismatch(); }
234
+ if(instanceStore.authority() != instanceAdmin.authority()) { revert ErrorInstanceServiceInstanceStoreAuthorityMismatch(); }
235
+ if(bundleSet.getInstanceAddress() != address(instance)) { revert ErrorInstanceServiceBundleSetInstanceMismatch(); }
236
+ if(riskSet.getInstanceAddress() != address(instance)) { revert ErrorInstanceServiceRiskSetInstanceMismatch(); }
389
237
  if(instanceReader.getInstance() != instance) { revert ErrorInstanceServiceInstanceReaderInstanceMismatch2(); }
390
- if(bundleManager.getInstance() != instance) { revert ErrorInstanceServiceBundleMangerInstanceMismatch(); }
391
238
 
392
- _masterOzAccessManager = ozAccessManagerAddress;
393
- _masterInstanceAccessManager = instanceAccessManagerAddress;
239
+ _masterAccessManager = accessManagerAddress;
240
+ _masterInstanceAdmin = instanceAdminAddress;
394
241
  _masterInstance = instanceAddress;
395
242
  _masterInstanceReader = instanceReaderAddress;
396
- _masterInstanceBundleManager = bundleManagerAddress;
243
+ _masterInstanceBundleSet = bundleSetAddress;
244
+ _masterInstanceRiskSet = riskSetAddress;
397
245
  _masterInstanceStore = instanceStoreAddress;
398
246
 
399
- IRegistryService registryService = IRegistryService(getRegistry().getServiceAddress(REGISTRY(), getVersion().toMajorPart()));
400
247
  IInstance masterInstance = IInstance(_masterInstance);
401
- IRegistry.ObjectInfo memory info = registryService.registerInstance(masterInstance, getOwner());
248
+ IRegistry.ObjectInfo memory info = _registryService.registerInstance(masterInstance, getOwner());
402
249
  masterInstanceNftId = info.nftId;
403
250
  }
404
251
 
405
- function setMasterInstanceReader(address instanceReaderAddress) external onlyOwner {
252
+ function upgradeMasterInstanceReader(address instanceReaderAddress)
253
+ external
254
+ onlyOwner
255
+ {
406
256
  if(_masterInstanceReader == address(0)) { revert ErrorInstanceServiceMasterInstanceReaderNotSet(); }
407
257
  if(instanceReaderAddress == address(0)) { revert ErrorInstanceServiceInstanceReaderAddressZero(); }
408
258
  if(instanceReaderAddress == _masterInstanceReader) { revert ErrorInstanceServiceInstanceReaderSameAsMasterInstanceReader(); }
@@ -413,101 +263,113 @@ contract InstanceService is
413
263
  _masterInstanceReader = instanceReaderAddress;
414
264
  }
415
265
 
416
- function upgradeInstanceReader(NftId instanceNftId)
417
- external
418
- onlyInstanceOwner(instanceNftId)
419
- {
420
- IRegistry registry = getRegistry();
421
- IRegistry.ObjectInfo memory instanceInfo = registry.getObjectInfo(instanceNftId);
422
- Instance instance = Instance(instanceInfo.objectAddress);
423
-
424
- InstanceReader upgradedInstanceReaderClone = InstanceReader(Clones.clone(address(_masterInstanceReader)));
425
- upgradedInstanceReaderClone.initialize(address(instance));
426
- instance.setInstanceReader(upgradedInstanceReaderClone);
427
- }
428
-
429
266
  function getMasterInstanceReader() external view returns (address) {
430
267
  return _masterInstanceReader;
431
268
  }
432
269
 
433
- function getMasterInstance() external view returns (address) {
434
- return _masterInstance;
435
- }
436
-
437
- function getMasterInstanceAccessManager() external view returns (address) {
438
- return _masterInstanceAccessManager;
270
+ /// @dev create new cloned instance admin
271
+ /// function used to setup a new instance
272
+ function _createInstanceAdmin()
273
+ internal
274
+ virtual
275
+ returns (InstanceAdmin clonedInstanceAdmin)
276
+ {
277
+ // start with setting up a new OZ access manager
278
+ // TODO consider _masterInstanceAdmin.authority() instead of _masterAccessManager
279
+ AccessManagerCloneable clonedAccessManager = AccessManagerCloneable(
280
+ Clones.clone(_masterAccessManager));
281
+
282
+ // set up the instance admin
283
+ clonedInstanceAdmin = InstanceAdmin(Clones.clone(_masterInstanceAdmin));
284
+ clonedInstanceAdmin.initialize(
285
+ clonedAccessManager,
286
+ getRegistry(),
287
+ getRelease());
439
288
  }
440
289
 
441
- function getMasterInstanceBundleManager() external view returns (address) {
442
- return _masterInstanceBundleManager;
443
- }
444
290
 
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
291
+ /// @dev create new cloned instance
292
+ /// function used to setup a new instance
293
+ function _createInstance(
294
+ InstanceAdmin instanceAdmin,
295
+ address instanceOwner
454
296
  )
455
297
  internal
456
- initializer
457
- virtual override
298
+ virtual
299
+ returns (IInstance)
458
300
  {
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);
301
+ InstanceStore clonedInstanceStore = InstanceStore(Clones.clone(address(_masterInstanceStore)));
302
+ BundleSet clonedBundleSet = BundleSet(Clones.clone(_masterInstanceBundleSet));
303
+ RiskSet clonedRiskSet = RiskSet(Clones.clone(_masterInstanceRiskSet));
304
+ InstanceReader clonedInstanceReader = InstanceReader(Clones.clone(address(_masterInstanceReader)));
305
+
306
+ // clone instance
307
+ Instance clonedInstance = Instance(Clones.clone(_masterInstance));
308
+ clonedInstance.initialize(
309
+ instanceAdmin,
310
+ clonedInstanceStore,
311
+ clonedBundleSet,
312
+ clonedRiskSet,
313
+ clonedInstanceReader,
314
+ getRegistry(),
315
+ instanceOwner);
316
+ return clonedInstance;
466
317
  }
467
318
 
468
- // all gif targets MUST be childs of instanceNftId
469
- function createGifTarget(
319
+
320
+ /// all gif targets MUST be children of instanceNftId
321
+ function _createGifTarget(
470
322
  NftId instanceNftId,
471
323
  address targetAddress,
472
324
  string memory targetName,
473
- bytes4[][] memory selectors,
474
- RoleId[] memory roles
325
+ RoleId[] memory roles,
326
+ bytes4[][] memory selectors
475
327
  )
476
- external
477
- onlyRegisteredService
328
+ internal
329
+ virtual
478
330
  {
331
+ // TODO instanceAdmin will check target instance match anyway
479
332
  (
480
333
  IInstance instance, // or instanceInfo
481
- NftId targetNftId // or targetInfo
334
+ // or targetInfo
482
335
  ) = _validateInstanceAndComponent(instanceNftId, targetAddress);
483
336
 
484
- InstanceAccessManager accessManager = instance.getInstanceAccessManager();
485
- accessManager.createGifTarget(targetAddress, targetName);
337
+ InstanceAdmin instanceAdmin = instance.getInstanceAdmin();
338
+
339
+ // TODO refactor/implement
340
+ // instanceAdmin.createGifTarget(targetAddress, targetName);
341
+
486
342
  // 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]);
343
+ for(uint roleIdx = 0; roleIdx < roles.length; roleIdx++) {
344
+ // TODO refactor/implement
345
+ // instanceAdmin.setTargetFunctionRoleByService(targetName, selectors[roleIdx], roles[roleIdx]);
492
346
  }
493
347
  }
348
+
349
+ /// @dev top level initializer
350
+ function _initialize(
351
+ address owner,
352
+ bytes memory data
353
+ )
354
+ internal
355
+ virtual override
356
+ initializer()
357
+ {
358
+ (
359
+ address authority,
360
+ address registry
361
+ ) = abi.decode(data, (address, address));
494
362
 
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;
363
+ __Service_init(authority, registry, owner);
501
364
 
502
- IInstance instance = IInstance(
503
- registry.getObjectInfo(
504
- instanceNftId).objectAddress);
365
+ _registryService = IRegistryService(_getServiceAddress(REGISTRY()));
366
+ _stakingService = IStakingService(_getServiceAddress(STAKING()));
367
+ _componentService = IComponentService(_getServiceAddress(COMPONENT()));
505
368
 
506
- instance.getInstanceAccessManager().setTargetLockedByService(
507
- componentAddress,
508
- locked);
369
+ _registerInterface(type(IInstanceService).interfaceId);
509
370
  }
510
371
 
372
+
511
373
  function _validateInstanceAndComponent(NftId instanceNftId, address componentAddress)
512
374
  internal
513
375
  view
@@ -516,15 +378,27 @@ contract InstanceService is
516
378
  IRegistry registry = getRegistry();
517
379
  IRegistry.ObjectInfo memory instanceInfo = registry.getObjectInfo(instanceNftId);
518
380
  if(instanceInfo.objectType != INSTANCE()) {
519
- revert ErrorInstanceServiceNotInstance(instanceNftId);
381
+ revert ErrorInstanceServiceNotInstanceNftId(instanceNftId);
520
382
  }
521
383
 
522
- IRegistry.ObjectInfo memory componentInfo = registry.getObjectInfo(componentAddress);
523
- if(componentInfo.parentNftId != instanceNftId) {
524
- revert ErrorInstanceServiceInstanceComponentMismatch(instanceNftId, componentInfo.nftId);
384
+ if (registry.getNftIdForAddress(componentAddress).gtz()) {
385
+ IRegistry.ObjectInfo memory componentInfo = registry.getObjectInfo(componentAddress);
386
+
387
+ if(componentInfo.parentNftId != instanceNftId) {
388
+ revert ErrorInstanceServiceInstanceComponentMismatch(instanceNftId, componentInfo.nftId);
389
+ }
390
+
391
+ componentNftId = componentInfo.nftId;
392
+ } else {
393
+
525
394
  }
526
395
 
527
396
  instance = Instance(instanceInfo.objectAddress);
528
- componentNftId = componentInfo.nftId;
397
+
398
+ }
399
+
400
+ // From IService
401
+ function _getDomain() internal pure override returns(ObjectType) {
402
+ return INSTANCE();
529
403
  }
530
404
  }