@etherisc/gif-next 0.0.2-e922e07-736 → 0.0.2-e964d24-516

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 (423) hide show
  1. package/README.md +6 -83
  2. package/artifacts/contracts/distribution/Distribution.sol/Distribution.dbg.json +4 -0
  3. package/artifacts/contracts/{components → distribution}/Distribution.sol/Distribution.json +129 -14
  4. package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.dbg.json +4 -0
  5. package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.json +1556 -0
  6. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +4 -0
  7. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.json +780 -0
  8. package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.dbg.json +4 -0
  9. package/artifacts/contracts/{components → distribution}/IDistributionComponent.sol/IDistributionComponent.json +203 -14
  10. package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.dbg.json +4 -0
  11. package/artifacts/contracts/{instance/service → distribution}/IDistributionService.sol/IDistributionService.json +110 -283
  12. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.dbg.json +1 -1
  13. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.json +68 -54
  14. package/artifacts/contracts/instance/Cloneable.sol/Cloneable.dbg.json +1 -1
  15. package/artifacts/contracts/instance/Cloneable.sol/Cloneable.json +5 -0
  16. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  17. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +309 -2078
  18. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
  19. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +183 -76
  20. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  21. package/artifacts/contracts/instance/Instance.sol/Instance.json +434 -2823
  22. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +1 -1
  23. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +493 -129
  24. package/artifacts/contracts/instance/InstanceAuthorizationsLib.sol/InstanceAuthorizationsLib.dbg.json +4 -0
  25. package/artifacts/contracts/instance/InstanceAuthorizationsLib.sol/InstanceAuthorizationsLib.json +124 -0
  26. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
  27. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +406 -192
  28. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
  29. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +224 -291
  30. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
  31. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +45 -82
  32. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.dbg.json +4 -0
  33. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.json +2788 -0
  34. package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.dbg.json +1 -1
  35. package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.json +8 -13
  36. package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
  37. package/artifacts/contracts/instance/base/ILifecycle.sol/ILifecycle.dbg.json +1 -1
  38. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
  39. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.json +44 -14
  40. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json +1 -1
  41. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.json +38 -13
  42. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +1 -1
  43. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.json +56 -73
  44. package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
  45. package/artifacts/contracts/instance/module/IComponents.sol/IComponents.dbg.json +4 -0
  46. package/artifacts/contracts/instance/module/IComponents.sol/IComponents.json +10 -0
  47. package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +1 -1
  48. package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +1 -1
  49. package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +1 -1
  50. package/artifacts/contracts/instance/module/ISetup.sol/ISetup.dbg.json +1 -1
  51. package/artifacts/contracts/instance/module/ITreasury.sol/ITreasury.dbg.json +1 -1
  52. package/artifacts/contracts/pool/BundleService.sol/BundleService.dbg.json +4 -0
  53. package/artifacts/contracts/pool/BundleService.sol/BundleService.json +1288 -0
  54. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.dbg.json +4 -0
  55. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.json +696 -0
  56. package/artifacts/contracts/pool/IBundleService.sol/IBundleService.dbg.json +4 -0
  57. package/artifacts/contracts/{instance/service → pool}/IBundleService.sol/IBundleService.json +291 -189
  58. package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.dbg.json +4 -0
  59. package/artifacts/contracts/{components → pool}/IPoolComponent.sol/IPoolComponent.json +231 -165
  60. package/artifacts/contracts/pool/IPoolService.sol/IPoolService.dbg.json +4 -0
  61. package/artifacts/contracts/pool/IPoolService.sol/IPoolService.json +1077 -0
  62. package/artifacts/contracts/pool/Pool.sol/Pool.dbg.json +4 -0
  63. package/artifacts/contracts/{components → pool}/Pool.sol/Pool.json +160 -204
  64. package/artifacts/contracts/pool/PoolService.sol/PoolService.dbg.json +4 -0
  65. package/artifacts/contracts/pool/PoolService.sol/PoolService.json +1622 -0
  66. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.dbg.json +4 -0
  67. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.json +708 -0
  68. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.dbg.json +4 -0
  69. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.json +918 -0
  70. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +4 -0
  71. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.json +648 -0
  72. package/artifacts/contracts/product/ClaimService.sol/ClaimService.dbg.json +4 -0
  73. package/artifacts/contracts/product/ClaimService.sol/ClaimService.json +1376 -0
  74. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +4 -0
  75. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.json +748 -0
  76. package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.dbg.json +4 -0
  77. package/artifacts/contracts/{instance/service/IClaimService.sol/IClaimService.json → product/IApplicationService.sol/IApplicationService.json} +184 -100
  78. package/artifacts/contracts/product/IClaimService.sol/IClaimService.dbg.json +4 -0
  79. package/artifacts/contracts/product/IClaimService.sol/IClaimService.json +743 -0
  80. package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.dbg.json +4 -0
  81. package/artifacts/contracts/{instance/service → product}/IPolicyService.sol/IPolicyService.json +211 -100
  82. package/artifacts/contracts/product/IPricingService.sol/IPricingService.dbg.json +4 -0
  83. package/artifacts/contracts/{instance/service/IApplicationService.sol/IApplicationService.json → product/IPricingService.sol/IPricingService.json} +120 -166
  84. package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.dbg.json +4 -0
  85. package/artifacts/contracts/{components → product}/IProductComponent.sol/IProductComponent.json +210 -21
  86. package/artifacts/contracts/product/IProductService.sol/IProductService.dbg.json +4 -0
  87. package/artifacts/contracts/{instance/service → product}/IProductService.sol/IProductService.json +86 -28
  88. package/artifacts/contracts/product/PolicyService.sol/PolicyService.dbg.json +4 -0
  89. package/artifacts/contracts/product/PolicyService.sol/PolicyService.json +1281 -0
  90. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +4 -0
  91. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.json +740 -0
  92. package/artifacts/contracts/product/PricingService.sol/PricingService.dbg.json +4 -0
  93. package/artifacts/contracts/product/PricingService.sol/PricingService.json +1004 -0
  94. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.dbg.json +4 -0
  95. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.json +688 -0
  96. package/artifacts/contracts/product/Product.sol/Product.dbg.json +4 -0
  97. package/artifacts/contracts/{components → product}/Product.sol/Product.json +121 -22
  98. package/artifacts/contracts/product/ProductService.sol/ProductService.dbg.json +4 -0
  99. package/artifacts/contracts/product/ProductService.sol/ProductService.json +864 -0
  100. package/artifacts/contracts/product/ProductServiceManager.sol/ProductServiceManager.dbg.json +4 -0
  101. package/artifacts/contracts/product/ProductServiceManager.sol/ProductServiceManager.json +640 -0
  102. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  103. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +15 -2
  104. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  105. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +19 -0
  106. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
  107. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +5 -37
  108. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
  109. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.json +18 -0
  110. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  111. package/artifacts/contracts/registry/Registry.sol/Registry.json +35 -16
  112. package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.dbg.json +1 -1
  113. package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.json +4 -4
  114. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
  115. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +26 -53
  116. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
  117. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +27 -40
  118. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.dbg.json +1 -1
  119. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.json +30 -18
  120. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
  121. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +14 -27
  122. package/artifacts/contracts/shared/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.dbg.json +4 -0
  123. package/artifacts/contracts/shared/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.json +1206 -0
  124. package/artifacts/contracts/shared/Component.sol/Component.dbg.json +4 -0
  125. package/artifacts/contracts/{components → shared}/Component.sol/Component.json +106 -7
  126. package/artifacts/contracts/shared/ComponentService.sol/ComponentService.dbg.json +4 -0
  127. package/artifacts/contracts/{instance/base → shared}/ComponentService.sol/ComponentService.json +114 -35
  128. package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +1 -1
  129. package/artifacts/contracts/shared/IComponent.sol/IComponent.dbg.json +4 -0
  130. package/artifacts/contracts/{components → shared}/IComponent.sol/IComponent.json +196 -7
  131. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
  132. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.json +0 -13
  133. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +1 -1
  134. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.json +69 -9
  135. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  136. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +0 -13
  137. package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +1 -1
  138. package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.json +0 -13
  139. package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
  140. package/artifacts/contracts/shared/IService.sol/IService.json +85 -27
  141. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +1 -1
  142. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
  143. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +8 -21
  144. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +1 -1
  145. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +80 -26
  146. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +1 -1
  147. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +20 -33
  148. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  149. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +8 -21
  150. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +1 -1
  151. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +2 -15
  152. package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
  153. package/artifacts/contracts/shared/Service.sol/Service.json +91 -28
  154. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
  155. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +24 -6
  156. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
  157. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +2 -2
  158. package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +1 -1
  159. package/artifacts/contracts/staking/IStakingService.sol/IStakingService.dbg.json +4 -0
  160. package/artifacts/contracts/staking/IStakingService.sol/IStakingService.json +523 -0
  161. package/artifacts/contracts/staking/StakeingServiceManager.sol/StakingServiceManager.dbg.json +4 -0
  162. package/artifacts/contracts/staking/StakeingServiceManager.sol/StakingServiceManager.json +628 -0
  163. package/artifacts/contracts/staking/StakingService.sol/StakingService.dbg.json +4 -0
  164. package/artifacts/contracts/staking/StakingService.sol/StakingService.json +767 -0
  165. package/artifacts/contracts/type/AddressSet.sol/LibAddressSet.dbg.json +4 -0
  166. package/artifacts/contracts/{types → type}/AddressSet.sol/LibAddressSet.json +3 -3
  167. package/artifacts/contracts/type/Amount.sol/AmountLib.dbg.json +4 -0
  168. package/artifacts/contracts/type/Amount.sol/AmountLib.json +281 -0
  169. package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.dbg.json +4 -0
  170. package/artifacts/contracts/{types → type}/Blocknumber.sol/BlocknumberLib.json +3 -3
  171. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.dbg.json +4 -0
  172. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.json +179 -0
  173. package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.dbg.json +4 -0
  174. package/artifacts/contracts/{types → type}/DistributorType.sol/DistributorTypeLib.json +5 -5
  175. package/artifacts/contracts/type/Fee.sol/FeeLib.dbg.json +4 -0
  176. package/artifacts/contracts/type/Fee.sol/FeeLib.json +312 -0
  177. package/artifacts/contracts/type/Key32.sol/Key32Lib.dbg.json +4 -0
  178. package/artifacts/contracts/{types → type}/Key32.sol/Key32Lib.json +3 -3
  179. package/artifacts/contracts/type/NftId.sol/NftIdLib.dbg.json +4 -0
  180. package/artifacts/contracts/type/NftId.sol/NftIdLib.json +166 -0
  181. package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.dbg.json +4 -0
  182. package/artifacts/contracts/{types → type}/NftIdSet.sol/LibNftIdSet.json +3 -3
  183. package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.dbg.json +4 -0
  184. package/artifacts/contracts/{types → type}/ObjectType.sol/ObjectTypeLib.json +3 -3
  185. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.dbg.json +4 -0
  186. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.json +209 -0
  187. package/artifacts/contracts/type/Referral.sol/ReferralLib.dbg.json +4 -0
  188. package/artifacts/contracts/{types → type}/Referral.sol/ReferralLib.json +5 -5
  189. package/artifacts/contracts/type/RiskId.sol/RiskIdLib.dbg.json +4 -0
  190. package/artifacts/contracts/{types → type}/RiskId.sol/RiskIdLib.json +5 -5
  191. package/artifacts/contracts/type/RoleId.sol/RoleIdLib.dbg.json +4 -0
  192. package/artifacts/contracts/{types → type}/RoleId.sol/RoleIdLib.json +5 -5
  193. package/artifacts/contracts/type/Seconds.sol/SecondsLib.dbg.json +4 -0
  194. package/artifacts/contracts/{types → type}/Seconds.sol/SecondsLib.json +3 -3
  195. package/artifacts/contracts/type/StateId.sol/StateIdLib.dbg.json +4 -0
  196. package/artifacts/contracts/{types → type}/StateId.sol/StateIdLib.json +3 -3
  197. package/artifacts/contracts/type/Timestamp.sol/TimestampLib.dbg.json +4 -0
  198. package/artifacts/contracts/{types → type}/Timestamp.sol/TimestampLib.json +20 -7
  199. package/artifacts/contracts/type/UFixed.sol/MathLib.dbg.json +4 -0
  200. package/artifacts/contracts/{types → type}/UFixed.sol/MathLib.json +3 -3
  201. package/artifacts/contracts/type/UFixed.sol/UFixedLib.dbg.json +4 -0
  202. package/artifacts/contracts/{types → type}/UFixed.sol/UFixedLib.json +3 -3
  203. package/artifacts/contracts/type/Version.sol/VersionLib.dbg.json +4 -0
  204. package/artifacts/contracts/{types → type}/Version.sol/VersionLib.json +3 -3
  205. package/artifacts/contracts/type/Version.sol/VersionPartLib.dbg.json +4 -0
  206. package/artifacts/contracts/{types → type}/Version.sol/VersionPartLib.json +3 -3
  207. package/contracts/{components → distribution}/Distribution.sol +21 -16
  208. package/contracts/distribution/DistributionService.sol +348 -0
  209. package/contracts/{instance/service → distribution}/DistributionServiceManager.sol +5 -5
  210. package/contracts/{components → distribution}/IDistributionComponent.sol +7 -7
  211. package/contracts/{instance/service → distribution}/IDistributionService.sol +19 -30
  212. package/contracts/instance/BundleManager.sol +13 -12
  213. package/contracts/instance/Cloneable.sol +7 -2
  214. package/contracts/instance/IInstance.sol +48 -63
  215. package/contracts/instance/IInstanceService.sol +31 -17
  216. package/contracts/instance/Instance.sol +131 -193
  217. package/contracts/instance/InstanceAccessManager.sol +405 -161
  218. package/contracts/instance/InstanceAuthorizationsLib.sol +308 -0
  219. package/contracts/instance/InstanceReader.sol +101 -26
  220. package/contracts/instance/InstanceService.sol +173 -354
  221. package/contracts/instance/InstanceServiceManager.sol +1 -1
  222. package/contracts/instance/InstanceStore.sol +211 -0
  223. package/contracts/instance/ObjectManager.sol +9 -11
  224. package/contracts/instance/base/IKeyValueStore.sol +5 -5
  225. package/contracts/instance/base/ILifecycle.sol +3 -3
  226. package/contracts/instance/base/KeyValueStore.sol +18 -41
  227. package/contracts/instance/base/Lifecycle.sol +27 -7
  228. package/contracts/instance/module/IAccess.sol +23 -16
  229. package/contracts/instance/module/IBundle.sol +10 -8
  230. package/contracts/instance/module/IComponents.sol +41 -0
  231. package/contracts/instance/module/IDistribution.sol +7 -6
  232. package/contracts/instance/module/IPolicy.sol +19 -14
  233. package/contracts/instance/module/IRisk.sol +1 -1
  234. package/contracts/instance/module/ISetup.sol +5 -18
  235. package/contracts/instance/module/ITreasury.sol +2 -2
  236. package/contracts/pool/BundleService.sol +382 -0
  237. package/contracts/{instance/service → pool}/BundleServiceManager.sol +5 -5
  238. package/contracts/pool/IBundleService.sol +118 -0
  239. package/contracts/{components → pool}/IPoolComponent.sol +19 -56
  240. package/contracts/pool/IPoolService.sol +114 -0
  241. package/contracts/{components → pool}/Pool.sol +62 -138
  242. package/contracts/pool/PoolService.sol +403 -0
  243. package/contracts/{instance/service → pool}/PoolServiceManager.sol +5 -5
  244. package/contracts/product/ApplicationService.sol +186 -0
  245. package/contracts/{instance/service → product}/ApplicationServiceManager.sol +2 -2
  246. package/contracts/product/ClaimService.sol +437 -0
  247. package/contracts/{instance/service → product}/ClaimServiceManager.sol +2 -2
  248. package/contracts/{instance/service → product}/IApplicationService.sol +14 -34
  249. package/contracts/product/IClaimService.sol +90 -0
  250. package/contracts/{instance/service → product}/IPolicyService.sol +34 -26
  251. package/contracts/product/IPricingService.sol +37 -0
  252. package/contracts/{components → product}/IProductComponent.sol +11 -10
  253. package/contracts/{instance/service → product}/IProductService.sol +10 -10
  254. package/contracts/product/PolicyService.sol +376 -0
  255. package/contracts/{instance/service → product}/PolicyServiceManager.sol +5 -5
  256. package/contracts/product/PricingService.sol +275 -0
  257. package/contracts/product/PricingServiceManager.sol +51 -0
  258. package/contracts/{components → product}/Product.sol +160 -74
  259. package/contracts/product/ProductService.sol +210 -0
  260. package/contracts/{instance/service → product}/ProductServiceManager.sol +5 -5
  261. package/contracts/registry/ChainNft.sol +8 -0
  262. package/contracts/registry/IRegistry.sol +6 -4
  263. package/contracts/registry/IRegistryService.sol +6 -7
  264. package/contracts/registry/ITransferInterceptor.sol +1 -0
  265. package/contracts/registry/Registry.sol +26 -23
  266. package/contracts/registry/RegistryAccessManager.sol +1 -1
  267. package/contracts/registry/RegistryService.sol +33 -31
  268. package/contracts/registry/RegistryServiceManager.sol +0 -2
  269. package/contracts/registry/ReleaseManager.sol +24 -22
  270. package/contracts/registry/TokenRegistry.sol +2 -2
  271. package/contracts/shared/AccessManagerUpgradeableInitializeable.sol +13 -0
  272. package/contracts/{components → shared}/Component.sol +68 -18
  273. package/contracts/shared/ComponentService.sol +150 -0
  274. package/contracts/{components → shared}/IComponent.sol +28 -6
  275. package/contracts/shared/INftOwnable.sol +1 -1
  276. package/contracts/shared/IPolicyHolder.sol +24 -10
  277. package/contracts/shared/IRegistryLinked.sol +0 -1
  278. package/contracts/shared/IService.sol +6 -6
  279. package/contracts/shared/IVersionable.sol +1 -1
  280. package/contracts/shared/NftOwnable.sol +1 -3
  281. package/contracts/shared/PolicyHolder.sol +31 -18
  282. package/contracts/shared/ProxyManager.sol +3 -3
  283. package/contracts/shared/Registerable.sol +12 -11
  284. package/contracts/shared/RegistryLinked.sol +0 -5
  285. package/contracts/shared/Service.sol +23 -9
  286. package/contracts/shared/TokenHandler.sol +14 -6
  287. package/contracts/shared/Versionable.sol +1 -1
  288. package/contracts/staking/IStakingService.sol +102 -0
  289. package/contracts/staking/StakeingServiceManager.sol +37 -0
  290. package/contracts/staking/StakingService.sol +166 -0
  291. package/contracts/type/Amount.sol +109 -0
  292. package/contracts/{types → type}/Blocknumber.sol +1 -0
  293. package/contracts/{types → type}/ClaimId.sol +25 -2
  294. package/contracts/{types → type}/Fee.sol +17 -8
  295. package/contracts/{types → type}/NftId.sol +8 -0
  296. package/contracts/{types → type}/NftIdSet.sol +1 -1
  297. package/contracts/{types → type}/ObjectType.sol +10 -5
  298. package/contracts/{types → type}/PayoutId.sol +33 -5
  299. package/contracts/{types → type}/RoleId.sol +6 -4
  300. package/contracts/{types → type}/StateId.sol +7 -2
  301. package/contracts/{types → type}/Timestamp.sol +6 -0
  302. package/contracts/{types → type}/UFixed.sol +1 -0
  303. package/contracts/{types → type}/Version.sol +1 -0
  304. package/package.json +1 -1
  305. package/artifacts/contracts/components/Component.sol/Component.dbg.json +0 -4
  306. package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +0 -4
  307. package/artifacts/contracts/components/IComponent.sol/IComponent.dbg.json +0 -4
  308. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +0 -4
  309. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +0 -4
  310. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +0 -4
  311. package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +0 -4
  312. package/artifacts/contracts/components/Product.sol/Product.dbg.json +0 -4
  313. package/artifacts/contracts/instance/base/ComponentService.sol/ComponentService.dbg.json +0 -4
  314. package/artifacts/contracts/instance/service/ApplicationService.sol/ApplicationService.dbg.json +0 -4
  315. package/artifacts/contracts/instance/service/ApplicationService.sol/ApplicationService.json +0 -968
  316. package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +0 -4
  317. package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.json +0 -665
  318. package/artifacts/contracts/instance/service/BundleService.sol/BundleService.dbg.json +0 -4
  319. package/artifacts/contracts/instance/service/BundleService.sol/BundleService.json +0 -1096
  320. package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.dbg.json +0 -4
  321. package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.json +0 -661
  322. package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.dbg.json +0 -4
  323. package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.json +0 -754
  324. package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +0 -4
  325. package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.json +0 -637
  326. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +0 -4
  327. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +0 -1724
  328. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +0 -4
  329. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.json +0 -801
  330. package/artifacts/contracts/instance/service/IApplicationService.sol/IApplicationService.dbg.json +0 -4
  331. package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.dbg.json +0 -4
  332. package/artifacts/contracts/instance/service/IClaimService.sol/IClaimService.dbg.json +0 -4
  333. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +0 -4
  334. package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.dbg.json +0 -4
  335. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +0 -4
  336. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +0 -347
  337. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +0 -4
  338. package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.dbg.json +0 -4
  339. package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.json +0 -1021
  340. package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +0 -4
  341. package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.json +0 -689
  342. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +0 -4
  343. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +0 -727
  344. package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.dbg.json +0 -4
  345. package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.json +0 -649
  346. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +0 -4
  347. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +0 -777
  348. package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.dbg.json +0 -4
  349. package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.json +0 -649
  350. package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.dbg.json +0 -4
  351. package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.json +0 -107
  352. package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json +0 -4
  353. package/artifacts/contracts/test/TestFee.sol/TestFee.json +0 -119
  354. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json +0 -4
  355. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +0 -383
  356. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +0 -4
  357. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.json +0 -116
  358. package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +0 -4
  359. package/artifacts/contracts/test/TestService.sol/TestService.json +0 -521
  360. package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json +0 -4
  361. package/artifacts/contracts/test/TestToken.sol/TestUsdc.json +0 -376
  362. package/artifacts/contracts/test/TestVersion.sol/TestVersion.dbg.json +0 -4
  363. package/artifacts/contracts/test/TestVersion.sol/TestVersion.json +0 -218
  364. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json +0 -4
  365. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.json +0 -104
  366. package/artifacts/contracts/test/Usdc.sol/USDC.dbg.json +0 -4
  367. package/artifacts/contracts/test/Usdc.sol/USDC.json +0 -376
  368. package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.dbg.json +0 -4
  369. package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +0 -4
  370. package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +0 -4
  371. package/artifacts/contracts/types/ChainId.sol/ChainIdLib.json +0 -10
  372. package/artifacts/contracts/types/ClaimId.sol/ClaimIdLib.dbg.json +0 -4
  373. package/artifacts/contracts/types/ClaimId.sol/ClaimIdLib.json +0 -100
  374. package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.dbg.json +0 -4
  375. package/artifacts/contracts/types/Fee.sol/FeeLib.dbg.json +0 -4
  376. package/artifacts/contracts/types/Fee.sol/FeeLib.json +0 -257
  377. package/artifacts/contracts/types/Key32.sol/Key32Lib.dbg.json +0 -4
  378. package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +0 -4
  379. package/artifacts/contracts/types/NftId.sol/NftIdLib.json +0 -153
  380. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.dbg.json +0 -4
  381. package/artifacts/contracts/types/NumberId.sol/NumberIdLib.dbg.json +0 -4
  382. package/artifacts/contracts/types/NumberId.sol/NumberIdLib.json +0 -100
  383. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.dbg.json +0 -4
  384. package/artifacts/contracts/types/PayoutId.sol/PayoutIdLib.dbg.json +0 -4
  385. package/artifacts/contracts/types/PayoutId.sol/PayoutIdLib.json +0 -100
  386. package/artifacts/contracts/types/Referral.sol/ReferralLib.dbg.json +0 -4
  387. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.dbg.json +0 -4
  388. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.dbg.json +0 -4
  389. package/artifacts/contracts/types/Seconds.sol/SecondsLib.dbg.json +0 -4
  390. package/artifacts/contracts/types/StateId.sol/StateIdLib.dbg.json +0 -4
  391. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json +0 -4
  392. package/artifacts/contracts/types/UFixed.sol/MathLib.dbg.json +0 -4
  393. package/artifacts/contracts/types/UFixed.sol/UFixedLib.dbg.json +0 -4
  394. package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +0 -4
  395. package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +0 -4
  396. package/contracts/instance/base/ComponentService.sol +0 -134
  397. package/contracts/instance/service/ApplicationService.sol +0 -349
  398. package/contracts/instance/service/BundleService.sol +0 -299
  399. package/contracts/instance/service/ClaimService.sol +0 -151
  400. package/contracts/instance/service/DistributionService.sol +0 -450
  401. package/contracts/instance/service/IBundleService.sol +0 -55
  402. package/contracts/instance/service/IClaimService.sol +0 -61
  403. package/contracts/instance/service/IPoolService.sol +0 -20
  404. package/contracts/instance/service/PolicyService.sol +0 -394
  405. package/contracts/instance/service/PoolService.sol +0 -109
  406. package/contracts/instance/service/ProductService.sol +0 -233
  407. package/contracts/shared/ContractDeployerLib.sol +0 -72
  408. package/contracts/test/TestFee.sol +0 -25
  409. package/contracts/test/TestRegisterable.sol +0 -18
  410. package/contracts/test/TestRoleId.sol +0 -14
  411. package/contracts/test/TestService.sol +0 -25
  412. package/contracts/test/TestToken.sol +0 -26
  413. package/contracts/test/TestVersion.sol +0 -44
  414. package/contracts/test/TestVersionable.sol +0 -17
  415. package/contracts/test/Usdc.sol +0 -26
  416. package/contracts/types/ChainId.sol +0 -38
  417. package/contracts/types/NumberId.sol +0 -52
  418. /package/contracts/{types → type}/AddressSet.sol +0 -0
  419. /package/contracts/{types → type}/DistributorType.sol +0 -0
  420. /package/contracts/{types → type}/Key32.sol +0 -0
  421. /package/contracts/{types → type}/Referral.sol +0 -0
  422. /package/contracts/{types → type}/RiskId.sol +0 -0
  423. /package/contracts/{types → type}/Seconds.sol +0 -0
@@ -2,6 +2,24 @@
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
+
7
+ import {NftId} from "../type/NftId.sol";
8
+ import {RoleId} from "../type/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 "../type/RoleId.sol";
10
+ import {ObjectType, INSTANCE, BUNDLE, APPLICATION, POLICY, CLAIM, PRODUCT, DISTRIBUTION, REGISTRY, POOL} from "../type/ObjectType.sol";
11
+
12
+ import {Service} from "../shared/Service.sol";
13
+ import {IService} from "../shared/IService.sol";
14
+ import {AccessManagerUpgradeableInitializeable} from "../shared/AccessManagerUpgradeableInitializeable.sol";
15
+
16
+ import {IDistributionComponent} from "../distribution/IDistributionComponent.sol";
17
+ import {IPoolComponent} from "../pool/IPoolComponent.sol";
18
+ import {IProductComponent} from "../product/IProductComponent.sol";
19
+
20
+ import {IRegistry} from "../registry/IRegistry.sol";
21
+ import {IRegistryService} from "../registry/IRegistryService.sol";
22
+ import {ChainNft} from "../registry/ChainNft.sol";
5
23
 
6
24
  import {Instance} from "./Instance.sol";
7
25
  import {IInstance} from "./IInstance.sol";
@@ -9,46 +27,43 @@ import {InstanceAccessManager} from "./InstanceAccessManager.sol";
9
27
  import {IInstanceService} from "./IInstanceService.sol";
10
28
  import {InstanceReader} from "./InstanceReader.sol";
11
29
  import {BundleManager} from "./BundleManager.sol";
12
- import {IRegistry} from "../registry/IRegistry.sol";
13
- import {IRegistryService} from "../registry/IRegistryService.sol";
14
- import {ChainNft} from "../registry/ChainNft.sol";
15
- import {Service} from "../../contracts/shared/Service.sol";
16
- import {IService} from "../shared/IService.sol";
17
- import {NftId} from "../../contracts/types/NftId.sol";
18
- import {RoleId} from "../types/RoleId.sol";
19
- import {ADMIN_ROLE, DISTRIBUTION_OWNER_ROLE, POOL_OWNER_ROLE, PRODUCT_OWNER_ROLE, PUBLIC_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} from "../types/RoleId.sol";
20
- import {ObjectType, INSTANCE, BUNDLE, APPLICATION, POLICY, CLAIM, PRODUCT, DISTRIBUTION, REGISTRY, POOL} from "../types/ObjectType.sol";
21
- import {IDistributionComponent} from "../components/IDistributionComponent.sol";
22
- import {IPoolComponent} from "../components/IPoolComponent.sol";
23
- import {IProductComponent} from "../components/IProductComponent.sol";
30
+ import {InstanceStore} from "./InstanceStore.sol";
31
+ import {InstanceAuthorizationsLib} from "./InstanceAuthorizationsLib.sol";
24
32
 
25
33
  contract InstanceService is
26
34
  Service,
27
35
  IInstanceService
28
36
  {
29
37
 
38
+ // TODO update to real hash when instance is stable
39
+ bytes32 public constant INSTANCE_CREATION_CODE_HASH = bytes32(0);
40
+
41
+ IRegistryService internal _registryService;
42
+ address internal _masterOzAccessManager;
30
43
  address internal _masterInstanceAccessManager;
31
44
  address internal _masterInstance;
32
45
  address internal _masterInstanceReader;
33
46
  address internal _masterInstanceBundleManager;
47
+ address internal _masterInstanceStore;
34
48
 
35
- // TODO update to real hash when instance is stable
36
- bytes32 public constant INSTANCE_CREATION_CODE_HASH = bytes32(0);
37
-
38
- modifier onlyInstanceOwner(NftId instanceNftId) {
39
- IRegistry registry = getRegistry();
40
- ChainNft chainNft = ChainNft(registry.getChainNftAddress());
41
-
42
- if( msg.sender != chainNft.ownerOf(instanceNftId.toInt())) {
43
- revert ErrorInstanceServiceNotInstanceOwner(msg.sender, instanceNftId);
49
+ modifier onlyInstanceOwner(NftId instanceNftId) {
50
+ if(msg.sender != getRegistry().ownerOf(instanceNftId)) {
51
+ revert ErrorInstanceServiceRequestUnauhorized(msg.sender);
44
52
  }
45
53
  _;
46
54
  }
47
-
55
+ // TODO check service domain?
56
+ // TODO check release version?
48
57
  modifier onlyRegisteredService() {
49
- address caller = msg.sender;
50
- if (! getRegistry().isRegisteredService(caller)) {
51
- revert ErrorInstanceServiceRequestUnauhorized(caller);
58
+ if (! getRegistry().isRegisteredService(msg.sender)) {
59
+ revert ErrorInstanceServiceRequestUnauhorized(msg.sender);
60
+ }
61
+ _;
62
+ }
63
+ // TODO check release version?
64
+ modifier onlyComponent() {
65
+ if (! getRegistry().isRegisteredComponent(msg.sender)) {
66
+ revert ErrorInstanceServiceRequestUnauhorized(msg.sender);
52
67
  }
53
68
  _;
54
69
  }
@@ -56,262 +71,113 @@ contract InstanceService is
56
71
  function createInstanceClone()
57
72
  external
58
73
  returns (
59
- InstanceAccessManager clonedAccessManager,
60
74
  Instance clonedInstance,
61
- NftId clonedInstanceNftId,
62
- InstanceReader clonedInstanceReader,
63
- BundleManager clonedBundleManager
75
+ NftId clonedInstanceNftId
64
76
  )
65
77
  {
66
78
  address instanceOwner = msg.sender;
67
- IRegistry registry = getRegistry();
68
- address registryAddress = address(registry);
69
- NftId registryNftId = registry.getNftId(registryAddress);
70
- address registryServiceAddress = registry.getServiceAddress(REGISTRY(), getMajorVersion());
71
- IRegistryService registryService = IRegistryService(registryServiceAddress);
79
+ AccessManagerUpgradeableInitializeable clonedOzAccessManager = AccessManagerUpgradeableInitializeable(
80
+ Clones.clone(_masterOzAccessManager));
72
81
 
73
- // initially set the authority of the access managar to this (being the instance service).
74
- // This will allow the instance service to bootstrap the authorizations of the instance
75
- // and then transfer the ownership of the access manager to the instance owner once everything is setup
76
- clonedAccessManager = InstanceAccessManager(Clones.clone(_masterInstanceAccessManager));
77
- clonedAccessManager.initialize(address(this));
82
+ // initially grants ADMIN_ROLE to this (being the instance service).
83
+ // This will allow the instance service to bootstrap the authorizations of the instance.
84
+ // Instance service will not use oz access manager directlly but through instance access manager instead
85
+ // Instance service will renounce ADMIN_ROLE when bootstraping is finished
86
+ clonedOzAccessManager.initialize(address(this));
78
87
 
79
88
  clonedInstance = Instance(Clones.clone(_masterInstance));
80
- clonedInstance.initialize(address(clonedAccessManager), registryAddress, registryNftId, msg.sender);
89
+ clonedInstance.initialize(
90
+ address(clonedOzAccessManager),
91
+ address(getRegistry()),
92
+ instanceOwner);
93
+ // initialize and set before instance reader
94
+ InstanceStore clonedInstanceStore = InstanceStore(Clones.clone(address(_masterInstanceStore)));
95
+ clonedInstanceStore.initialize(address(clonedInstance));
96
+ clonedInstance.setInstanceStore(clonedInstanceStore);
81
97
 
82
- clonedInstanceReader = InstanceReader(Clones.clone(address(_masterInstanceReader)));
83
- clonedInstanceReader.initialize(registryAddress, address(clonedInstance));
98
+ InstanceReader clonedInstanceReader = InstanceReader(Clones.clone(address(_masterInstanceReader)));
99
+ clonedInstanceReader.initialize(address(clonedInstance));
84
100
  clonedInstance.setInstanceReader(clonedInstanceReader);
85
101
 
86
- clonedBundleManager = BundleManager(Clones.clone(_masterInstanceBundleManager));
87
- clonedBundleManager.initialize(address(clonedAccessManager), registryAddress, address(clonedInstance));
102
+ BundleManager clonedBundleManager = BundleManager(Clones.clone(_masterInstanceBundleManager));
103
+ clonedBundleManager.initialize(address(clonedInstance));
88
104
  clonedInstance.setBundleManager(clonedBundleManager);
89
105
 
106
+ InstanceAccessManager clonedInstanceAccessManager = InstanceAccessManager(Clones.clone(_masterInstanceAccessManager));
107
+ clonedOzAccessManager.grantRole(ADMIN_ROLE().toInt(), address(clonedInstanceAccessManager), 0);
108
+ clonedInstanceAccessManager.initialize(address(clonedInstance));
109
+ clonedInstance.setInstanceAccessManager(clonedInstanceAccessManager);
110
+
90
111
  // TODO amend setters with instance specific , policy manager ...
91
112
 
92
- _grantInitialAuthorizations(clonedAccessManager, clonedInstance, clonedBundleManager);
113
+ // TODO library does external calls -> but it is registry and access manager -> find out is it best practice
114
+ InstanceAuthorizationsLib.grantInitialAuthorizations(
115
+ clonedInstanceAccessManager,
116
+ clonedInstance,
117
+ clonedBundleManager,
118
+ clonedInstanceStore,
119
+ instanceOwner,
120
+ getRegistry(),
121
+ getVersion().toMajorPart());
93
122
 
94
- // to complete setup switch instance ownership to the instance owner
95
- // TODO: use a role less powerful than admin, maybe INSTANCE_ADMIN (does not exist yet)
96
- clonedAccessManager.grantRole(ADMIN_ROLE(), instanceOwner);
97
- clonedAccessManager.revokeRole(ADMIN_ROLE(), address(this));
123
+ clonedOzAccessManager.renounceRole(ADMIN_ROLE().toInt(), address(this));
98
124
 
99
- IRegistry.ObjectInfo memory info = registryService.registerInstance(clonedInstance, instanceOwner);
125
+ IRegistry.ObjectInfo memory info = _registryService.registerInstance(clonedInstance, instanceOwner);
100
126
  clonedInstanceNftId = info.nftId;
101
- // clonedInstance.linkToRegisteredNftId();
102
127
 
103
- emit LogInstanceCloned(address(clonedAccessManager), address(clonedInstance), address(clonedInstanceReader), clonedInstanceNftId);
128
+ emit LogInstanceCloned(
129
+ address(clonedOzAccessManager),
130
+ address(clonedInstanceAccessManager),
131
+ address(clonedInstance),
132
+ address(clonedInstanceStore),
133
+ address(clonedBundleManager),
134
+ address(clonedInstanceReader),
135
+ clonedInstanceNftId);
104
136
  }
105
137
 
106
- function _grantInitialAuthorizations(InstanceAccessManager clonedAccessManager, Instance clonedInstance, BundleManager clonedBundleManager) internal {
107
- _createGifRoles(clonedAccessManager);
108
- _createGifTargets(clonedAccessManager, clonedInstance, clonedBundleManager);
109
- _grantDistributionServiceAuthorizations(clonedAccessManager, clonedInstance);
110
- _grantPoolServiceAuthorizations(clonedAccessManager, clonedInstance);
111
- _grantProductServiceAuthorizations(clonedAccessManager, clonedInstance);
112
- _grantApplicationServiceAuthorizations(clonedAccessManager, clonedInstance);
113
- _grantPolicyServiceAuthorizations(clonedAccessManager, clonedInstance);
114
- _grantClaimServiceAuthorizations(clonedAccessManager, clonedInstance);
115
- _grantBundleServiceAuthorizations(clonedAccessManager, clonedInstance, clonedBundleManager);
116
- _grantInstanceServiceAuthorizations(clonedAccessManager, clonedInstance);
117
- }
118
-
119
- function _createGifRoles(InstanceAccessManager clonedAccessManager) internal {
120
- clonedAccessManager.createGifRole(DISTRIBUTION_OWNER_ROLE(), "DistributionOwnerRole");
121
- clonedAccessManager.createGifRole(POOL_OWNER_ROLE(), "PoolOwnerRole");
122
- clonedAccessManager.createGifRole(PRODUCT_OWNER_ROLE(), "ProductOwnerRole");
123
-
124
- clonedAccessManager.createGifRole(DISTRIBUTION_SERVICE_ROLE(), "DistributionServiceRole");
125
- clonedAccessManager.createGifRole(POOL_SERVICE_ROLE(), "PoolServiceRole");
126
- clonedAccessManager.createGifRole(PRODUCT_SERVICE_ROLE(), "ProductServiceRole");
127
- clonedAccessManager.createGifRole(APPLICATION_SERVICE_ROLE(), "ApplicationServiceRole");
128
- clonedAccessManager.createGifRole(POLICY_SERVICE_ROLE(), "PolicyServiceRole");
129
- clonedAccessManager.createGifRole(CLAIM_SERVICE_ROLE(), "ClaimServiceRole");
130
- clonedAccessManager.createGifRole(BUNDLE_SERVICE_ROLE(), "BundleServiceRole");
131
- clonedAccessManager.createGifRole(INSTANCE_SERVICE_ROLE(), "InstanceServiceRole");
132
- }
133
-
134
- function _createGifTargets(InstanceAccessManager clonedAccessManager, Instance clonedInstance, BundleManager clonedBundleManager) internal {
135
- clonedAccessManager.createGifTarget(address(clonedAccessManager), "InstanceAccessManager");
136
- clonedAccessManager.createGifTarget(address(clonedInstance), "Instance");
137
- clonedAccessManager.createGifTarget(address(clonedBundleManager), "BundleManager");
138
- }
139
-
140
- function _grantDistributionServiceAuthorizations(InstanceAccessManager clonedAccessManager, Instance clonedInstance) internal {
141
- // configure authorization for distribution service on instance
142
- IRegistry registry = getRegistry();
143
- address distributionServiceAddress = registry.getServiceAddress(DISTRIBUTION(), getMajorVersion());
144
- clonedAccessManager.grantRole(DISTRIBUTION_SERVICE_ROLE(), distributionServiceAddress);
145
- bytes4[] memory instanceDistributionServiceSelectors = new bytes4[](11);
146
- instanceDistributionServiceSelectors[0] = clonedInstance.createDistributionSetup.selector;
147
- instanceDistributionServiceSelectors[1] = clonedInstance.updateDistributionSetup.selector;
148
- instanceDistributionServiceSelectors[2] = clonedInstance.createDistributorType.selector;
149
- instanceDistributionServiceSelectors[3] = clonedInstance.updateDistributorType.selector;
150
- instanceDistributionServiceSelectors[4] = clonedInstance.updateDistributorTypeState.selector;
151
- instanceDistributionServiceSelectors[5] = clonedInstance.createDistributor.selector;
152
- instanceDistributionServiceSelectors[6] = clonedInstance.updateDistributor.selector;
153
- instanceDistributionServiceSelectors[7] = clonedInstance.updateDistributorState.selector;
154
- instanceDistributionServiceSelectors[8] = clonedInstance.createReferral.selector;
155
- instanceDistributionServiceSelectors[9] = clonedInstance.updateReferral.selector;
156
- instanceDistributionServiceSelectors[10] = clonedInstance.updateReferralState.selector;
157
- clonedAccessManager.setTargetFunctionRole(
158
- "Instance",
159
- instanceDistributionServiceSelectors,
160
- DISTRIBUTION_SERVICE_ROLE());
161
- }
162
-
163
- function _grantPoolServiceAuthorizations(InstanceAccessManager clonedAccessManager, Instance clonedInstance) internal {
164
- // configure authorization for pool service on instance
165
- address poolServiceAddress = getRegistry().getServiceAddress(POOL(), getMajorVersion());
166
- clonedAccessManager.grantRole(POOL_SERVICE_ROLE(), address(poolServiceAddress));
167
- bytes4[] memory instancePoolServiceSelectors = new bytes4[](4);
168
- instancePoolServiceSelectors[0] = clonedInstance.createPoolSetup.selector;
169
- instancePoolServiceSelectors[1] = clonedInstance.updatePoolSetup.selector;
170
- clonedAccessManager.setTargetFunctionRole(
171
- "Instance",
172
- instancePoolServiceSelectors,
173
- POOL_SERVICE_ROLE());
174
- }
175
-
176
- function _grantProductServiceAuthorizations(InstanceAccessManager clonedAccessManager, Instance clonedInstance) internal {
177
- // configure authorization for product service on instance
178
- address productServiceAddress = getRegistry().getServiceAddress(PRODUCT(), getMajorVersion());
179
- clonedAccessManager.grantRole(PRODUCT_SERVICE_ROLE(), address(productServiceAddress));
180
- bytes4[] memory instanceProductServiceSelectors = new bytes4[](5);
181
- instanceProductServiceSelectors[0] = clonedInstance.createProductSetup.selector;
182
- instanceProductServiceSelectors[1] = clonedInstance.updateProductSetup.selector;
183
- instanceProductServiceSelectors[2] = clonedInstance.createRisk.selector;
184
- instanceProductServiceSelectors[3] = clonedInstance.updateRisk.selector;
185
- instanceProductServiceSelectors[4] = clonedInstance.updateRiskState.selector;
186
- clonedAccessManager.setTargetFunctionRole(
187
- "Instance",
188
- instanceProductServiceSelectors,
189
- PRODUCT_SERVICE_ROLE());
190
- }
191
-
192
- function _grantApplicationServiceAuthorizations(InstanceAccessManager clonedAccessManager, Instance clonedInstance) internal {
193
- // configure authorization for application services on instance
194
- address applicationServiceAddress = getRegistry().getServiceAddress(APPLICATION(), getMajorVersion());
195
- clonedAccessManager.grantRole(APPLICATION_SERVICE_ROLE(), applicationServiceAddress);
196
- bytes4[] memory instanceApplicationServiceSelectors = new bytes4[](3);
197
- instanceApplicationServiceSelectors[0] = clonedInstance.createApplication.selector;
198
- instanceApplicationServiceSelectors[1] = clonedInstance.updateApplication.selector;
199
- instanceApplicationServiceSelectors[2] = clonedInstance.updateApplicationState.selector;
200
- clonedAccessManager.setTargetFunctionRole(
201
- "Instance",
202
- instanceApplicationServiceSelectors,
203
- APPLICATION_SERVICE_ROLE());
204
- }
205
-
206
- function _grantPolicyServiceAuthorizations(InstanceAccessManager clonedAccessManager, Instance clonedInstance) internal {
207
- // configure authorization for policy services on instance
208
- address policyServiceAddress = getRegistry().getServiceAddress(POLICY(), getMajorVersion());
209
- clonedAccessManager.grantRole(POLICY_SERVICE_ROLE(), policyServiceAddress);
210
- bytes4[] memory instancePolicyServiceSelectors = new bytes4[](2);
211
- instancePolicyServiceSelectors[0] = clonedInstance.updatePolicy.selector;
212
- instancePolicyServiceSelectors[1] = clonedInstance.updatePolicyState.selector;
213
- clonedAccessManager.setTargetFunctionRole(
214
- "Instance",
215
- instancePolicyServiceSelectors,
216
- POLICY_SERVICE_ROLE());
217
- }
218
-
219
- function _grantClaimServiceAuthorizations(InstanceAccessManager clonedAccessManager, Instance clonedInstance) internal {
220
- // configure authorization for claim/payout services on instance
221
- address claimServiceAddress = getRegistry().getServiceAddress(CLAIM(), getMajorVersion());
222
- clonedAccessManager.grantRole(POLICY_SERVICE_ROLE(), claimServiceAddress);
223
- // TODO add claims function authz
224
- bytes4[] memory instanceClaimServiceSelectors = new bytes4[](0);
225
- // instanceClaimServiceSelectors[0] = clonedInstance.updatePolicy.selector;
226
- // instanceClaimServiceSelectors[1] = clonedInstance.updatePolicyState.selector;
227
- clonedAccessManager.setTargetFunctionRole(
228
- "Instance",
229
- instanceClaimServiceSelectors,
230
- CLAIM_SERVICE_ROLE());
231
- }
232
-
233
- function _grantBundleServiceAuthorizations(InstanceAccessManager clonedAccessManager, Instance clonedInstance, BundleManager clonedBundleManager) internal {
234
- // configure authorization for bundle service on instance
235
- address bundleServiceAddress = getRegistry().getServiceAddress(BUNDLE(), getMajorVersion());
236
- clonedAccessManager.grantRole(BUNDLE_SERVICE_ROLE(), address(bundleServiceAddress));
237
- bytes4[] memory instanceBundleServiceSelectors = new bytes4[](2);
238
- instanceBundleServiceSelectors[0] = clonedInstance.createBundle.selector;
239
- instanceBundleServiceSelectors[1] = clonedInstance.updateBundle.selector;
240
- clonedAccessManager.setTargetFunctionRole(
241
- "Instance",
242
- instanceBundleServiceSelectors,
243
- BUNDLE_SERVICE_ROLE());
244
-
245
- // configure authorization for bundle service on bundle manager
246
- bytes4[] memory bundleManagerBundleServiceSelectors = new bytes4[](5);
247
- bundleManagerBundleServiceSelectors[0] = clonedBundleManager.linkPolicy.selector;
248
- bundleManagerBundleServiceSelectors[1] = clonedBundleManager.unlinkPolicy.selector;
249
- bundleManagerBundleServiceSelectors[2] = clonedBundleManager.add.selector;
250
- bundleManagerBundleServiceSelectors[3] = clonedBundleManager.lock.selector;
251
- bundleManagerBundleServiceSelectors[4] = clonedBundleManager.unlock.selector;
252
- clonedAccessManager.setTargetFunctionRole(
253
- "BundleManager",
254
- bundleManagerBundleServiceSelectors,
255
- BUNDLE_SERVICE_ROLE());
256
- }
257
-
258
- function _grantInstanceServiceAuthorizations(InstanceAccessManager clonedAccessManager, Instance clonedInstance) internal {
259
- // configure authorization for instance service on instance
260
- address instanceServiceAddress = getRegistry().getServiceAddress(INSTANCE(), getMajorVersion());
261
- clonedAccessManager.grantRole(INSTANCE_SERVICE_ROLE(), instanceServiceAddress);
262
- bytes4[] memory instanceInstanceServiceSelectors = new bytes4[](1);
263
- instanceInstanceServiceSelectors[0] = clonedInstance.setInstanceReader.selector;
264
- clonedAccessManager.setTargetFunctionRole(
265
- "Instance",
266
- instanceInstanceServiceSelectors,
267
- INSTANCE_SERVICE_ROLE());
268
-
269
- bytes4[] memory instanceAccessManagerInstanceServiceSelectors = new bytes4[](1);
270
- instanceAccessManagerInstanceServiceSelectors[0] = clonedAccessManager.createGifTarget.selector;
271
- clonedAccessManager.setTargetFunctionRole(
272
- "InstanceAccessManager",
273
- instanceAccessManagerInstanceServiceSelectors,
274
- INSTANCE_SERVICE_ROLE());
275
- }
276
-
277
- function setAndRegisterMasterInstance(address instanceAddress)
138
+ function setAndRegisterMasterInstance(address instanceAddress)
278
139
  external
279
140
  onlyOwner
280
141
  returns(NftId masterInstanceNftId)
281
142
  {
282
143
  if(_masterInstance != address(0)) { revert ErrorInstanceServiceMasterInstanceAlreadySet(); }
144
+ if(_masterOzAccessManager != address(0)) { revert ErrorInstanceServiceMasterOzAccessManagerAlreadySet(); }
283
145
  if(_masterInstanceAccessManager != address(0)) { revert ErrorInstanceServiceMasterInstanceAccessManagerAlreadySet(); }
284
146
  if(_masterInstanceBundleManager != address(0)) { revert ErrorInstanceServiceMasterBundleManagerAlreadySet(); }
285
147
 
286
148
  if(instanceAddress == address(0)) { revert ErrorInstanceServiceInstanceAddressZero(); }
287
149
 
288
150
  IInstance instance = IInstance(instanceAddress);
289
- InstanceAccessManager accessManager = InstanceAccessManager(instance.authority());
290
- address accessManagerAddress = address(accessManager);
151
+ InstanceAccessManager instanceAccessManager = instance.getInstanceAccessManager();
152
+ address instanceAccessManagerAddress = address(instanceAccessManager);
291
153
  InstanceReader instanceReader = instance.getInstanceReader();
292
154
  address instanceReaderAddress = address(instanceReader);
293
155
  BundleManager bundleManager = instance.getBundleManager();
294
156
  address bundleManagerAddress = address(bundleManager);
157
+ InstanceStore instanceStore = instance.getInstanceStore();
158
+ address instanceStoreAddress = address(instanceStore);
295
159
 
296
- if(accessManagerAddress == address(0)) { revert ErrorInstanceServiceAccessManagerZero(); }
160
+ if(instanceAccessManagerAddress == address(0)) { revert ErrorInstanceServiceInstanceAccessManagerZero(); }
297
161
  if(instanceReaderAddress == address(0)) { revert ErrorInstanceServiceInstanceReaderZero(); }
298
162
  if(bundleManagerAddress == address(0)) { revert ErrorInstanceServiceBundleManagerZero(); }
163
+ if(instanceStoreAddress == address(0)) { revert ErrorInstanceServiceInstanceStoreZero(); }
299
164
 
300
- if(instance.authority() != accessManagerAddress) { revert ErrorInstanceServiceInstanceAuthorityMismatch(); }
301
- if(instanceReader.getInstance() != instance) { revert ErrorInstanceServiceInstanceReaderInstanceMismatch2(); }
165
+ if(instance.authority() != instanceAccessManager.authority()) { revert ErrorInstanceServiceInstanceAuthorityMismatch(); }
166
+ if(bundleManager.authority() != instanceAccessManager.authority()) { revert ErrorInstanceServiceBundleManagerAuthorityMismatch(); }
167
+ if(instanceStore.authority() != instanceAccessManager.authority()) { revert ErrorInstanceServiceInstanceStoreAuthorityMismatch(); }
302
168
  if(bundleManager.getInstance() != instance) { revert ErrorInstanceServiceBundleMangerInstanceMismatch(); }
169
+ if(instanceReader.getInstance() != instance) { revert ErrorInstanceServiceInstanceReaderInstanceMismatch2(); }
303
170
 
304
- _masterInstanceAccessManager = accessManagerAddress;
171
+ _masterOzAccessManager = instance.authority();
172
+ _masterInstanceAccessManager = instanceAccessManagerAddress;
305
173
  _masterInstance = instanceAddress;
306
174
  _masterInstanceReader = instanceReaderAddress;
307
175
  _masterInstanceBundleManager = bundleManagerAddress;
176
+ _masterInstanceStore = instanceStoreAddress;
308
177
 
309
- IRegistryService registryService = IRegistryService(getRegistry().getServiceAddress(REGISTRY(), getMajorVersion()));
310
178
  IInstance masterInstance = IInstance(_masterInstance);
311
- IRegistry.ObjectInfo memory info = registryService.registerInstance(masterInstance, getOwner());
179
+ IRegistry.ObjectInfo memory info = _registryService.registerInstance(masterInstance, getOwner());
312
180
  masterInstanceNftId = info.nftId;
313
-
314
- // masterInstance.linkToRegisteredNftId();
315
181
  }
316
182
 
317
183
  function setMasterInstanceReader(address instanceReaderAddress) external onlyOwner {
@@ -325,40 +191,72 @@ contract InstanceService is
325
191
  _masterInstanceReader = instanceReaderAddress;
326
192
  }
327
193
 
328
- // TODO access restriction
329
- function upgradeInstanceReader(NftId instanceNftId) external {
194
+ function upgradeInstanceReader(NftId instanceNftId)
195
+ external
196
+ onlyInstanceOwner(instanceNftId)
197
+ {
330
198
  IRegistry registry = getRegistry();
331
199
  IRegistry.ObjectInfo memory instanceInfo = registry.getObjectInfo(instanceNftId);
332
200
  Instance instance = Instance(instanceInfo.objectAddress);
333
- address owner = instance.getOwner();
334
-
335
- if (msg.sender != owner) {
336
- revert ErrorInstanceServiceRequestUnauhorized(msg.sender);
337
- }
338
201
 
339
202
  InstanceReader upgradedInstanceReaderClone = InstanceReader(Clones.clone(address(_masterInstanceReader)));
340
- upgradedInstanceReaderClone.initialize(address(registry), address(instance));
203
+ upgradedInstanceReaderClone.initialize(address(instance));
341
204
  instance.setInstanceReader(upgradedInstanceReaderClone);
342
205
  }
343
206
 
344
- function getMasterInstanceReader() external view returns (address) {
345
- return _masterInstanceReader;
346
- }
347
207
 
348
- function getMasterInstance() external view returns (address) {
349
- return _masterInstance;
208
+ // all gif targets MUST be childs of instanceNftId
209
+ function createGifTarget(
210
+ NftId instanceNftId,
211
+ address targetAddress,
212
+ string memory targetName,
213
+ bytes4[][] memory selectors,
214
+ RoleId[] memory roles
215
+ )
216
+ external
217
+ onlyRegisteredService
218
+ {
219
+ (
220
+ IInstance instance, // or instanceInfo
221
+ // or targetInfo
222
+ ) = _validateInstanceAndComponent(instanceNftId, targetAddress);
223
+
224
+ InstanceAccessManager accessManager = instance.getInstanceAccessManager();
225
+ accessManager.createGifTarget(targetAddress, targetName);
226
+ // set proposed target config
227
+ // TODO restriction: gif targets are set only once and only here?
228
+ // assume config is a mix of gif and custom roles and no further configuration by INSTANCE_OWNER_ROLE is ever needed?
229
+ for(uint roleIdx = 0; roleIdx < roles.length; roleIdx++)
230
+ {
231
+ accessManager.setCoreTargetFunctionRole(targetName, selectors[roleIdx], roles[roleIdx]);
232
+ }
350
233
  }
351
234
 
352
- function getMasterInstanceAccessManager() external view returns (address) {
353
- return _masterInstanceAccessManager;
235
+
236
+ // TODO called by component, but target can be component helper...so needs target name
237
+ // TODO check that targetName associated with component...how???
238
+ function setComponentLocked(bool locked) onlyComponent external {
239
+
240
+ address componentAddress = msg.sender;
241
+ IRegistry registry = getRegistry();
242
+ NftId instanceNftId = registry.getObjectInfo(componentAddress).parentNftId;
243
+
244
+ IInstance instance = IInstance(
245
+ registry.getObjectInfo(
246
+ instanceNftId).objectAddress);
247
+
248
+ instance.getInstanceAccessManager().setTargetLockedByService(
249
+ componentAddress,
250
+ locked);
354
251
  }
355
252
 
356
- function getMasterInstanceBundleManager() external view returns (address) {
357
- return _masterInstanceBundleManager;
253
+
254
+ function getMasterInstanceReader() external view returns (address) {
255
+ return _masterInstanceReader;
358
256
  }
359
257
 
360
258
  // From IService
361
- function getDomain() public pure override(Service, IService) returns(ObjectType) {
259
+ function getDomain() public pure override returns(ObjectType) {
362
260
  return INSTANCE();
363
261
  }
364
262
 
@@ -371,119 +269,40 @@ contract InstanceService is
371
269
  initializer
372
270
  virtual override
373
271
  {
374
- address initialOwner;
375
- address registryAddress;
376
- (registryAddress, initialOwner) = abi.decode(data, (address, address));
272
+ (
273
+ address registryAddress,
274
+ address initialOwner
275
+ ) = abi.decode(data, (address, address));
276
+
277
+ _registryService = IRegistryService(
278
+ IRegistry(registryAddress).getServiceAddress(
279
+ REGISTRY(),
280
+ getVersion().toMajorPart()));
281
+
377
282
  // TODO while InstanceService is not deployed in InstanceServiceManager constructor
378
283
  // owner is InstanceServiceManager deployer
379
- initializeService(registryAddress, owner);
284
+ initializeService(registryAddress, address(0), owner);
380
285
  registerInterface(type(IInstanceService).interfaceId);
381
286
  }
382
287
 
383
- function hasRole(address account, RoleId role, address instanceAddress) public view returns (bool) {
384
- Instance instance = Instance(instanceAddress);
385
- InstanceAccessManager accessManager = InstanceAccessManager(instance.authority());
386
- return accessManager.hasRole(role, account);
387
- }
388
-
389
- function createGifTarget(NftId instanceNftId, address targetAddress, string memory targetName) external onlyRegisteredService {
390
- IRegistry registry = getRegistry();
391
- IRegistry.ObjectInfo memory instanceInfo = registry.getObjectInfo(instanceNftId);
392
- Instance instance = Instance(instanceInfo.objectAddress);
393
- InstanceAccessManager accessManager = InstanceAccessManager(instance.authority());
394
- accessManager.createGifTarget(targetAddress, targetName);
395
- }
396
-
397
- function grantDistributionDefaultPermissions(NftId instanceNftId, address distributionAddress, string memory distributionName) external onlyRegisteredService {
398
- IRegistry registry = getRegistry();
399
- IRegistry.ObjectInfo memory distributionInfo = registry.getObjectInfo(distributionAddress);
400
-
401
- if (distributionInfo.objectType != DISTRIBUTION()) {
402
- revert ErrorInstanceServiceInvalidComponentType(distributionAddress, DISTRIBUTION(), distributionInfo.objectType);
403
- }
404
288
 
405
- IRegistry.ObjectInfo memory instanceInfo = registry.getObjectInfo(instanceNftId);
406
- Instance instance = Instance(instanceInfo.objectAddress);
407
- InstanceAccessManager instanceAccessManager = InstanceAccessManager(instance.authority());
408
-
409
- bytes4[] memory fctSelectors = new bytes4[](1);
410
- fctSelectors[0] = IDistributionComponent.setFees.selector;
411
- instanceAccessManager.setTargetFunctionRole(distributionName, fctSelectors, DISTRIBUTION_OWNER_ROLE());
412
-
413
- bytes4[] memory fctSelectors2 = new bytes4[](1);
414
- fctSelectors2[0] = IDistributionComponent.processRenewal.selector;
415
- instanceAccessManager.setTargetFunctionRole(distributionName, fctSelectors2, PRODUCT_SERVICE_ROLE());
416
- }
417
-
418
- function grantPoolDefaultPermissions(NftId instanceNftId, address poolAddress, string memory poolName) external onlyRegisteredService {
289
+ function _validateInstanceAndComponent(NftId instanceNftId, address componentAddress)
290
+ internal
291
+ view
292
+ returns (IInstance instance, NftId componentNftId)
293
+ {
419
294
  IRegistry registry = getRegistry();
420
- IRegistry.ObjectInfo memory poolInfo = registry.getObjectInfo(poolAddress);
421
-
422
- if (poolInfo.objectType != POOL()) {
423
- revert ErrorInstanceServiceInvalidComponentType(poolAddress, POOL(), poolInfo.objectType);
424
- }
425
-
426
295
  IRegistry.ObjectInfo memory instanceInfo = registry.getObjectInfo(instanceNftId);
427
- Instance instance = Instance(instanceInfo.objectAddress);
428
- InstanceAccessManager instanceAccessManager = InstanceAccessManager(instance.authority());
429
-
430
- bytes4[] memory fctSelectors = new bytes4[](1);
431
- fctSelectors[0] = IPoolComponent.setFees.selector;
432
- instanceAccessManager.setTargetFunctionRole(poolName, fctSelectors, POOL_OWNER_ROLE());
433
-
434
- bytes4[] memory fctSelectors2 = new bytes4[](1);
435
- fctSelectors2[0] = IPoolComponent.verifyApplication.selector;
436
- instanceAccessManager.setTargetFunctionRole(poolName, fctSelectors2, POLICY_SERVICE_ROLE());
437
-
438
- // bundle owner specific functions
439
- bytes4[] memory fctSelectors3 = new bytes4[](7);
440
- fctSelectors3[0] = IPoolComponent.stake.selector;
441
- fctSelectors3[1] = IPoolComponent.unstake.selector;
442
- fctSelectors3[2] = IPoolComponent.extend.selector;
443
- fctSelectors3[3] = IPoolComponent.lockBundle.selector;
444
- fctSelectors3[4] = IPoolComponent.unlockBundle.selector;
445
- fctSelectors3[5] = IPoolComponent.close.selector;
446
- fctSelectors3[6] = IPoolComponent.setBundleFee.selector;
447
- instanceAccessManager.setTargetFunctionRole(
448
- poolName,
449
- fctSelectors3,
450
- IPoolComponent(poolAddress).getBundleOwnerRole());
451
- }
452
-
453
- function grantProductDefaultPermissions(NftId instanceNftId, address productAddress, string memory productName) external onlyRegisteredService {
454
- IRegistry registry = getRegistry();
455
- IRegistry.ObjectInfo memory productInfo = registry.getObjectInfo(productAddress);
456
-
457
- if (productInfo.objectType != PRODUCT()) {
458
- revert ErrorInstanceServiceInvalidComponentType(productAddress, PRODUCT(), productInfo.objectType);
296
+ if(instanceInfo.objectType != INSTANCE()) {
297
+ revert ErrorInstanceServiceNotInstance(instanceNftId);
459
298
  }
460
299
 
461
- IRegistry.ObjectInfo memory instanceInfo = registry.getObjectInfo(instanceNftId);
462
- Instance instance = Instance(instanceInfo.objectAddress);
463
- InstanceAccessManager instanceAccessManager = InstanceAccessManager(instance.authority());
464
-
465
- bytes4[] memory fctSelectors = new bytes4[](1);
466
- fctSelectors[0] = IProductComponent.setFees.selector;
467
- instanceAccessManager.setTargetFunctionRole(productName, fctSelectors, PRODUCT_OWNER_ROLE());
468
- }
469
-
470
- function setTargetLocked(string memory targetName, bool locked) external {
471
- address componentAddress = msg.sender;
472
- IRegistry registry = getRegistry();
473
300
  IRegistry.ObjectInfo memory componentInfo = registry.getObjectInfo(componentAddress);
474
- if (componentInfo.nftId.eqz()) {
475
- revert ErrorInstanceServiceComponentNotRegistered(componentAddress);
301
+ if(componentInfo.parentNftId != instanceNftId) {
302
+ revert ErrorInstanceServiceInstanceComponentMismatch(instanceNftId, componentInfo.nftId);
476
303
  }
477
304
 
478
- // TODO validate component type
479
-
480
-
481
- address instanceAddress = registry.getObjectInfo(componentInfo.parentNftId).objectAddress;
482
- IInstance instance = IInstance(instanceAddress);
483
-
484
- InstanceAccessManager accessManager = InstanceAccessManager(instance.authority());
485
- accessManager.setTargetClosed(targetName, locked);
305
+ instance = Instance(instanceInfo.objectAddress);
306
+ componentNftId = componentInfo.nftId;
486
307
  }
487
-
488
- }
489
-
308
+ }
@@ -7,7 +7,7 @@ import {ProxyManager} from "../shared/ProxyManager.sol";
7
7
  import {InstanceService} from "./InstanceService.sol";
8
8
  import {Registry} from "../registry/Registry.sol";
9
9
  import {RegistryService} from "../registry/RegistryService.sol";
10
- import {REGISTRY} from "../types/ObjectType.sol";
10
+ import {REGISTRY} from "../type/ObjectType.sol";
11
11
 
12
12
  contract InstanceServiceManager is ProxyManager {
13
13