@etherisc/gif-next 0.0.2-fe88ad7-208 → 0.0.2-ff8087d-237

Sign up to get free protection for your applications and to get access to all the features.
Files changed (378) hide show
  1. package/README.md +8 -13
  2. package/artifacts/contracts/components/Component.sol/Component.dbg.json +4 -0
  3. package/artifacts/contracts/components/Component.sol/Component.json +873 -0
  4. package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +1 -1
  5. package/artifacts/contracts/components/Distribution.sol/Distribution.json +903 -202
  6. package/artifacts/contracts/components/IComponent.sol/IComponent.dbg.json +4 -0
  7. package/artifacts/contracts/components/{BaseComponent.sol/BaseComponent.json → IComponent.sol/IComponent.json} +237 -83
  8. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
  9. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.json +879 -31
  10. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
  11. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.json +879 -59
  12. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +1 -1
  13. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.json +720 -16
  14. package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
  15. package/artifacts/contracts/components/Pool.sol/Pool.json +760 -195
  16. package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
  17. package/artifacts/contracts/components/Product.sol/Product.json +564 -141
  18. package/artifacts/contracts/instance/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.dbg.json +1 -1
  19. package/artifacts/contracts/instance/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.json +15 -15
  20. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.dbg.json +1 -1
  21. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.json +69 -79
  22. package/artifacts/contracts/instance/Cloneable.sol/Cloneable.dbg.json +1 -1
  23. package/artifacts/contracts/instance/Cloneable.sol/Cloneable.json +5 -0
  24. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  25. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +1474 -483
  26. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
  27. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +248 -218
  28. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  29. package/artifacts/contracts/instance/Instance.sol/Instance.json +1152 -794
  30. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +1 -1
  31. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +462 -179
  32. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
  33. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +414 -267
  34. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
  35. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +482 -346
  36. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
  37. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +355 -91
  38. package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.dbg.json +1 -1
  39. package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.json +11 -40
  40. package/artifacts/contracts/instance/base/ComponentService.sol/ComponentService.dbg.json +4 -0
  41. package/artifacts/contracts/instance/base/{ComponentServiceBase.sol/ComponentServiceBase.json → ComponentService.sol/ComponentService.json} +263 -164
  42. package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
  43. package/artifacts/contracts/instance/base/ILifecycle.sol/ILifecycle.dbg.json +1 -1
  44. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
  45. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.json +40 -10
  46. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json +1 -1
  47. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.json +36 -11
  48. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +1 -1
  49. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.json +58 -75
  50. package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
  51. package/artifacts/contracts/instance/module/IComponents.sol/IComponents.dbg.json +4 -0
  52. package/artifacts/contracts/instance/module/IComponents.sol/IComponents.json +10 -0
  53. package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +1 -1
  54. package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +1 -1
  55. package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +1 -1
  56. package/artifacts/contracts/instance/module/ISetup.sol/ISetup.dbg.json +1 -1
  57. package/artifacts/contracts/instance/module/ITreasury.sol/ITreasury.dbg.json +1 -1
  58. package/artifacts/contracts/instance/service/ApplicationService.sol/ApplicationService.dbg.json +4 -0
  59. package/artifacts/contracts/instance/service/ApplicationService.sol/ApplicationService.json +1124 -0
  60. package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +4 -0
  61. package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.json +688 -0
  62. package/artifacts/contracts/instance/service/BundleService.sol/BundleService.dbg.json +1 -1
  63. package/artifacts/contracts/instance/service/BundleService.sol/BundleService.json +641 -303
  64. package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.dbg.json +1 -1
  65. package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.json +343 -79
  66. package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.dbg.json +4 -0
  67. package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.json +1384 -0
  68. package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +4 -0
  69. package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.json +752 -0
  70. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +1 -1
  71. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +1434 -280
  72. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
  73. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.json +469 -73
  74. package/artifacts/contracts/instance/service/IApplicationService.sol/IApplicationService.dbg.json +4 -0
  75. package/artifacts/contracts/instance/service/{IComponentOwnerService.sol/IComponentOwnerService.json → IApplicationService.sol/IApplicationService.json} +342 -189
  76. package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.dbg.json +1 -1
  77. package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.json +310 -249
  78. package/artifacts/contracts/instance/service/IClaimService.sol/IClaimService.dbg.json +4 -0
  79. package/artifacts/contracts/instance/service/IClaimService.sol/IClaimService.json +743 -0
  80. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +1 -1
  81. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.json +757 -144
  82. package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.dbg.json +1 -1
  83. package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.json +262 -275
  84. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +1 -1
  85. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +703 -125
  86. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +1 -1
  87. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +71 -165
  88. package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.dbg.json +1 -1
  89. package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.json +632 -344
  90. package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +1 -1
  91. package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.json +367 -91
  92. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +1 -1
  93. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +1119 -224
  94. package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
  95. package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.json +361 -73
  96. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +1 -1
  97. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +297 -210
  98. package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.dbg.json +1 -1
  99. package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.json +298 -78
  100. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  101. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +15 -2
  102. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  103. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +117 -5
  104. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
  105. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +99 -217
  106. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
  107. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.json +18 -0
  108. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  109. package/artifacts/contracts/registry/Registry.sol/Registry.json +131 -27
  110. package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.dbg.json +1 -1
  111. package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.json +18 -18
  112. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
  113. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +205 -250
  114. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
  115. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +287 -81
  116. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.dbg.json +1 -1
  117. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.json +81 -68
  118. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
  119. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +138 -50
  120. package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.dbg.json +1 -1
  121. package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +1 -1
  122. package/artifacts/contracts/shared/ERC165.sol/ERC165.json +41 -3
  123. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
  124. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.json +27 -29
  125. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +4 -0
  126. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.json +189 -0
  127. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  128. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +8 -34
  129. package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +4 -0
  130. package/artifacts/contracts/{experiment/inheritance/IA.sol/ISharedA.json → shared/IRegistryLinked.sol/IRegistryLinked.json} +15 -17
  131. package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
  132. package/artifacts/contracts/shared/IService.sol/IService.json +71 -165
  133. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +1 -1
  134. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.json +2 -152
  135. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
  136. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +107 -27
  137. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +4 -0
  138. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +302 -0
  139. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +1 -1
  140. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +283 -63
  141. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  142. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +116 -51
  143. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +4 -0
  144. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +71 -0
  145. package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
  146. package/artifacts/contracts/shared/Service.sol/Service.json +173 -153
  147. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
  148. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +24 -6
  149. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
  150. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +2 -2
  151. package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +1 -1
  152. package/artifacts/contracts/shared/Versionable.sol/Versionable.json +2 -152
  153. package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json +1 -1
  154. package/artifacts/contracts/test/TestFee.sol/TestFee.json +2 -2
  155. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json +1 -1
  156. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +116 -51
  157. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +1 -1
  158. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.json +6 -6
  159. package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +1 -1
  160. package/artifacts/contracts/test/TestService.sol/TestService.json +191 -203
  161. package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json +1 -1
  162. package/artifacts/contracts/test/TestVersion.sol/TestVersion.dbg.json +1 -1
  163. package/artifacts/contracts/test/TestVersion.sol/TestVersion.json +2 -2
  164. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json +1 -1
  165. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.json +8 -190
  166. package/artifacts/contracts/test/Usdc.sol/USDC.dbg.json +1 -1
  167. package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.dbg.json +1 -1
  168. package/artifacts/contracts/types/Amount.sol/AmountLib.dbg.json +4 -0
  169. package/artifacts/contracts/types/Amount.sol/AmountLib.json +281 -0
  170. package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
  171. package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.json +2 -2
  172. package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +1 -1
  173. package/artifacts/contracts/types/ClaimId.sol/ClaimIdLib.dbg.json +4 -0
  174. package/artifacts/contracts/types/ClaimId.sol/ClaimIdLib.json +179 -0
  175. package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.dbg.json +1 -1
  176. package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.json +2 -2
  177. package/artifacts/contracts/types/Fee.sol/FeeLib.dbg.json +1 -1
  178. package/artifacts/contracts/types/Fee.sol/FeeLib.json +74 -19
  179. package/artifacts/contracts/types/Key32.sol/Key32Lib.dbg.json +1 -1
  180. package/artifacts/contracts/types/Key32.sol/Key32Lib.json +2 -2
  181. package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +1 -1
  182. package/artifacts/contracts/types/NftId.sol/NftIdLib.json +17 -4
  183. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
  184. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.json +2 -2
  185. package/artifacts/contracts/types/NumberId.sol/NumberIdLib.dbg.json +1 -1
  186. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
  187. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.json +2 -2
  188. package/artifacts/contracts/types/PayoutId.sol/PayoutIdLib.dbg.json +4 -0
  189. package/artifacts/contracts/types/PayoutId.sol/PayoutIdLib.json +209 -0
  190. package/artifacts/contracts/types/Referral.sol/ReferralLib.dbg.json +1 -1
  191. package/artifacts/contracts/types/Referral.sol/ReferralLib.json +23 -4
  192. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.dbg.json +1 -1
  193. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.json +2 -2
  194. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.dbg.json +1 -1
  195. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.json +2 -2
  196. package/artifacts/contracts/types/Seconds.sol/SecondsLib.dbg.json +4 -0
  197. package/artifacts/contracts/types/Seconds.sol/SecondsLib.json +124 -0
  198. package/artifacts/contracts/types/StateId.sol/StateIdLib.dbg.json +1 -1
  199. package/artifacts/contracts/types/StateId.sol/StateIdLib.json +2 -2
  200. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json +1 -1
  201. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.json +38 -7
  202. package/artifacts/contracts/types/UFixed.sol/MathLib.dbg.json +1 -1
  203. package/artifacts/contracts/types/UFixed.sol/MathLib.json +2 -2
  204. package/artifacts/contracts/types/UFixed.sol/UFixedLib.dbg.json +1 -1
  205. package/artifacts/contracts/types/UFixed.sol/UFixedLib.json +2 -2
  206. package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +1 -1
  207. package/artifacts/contracts/types/Version.sol/VersionLib.json +2 -2
  208. package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +1 -1
  209. package/artifacts/contracts/types/Version.sol/VersionPartLib.json +2 -2
  210. package/contracts/components/Component.sol +272 -0
  211. package/contracts/components/Distribution.sol +204 -82
  212. package/contracts/components/IComponent.sol +90 -0
  213. package/contracts/components/IDistributionComponent.sol +44 -17
  214. package/contracts/components/IPoolComponent.sol +90 -42
  215. package/contracts/components/IProductComponent.sol +15 -9
  216. package/contracts/components/Pool.sol +217 -186
  217. package/contracts/components/Product.sol +246 -166
  218. package/contracts/instance/AccessManagerUpgradeableInitializeable.sol +2 -12
  219. package/contracts/instance/BundleManager.sol +17 -20
  220. package/contracts/instance/Cloneable.sol +7 -2
  221. package/contracts/instance/IInstance.sol +67 -25
  222. package/contracts/instance/IInstanceService.sol +34 -11
  223. package/contracts/instance/Instance.sol +158 -116
  224. package/contracts/instance/InstanceAccessManager.sol +389 -165
  225. package/contracts/instance/InstanceReader.sol +87 -36
  226. package/contracts/instance/InstanceService.sol +295 -161
  227. package/contracts/instance/InstanceServiceManager.sol +1 -1
  228. package/contracts/instance/ObjectManager.sol +10 -29
  229. package/contracts/instance/base/ComponentService.sol +130 -0
  230. package/contracts/instance/base/KeyValueStore.sol +13 -36
  231. package/contracts/instance/base/Lifecycle.sol +26 -6
  232. package/contracts/instance/module/IAccess.sol +22 -16
  233. package/contracts/instance/module/IBundle.sol +8 -5
  234. package/contracts/instance/module/IComponents.sol +41 -0
  235. package/contracts/instance/module/IDistribution.sol +3 -0
  236. package/contracts/instance/module/IPolicy.sol +43 -11
  237. package/contracts/instance/module/ISetup.sol +7 -20
  238. package/contracts/instance/service/ApplicationService.sol +356 -0
  239. package/contracts/instance/service/ApplicationServiceManager.sol +35 -0
  240. package/contracts/instance/service/BundleService.sol +244 -119
  241. package/contracts/instance/service/BundleServiceManager.sol +1 -1
  242. package/contracts/instance/service/ClaimService.sol +443 -0
  243. package/contracts/instance/service/ClaimServiceManager.sol +35 -0
  244. package/contracts/instance/service/DistributionService.sol +360 -41
  245. package/contracts/instance/service/DistributionServiceManager.sol +1 -1
  246. package/contracts/instance/service/IApplicationService.sol +79 -0
  247. package/contracts/instance/service/IBundleService.sol +93 -20
  248. package/contracts/instance/service/IClaimService.sol +90 -0
  249. package/contracts/instance/service/IDistributionService.sol +89 -0
  250. package/contracts/instance/service/IPolicyService.sol +44 -51
  251. package/contracts/instance/service/IPoolService.sol +97 -3
  252. package/contracts/instance/service/PolicyService.sol +233 -364
  253. package/contracts/instance/service/PolicyServiceManager.sol +2 -2
  254. package/contracts/instance/service/PoolService.sol +319 -40
  255. package/contracts/instance/service/PoolServiceManager.sol +1 -1
  256. package/contracts/instance/service/ProductService.sol +90 -50
  257. package/contracts/instance/service/ProductServiceManager.sol +2 -2
  258. package/contracts/registry/ChainNft.sol +8 -0
  259. package/contracts/registry/IRegistry.sol +18 -8
  260. package/contracts/registry/IRegistryService.sol +21 -13
  261. package/contracts/registry/ITransferInterceptor.sol +1 -0
  262. package/contracts/registry/Registry.sol +142 -71
  263. package/contracts/registry/RegistryAccessManager.sol +31 -25
  264. package/contracts/registry/RegistryService.sol +93 -134
  265. package/contracts/registry/RegistryServiceManager.sol +13 -13
  266. package/contracts/registry/ReleaseManager.sol +103 -127
  267. package/contracts/registry/TokenRegistry.sol +19 -13
  268. package/contracts/shared/ERC165.sol +14 -12
  269. package/contracts/shared/INftOwnable.sol +11 -10
  270. package/contracts/shared/IPolicyHolder.sol +40 -0
  271. package/contracts/shared/IRegisterable.sol +4 -6
  272. package/contracts/shared/IRegistryLinked.sol +11 -0
  273. package/contracts/shared/IService.sol +6 -4
  274. package/contracts/shared/IVersionable.sol +4 -47
  275. package/contracts/shared/NftOwnable.sol +64 -80
  276. package/contracts/shared/PolicyHolder.sol +94 -0
  277. package/contracts/shared/ProxyManager.sol +100 -25
  278. package/contracts/shared/Registerable.sol +24 -39
  279. package/contracts/shared/RegistryLinked.sol +43 -0
  280. package/contracts/shared/Service.sol +36 -22
  281. package/contracts/shared/TokenHandler.sol +14 -6
  282. package/contracts/shared/Versionable.sol +4 -92
  283. package/contracts/test/TestRegisterable.sol +1 -1
  284. package/contracts/test/TestService.sol +1 -1
  285. package/contracts/types/Amount.sol +109 -0
  286. package/contracts/types/Blocknumber.sol +1 -0
  287. package/contracts/types/ClaimId.sol +75 -0
  288. package/contracts/types/DistributorType.sol +2 -2
  289. package/contracts/types/Fee.sol +17 -8
  290. package/contracts/types/NftId.sol +8 -0
  291. package/contracts/types/ObjectType.sol +11 -6
  292. package/contracts/types/PayoutId.sol +82 -0
  293. package/contracts/types/Referral.sol +4 -0
  294. package/contracts/types/RoleId.sol +18 -11
  295. package/contracts/types/Seconds.sol +54 -0
  296. package/contracts/types/StateId.sol +7 -2
  297. package/contracts/types/Timestamp.sol +18 -13
  298. package/contracts/types/UFixed.sol +1 -0
  299. package/contracts/types/Version.sol +1 -0
  300. package/package.json +3 -3
  301. package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.dbg.json +0 -4
  302. package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.dbg.json +0 -4
  303. package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.json +0 -397
  304. package/artifacts/contracts/experiment/cloning/Cloner.sol/Cloner.dbg.json +0 -4
  305. package/artifacts/contracts/experiment/cloning/Cloner.sol/Cloner.json +0 -66
  306. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock1.dbg.json +0 -4
  307. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock1.json +0 -24
  308. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock2.dbg.json +0 -4
  309. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock2.json +0 -42
  310. package/artifacts/contracts/experiment/errors/Require.sol/Require.dbg.json +0 -4
  311. package/artifacts/contracts/experiment/errors/Require.sol/Require.json +0 -105
  312. package/artifacts/contracts/experiment/errors/Revert.sol/Revert.dbg.json +0 -4
  313. package/artifacts/contracts/experiment/errors/Revert.sol/Revert.json +0 -105
  314. package/artifacts/contracts/experiment/inheritance/A.sol/A.dbg.json +0 -4
  315. package/artifacts/contracts/experiment/inheritance/A.sol/A.json +0 -128
  316. package/artifacts/contracts/experiment/inheritance/A.sol/AShared.dbg.json +0 -4
  317. package/artifacts/contracts/experiment/inheritance/A.sol/AShared.json +0 -42
  318. package/artifacts/contracts/experiment/inheritance/B.sol/B.dbg.json +0 -4
  319. package/artifacts/contracts/experiment/inheritance/B.sol/B.json +0 -76
  320. package/artifacts/contracts/experiment/inheritance/C.sol/C.dbg.json +0 -4
  321. package/artifacts/contracts/experiment/inheritance/C.sol/C.json +0 -89
  322. package/artifacts/contracts/experiment/inheritance/IA.sol/IA.dbg.json +0 -4
  323. package/artifacts/contracts/experiment/inheritance/IA.sol/IA.json +0 -128
  324. package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.dbg.json +0 -4
  325. package/artifacts/contracts/experiment/inheritance/IB.sol/IB.dbg.json +0 -4
  326. package/artifacts/contracts/experiment/inheritance/IB.sol/IB.json +0 -50
  327. package/artifacts/contracts/experiment/inheritance/IC.sol/IC.dbg.json +0 -4
  328. package/artifacts/contracts/experiment/inheritance/IC.sol/IC.json +0 -63
  329. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.dbg.json +0 -4
  330. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.json +0 -59
  331. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.dbg.json +0 -4
  332. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.json +0 -124
  333. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.dbg.json +0 -4
  334. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.json +0 -74
  335. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.dbg.json +0 -4
  336. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.json +0 -124
  337. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.dbg.json +0 -4
  338. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.json +0 -207
  339. package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.dbg.json +0 -4
  340. package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.json +0 -10
  341. package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.dbg.json +0 -4
  342. package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.json +0 -10
  343. package/artifacts/contracts/instance/IInstanceBase.sol/IInstanceBase.dbg.json +0 -4
  344. package/artifacts/contracts/instance/IInstanceBase.sol/IInstanceBase.json +0 -448
  345. package/artifacts/contracts/instance/InstanceBase.sol/InstanceBase.dbg.json +0 -4
  346. package/artifacts/contracts/instance/InstanceBase.sol/InstanceBase.json +0 -763
  347. package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.dbg.json +0 -4
  348. package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.dbg.json +0 -4
  349. package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.json +0 -113
  350. package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.dbg.json +0 -4
  351. package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.json +0 -814
  352. package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.dbg.json +0 -4
  353. package/artifacts/contracts/shared/RegisterableUpgradable.sol/RegisterableUpgradable.dbg.json +0 -4
  354. package/artifacts/contracts/shared/RegisterableUpgradable.sol/RegisterableUpgradable.json +0 -442
  355. package/contracts/components/BaseComponent.sol +0 -159
  356. package/contracts/components/IBaseComponent.sol +0 -34
  357. package/contracts/experiment/cloning/Cloner.sol +0 -47
  358. package/contracts/experiment/errors/Require.sol +0 -38
  359. package/contracts/experiment/errors/Revert.sol +0 -44
  360. package/contracts/experiment/inheritance/A.sol +0 -53
  361. package/contracts/experiment/inheritance/B.sol +0 -28
  362. package/contracts/experiment/inheritance/C.sol +0 -34
  363. package/contracts/experiment/inheritance/IA.sol +0 -13
  364. package/contracts/experiment/inheritance/IB.sol +0 -10
  365. package/contracts/experiment/inheritance/IC.sol +0 -12
  366. package/contracts/experiment/statemachine/Dummy.sol +0 -27
  367. package/contracts/experiment/statemachine/ISM.sol +0 -25
  368. package/contracts/experiment/statemachine/SM.sol +0 -57
  369. package/contracts/experiment/statemachine/SimpleStateMachine.sol +0 -31
  370. package/contracts/experiment/types/TypeA.sol +0 -47
  371. package/contracts/experiment/types/TypeB.sol +0 -29
  372. package/contracts/instance/IInstanceBase.sol +0 -26
  373. package/contracts/instance/InstanceBase.sol +0 -41
  374. package/contracts/instance/base/ComponentServiceBase.sol +0 -82
  375. package/contracts/instance/base/IInstanceBase.sol +0 -23
  376. package/contracts/instance/service/ComponentOwnerService.sol +0 -315
  377. package/contracts/instance/service/IComponentOwnerService.sol +0 -20
  378. package/contracts/shared/RegisterableUpgradable.sol +0 -16
@@ -2,6 +2,7 @@
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";
5
6
 
6
7
  import {Instance} from "./Instance.sol";
7
8
  import {IInstance} from "./IInstance.sol";
@@ -9,41 +10,48 @@ import {InstanceAccessManager} from "./InstanceAccessManager.sol";
9
10
  import {IInstanceService} from "./IInstanceService.sol";
10
11
  import {InstanceReader} from "./InstanceReader.sol";
11
12
  import {BundleManager} from "./BundleManager.sol";
13
+ import {AccessManagerUpgradeableInitializeable} from "./AccessManagerUpgradeableInitializeable.sol";
12
14
  import {IRegistry} from "../registry/IRegistry.sol";
13
- import {RegistryService} from "../registry/RegistryService.sol";
14
- import {ChainNft} from "../registry/ChainNft.sol";
15
+ import {IRegistryService} from "../registry/IRegistryService.sol";
15
16
  import {Service} from "../../contracts/shared/Service.sol";
16
- import {IService} from "../shared/IService.sol";
17
17
  import {NftId} from "../../contracts/types/NftId.sol";
18
18
  import {RoleId} from "../types/RoleId.sol";
19
- import {ADMIN_ROLE, DISTRIBUTION_OWNER_ROLE, POOL_OWNER_ROLE, PRODUCT_OWNER_ROLE, INSTANCE_SERVICE_ROLE, DISTRIBUTION_SERVICE_ROLE, POOL_SERVICE_ROLE, PRODUCT_SERVICE_ROLE, POLICY_SERVICE_ROLE, BUNDLE_SERVICE_ROLE} from "../types/RoleId.sol";
20
- import {ObjectType, INSTANCE, BUNDLE, POLICY, PRODUCT, DISTRIBUTION, REGISTRY, POOL} from "../types/ObjectType.sol";
19
+ 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";
20
+ import {ObjectType, INSTANCE, BUNDLE, APPLICATION, POLICY, CLAIM, PRODUCT, DISTRIBUTION, REGISTRY, POOL} from "../types/ObjectType.sol";
21
21
 
22
- contract InstanceService is Service, IInstanceService {
22
+ contract InstanceService is
23
+ Service,
24
+ IInstanceService
25
+ {
23
26
 
27
+ // TODO update to real hash when instance is stable
28
+ bytes32 public constant INSTANCE_CREATION_CODE_HASH = bytes32(0);
29
+
30
+ IRegistryService internal _registryService;
31
+ address internal _masterOzAccessManager;
24
32
  address internal _masterInstanceAccessManager;
25
33
  address internal _masterInstance;
26
34
  address internal _masterInstanceReader;
27
35
  address internal _masterInstanceBundleManager;
28
36
 
29
- // TODO update to real hash when instance is stable
30
- bytes32 public constant INSTANCE_CREATION_CODE_HASH = bytes32(0);
31
- string public constant NAME = "InstanceService";
32
-
33
- modifier onlyInstanceOwner(NftId instanceNftId) {
34
- IRegistry registry = getRegistry();
35
- ChainNft chainNft = registry.getChainNft();
36
-
37
- if( msg.sender != chainNft.ownerOf(instanceNftId.toInt())) {
38
- revert ErrorInstanceServiceNotInstanceOwner(msg.sender, instanceNftId);
37
+ modifier onlyInstanceOwner(NftId instanceNftId) {
38
+ if(msg.sender != getRegistry().ownerOf(instanceNftId)) {
39
+ revert ErrorInstanceServiceRequestUnauhorized(msg.sender);
39
40
  }
40
41
  _;
41
42
  }
42
-
43
+ // TODO check service domain?
44
+ // TODO check release version?
43
45
  modifier onlyRegisteredService() {
44
- address caller = msg.sender;
45
- if (! getRegistry().isRegisteredService(caller)) {
46
- revert ErrorInstanceServiceRequestUnauhorized(caller);
46
+ if (! getRegistry().isRegisteredService(msg.sender)) {
47
+ revert ErrorInstanceServiceRequestUnauhorized(msg.sender);
48
+ }
49
+ _;
50
+ }
51
+ // TODO check release version?
52
+ modifier onlyComponent() {
53
+ if (! getRegistry().isRegisteredComponent(msg.sender)) {
54
+ revert ErrorInstanceServiceRequestUnauhorized(msg.sender);
47
55
  }
48
56
  _;
49
57
  }
@@ -51,102 +59,130 @@ contract InstanceService is Service, IInstanceService {
51
59
  function createInstanceClone()
52
60
  external
53
61
  returns (
54
- InstanceAccessManager clonedAccessManager,
55
62
  Instance clonedInstance,
56
- NftId clonedInstanceNftId,
57
- InstanceReader clonedInstanceReader,
58
- BundleManager clonedBundleManager
63
+ NftId clonedInstanceNftId
59
64
  )
60
65
  {
61
66
  address instanceOwner = msg.sender;
62
- IRegistry registry = getRegistry();
63
- address registryAddress = address(registry);
64
- NftId registryNftId = registry.getNftId(registryAddress);
65
- address registryServiceAddress = registry.getServiceAddress(REGISTRY(), getMajorVersion());
66
- RegistryService registryService = RegistryService(registryServiceAddress);
67
+ AccessManagerUpgradeableInitializeable clonedOzAccessManager = AccessManagerUpgradeableInitializeable(
68
+ Clones.clone(_masterOzAccessManager));
67
69
 
68
- // initially set the authority of the access managar to this (being the instance service).
69
- // This will allow the instance service to bootstrap the authorizations of the instance
70
- // and then transfer the ownership of the access manager to the instance owner once everything is setup
71
- clonedAccessManager = InstanceAccessManager(Clones.clone(_masterInstanceAccessManager));
72
- clonedAccessManager.__InstanceAccessManager_initialize(address(this));
70
+ // initially grants ADMIN_ROLE to this (being the instance service).
71
+ // This will allow the instance service to bootstrap the authorizations of the instance.
72
+ // Instance service will not use oz access manager directlly but through instance access manager instead
73
+ // Instance service will renounce ADMIN_ROLE when bootstraping is finished
74
+ clonedOzAccessManager.initialize(address(this));
73
75
 
74
76
  clonedInstance = Instance(Clones.clone(_masterInstance));
75
- clonedInstance.initialize(address(clonedAccessManager), registryAddress, registryNftId, msg.sender);
76
- ( IRegistry.ObjectInfo memory info, ) = registryService.registerInstance(clonedInstance);
77
- clonedInstanceNftId = info.nftId;
77
+ clonedInstance.initialize(
78
+ address(clonedOzAccessManager),
79
+ address(getRegistry()),
80
+ instanceOwner);
78
81
 
79
- clonedInstanceReader = InstanceReader(Clones.clone(address(_masterInstanceReader)));
80
- clonedInstanceReader.initialize(registryAddress, clonedInstanceNftId);
82
+ InstanceReader clonedInstanceReader = InstanceReader(Clones.clone(address(_masterInstanceReader)));
83
+ clonedInstanceReader.initialize(address(clonedInstance));
81
84
  clonedInstance.setInstanceReader(clonedInstanceReader);
82
85
 
83
- clonedBundleManager = BundleManager(Clones.clone(_masterInstanceBundleManager));
84
- clonedBundleManager.initialize(address(clonedAccessManager), registryAddress, clonedInstanceNftId);
86
+ BundleManager clonedBundleManager = BundleManager(Clones.clone(_masterInstanceBundleManager));
87
+ clonedBundleManager.initialize(address(clonedInstance));
85
88
  clonedInstance.setBundleManager(clonedBundleManager);
86
89
 
90
+ InstanceAccessManager clonedInstanceAccessManager = InstanceAccessManager(Clones.clone(_masterInstanceAccessManager));
91
+ clonedOzAccessManager.grantRole(ADMIN_ROLE().toInt(), address(clonedInstanceAccessManager), 0);
92
+ clonedInstanceAccessManager.initialize(address(clonedInstance));
93
+ clonedInstance.setInstanceAccessManager(clonedInstanceAccessManager);
94
+
87
95
  // TODO amend setters with instance specific , policy manager ...
88
96
 
89
- _grantInitialAuthorizations(clonedAccessManager, clonedInstance, clonedBundleManager);
97
+ _grantInitialAuthorizations(clonedInstanceAccessManager, clonedInstance, clonedBundleManager, instanceOwner);
90
98
 
91
- // to complete setup switch instance ownership to the instance owner
92
- // TODO: use a role less powerful than admin, maybe INSTANCE_ADMIN (does not exist yet)
93
- clonedAccessManager.grantRole(ADMIN_ROLE(), instanceOwner);
94
- clonedAccessManager.revokeRole(ADMIN_ROLE(), address(this));
99
+ clonedOzAccessManager.renounceRole(ADMIN_ROLE().toInt(), address(this));
95
100
 
96
- emit LogInstanceCloned(address(clonedAccessManager), address(clonedInstance), address(clonedInstanceReader), clonedInstanceNftId);
101
+ IRegistry.ObjectInfo memory info = _registryService.registerInstance(clonedInstance, instanceOwner);
102
+ clonedInstanceNftId = info.nftId;
103
+
104
+ emit LogInstanceCloned(
105
+ address(clonedOzAccessManager),
106
+ address(clonedInstanceAccessManager),
107
+ address(clonedInstance),
108
+ address(clonedBundleManager),
109
+ address(clonedInstanceReader),
110
+ clonedInstanceNftId);
97
111
  }
98
112
 
99
- function _grantInitialAuthorizations(InstanceAccessManager clonedAccessManager, Instance clonedInstance, BundleManager clonedBundleManager) internal {
100
- _createGifRoles(clonedAccessManager);
101
- _createGifTargets(clonedAccessManager, clonedInstance, clonedBundleManager);
113
+ function _grantInitialAuthorizations(
114
+ InstanceAccessManager clonedAccessManager,
115
+ Instance clonedInstance,
116
+ BundleManager clonedBundleManager,
117
+ address instanceOwner)
118
+ internal
119
+ {
120
+ _createCoreAndGifRoles(clonedAccessManager);
121
+ _createCoreTargets(clonedAccessManager, clonedInstance, clonedBundleManager);
102
122
  _grantDistributionServiceAuthorizations(clonedAccessManager, clonedInstance);
103
123
  _grantPoolServiceAuthorizations(clonedAccessManager, clonedInstance);
104
124
  _grantProductServiceAuthorizations(clonedAccessManager, clonedInstance);
125
+ _grantApplicationServiceAuthorizations(clonedAccessManager, clonedInstance);
105
126
  _grantPolicyServiceAuthorizations(clonedAccessManager, clonedInstance);
127
+ _grantClaimServiceAuthorizations(clonedAccessManager, clonedInstance);
106
128
  _grantBundleServiceAuthorizations(clonedAccessManager, clonedInstance, clonedBundleManager);
107
129
  _grantInstanceServiceAuthorizations(clonedAccessManager, clonedInstance);
130
+ _grantInstanceOwnerAuthorizations(clonedAccessManager, instanceOwner);
108
131
  }
109
132
 
110
- function _createGifRoles(InstanceAccessManager clonedAccessManager) internal {
111
- clonedAccessManager.createGifRole(DISTRIBUTION_OWNER_ROLE(), "DistributionOwnerRole");
112
- clonedAccessManager.createGifRole(POOL_OWNER_ROLE(), "PoolOwnerRole");
113
- clonedAccessManager.createGifRole(PRODUCT_OWNER_ROLE(), "ProductOwnerRole");
114
-
115
- clonedAccessManager.createGifRole(DISTRIBUTION_SERVICE_ROLE(), "DistributionServiceRole");
116
- clonedAccessManager.createGifRole(POOL_SERVICE_ROLE(), "PoolServiceRole");
117
- clonedAccessManager.createGifRole(PRODUCT_SERVICE_ROLE(), "ProductServiceRole");
118
- clonedAccessManager.createGifRole(POLICY_SERVICE_ROLE(), "PolicyServiceRole");
119
- clonedAccessManager.createGifRole(BUNDLE_SERVICE_ROLE(), "BundleServiceRole");
120
- clonedAccessManager.createGifRole(INSTANCE_SERVICE_ROLE(), "InstanceServiceRole");
133
+ function _createCoreAndGifRoles(InstanceAccessManager clonedAccessManager) internal {
134
+ // default roles controlled by ADMIN_ROLE -> core roles
135
+ // all set/granted only once during cloning (the only exception is INSTANCE_OWNER_ROLE, hooked to instance nft)
136
+ clonedAccessManager.createCoreRole(INSTANCE_SERVICE_ROLE(), "InstanceServiceRole");
137
+ clonedAccessManager.createCoreRole(DISTRIBUTION_SERVICE_ROLE(), "DistributionServiceRole");
138
+ clonedAccessManager.createCoreRole(POOL_SERVICE_ROLE(), "PoolServiceRole");
139
+ clonedAccessManager.createCoreRole(APPLICATION_SERVICE_ROLE(), "ApplicationServiceRole");
140
+ clonedAccessManager.createCoreRole(PRODUCT_SERVICE_ROLE(), "ProductServiceRole");
141
+ clonedAccessManager.createCoreRole(CLAIM_SERVICE_ROLE(), "ClaimServiceRole");
142
+ clonedAccessManager.createCoreRole(POLICY_SERVICE_ROLE(), "PolicyServiceRole");
143
+ clonedAccessManager.createCoreRole(BUNDLE_SERVICE_ROLE(), "BundleServiceRole");
144
+ // default roles controlled by INSTANCE_OWNER_ROLE -> gif roles
145
+ clonedAccessManager.createGifRole(DISTRIBUTION_OWNER_ROLE(), "DistributionOwnerRole", INSTANCE_OWNER_ROLE());
146
+ clonedAccessManager.createGifRole(POOL_OWNER_ROLE(), "PoolOwnerRole", INSTANCE_OWNER_ROLE());
147
+ clonedAccessManager.createGifRole(PRODUCT_OWNER_ROLE(), "ProductOwnerRole", INSTANCE_OWNER_ROLE());
121
148
  }
122
149
 
123
- function _createGifTargets(InstanceAccessManager clonedAccessManager, Instance clonedInstance, BundleManager clonedBundleManager) internal {
124
- clonedAccessManager.createGifTarget(address(clonedInstance), "Instance");
125
- clonedAccessManager.createGifTarget(address(clonedBundleManager), "BundleManager");
150
+ function _createCoreTargets(InstanceAccessManager clonedAccessManager, Instance clonedInstance, BundleManager clonedBundleManager) internal {
151
+ clonedAccessManager.createCoreTarget(address(clonedAccessManager), "InstanceAccessManager");
152
+ clonedAccessManager.createCoreTarget(address(clonedInstance), "Instance");
153
+ clonedAccessManager.createCoreTarget(address(clonedBundleManager), "BundleManager");
126
154
  }
127
155
 
128
156
  function _grantDistributionServiceAuthorizations(InstanceAccessManager clonedAccessManager, Instance clonedInstance) internal {
129
157
  // configure authorization for distribution service on instance
130
- IRegistry registry = getRegistry();
131
- address distributionServiceAddress = registry.getServiceAddress(DISTRIBUTION(), getMajorVersion());
158
+ address distributionServiceAddress = getRegistry().getServiceAddress(DISTRIBUTION(), getVersion().toMajorPart());
132
159
  clonedAccessManager.grantRole(DISTRIBUTION_SERVICE_ROLE(), distributionServiceAddress);
133
- bytes4[] memory instanceDistributionServiceSelectors = new bytes4[](2);
160
+ bytes4[] memory instanceDistributionServiceSelectors = new bytes4[](11);
134
161
  instanceDistributionServiceSelectors[0] = clonedInstance.createDistributionSetup.selector;
135
162
  instanceDistributionServiceSelectors[1] = clonedInstance.updateDistributionSetup.selector;
136
- clonedAccessManager.setTargetFunctionRole(
163
+ instanceDistributionServiceSelectors[2] = clonedInstance.createDistributorType.selector;
164
+ instanceDistributionServiceSelectors[3] = clonedInstance.updateDistributorType.selector;
165
+ instanceDistributionServiceSelectors[4] = clonedInstance.updateDistributorTypeState.selector;
166
+ instanceDistributionServiceSelectors[5] = clonedInstance.createDistributor.selector;
167
+ instanceDistributionServiceSelectors[6] = clonedInstance.updateDistributor.selector;
168
+ instanceDistributionServiceSelectors[7] = clonedInstance.updateDistributorState.selector;
169
+ instanceDistributionServiceSelectors[8] = clonedInstance.createReferral.selector;
170
+ instanceDistributionServiceSelectors[9] = clonedInstance.updateReferral.selector;
171
+ instanceDistributionServiceSelectors[10] = clonedInstance.updateReferralState.selector;
172
+ clonedAccessManager.setCoreTargetFunctionRole(
137
173
  "Instance",
138
174
  instanceDistributionServiceSelectors,
139
- DISTRIBUTION_SERVICE_ROLE());
175
+ DISTRIBUTION_SERVICE_ROLE());
140
176
  }
141
177
 
142
178
  function _grantPoolServiceAuthorizations(InstanceAccessManager clonedAccessManager, Instance clonedInstance) internal {
143
179
  // configure authorization for pool service on instance
144
- address poolServiceAddress = _registry.getServiceAddress(POOL(), getMajorVersion());
180
+ address poolServiceAddress = getRegistry().getServiceAddress(POOL(), getVersion().toMajorPart());
145
181
  clonedAccessManager.grantRole(POOL_SERVICE_ROLE(), address(poolServiceAddress));
146
182
  bytes4[] memory instancePoolServiceSelectors = new bytes4[](4);
147
183
  instancePoolServiceSelectors[0] = clonedInstance.createPoolSetup.selector;
148
184
  instancePoolServiceSelectors[1] = clonedInstance.updatePoolSetup.selector;
149
- clonedAccessManager.setTargetFunctionRole(
185
+ clonedAccessManager.setCoreTargetFunctionRole(
150
186
  "Instance",
151
187
  instancePoolServiceSelectors,
152
188
  POOL_SERVICE_ROLE());
@@ -154,7 +190,7 @@ contract InstanceService is Service, IInstanceService {
154
190
 
155
191
  function _grantProductServiceAuthorizations(InstanceAccessManager clonedAccessManager, Instance clonedInstance) internal {
156
192
  // configure authorization for product service on instance
157
- address productServiceAddress = _registry.getServiceAddress(PRODUCT(), getMajorVersion());
193
+ address productServiceAddress = getRegistry().getServiceAddress(PRODUCT(), getVersion().toMajorPart());
158
194
  clonedAccessManager.grantRole(PRODUCT_SERVICE_ROLE(), address(productServiceAddress));
159
195
  bytes4[] memory instanceProductServiceSelectors = new bytes4[](5);
160
196
  instanceProductServiceSelectors[0] = clonedInstance.createProductSetup.selector;
@@ -162,34 +198,71 @@ contract InstanceService is Service, IInstanceService {
162
198
  instanceProductServiceSelectors[2] = clonedInstance.createRisk.selector;
163
199
  instanceProductServiceSelectors[3] = clonedInstance.updateRisk.selector;
164
200
  instanceProductServiceSelectors[4] = clonedInstance.updateRiskState.selector;
165
- clonedAccessManager.setTargetFunctionRole(
201
+ clonedAccessManager.setCoreTargetFunctionRole(
166
202
  "Instance",
167
203
  instanceProductServiceSelectors,
168
204
  PRODUCT_SERVICE_ROLE());
169
205
  }
170
206
 
207
+ function _grantApplicationServiceAuthorizations(InstanceAccessManager clonedAccessManager, Instance clonedInstance) internal {
208
+ // configure authorization for application services on instance
209
+ address applicationServiceAddress = getRegistry().getServiceAddress(APPLICATION(), getVersion().toMajorPart());
210
+ clonedAccessManager.grantRole(APPLICATION_SERVICE_ROLE(), applicationServiceAddress);
211
+ bytes4[] memory instanceApplicationServiceSelectors = new bytes4[](3);
212
+ instanceApplicationServiceSelectors[0] = clonedInstance.createApplication.selector;
213
+ instanceApplicationServiceSelectors[1] = clonedInstance.updateApplication.selector;
214
+ instanceApplicationServiceSelectors[2] = clonedInstance.updateApplicationState.selector;
215
+ clonedAccessManager.setCoreTargetFunctionRole(
216
+ "Instance",
217
+ instanceApplicationServiceSelectors,
218
+ APPLICATION_SERVICE_ROLE());
219
+ }
220
+
171
221
  function _grantPolicyServiceAuthorizations(InstanceAccessManager clonedAccessManager, Instance clonedInstance) internal {
172
- // configure authorization for policy service on instance
173
- address policyServiceAddress = _registry.getServiceAddress(POLICY(), getMajorVersion());
174
- clonedAccessManager.grantRole(POLICY_SERVICE_ROLE(), address(policyServiceAddress));
175
- bytes4[] memory instancePolicyServiceSelectors = new bytes4[](3);
176
- instancePolicyServiceSelectors[0] = clonedInstance.createPolicy.selector;
177
- instancePolicyServiceSelectors[1] = clonedInstance.updatePolicy.selector;
178
- instancePolicyServiceSelectors[2] = clonedInstance.updatePolicyState.selector;
179
- clonedAccessManager.setTargetFunctionRole(
222
+ // configure authorization for policy services on instance
223
+ address policyServiceAddress = getRegistry().getServiceAddress(POLICY(), getVersion().toMajorPart());
224
+ clonedAccessManager.grantRole(POLICY_SERVICE_ROLE(), policyServiceAddress);
225
+ bytes4[] memory instancePolicyServiceSelectors = new bytes4[](2);
226
+ instancePolicyServiceSelectors[0] = clonedInstance.updatePolicy.selector;
227
+ instancePolicyServiceSelectors[1] = clonedInstance.updatePolicyState.selector;
228
+ clonedAccessManager.setCoreTargetFunctionRole(
180
229
  "Instance",
181
230
  instancePolicyServiceSelectors,
182
231
  POLICY_SERVICE_ROLE());
183
232
  }
184
233
 
234
+ function _grantClaimServiceAuthorizations(InstanceAccessManager clonedAccessManager, Instance clonedInstance) internal {
235
+ // configure authorization for claim/payout services on instance
236
+ address claimServiceAddress = getRegistry().getServiceAddress(CLAIM(), getVersion().toMajorPart());
237
+ clonedAccessManager.grantRole(CLAIM_SERVICE_ROLE(), claimServiceAddress);
238
+
239
+ bytes4[] memory instancePolicyServiceSelectors = new bytes4[](1);
240
+ instancePolicyServiceSelectors[0] = clonedInstance.updatePolicyClaims.selector;
241
+ clonedAccessManager.setCoreTargetFunctionRole(
242
+ "Instance",
243
+ instancePolicyServiceSelectors,
244
+ CLAIM_SERVICE_ROLE());
245
+
246
+ bytes4[] memory instanceClaimServiceSelectors = new bytes4[](4);
247
+ instanceClaimServiceSelectors[0] = clonedInstance.createClaim.selector;
248
+ instanceClaimServiceSelectors[1] = clonedInstance.updateClaim.selector;
249
+ instanceClaimServiceSelectors[2] = clonedInstance.createPayout.selector;
250
+ instanceClaimServiceSelectors[3] = clonedInstance.updatePayout.selector;
251
+ clonedAccessManager.setCoreTargetFunctionRole(
252
+ "Instance",
253
+ instanceClaimServiceSelectors,
254
+ CLAIM_SERVICE_ROLE());
255
+ }
256
+
185
257
  function _grantBundleServiceAuthorizations(InstanceAccessManager clonedAccessManager, Instance clonedInstance, BundleManager clonedBundleManager) internal {
186
258
  // configure authorization for bundle service on instance
187
- address bundleServiceAddress = _registry.getServiceAddress(BUNDLE(), getMajorVersion());
259
+ address bundleServiceAddress = getRegistry().getServiceAddress(BUNDLE(), getVersion().toMajorPart());
188
260
  clonedAccessManager.grantRole(BUNDLE_SERVICE_ROLE(), address(bundleServiceAddress));
189
- bytes4[] memory instanceBundleServiceSelectors = new bytes4[](2);
261
+ bytes4[] memory instanceBundleServiceSelectors = new bytes4[](3);
190
262
  instanceBundleServiceSelectors[0] = clonedInstance.createBundle.selector;
191
263
  instanceBundleServiceSelectors[1] = clonedInstance.updateBundle.selector;
192
- clonedAccessManager.setTargetFunctionRole(
264
+ instanceBundleServiceSelectors[2] = clonedInstance.updateBundleState.selector;
265
+ clonedAccessManager.setCoreTargetFunctionRole(
193
266
  "Instance",
194
267
  instanceBundleServiceSelectors,
195
268
  BUNDLE_SERVICE_ROLE());
@@ -201,100 +274,169 @@ contract InstanceService is Service, IInstanceService {
201
274
  bundleManagerBundleServiceSelectors[2] = clonedBundleManager.add.selector;
202
275
  bundleManagerBundleServiceSelectors[3] = clonedBundleManager.lock.selector;
203
276
  bundleManagerBundleServiceSelectors[4] = clonedBundleManager.unlock.selector;
204
- clonedAccessManager.setTargetFunctionRole(
277
+ clonedAccessManager.setCoreTargetFunctionRole(
205
278
  "BundleManager",
206
279
  bundleManagerBundleServiceSelectors,
207
280
  BUNDLE_SERVICE_ROLE());
208
281
  }
209
282
 
210
283
  function _grantInstanceServiceAuthorizations(InstanceAccessManager clonedAccessManager, Instance clonedInstance) internal {
211
- // configure authorization for instance service on instance
212
- address instanceServiceAddress = _registry.getServiceAddress(INSTANCE(), getMajorVersion());
284
+ // configure authorization for instance service on instance
285
+ address instanceServiceAddress = getRegistry().getServiceAddress(INSTANCE(), getVersion().toMajorPart());
213
286
  clonedAccessManager.grantRole(INSTANCE_SERVICE_ROLE(), instanceServiceAddress);
214
287
  bytes4[] memory instanceInstanceServiceSelectors = new bytes4[](1);
215
288
  instanceInstanceServiceSelectors[0] = clonedInstance.setInstanceReader.selector;
216
- clonedAccessManager.setTargetFunctionRole(
289
+ clonedAccessManager.setCoreTargetFunctionRole(
217
290
  "Instance",
218
291
  instanceInstanceServiceSelectors,
219
292
  INSTANCE_SERVICE_ROLE());
293
+
294
+ // configure authorizations for instance service on instance access manager
295
+ bytes4[] memory accessManagerInstanceServiceSelectors = new bytes4[](3);
296
+ accessManagerInstanceServiceSelectors[0] = clonedAccessManager.createGifTarget.selector;
297
+ accessManagerInstanceServiceSelectors[1] = clonedAccessManager.setTargetLocked.selector;
298
+ accessManagerInstanceServiceSelectors[2] = clonedAccessManager.setCoreTargetFunctionRole.selector;
299
+ clonedAccessManager.setCoreTargetFunctionRole(
300
+ "InstanceAccessManager",
301
+ accessManagerInstanceServiceSelectors,
302
+ INSTANCE_SERVICE_ROLE());
220
303
  }
221
304
 
222
- function setMasterInstance(address accessManagerAddress, address instanceAddress, address instanceReaderAddress, address bundleManagerAddress) external onlyOwner {
223
- require(_masterInstanceAccessManager == address(0), "ERROR:CRD-001:ACCESS_MANAGER_MASTER_ALREADY_SET");
224
- require(_masterInstance == address(0), "ERROR:CRD-002:INSTANCE_MASTER_ALREADY_SET");
225
- require(_masterInstanceBundleManager == address(0), "ERROR:CRD-004:BUNDLE_MANAGER_MASTER_ALREADY_SET");
305
+ function _grantInstanceOwnerAuthorizations(InstanceAccessManager clonedAccessManager, address instanceOwner) internal {
306
+ // configure authorization for instance owner on instance access manager
307
+ // instance owner role is granted/revoked ONLY by INSTANCE_ROLE
308
+ bytes4[] memory accessManagerInstanceOwnerSelectors = new bytes4[](3);
309
+ accessManagerInstanceOwnerSelectors[0] = clonedAccessManager.createRole.selector;
310
+ accessManagerInstanceOwnerSelectors[1] = clonedAccessManager.createTarget.selector;
311
+ accessManagerInstanceOwnerSelectors[2] = clonedAccessManager.setTargetFunctionRole.selector;
312
+ clonedAccessManager.setCoreTargetFunctionRole(
313
+ "InstanceAccessManager",
314
+ accessManagerInstanceOwnerSelectors,
315
+ INSTANCE_OWNER_ROLE());
316
+ }
226
317
 
227
- require (accessManagerAddress != address(0), "ERROR:CRD-005:ACCESS_MANAGER_ZERO");
228
- require (instanceAddress != address(0), "ERROR:CRD-006:INSTANCE_ZERO");
229
- require (instanceReaderAddress != address(0), "ERROR:CRD-007:INSTANCE_READER_ZERO");
230
- require (bundleManagerAddress != address(0), "ERROR:CRD-008:BUNDLE_MANAGER_ZERO");
231
318
 
232
- Instance instance = Instance(instanceAddress);
233
- InstanceReader instanceReader = InstanceReader(instanceReaderAddress);
234
- BundleManager bundleManager = BundleManager(bundleManagerAddress);
319
+ function setAndRegisterMasterInstance(address instanceAddress)
320
+ external
321
+ onlyOwner
322
+ returns(NftId masterInstanceNftId)
323
+ {
324
+ if(_masterInstance != address(0)) { revert ErrorInstanceServiceMasterInstanceAlreadySet(); }
325
+ if(_masterOzAccessManager != address(0)) { revert ErrorInstanceServiceMasterOzAccessManagerAlreadySet(); }
326
+ if(_masterInstanceAccessManager != address(0)) { revert ErrorInstanceServiceMasterInstanceAccessManagerAlreadySet(); }
327
+ if(_masterInstanceBundleManager != address(0)) { revert ErrorInstanceServiceMasterBundleManagerAlreadySet(); }
235
328
 
236
- require(instance.authority() == accessManagerAddress, "ERROR:CRD-009:INSTANCE_AUTHORITY_MISMATCH");
237
- require(instanceReader.getInstanceNftId() == instance.getNftId(), "ERROR:CRD-010:INSTANCE_READER_INSTANCE_MISMATCH");
238
- require(bundleManager.getInstanceNftId() == instance.getNftId(), "ERROR:CRD-011:BUNDLE_MANAGER_INSTANCE_MISMATCH");
329
+ if(instanceAddress == address(0)) { revert ErrorInstanceServiceInstanceAddressZero(); }
239
330
 
240
- _masterInstanceAccessManager = accessManagerAddress;
331
+ IInstance instance = IInstance(instanceAddress);
332
+ InstanceAccessManager instanceAccessManager = instance.getInstanceAccessManager();
333
+ address instanceAccessManagerAddress = address(instanceAccessManager);
334
+ InstanceReader instanceReader = instance.getInstanceReader();
335
+ address instanceReaderAddress = address(instanceReader);
336
+ BundleManager bundleManager = instance.getBundleManager();
337
+ address bundleManagerAddress = address(bundleManager);
338
+
339
+ if(instanceAccessManagerAddress == address(0)) { revert ErrorInstanceServiceInstanceAccessManagerZero(); }
340
+ if(instanceReaderAddress == address(0)) { revert ErrorInstanceServiceInstanceReaderZero(); }
341
+ if(bundleManagerAddress == address(0)) { revert ErrorInstanceServiceBundleManagerZero(); }
342
+
343
+ if(instance.authority() != instanceAccessManager.authority()) { revert ErrorInstanceServiceInstanceAuthorityMismatch(); }
344
+ if(bundleManager.authority() != instance.authority()) { revert ErrorInstanceServiceBundleManagerAuthorityMismatch(); }
345
+ if(bundleManager.getInstance() != instance) { revert ErrorInstanceServiceBundleMangerInstanceMismatch(); }
346
+ if(instanceReader.getInstance() != instance) { revert ErrorInstanceServiceInstanceReaderInstanceMismatch2(); }
347
+
348
+ _masterOzAccessManager = instance.authority();
349
+ _masterInstanceAccessManager = instanceAccessManagerAddress;
241
350
  _masterInstance = instanceAddress;
242
351
  _masterInstanceReader = instanceReaderAddress;
243
352
  _masterInstanceBundleManager = bundleManagerAddress;
353
+
354
+ IInstance masterInstance = IInstance(_masterInstance);
355
+ IRegistry.ObjectInfo memory info = _registryService.registerInstance(masterInstance, getOwner());
356
+ masterInstanceNftId = info.nftId;
244
357
  }
245
358
 
246
359
  function setMasterInstanceReader(address instanceReaderAddress) external onlyOwner {
247
- require(_masterInstanceReader != address(0), "ERROR:CRD-003:INSTANCE_READER_MASTER_NOT_SET");
248
- require (instanceReaderAddress != address(0), "ERROR:CRD-012:INSTANCE_READER_ZERO");
249
- require(instanceReaderAddress != _masterInstanceReader, "ERROR:CRD-014:INSTANCE_READER_MASTER_SAME_AS_NEW");
360
+ if(_masterInstanceReader == address(0)) { revert ErrorInstanceServiceMasterInstanceReaderNotSet(); }
361
+ if(instanceReaderAddress == address(0)) { revert ErrorInstanceServiceInstanceReaderAddressZero(); }
362
+ if(instanceReaderAddress == _masterInstanceReader) { revert ErrorInstanceServiceInstanceReaderSameAsMasterInstanceReader(); }
250
363
 
251
364
  InstanceReader instanceReader = InstanceReader(instanceReaderAddress);
252
- require(instanceReader.getInstanceNftId() == Instance(_masterInstance).getNftId(), "ERROR:CRD-015:INSTANCE_READER_INSTANCE_MISMATCH");
365
+ if(instanceReader.getInstance() != IInstance(_masterInstance)) { revert ErrorInstanceServiceInstanceReaderInstanceMismatch(); }
253
366
 
254
367
  _masterInstanceReader = instanceReaderAddress;
255
368
  }
256
369
 
257
- function upgradeInstanceReader(NftId instanceNftId) external {
370
+ function upgradeInstanceReader(NftId instanceNftId)
371
+ external
372
+ onlyInstanceOwner(instanceNftId)
373
+ {
258
374
  IRegistry registry = getRegistry();
259
375
  IRegistry.ObjectInfo memory instanceInfo = registry.getObjectInfo(instanceNftId);
260
376
  Instance instance = Instance(instanceInfo.objectAddress);
261
- address owner = instance.getOwner();
262
-
263
- if (msg.sender != owner) {
264
- revert ErrorInstanceServiceRequestUnauhorized(msg.sender);
265
- }
266
377
 
267
378
  InstanceReader upgradedInstanceReaderClone = InstanceReader(Clones.clone(address(_masterInstanceReader)));
268
- upgradedInstanceReaderClone.initialize(address(registry), instanceNftId);
379
+ upgradedInstanceReaderClone.initialize(address(instance));
269
380
  instance.setInstanceReader(upgradedInstanceReaderClone);
270
381
  }
271
382
 
272
- function getMasterInstanceReader() external view returns (address) {
273
- return _masterInstanceReader;
274
- }
275
383
 
276
- function getMasterInstance() external view returns (address) {
277
- return _masterInstance;
384
+ // all gif targets MUST be childs of instanceNftId
385
+ function createGifTarget(
386
+ NftId instanceNftId,
387
+ address targetAddress,
388
+ string memory targetName,
389
+ bytes4[][] memory selectors,
390
+ RoleId[] memory roles
391
+ )
392
+ external
393
+ onlyRegisteredService
394
+ {
395
+ (
396
+ IInstance instance, // or instanceInfo
397
+ // or targetInfo
398
+ ) = _validateInstanceAndComponent(instanceNftId, targetAddress);
399
+
400
+ InstanceAccessManager accessManager = instance.getInstanceAccessManager();
401
+ accessManager.createGifTarget(targetAddress, targetName);
402
+ // set proposed target config
403
+ // TODO restriction: for gif targets can set only once and only here?
404
+ // assume config is a mix of gif and custom roles and no further configuration by INSTANCE_OWNER_ROLE is ever needed?
405
+ for(uint roleIdx = 0; roleIdx < roles.length; roleIdx++)
406
+ {
407
+ accessManager.setCoreTargetFunctionRole(targetName, selectors[roleIdx], roles[roleIdx]);
408
+ }
278
409
  }
279
410
 
280
- function getMasterInstanceAccessManager() external view returns (address) {
281
- return _masterInstanceAccessManager;
411
+
412
+ // TODO called by component, but target can be component helper...so needs target name
413
+ // TODO check that targetName associated with component...how???
414
+ function setComponentLocked(bool locked) onlyComponent external {
415
+
416
+ address componentAddress = msg.sender;
417
+ IRegistry registry = getRegistry();
418
+ NftId instanceNftId = registry.getObjectInfo(componentAddress).parentNftId;
419
+
420
+ IInstance instance = IInstance(
421
+ registry.getObjectInfo(
422
+ instanceNftId).objectAddress);
423
+
424
+ instance.getInstanceAccessManager().setTargetLocked(
425
+ componentAddress,
426
+ locked);
282
427
  }
283
428
 
284
- function getMasterInstanceBundleManager() external view returns (address) {
285
- return _masterInstanceBundleManager;
429
+
430
+ function getMasterInstanceReader() external view returns (address) {
431
+ return _masterInstanceReader;
286
432
  }
287
433
 
288
434
  // From IService
289
- function getDomain() public pure override(Service, IService) returns(ObjectType) {
435
+ function getDomain() public pure override returns(ObjectType) {
290
436
  return INSTANCE();
291
437
  }
292
438
 
293
439
  /// @dev top level initializer
294
- // 1) registry is non upgradeable -> don't need a proxy and uses constructor !
295
- // 2) deploy registry service first -> from its initialization func it is easier to deploy registry then vice versa
296
- // 3) deploy registry -> pass registry service address as constructor argument
297
- // registry is getting instantiated and locked to registry service address forever
298
440
  function _initialize(
299
441
  address owner,
300
442
  bytes memory data
@@ -303,48 +445,40 @@ contract InstanceService is Service, IInstanceService {
303
445
  initializer
304
446
  virtual override
305
447
  {
306
- address initialOwner = address(0);
307
- address registryAddress = address(0);
308
- (registryAddress, initialOwner) = abi.decode(data, (address, address));
448
+ (
449
+ address registryAddress,
450
+ address initialOwner
451
+ ) = abi.decode(data, (address, address));
452
+
453
+ _registryService = IRegistryService(
454
+ IRegistry(registryAddress).getServiceAddress(
455
+ REGISTRY(),
456
+ getVersion().toMajorPart()));
457
+
309
458
  // TODO while InstanceService is not deployed in InstanceServiceManager constructor
310
459
  // owner is InstanceServiceManager deployer
311
- _initializeService(registryAddress, owner);
312
-
313
- _registerInterface(type(IService).interfaceId);
314
- _registerInterface(type(IInstanceService).interfaceId);
460
+ initializeService(registryAddress, address(0), owner);
461
+ registerInterface(type(IInstanceService).interfaceId);
315
462
  }
316
463
 
317
- function hasRole(address account, RoleId role, address instanceAddress) public view returns (bool) {
318
- Instance instance = Instance(instanceAddress);
319
- InstanceAccessManager accessManager = instance.getInstanceAccessManager();
320
- return accessManager.hasRole(role, account);
321
- }
322
464
 
323
- function createTarget(NftId instanceNftId, address targetAddress, string memory targetName) external onlyRegisteredService {
465
+ function _validateInstanceAndComponent(NftId instanceNftId, address componentAddress)
466
+ internal
467
+ view
468
+ returns (IInstance instance, NftId componentNftId)
469
+ {
324
470
  IRegistry registry = getRegistry();
325
471
  IRegistry.ObjectInfo memory instanceInfo = registry.getObjectInfo(instanceNftId);
326
- Instance instance = Instance(instanceInfo.objectAddress);
327
- InstanceAccessManager accessManager = instance.getInstanceAccessManager();
328
- accessManager.createTarget(targetAddress, targetName);
329
- }
472
+ if(instanceInfo.objectType != INSTANCE()) {
473
+ revert ErrorInstanceServiceNotInstance(instanceNftId);
474
+ }
330
475
 
331
- function setTargetLocked(string memory targetName, bool locked) external {
332
- address componentAddress = msg.sender;
333
- IRegistry registry = getRegistry();
334
476
  IRegistry.ObjectInfo memory componentInfo = registry.getObjectInfo(componentAddress);
335
- if (componentInfo.nftId.eqz()) {
336
- revert ErrorInstanceServiceComponentNotRegistered(componentAddress);
477
+ if(componentInfo.parentNftId != instanceNftId) {
478
+ revert ErrorInstanceServiceInstanceComponentMismatch(instanceNftId, componentInfo.nftId);
337
479
  }
338
480
 
339
- // TODO validate component type
340
-
341
-
342
- address instanceAddress = registry.getObjectInfo(componentInfo.parentNftId).objectAddress;
343
- IInstance instance = IInstance(instanceAddress);
344
-
345
- InstanceAccessManager accessManager = instance.getInstanceAccessManager();
346
- accessManager.setTargetClosed(targetName, locked);
481
+ instance = Instance(instanceInfo.objectAddress);
482
+ componentNftId = componentInfo.nftId;
347
483
  }
348
-
349
- }
350
-
484
+ }