@etherisc/gif-next 0.0.2-e8b06c8-540 → 0.0.2-e8ea17d-715

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 (344) hide show
  1. package/README.md +13 -1
  2. package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.dbg.json +1 -1
  3. package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.json +38 -33
  4. package/artifacts/contracts/authorization/AccessManagerCloneable.sol/AccessManagerCloneable.dbg.json +4 -0
  5. package/artifacts/contracts/authorization/AccessManagerCloneable.sol/AccessManagerCloneable.json +1206 -0
  6. package/artifacts/contracts/authorization/Authorization.sol/Authorization.dbg.json +1 -1
  7. package/artifacts/contracts/authorization/Authorization.sol/Authorization.json +8 -8
  8. package/artifacts/contracts/authorization/IAccess.sol/IAccess.dbg.json +1 -1
  9. package/artifacts/contracts/authorization/IAccessAdmin.sol/IAccessAdmin.dbg.json +1 -1
  10. package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.dbg.json +1 -1
  11. package/artifacts/contracts/authorization/IModuleAuthorization.sol/IModuleAuthorization.dbg.json +1 -1
  12. package/artifacts/contracts/authorization/IServiceAuthorization.sol/IServiceAuthorization.dbg.json +1 -1
  13. package/artifacts/contracts/authorization/IServiceAuthorization.sol/IServiceAuthorization.json +19 -0
  14. package/artifacts/contracts/authorization/ModuleAuthorization.sol/ModuleAuthorization.dbg.json +1 -1
  15. package/artifacts/contracts/authorization/ModuleAuthorization.sol/ModuleAuthorization.json +8 -8
  16. package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.dbg.json +1 -1
  17. package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.json +23 -4
  18. package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.dbg.json +1 -1
  19. package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.json +26 -26
  20. package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.dbg.json +1 -1
  21. package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.json +19 -19
  22. package/artifacts/contracts/distribution/Distribution.sol/Distribution.dbg.json +1 -1
  23. package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.dbg.json +1 -1
  24. package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.json +74 -74
  25. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
  26. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.json +55 -55
  27. package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
  28. package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.dbg.json +1 -1
  29. package/artifacts/contracts/instance/BundleSet.sol/BundleSet.dbg.json +4 -0
  30. package/artifacts/contracts/instance/BundleSet.sol/BundleSet.json +703 -0
  31. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  32. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +7 -7
  33. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
  34. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +10 -5
  35. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  36. package/artifacts/contracts/instance/Instance.sol/Instance.json +19 -19
  37. package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.dbg.json +1 -1
  38. package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.json +1208 -290
  39. package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.dbg.json +1 -1
  40. package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.json +31 -31
  41. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
  42. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +58 -58
  43. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
  44. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +44 -39
  45. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
  46. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +35 -35
  47. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.dbg.json +1 -1
  48. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.json +83 -84
  49. package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.dbg.json +1 -1
  50. package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.json +2 -2
  51. package/artifacts/contracts/instance/base/Cloneable.sol/Cloneable.dbg.json +1 -1
  52. package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.dbg.json +1 -1
  53. package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.json +2 -2
  54. package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.dbg.json +4 -0
  55. package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.json +182 -0
  56. package/artifacts/contracts/instance/base/ObjectSet.sol/ObjectSet.dbg.json +4 -0
  57. package/artifacts/contracts/instance/base/ObjectSet.sol/ObjectSet.json +181 -0
  58. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +1 -1
  59. package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
  60. package/artifacts/contracts/instance/module/IComponents.sol/IComponents.dbg.json +1 -1
  61. package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +1 -1
  62. package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +1 -1
  63. package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +1 -1
  64. package/artifacts/contracts/mock/Dip.sol/Dip.dbg.json +1 -1
  65. package/artifacts/contracts/mock/Dip.sol/Dip.json +2 -2
  66. package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.dbg.json +1 -1
  67. package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.json +16 -16
  68. package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.dbg.json +1 -1
  69. package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.json +21 -21
  70. package/artifacts/contracts/oracle/IOracle.sol/IOracle.dbg.json +1 -1
  71. package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.dbg.json +1 -1
  72. package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.dbg.json +1 -1
  73. package/artifacts/contracts/oracle/Oracle.sol/Oracle.dbg.json +1 -1
  74. package/artifacts/contracts/oracle/OracleService.sol/OracleService.dbg.json +1 -1
  75. package/artifacts/contracts/oracle/OracleService.sol/OracleService.json +32 -32
  76. package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.dbg.json +1 -1
  77. package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.json +34 -34
  78. package/artifacts/contracts/pool/BasicPool.sol/BasicPool.dbg.json +1 -1
  79. package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.dbg.json +1 -1
  80. package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.json +19 -19
  81. package/artifacts/contracts/pool/BundleService.sol/BundleService.dbg.json +1 -1
  82. package/artifacts/contracts/pool/BundleService.sol/BundleService.json +55 -55
  83. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.dbg.json +1 -1
  84. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.json +40 -40
  85. package/artifacts/contracts/pool/IBundleService.sol/IBundleService.dbg.json +1 -1
  86. package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
  87. package/artifacts/contracts/pool/IPoolService.sol/IPoolService.dbg.json +1 -1
  88. package/artifacts/contracts/pool/Pool.sol/Pool.dbg.json +1 -1
  89. package/artifacts/contracts/pool/PoolService.sol/PoolService.dbg.json +1 -1
  90. package/artifacts/contracts/pool/PoolService.sol/PoolService.json +36 -36
  91. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
  92. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.json +36 -36
  93. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.dbg.json +1 -1
  94. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.json +32 -32
  95. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +1 -1
  96. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.json +34 -34
  97. package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.dbg.json +1 -1
  98. package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.dbg.json +1 -1
  99. package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.json +19 -19
  100. package/artifacts/contracts/product/ClaimService.sol/ClaimService.dbg.json +1 -1
  101. package/artifacts/contracts/product/ClaimService.sol/ClaimService.json +72 -72
  102. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +1 -1
  103. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.json +54 -54
  104. package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.dbg.json +1 -1
  105. package/artifacts/contracts/product/IClaimService.sol/IClaimService.dbg.json +1 -1
  106. package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.dbg.json +1 -1
  107. package/artifacts/contracts/product/IPricingService.sol/IPricingService.dbg.json +1 -1
  108. package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.dbg.json +1 -1
  109. package/artifacts/contracts/product/IProductService.sol/IProductService.dbg.json +1 -1
  110. package/artifacts/contracts/product/PolicyService.sol/PolicyService.dbg.json +1 -1
  111. package/artifacts/contracts/product/PolicyService.sol/PolicyService.json +50 -50
  112. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +1 -1
  113. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.json +43 -43
  114. package/artifacts/contracts/product/PricingService.sol/PricingService.dbg.json +1 -1
  115. package/artifacts/contracts/product/PricingService.sol/PricingService.json +58 -58
  116. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.dbg.json +1 -1
  117. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.json +47 -47
  118. package/artifacts/contracts/product/Product.sol/Product.dbg.json +1 -1
  119. package/artifacts/contracts/product/ProductService.sol/ProductService.dbg.json +1 -1
  120. package/artifacts/contracts/product/ProductService.sol/ProductService.json +20 -20
  121. package/artifacts/contracts/product/ProductServiceManager.sol/ProductServiceManager.dbg.json +1 -1
  122. package/artifacts/contracts/product/ProductServiceManager.sol/ProductServiceManager.json +28 -28
  123. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  124. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +2 -2
  125. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  126. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +50 -46
  127. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
  128. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +0 -183
  129. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
  130. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  131. package/artifacts/contracts/registry/Registry.sol/Registry.json +101 -73
  132. package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.dbg.json +1 -1
  133. package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.json +100 -95
  134. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
  135. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +18 -18
  136. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
  137. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +27 -27
  138. package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.dbg.json +4 -0
  139. package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.json +164 -0
  140. package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.dbg.json +4 -0
  141. package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.json +1159 -0
  142. package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.dbg.json +1 -1
  143. package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.json +26 -7
  144. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
  145. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +4 -4
  146. package/artifacts/contracts/shared/Component.sol/Component.dbg.json +1 -1
  147. package/artifacts/contracts/shared/ComponentService.sol/ComponentService.dbg.json +1 -1
  148. package/artifacts/contracts/shared/ComponentService.sol/ComponentService.json +62 -62
  149. package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.dbg.json +1 -1
  150. package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.json +49 -49
  151. package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.dbg.json +1 -1
  152. package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +1 -1
  153. package/artifacts/contracts/shared/ERC165.sol/ERC165.json +2 -2
  154. package/artifacts/contracts/shared/IComponent.sol/IComponent.dbg.json +1 -1
  155. package/artifacts/contracts/shared/IComponentService.sol/IComponentService.dbg.json +1 -1
  156. package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.dbg.json +1 -1
  157. package/artifacts/contracts/shared/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
  158. package/artifacts/contracts/shared/IKeyValueStore.sol/IKeyValueStore.json +11 -5
  159. package/artifacts/contracts/shared/ILifecycle.sol/ILifecycle.dbg.json +1 -1
  160. package/artifacts/contracts/shared/ILifecycle.sol/ILifecycle.json +0 -5
  161. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
  162. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +1 -1
  163. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  164. package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +1 -1
  165. package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
  166. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +1 -1
  167. package/artifacts/contracts/shared/InitializableCustom.sol/InitializableCustom.dbg.json +1 -1
  168. package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.dbg.json +1 -1
  169. package/artifacts/contracts/shared/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
  170. package/artifacts/contracts/shared/KeyValueStore.sol/KeyValueStore.json +15 -89
  171. package/artifacts/contracts/shared/Lifecycle.sol/Lifecycle.dbg.json +1 -1
  172. package/artifacts/contracts/shared/Lifecycle.sol/Lifecycle.json +4 -65
  173. package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.dbg.json +4 -0
  174. package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.json +306 -0
  175. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
  176. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +6 -6
  177. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +1 -1
  178. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +6 -6
  179. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +1 -1
  180. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +14 -14
  181. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  182. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +8 -8
  183. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +1 -1
  184. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +2 -2
  185. package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
  186. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
  187. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +6 -6
  188. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
  189. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +2 -2
  190. package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +1 -1
  191. package/artifacts/contracts/staking/IStaking.sol/IStaking.dbg.json +1 -1
  192. package/artifacts/contracts/staking/IStakingService.sol/IStakingService.dbg.json +1 -1
  193. package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.dbg.json +1 -1
  194. package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.json +32 -32
  195. package/artifacts/contracts/staking/Staking.sol/Staking.dbg.json +1 -1
  196. package/artifacts/contracts/staking/Staking.sol/Staking.json +44 -44
  197. package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.dbg.json +4 -0
  198. package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.json +164 -0
  199. package/artifacts/contracts/staking/StakingManager.sol/StakingManager.dbg.json +1 -1
  200. package/artifacts/contracts/staking/StakingManager.sol/StakingManager.json +40 -40
  201. package/artifacts/contracts/staking/StakingReader.sol/StakingReader.dbg.json +1 -1
  202. package/artifacts/contracts/staking/StakingReader.sol/StakingReader.json +6 -6
  203. package/artifacts/contracts/staking/StakingService.sol/StakingService.dbg.json +1 -1
  204. package/artifacts/contracts/staking/StakingService.sol/StakingService.json +26 -26
  205. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.dbg.json +1 -1
  206. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.json +31 -31
  207. package/artifacts/contracts/staking/StakingStore.sol/StakingStore.dbg.json +1 -1
  208. package/artifacts/contracts/staking/StakingStore.sol/StakingStore.json +145 -169
  209. package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.dbg.json +1 -1
  210. package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.json +22 -22
  211. package/artifacts/contracts/type/AddressSet.sol/LibAddressSet.dbg.json +1 -1
  212. package/artifacts/contracts/type/AddressSet.sol/LibAddressSet.json +2 -2
  213. package/artifacts/contracts/type/Amount.sol/AmountLib.dbg.json +1 -1
  214. package/artifacts/contracts/type/Amount.sol/AmountLib.json +8 -8
  215. package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
  216. package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.json +2 -2
  217. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.dbg.json +1 -1
  218. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.json +4 -4
  219. package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.dbg.json +1 -1
  220. package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.json +4 -4
  221. package/artifacts/contracts/type/Fee.sol/FeeLib.dbg.json +1 -1
  222. package/artifacts/contracts/type/Fee.sol/FeeLib.json +12 -12
  223. package/artifacts/contracts/type/Key32.sol/Key32Lib.dbg.json +1 -1
  224. package/artifacts/contracts/type/Key32.sol/Key32Lib.json +2 -2
  225. package/artifacts/contracts/type/NftId.sol/NftIdLib.dbg.json +1 -1
  226. package/artifacts/contracts/type/NftId.sol/NftIdLib.json +4 -4
  227. package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
  228. package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.json +2 -2
  229. package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
  230. package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.json +2 -2
  231. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.dbg.json +1 -1
  232. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.json +4 -4
  233. package/artifacts/contracts/type/Referral.sol/ReferralLib.dbg.json +1 -1
  234. package/artifacts/contracts/type/Referral.sol/ReferralLib.json +4 -4
  235. package/artifacts/contracts/type/RequestId.sol/RequestIdLib.dbg.json +1 -1
  236. package/artifacts/contracts/type/RequestId.sol/RequestIdLib.json +4 -4
  237. package/artifacts/contracts/type/RiskId.sol/RiskIdLib.dbg.json +1 -1
  238. package/artifacts/contracts/type/RiskId.sol/RiskIdLib.json +4 -4
  239. package/artifacts/contracts/type/RoleId.sol/RoleIdLib.dbg.json +1 -1
  240. package/artifacts/contracts/type/RoleId.sol/RoleIdLib.json +14 -14
  241. package/artifacts/contracts/type/Seconds.sol/SecondsLib.dbg.json +1 -1
  242. package/artifacts/contracts/type/Seconds.sol/SecondsLib.json +2 -2
  243. package/artifacts/contracts/type/Selector.sol/SelectorLib.dbg.json +1 -1
  244. package/artifacts/contracts/type/Selector.sol/SelectorLib.json +2 -2
  245. package/artifacts/contracts/type/Selector.sol/SelectorSetLib.dbg.json +1 -1
  246. package/artifacts/contracts/type/Selector.sol/SelectorSetLib.json +2 -2
  247. package/artifacts/contracts/type/StateId.sol/StateIdLib.dbg.json +1 -1
  248. package/artifacts/contracts/type/StateId.sol/StateIdLib.json +2 -2
  249. package/artifacts/contracts/type/String.sol/StrLib.dbg.json +1 -1
  250. package/artifacts/contracts/type/String.sol/StrLib.json +2 -2
  251. package/artifacts/contracts/type/Timestamp.sol/TimestampLib.dbg.json +1 -1
  252. package/artifacts/contracts/type/Timestamp.sol/TimestampLib.json +4 -4
  253. package/artifacts/contracts/type/UFixed.sol/MathLib.dbg.json +1 -1
  254. package/artifacts/contracts/type/UFixed.sol/MathLib.json +2 -2
  255. package/artifacts/contracts/type/UFixed.sol/UFixedLib.dbg.json +1 -1
  256. package/artifacts/contracts/type/UFixed.sol/UFixedLib.json +2 -2
  257. package/artifacts/contracts/type/Version.sol/VersionLib.dbg.json +1 -1
  258. package/artifacts/contracts/type/Version.sol/VersionLib.json +2 -2
  259. package/artifacts/contracts/type/Version.sol/VersionPartLib.dbg.json +1 -1
  260. package/artifacts/contracts/type/Version.sol/VersionPartLib.json +21 -2
  261. package/contracts/authorization/AccessAdmin.sol +8 -39
  262. package/contracts/authorization/AccessManagerCloneable.sol +16 -0
  263. package/contracts/authorization/IServiceAuthorization.sol +3 -0
  264. package/contracts/authorization/ModuleAuthorization.sol +0 -125
  265. package/contracts/authorization/ServiceAuthorization.sol +4 -0
  266. package/contracts/distribution/DistributionService.sol +0 -1
  267. package/contracts/distribution/IDistributionComponent.sol +0 -30
  268. package/contracts/instance/{BundleManager.sol → BundleSet.sol} +23 -23
  269. package/contracts/instance/IInstance.sol +7 -7
  270. package/contracts/instance/IInstanceService.sol +6 -5
  271. package/contracts/instance/Instance.sol +8 -47
  272. package/contracts/instance/InstanceAdmin.sol +201 -269
  273. package/contracts/instance/InstanceAuthorizationV3.sol +14 -25
  274. package/contracts/instance/InstanceReader.sol +0 -5
  275. package/contracts/instance/InstanceService.sol +30 -103
  276. package/contracts/instance/InstanceStore.sol +6 -3
  277. package/contracts/instance/base/ObjectLifecycle.sol +106 -0
  278. package/contracts/instance/base/{ObjectManager.sol → ObjectSet.sol} +5 -5
  279. package/contracts/pool/BundleService.sol +8 -8
  280. package/contracts/pool/PoolService.sol +0 -1
  281. package/contracts/registry/IRegistry.sol +26 -16
  282. package/contracts/registry/IRegistryService.sol +6 -6
  283. package/contracts/registry/Registry.sol +80 -86
  284. package/contracts/registry/RegistryAdmin.sol +24 -22
  285. package/contracts/registry/ReleaseLifecycle.sol +27 -0
  286. package/contracts/registry/{ReleaseManager.sol → ReleaseRegistry.sol} +148 -191
  287. package/contracts/registry/ServiceAuthorizationV3.sol +5 -7
  288. package/contracts/registry/TokenRegistry.sol +2 -2
  289. package/contracts/shared/ComponentService.sol +2 -47
  290. package/contracts/shared/IKeyValueStore.sol +1 -0
  291. package/contracts/shared/ILifecycle.sol +1 -2
  292. package/contracts/shared/InstanceLinkedComponent.sol +0 -1
  293. package/contracts/shared/KeyValueStore.sol +6 -2
  294. package/contracts/shared/Lifecycle.sol +16 -69
  295. package/contracts/shared/{NftIdSetManager.sol → NftIdSet.sol} +1 -1
  296. package/contracts/staking/IStaking.sol +0 -1
  297. package/contracts/staking/IStakingService.sol +12 -5
  298. package/contracts/staking/Staking.sol +1 -3
  299. package/contracts/staking/StakingLifecycle.sol +23 -0
  300. package/contracts/staking/StakingManager.sol +0 -1
  301. package/contracts/staking/StakingReader.sol +6 -7
  302. package/contracts/staking/StakingStore.sol +10 -8
  303. package/contracts/type/ObjectType.sol +3 -7
  304. package/contracts/type/RoleId.sol +10 -38
  305. package/contracts/type/Version.sol +3 -1
  306. package/package.json +3 -3
  307. package/artifacts/contracts/authorization/InstanceAdmin.sol/InstanceAdmin.dbg.json +0 -4
  308. package/artifacts/contracts/authorization/InstanceAdmin.sol/InstanceAdmin.json +0 -1385
  309. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.dbg.json +0 -4
  310. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.json +0 -703
  311. package/artifacts/contracts/instance/InstanceAdminNew.sol/InstanceAdminNew.dbg.json +0 -4
  312. package/artifacts/contracts/instance/InstanceAdminNew.sol/InstanceAdminNew.json +0 -1616
  313. package/artifacts/contracts/instance/InstanceAuthorizationsLib.sol/InstanceAuthorizationsLib.dbg.json +0 -4
  314. package/artifacts/contracts/instance/InstanceAuthorizationsLib.sol/InstanceAuthorizationsLib.json +0 -228
  315. package/artifacts/contracts/instance/base/ObjectManager.sol/ObjectManager.dbg.json +0 -4
  316. package/artifacts/contracts/instance/base/ObjectManager.sol/ObjectManager.json +0 -181
  317. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.dbg.json +0 -4
  318. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.json +0 -1237
  319. package/artifacts/contracts/shared/AccessManagerCustom.sol/AccessManagerCustom.dbg.json +0 -4
  320. package/artifacts/contracts/shared/AccessManagerCustom.sol/AccessManagerCustom.json +0 -1193
  321. package/artifacts/contracts/shared/AccessManagerExtended.sol/AccessManagerExtended.dbg.json +0 -4
  322. package/artifacts/contracts/shared/AccessManagerExtended.sol/AccessManagerExtended.json +0 -1747
  323. package/artifacts/contracts/shared/AccessManagerExtendedInitializeable.sol/AccessManagerExtendedInitializeable.dbg.json +0 -4
  324. package/artifacts/contracts/shared/AccessManagerExtendedInitializeable.sol/AccessManagerExtendedInitializeable.json +0 -1760
  325. package/artifacts/contracts/shared/AccessManagerExtendedWithDisable.sol/AccessManagerExtendedWithDisable.dbg.json +0 -4
  326. package/artifacts/contracts/shared/AccessManagerExtendedWithDisable.sol/AccessManagerExtendedWithDisable.json +0 -1838
  327. package/artifacts/contracts/shared/AccessManagerExtendedWithDisableInitializeable.sol/AccessManagerExtendedWithDisableInitializeable.dbg.json +0 -4
  328. package/artifacts/contracts/shared/AccessManagerExtendedWithDisableInitializeable.sol/AccessManagerExtendedWithDisableInitializeable.json +0 -1856
  329. package/artifacts/contracts/shared/IAccessManagerExtended.sol/IAccessManagerExtended.dbg.json +0 -4
  330. package/artifacts/contracts/shared/IAccessManagerExtended.sol/IAccessManagerExtended.json +0 -1562
  331. package/artifacts/contracts/shared/IAccessManagerExtendedWithDisable.sol/IAccessManagerExtendedWithDisable.dbg.json +0 -4
  332. package/artifacts/contracts/shared/IAccessManagerExtendedWithDisable.sol/IAccessManagerExtendedWithDisable.json +0 -1600
  333. package/artifacts/contracts/shared/NftIdSetManager.sol/NftIdSetManager.dbg.json +0 -4
  334. package/artifacts/contracts/shared/NftIdSetManager.sol/NftIdSetManager.json +0 -306
  335. package/contracts/authorization/InstanceAdmin.sol +0 -108
  336. package/contracts/instance/InstanceAdminNew.sol +0 -261
  337. package/contracts/instance/InstanceAuthorizationsLib.sol +0 -422
  338. package/contracts/shared/AccessManagerCustom.sol +0 -741
  339. package/contracts/shared/AccessManagerExtended.sol +0 -481
  340. package/contracts/shared/AccessManagerExtendedInitializeable.sol +0 -13
  341. package/contracts/shared/AccessManagerExtendedWithDisable.sol +0 -137
  342. package/contracts/shared/AccessManagerExtendedWithDisableInitializeable.sol +0 -14
  343. package/contracts/shared/IAccessManagerExtended.sol +0 -74
  344. package/contracts/shared/IAccessManagerExtendedWithDisable.sol +0 -18
@@ -1,334 +1,266 @@
1
- // SPDX-License-Identifier: Apache-2.0
1
+ // SPDX-License-Identifier: UNLICENSED
2
2
  pragma solidity ^0.8.20;
3
3
 
4
- import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";
5
- import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
6
-
7
- import {RoleId, RoleIdLib, ADMIN_ROLE, PUBLIC_ROLE} from "../type/RoleId.sol";
8
- import {TimestampLib} from "../type/Timestamp.sol";
9
- import {NftId} from "../type/NftId.sol";
10
-
11
- import {AccessManagerExtendedInitializeable} from "../shared/AccessManagerExtendedInitializeable.sol";
4
+ import {AccessManager} from "@openzeppelin/contracts/access/manager/AccessManager.sol";
12
5
 
6
+ import {AccessAdmin} from "../authorization/AccessAdmin.sol";
7
+ import {AccessManagerCloneable} from "../authorization/AccessManagerCloneable.sol";
8
+ import {IAccessAdmin} from "../authorization/IAccessAdmin.sol";
9
+ import {IAuthorization} from "../authorization/IAuthorization.sol";
10
+ import {IModuleAuthorization} from "../authorization/IModuleAuthorization.sol";
13
11
  import {IRegistry} from "../registry/IRegistry.sol";
14
-
15
12
  import {IInstance} from "./IInstance.sol";
16
- import {IAccess} from "./module/IAccess.sol";
13
+ import {IService} from "../shared/IService.sol";
14
+ import {ObjectType, ObjectTypeLib, ALL, POOL, RELEASE} from "../type/ObjectType.sol";
15
+ import {RoleId, RoleIdLib, ADMIN_ROLE, PUBLIC_ROLE, DISTRIBUTION_OWNER_ROLE, ORACLE_OWNER_ROLE, POOL_OWNER_ROLE, PRODUCT_OWNER_ROLE} from "../type/RoleId.sol";
16
+ import {Str, StrLib} from "../type/String.sol";
17
+ import {VersionPart} from "../type/Version.sol";
17
18
 
18
- function INSTANCE_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(2600); }
19
- function INSTANCE_OWNER_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(10); }
20
19
 
21
20
  contract InstanceAdmin is
22
- AccessManagedUpgradeable
21
+ AccessAdmin
23
22
  {
24
- using RoleIdLib for RoleId;
25
-
26
- string public constant INSTANCE_ROLE_NAME = "InstanceRole";
27
- string public constant INSTANCE_OWNER_ROLE_NAME = "InstanceOwnerRole";
28
-
23
+ string public constant INSTANCE_TARGET_NAME = "Instance";
24
+ string public constant INSTANCE_STORE_TARGET_NAME = "InstanceStore";
29
25
  string public constant INSTANCE_ADMIN_TARGET_NAME = "InstanceAdmin";
26
+ string public constant BUNDLE_SET_TARGET_NAME = "BundleSet";
30
27
 
31
28
  uint64 public constant CUSTOM_ROLE_ID_MIN = 10000; // MUST be even
32
- uint32 public constant EXECUTION_DELAY = 0;
33
29
 
34
- mapping(address target => IAccess.Type) _targetType;
35
- mapping(RoleId roleId => IAccess.Type) _roleType;
36
- uint64 _idNext;
30
+ error ErrorInstanceAdminNotRegistered(address target);
31
+ error ErrorInstanceAdminAlreadyAuthorized(address target);
32
+ error ErrorInstanceAdminReleaseMismatch();
33
+ error ErrorInstanceAdminExpectedTargetMissing(string targetName);
37
34
 
38
- AccessManagerExtendedInitializeable internal _accessManager;
39
- address _instance;
35
+ IInstance _instance;
40
36
  IRegistry internal _registry;
37
+ uint64 _idNext;
41
38
 
42
- // instance owner role is granted upon instance nft minting in callback function
43
- // assume this contract is already a member of ADMIN_ROLE, the only member
44
- function initialize(address instanceAddress) external initializer
45
- {
46
- IInstance instance = IInstance(instanceAddress);
47
- IRegistry registry = instance.getRegistry();
48
- address authority = instance.authority();
49
-
50
- __AccessManaged_init(authority);
51
-
52
- _accessManager = AccessManagerExtendedInitializeable(authority);
53
- _instance = instanceAddress;
54
- _registry = registry;
55
- _idNext = CUSTOM_ROLE_ID_MIN;
56
-
57
- // minimum configuration required for nft interception
58
- _createRole(INSTANCE_ROLE(), INSTANCE_ROLE_NAME, IAccess.Type.Core);
59
- _createRole(INSTANCE_OWNER_ROLE(), INSTANCE_OWNER_ROLE_NAME, IAccess.Type.Core);
60
- _grantRole(INSTANCE_ROLE(), address(instance));
61
-
62
- _createTarget(address(this), INSTANCE_ADMIN_TARGET_NAME, IAccess.Type.Core);
63
- bytes4[] memory instanceAdminInstanceSelectors = new bytes4[](1);
64
- instanceAdminInstanceSelectors[0] = this.transferInstanceOwnerRole.selector;
65
- _setTargetFunctionRole(address(this), instanceAdminInstanceSelectors, INSTANCE_ROLE());
66
- }
67
-
68
- //--- Role ------------------------------------------------------//
69
- // ADMIN_ROLE
70
- // assume all core roles are known at deployment time
71
- // assume core roles are set and granted only during instance cloning
72
- // assume core roles are never revoked -> core roles admin is never active after intialization
73
- function createCoreRole(RoleId roleId, string memory name) external restricted() {
74
- _createRole(roleId, name, IAccess.Type.Core);
75
- }
39
+ IModuleAuthorization _instanceAuthorization;
76
40
 
77
- // ADMIN_ROLE
78
- // assume gif roles can be revoked
79
- // assume admin is INSTANCE_OWNER_ROLE or INSTANCE_ROLE
80
- function createGifRole(RoleId roleId, string memory name, RoleId admin) external restricted() {
81
- _createRole(roleId, name, IAccess.Type.Gif);
82
- _setRoleAdmin(roleId, admin);
41
+ /// @dev Only used for master instance admin.
42
+ /// Contracts created via constructor come with disabled initializers.
43
+ constructor(
44
+ IModuleAuthorization instanceAuthorization
45
+ )
46
+ AccessAdmin()
47
+ {
48
+ _instanceAuthorization = instanceAuthorization;
83
49
  }
84
50
 
85
- // INSTANCE_ROLE
86
- // TODO specify how many owners role can have -> many roles MUST have exactly 1 member?
87
- function createRole(string memory roleName, string memory adminName)
51
+ /// @dev Initializes this instance admin with the provided instances authorization specification.
52
+ /// Internally the function creates an instance specific OpenZeppelin AccessManager that is used as the authority
53
+ /// for the inststance authorizatios.
54
+ /// Important: Initialization of this instance admin is only complete after calling function initializeInstance.
55
+ function initialize(
56
+ AccessManagerCloneable accessManager,
57
+ IModuleAuthorization instanceAuthorization
58
+ )
88
59
  external
89
- restricted()
90
- returns(RoleId roleId, RoleId admin)
60
+ initializer()
91
61
  {
92
- (roleId, admin) = _getNextCustomRoleId();
62
+ // create new access manager for this instance admin
63
+ _initializeAuthority(address(accessManager));
93
64
 
94
- _createRole(roleId, roleName, IAccess.Type.Custom);
95
- _createRole(admin, adminName, IAccess.Type.Custom);
65
+ // create basic instance independent setup
66
+ _createAdminAndPublicRoles();
96
67
 
97
- _setRoleAdmin(roleId, admin);
98
- _setRoleAdmin(admin, INSTANCE_OWNER_ROLE());
68
+ // store instance authorization specification
69
+ _instanceAuthorization = IModuleAuthorization(instanceAuthorization);
99
70
  }
100
71
 
101
- // ADMIN_ROLE
102
- // assume used by instance service only during instance cloning
103
- // assume used only by this.createRole(), this.createGifRole() afterwards
104
- function setRoleAdmin(RoleId roleId, RoleId admin) public restricted() {
105
- _setRoleAdmin(roleId, admin);
106
- }
107
-
108
- // INSTANCE_ROLE
109
- function transferInstanceOwnerRole(address from, address to) external restricted() {
110
- // temp pre transfer checks
111
- assert(_getRoleMembers(INSTANCE_ROLE()) == 1);
112
- assert(_hasRole(INSTANCE_ROLE(), _instance));
113
- assert(_getRoleAdmin(INSTANCE_OWNER_ROLE()).toInt() == ADMIN_ROLE().toInt());
114
- if(from != address(0)) { // nft transfer
115
- assert(_getRoleMembers(INSTANCE_OWNER_ROLE()) == 1);
116
- } else { // nft minting
117
- assert(_getRoleMembers(INSTANCE_OWNER_ROLE()) == 0);
72
+ function _checkTargetIsReadyForAuthorization(address target)
73
+ internal
74
+ view
75
+ {
76
+ if (address(_registry) != address(0) && !_registry.isRegistered(target)) {
77
+ revert ErrorInstanceAdminNotRegistered(target);
118
78
  }
119
79
 
120
- // transfer
121
- assert(from != to);
122
- _grantRole(INSTANCE_OWNER_ROLE(), to);
123
- if(from != address(0)) { // nft transfer
124
- _revokeRole(INSTANCE_OWNER_ROLE(), from);
80
+ if (targetExists(target)) {
81
+ revert ErrorInstanceAdminAlreadyAuthorized(target);
125
82
  }
126
-
127
- // temp post transfer checks
128
- assert(_getRoleMembers(INSTANCE_OWNER_ROLE()) == 1);// temp
129
- assert(_hasRole(INSTANCE_OWNER_ROLE(), to));
130
83
  }
131
84
 
132
- //--- Target ------------------------------------------------------//
133
- // ADMIN_ROLE
134
- // assume some core targets are registred (instance) while others are not (instance accesss manager, instance reader, bundle manager)
135
- function createCoreTarget(address target, string memory name) external restricted() {
136
- _createTarget(target, name, IAccess.Type.Core);
137
- }
138
-
139
- // INSTANCE_SERVICE_ROLE
140
- function createGifTarget(address target, string memory name) external restricted()
85
+ /// @dev Completes the initialization of this instance admin using the provided instance.
86
+ /// Important: The instance MUST be registered and all instance supporting contracts must be wired to this instance.
87
+ function initializeInstanceAuthorization(address instanceAddress)
88
+ external
141
89
  {
142
- if(!_registry.isRegistered(target)) {
143
- revert IAccess.ErrorIAccessTargetNotRegistered(target);
144
- }
90
+ _checkTargetIsReadyForAuthorization(instanceAddress);
145
91
 
146
- NftId targetParentNftId = _registry.getObjectInfo(target).parentNftId;
147
- NftId instanceNftId = _registry.getObjectInfo(_instance).nftId;
148
- if(targetParentNftId != instanceNftId) {
149
- revert IAccess.ErrorIAccessTargetInstanceMismatch(target, targetParentNftId, instanceNftId);
150
- }
151
-
152
- _createTarget(target, name, IAccess.Type.Gif);
153
- }
92
+ _idNext = CUSTOM_ROLE_ID_MIN;
93
+ _instance = IInstance(instanceAddress);
94
+ _registry = _instance.getRegistry();
154
95
 
155
- // INSTANCE_ROLE
156
- // assume custom target.authority() is constant -> target MUST not be used with different instance access manager
157
- // assume custom target can not be registered as component -> each service which is doing component registration MUST register a gif target
158
- // assume custom target can not be registered as instance or service -> why?
159
- // TODO check target associated with instance owner or instance or instance components or components helpers
160
- function createTarget(address target, string memory name) external restricted() {
161
- _createTarget(target, name, IAccess.Type.Custom);
162
- }
96
+ // check matching releases
97
+ if (_instanceAuthorization.getRelease() != _instance.getMajorVersion()) {
98
+ revert ErrorInstanceAdminReleaseMismatch();
99
+ }
163
100
 
164
- // TODO instance owner locks component instead of revoking it access to the instance...
165
- // INSTANCE_SERVICE_ROLE
166
- function setTargetLockedByService(address target, bool locked) external restricted {
167
- _setTargetLocked(target, locked);
168
- }
101
+ // add instance authorization
102
+ _createRoles(_instanceAuthorization);
103
+ _createModuleTargetsWithRoles();
104
+ _createTargetAuthorizations(_instanceAuthorization);
169
105
 
170
- // INSTANCE_ROLE
171
- function setTargetLockedByInstance(address target, bool locked) external restricted {
172
- _setTargetLocked(target, locked);
106
+ // grant component owner roles to instance owner
107
+ _grantComponentOwnerRoles();
173
108
  }
174
109
 
175
110
 
176
- // allowed combinations of roles and targets:
177
- //1) set core role for core target
178
- //2) set gif role for gif target
179
- //3) set custom role for gif target
180
- //4) set custom role for custom target
181
-
182
- // ADMIN_ROLE if used only during initialization, works with:
183
- // any roles for any targets
184
- // INSTANCE_SERVICE_ROLE if used not only during initilization, works with:
185
- // core roles for core targets
186
- // gif roles for gif targets
187
- function setTargetFunctionRoleByService(
188
- string memory targetName,
189
- bytes4[] calldata selectors,
190
- RoleId roleId
191
- )
192
- public
193
- virtual
194
- restricted
111
+ /// @dev Initializes the authorization for the specified component.
112
+ /// Important: The component MUST be registered.
113
+ function initializeComponentAuthorization(
114
+ address componentAddress,
115
+ IAuthorization authorization
116
+ )
117
+ external
195
118
  {
196
- address target = _accessManager.getTargetAddress(targetName);
197
- // not custom target
198
- if(_targetType[target] == IAccess.Type.Custom) {
199
- revert IAccess.ErrorIAccessTargetTypeInvalid(target, IAccess.Type.Custom);
200
- }
201
-
202
- // not custom role
203
- if(_roleType[roleId] == IAccess.Type.Custom) {
204
- revert IAccess.ErrorIAccessRoleTypeInvalid(roleId, IAccess.Type.Custom);
205
- }
206
-
207
- _setTargetFunctionRole(target, selectors, roleId);
119
+ _checkTargetIsReadyForAuthorization(componentAddress);
120
+
121
+ _createRoles(authorization);
122
+
123
+ // create component target
124
+ _createTarget(
125
+ componentAddress,
126
+ authorization.getTargetName(),
127
+ true, // checkAuthority
128
+ false); // custom
129
+
130
+ _grantRoleToAccount(
131
+ authorization.getTargetRole(
132
+ authorization.getTarget()),
133
+ componentAddress);
134
+
135
+ _createTargetAuthorizations(authorization);
208
136
  }
209
137
 
210
- // INSTANCE_ROLE
211
- // gif role for gif target
212
- // gif role for custom target
213
- // custom role for gif target -> need to prohibit
214
- // custom role for custom target
215
- // TODO instance owner can mess with gif target (component) -> e.g. set custom role for function intendent to work with gif role
216
- function setTargetFunctionRoleByInstance(
217
- string memory targetName,
218
- bytes4[] calldata selectors,
219
- RoleId roleId// string memory roleName
220
- )
221
- public
222
- virtual
223
- restricted()
224
- {
225
- address target = _accessManager.getTargetAddress(targetName);
226
138
 
227
- // not core target
228
- if(_targetType[target] == IAccess.Type.Core) {
229
- revert IAccess.ErrorIAccessTargetTypeInvalid(target, IAccess.Type.Core);
230
- }
231
-
232
- // not core role
233
- if(_roleType[roleId] == IAccess.Type.Core) {
234
- revert IAccess.ErrorIAccessRoleTypeInvalid(roleId, IAccess.Type.Core);
235
- }
236
-
237
- _setTargetFunctionRole(target, selectors, roleId);
139
+ function _grantComponentOwnerRoles()
140
+ internal
141
+ {
142
+ address instanceOwner = _registry.ownerOf(_instance.getNftId());
143
+ _grantRoleToAccount(DISTRIBUTION_OWNER_ROLE(), instanceOwner);
144
+ _grantRoleToAccount(ORACLE_OWNER_ROLE(), instanceOwner);
145
+ _grantRoleToAccount(POOL_OWNER_ROLE(), instanceOwner);
146
+ _grantRoleToAccount(PRODUCT_OWNER_ROLE(), instanceOwner);
238
147
  }
239
148
 
240
- //--- Role internal view/pure functions --------------------------------------//
241
- function _createRole(RoleId roleId, string memory name, IAccess.Type rtype) internal {
242
- _validateRole(roleId, rtype);
149
+ /// @dev Creates a custom role
150
+ // TODO implement
151
+ // function createRole()
152
+ // external
153
+ // restricted()
154
+ // {
243
155
 
244
- _roleType[roleId] = rtype;
245
- _accessManager.createRole(roleId.toInt(), name);
246
- }
156
+ // }
247
157
 
248
- function _validateRole(RoleId roleId, IAccess.Type rtype) internal pure
158
+ /// @dev Grants the provided role to the specified account
159
+ function grantRole(
160
+ RoleId roleId,
161
+ address account)
162
+ external
163
+ restricted()
249
164
  {
250
- uint roleIdInt = roleId.toInt();
251
- if(rtype == IAccess.Type.Custom && roleIdInt < CUSTOM_ROLE_ID_MIN) {
252
- revert IAccess.ErrorIAccessRoleIdTooSmall(roleId);
253
- }
254
-
255
- if(
256
- rtype != IAccess.Type.Custom &&
257
- roleIdInt >= CUSTOM_ROLE_ID_MIN &&
258
- roleIdInt != PUBLIC_ROLE().toInt())
259
- {
260
- revert IAccess.ErrorIAccessRoleIdTooBig(roleId);
261
- }
165
+ _grantRoleToAccount(roleId, account);
262
166
  }
263
167
 
264
- function _grantRole(RoleId roleId, address account) internal {
265
- _accessManager.grantRole(roleId.toInt(), account, EXECUTION_DELAY);
168
+ /// @dev Returns the instance authorization specification used to set up this instance admin.
169
+ function getInstanceAuthorization()
170
+ external
171
+ view
172
+ returns (IModuleAuthorization instanceAuthorizaion)
173
+ {
174
+ return _instanceAuthorization;
266
175
  }
267
176
 
268
- function _revokeRole(RoleId roleId, address member) internal {
269
- _accessManager.revokeRole(roleId.toInt(), member);
270
- }
271
177
 
272
- function _setRoleAdmin(RoleId roleId, RoleId admin) internal {
273
- if(_roleType[roleId] == IAccess.Type.Core) {
274
- revert IAccess.ErrorIAccessRoleTypeInvalid(roleId, IAccess.Type.Core);
178
+ function _createRoles(IAuthorization authorization)
179
+ internal
180
+ {
181
+ RoleId[] memory roles = authorization.getRoles();
182
+ RoleId roleId;
183
+ RoleInfo memory roleInfo;
184
+
185
+ for(uint256 i = 0; i < roles.length; i++) {
186
+ roleId = roles[i];
187
+ _createRole(
188
+ roleId,
189
+ authorization.getRoleInfo(roleId));
275
190
  }
276
-
277
- _accessManager.setRoleAdmin(roleId.toInt(), admin.toInt());
278
191
  }
279
192
 
280
- function _getRoleAdmin(RoleId roleId) internal view returns (RoleId admin) {
281
- return RoleIdLib.toRoleId(_accessManager.getRoleAdmin(roleId.toInt()));
282
- }
283
-
284
- function _hasRole(RoleId roleId, address account) internal view returns (bool accountHasRole) {
285
- uint32 executionDelay;
286
- (accountHasRole, executionDelay) = _accessManager.hasRole(roleId.toInt(), account);
287
- assert(executionDelay == 0);
288
- }
289
-
290
- function _getRoleMembers(RoleId roleId) internal view returns (uint) {
291
- return _accessManager.getRoleMembers(roleId.toInt());
292
- }
293
-
294
- function _getNextCustomRoleId() internal returns(RoleId roleId, RoleId admin) {
295
- uint64 roleIdInt = _idNext;
296
- uint64 adminInt = roleIdInt + 1;
297
-
298
- _idNext = roleIdInt + 2;
299
193
 
300
- roleId = RoleIdLib.toRoleId(roleIdInt);
301
- admin = RoleIdLib.toRoleId(adminInt);
302
- }
303
-
304
- //--- Target internal view/pure functions --------------------------------------//
305
- function _createTarget(address target, string memory name, IAccess.Type ttype)
306
- internal
194
+ function _createTargetAuthorizations(IAuthorization authorization)
195
+ internal
307
196
  {
308
- _validateTarget(target, ttype);
309
- _targetType[target] = ttype;
310
- _accessManager.createTarget(target, name);
197
+ Str[] memory targets = authorization.getTargets();
198
+ Str target;
199
+
200
+ for(uint256 i = 0; i < targets.length; i++) {
201
+ target = targets[i];
202
+ RoleId[] memory authorizedRoles = authorization.getAuthorizedRoles(target);
203
+ RoleId authorizedRole;
204
+
205
+ for(uint256 j = 0; j < authorizedRoles.length; j++) {
206
+ authorizedRole = authorizedRoles[j];
207
+
208
+ _authorizeTargetFunctions(
209
+ getTargetForName(target),
210
+ authorizedRole,
211
+ authorization.getAuthorizedFunctions(
212
+ target,
213
+ authorizedRole));
214
+ }
215
+ }
311
216
  }
312
217
 
313
- function _validateTarget(address target, IAccess.Type ttype)
314
- internal
315
- view
316
- {}
317
-
318
- // IMPORTANT: instance admin MUST be of Core type -> otherwise can be locked forever
319
- // TODO: consider locking gif targets in a separate function?
320
- function _setTargetLocked(address target, bool locked) internal
218
+ function _checkAndCreateTargetWithRole(
219
+ address target,
220
+ string memory targetName
221
+ )
222
+ internal
321
223
  {
322
- IAccess.Type targetType = _targetType[target];
323
-
324
- if(targetType == IAccess.Type.Core) {
325
- revert IAccess.ErrorIAccessTargetTypeInvalid(target, targetType);
224
+ // check that target name is defined in authorization specification
225
+ Str name = StrLib.toStr(targetName);
226
+ if (!_instanceAuthorization.targetExists(name)) {
227
+ revert ErrorInstanceAdminExpectedTargetMissing(targetName);
326
228
  }
327
229
 
328
- _accessManager.setTargetClosed(target, locked);
230
+ // create named target
231
+ _createTarget(
232
+ target,
233
+ targetName,
234
+ false, // check authority TODO check normal targets, don't check service targets (they share authority with registry admin)
235
+ false);
236
+
237
+ // assign target role if defined
238
+ RoleId targetRoleId = _instanceAuthorization.getTargetRole(name);
239
+ if (targetRoleId != RoleIdLib.zero()) {
240
+ _grantRoleToAccount(targetRoleId, target);
241
+ }
329
242
  }
330
243
 
331
- function _setTargetFunctionRole(address target, bytes4[] memory selectors, RoleId roleId) internal {
332
- _accessManager.setTargetFunctionRole(target, selectors, roleId.toInt());
244
+ function _createModuleTargetsWithRoles()
245
+ internal
246
+ {
247
+ // create module targets
248
+ _checkAndCreateTargetWithRole(address(_instance), INSTANCE_TARGET_NAME);
249
+ _checkAndCreateTargetWithRole(address(_instance.getInstanceStore()), INSTANCE_STORE_TARGET_NAME);
250
+ _checkAndCreateTargetWithRole(address(_instance.getInstanceAdmin()), INSTANCE_ADMIN_TARGET_NAME);
251
+ _checkAndCreateTargetWithRole(address(_instance.getBundleSet()), BUNDLE_SET_TARGET_NAME);
252
+
253
+ // create targets for services that need to access the module targets
254
+ ObjectType[] memory serviceDomains = _instanceAuthorization.getServiceDomains();
255
+ VersionPart release = _instanceAuthorization.getRelease();
256
+ ObjectType serviceDomain;
257
+
258
+ for (uint256 i = 0; i < serviceDomains.length; i++) {
259
+ serviceDomain = serviceDomains[i];
260
+
261
+ _checkAndCreateTargetWithRole(
262
+ _registry.getServiceAddress(serviceDomain, release),
263
+ _instanceAuthorization.getServiceTarget(serviceDomain).toString());
264
+ }
333
265
  }
334
- }
266
+ }
@@ -9,10 +9,10 @@ import {
9
9
  ADMIN_ROLE, DISTRIBUTION_OWNER_ROLE, ORACLE_OWNER_ROLE, POOL_OWNER_ROLE, PRODUCT_OWNER_ROLE
10
10
  } from "../../contracts/type/RoleId.sol";
11
11
 
12
- import {BundleManager} from "../instance/BundleManager.sol";
12
+ import {BundleSet} from "../instance/BundleSet.sol";
13
13
  import {IAccess} from "../authorization/IAccess.sol";
14
14
  import {Instance} from "../instance/Instance.sol";
15
- import {InstanceAdminNew} from "../instance/InstanceAdminNew.sol";
15
+ import {InstanceAdmin} from "../instance/InstanceAdmin.sol";
16
16
  import {InstanceStore} from "../instance/InstanceStore.sol";
17
17
  import {ModuleAuthorization} from "../authorization/ModuleAuthorization.sol";
18
18
  import {RoleId} from "../type/RoleId.sol";
@@ -26,7 +26,7 @@ contract InstanceAuthorizationV3
26
26
  string public constant INSTANCE_TARGET_NAME = "Instance";
27
27
  string public constant INSTANCE_STORE_TARGET_NAME = "InstanceStore";
28
28
  string public constant INSTANCE_ADMIN_TARGET_NAME = "InstanceAdmin";
29
- string public constant BUNDLE_MANAGER_TARGET_NAME = "BundleManager";
29
+ string public constant BUNDLE_SET_TARGET_NAME = "BundleSet";
30
30
 
31
31
  string public constant INSTANCE_ROLE_NAME = "InstanceRole";
32
32
  string public constant DISTRIBUTION_OWNER_ROLE_NAME = "DistributionOwnerRole";
@@ -61,7 +61,7 @@ contract InstanceAuthorizationV3
61
61
  // instance supporting targets
62
62
  _addTarget(INSTANCE_STORE_TARGET_NAME);
63
63
  _addTarget(INSTANCE_ADMIN_TARGET_NAME);
64
- _addTarget(BUNDLE_MANAGER_TARGET_NAME);
64
+ _addTarget(BUNDLE_SET_TARGET_NAME);
65
65
 
66
66
  // service targets relevant to instance
67
67
  _addServiceTargetWithRole(INSTANCE());
@@ -84,22 +84,22 @@ contract InstanceAuthorizationV3
84
84
  _setupInstanceAuthorization();
85
85
  _setupInstanceAdminAuthorization();
86
86
  _setupInstanceStoreAuthorization();
87
- _setupBundleManagerAuthorization();
87
+ _setupBundleSetAuthorization();
88
88
  }
89
89
 
90
90
 
91
- function _setupBundleManagerAuthorization()
91
+ function _setupBundleSetAuthorization()
92
92
  internal
93
93
  {
94
94
  IAccess.FunctionInfo[] storage functions;
95
95
 
96
96
  // authorize bundle service role
97
- functions = _authorizeForTarget(BUNDLE_MANAGER_TARGET_NAME, getServiceRole(BUNDLE()));
98
- _authorize(functions, BundleManager.linkPolicy.selector, "linkPolicy");
99
- _authorize(functions, BundleManager.unlinkPolicy.selector, "unlinkPolicy");
100
- _authorize(functions, BundleManager.add.selector, "add");
101
- _authorize(functions, BundleManager.lock.selector, "lock");
102
- _authorize(functions, BundleManager.unlock.selector, "unlock");
97
+ functions = _authorizeForTarget(BUNDLE_SET_TARGET_NAME, getServiceRole(BUNDLE()));
98
+ _authorize(functions, BundleSet.linkPolicy.selector, "linkPolicy");
99
+ _authorize(functions, BundleSet.unlinkPolicy.selector, "unlinkPolicy");
100
+ _authorize(functions, BundleSet.add.selector, "add");
101
+ _authorize(functions, BundleSet.lock.selector, "lock");
102
+ _authorize(functions, BundleSet.unlock.selector, "unlock");
103
103
  }
104
104
 
105
105
 
@@ -108,12 +108,8 @@ contract InstanceAuthorizationV3
108
108
  {
109
109
  IAccess.FunctionInfo[] storage functions;
110
110
 
111
- // TODO cleanup
112
111
  // authorize instance service role
113
112
  functions = _authorizeForTarget(INSTANCE_TARGET_NAME, getServiceRole(INSTANCE()));
114
- // _authorize(functions, Instance.setInstanceAdmin.selector, "setInstanceAdmin");
115
- // _authorize(functions, Instance.setInstanceStore.selector, "setInstanceStore");
116
- // _authorize(functions, Instance.setBundleManager.selector, "setBundleManager");
117
113
  _authorize(functions, Instance.setInstanceReader.selector, "setInstanceReader");
118
114
  }
119
115
 
@@ -125,17 +121,10 @@ contract InstanceAuthorizationV3
125
121
 
126
122
  // authorize instance role
127
123
  functions = _authorizeForTarget(INSTANCE_ADMIN_TARGET_NAME, _getTargetRoleId(INSTANCE()));
128
- // _authorize(functions, InstanceAdminNew.createRole.selector, "createRole");
129
- _authorize(functions, InstanceAdminNew.grantRole.selector, "grantRole");
130
- // _authorize(functions, InstanceAdminNew.createTarget.selector, "createTarget");
131
- // _authorize(functions, InstanceAdminNew.setTargetFunctionRoleByInstance.selector, "setTargetFunctionRoleByInstance");
132
- // _authorize(functions, InstanceAdminNew.setTargetLockedByInstance.selector, "setTargetLockedByInstance");
124
+ _authorize(functions, InstanceAdmin.grantRole.selector, "grantRole");
133
125
 
134
126
  // authorize instance service role
135
- functions = _authorizeForTarget(INSTANCE_ADMIN_TARGET_NAME, getServiceRole(INSTANCE()));
136
- // _authorize(functions, InstanceAdminNew.createGifTarget.selector, "createGifTarget");
137
- // _authorize(functions, InstanceAdminNew.setTargetLockedByService.selector, "setTargetLockedByService");
138
- // _authorize(functions, InstanceAdminNew.setTargetFunctionRoleByService.selector, "setTargetFunctionRoleByService");
127
+ // functions = _authorizeForTarget(INSTANCE_ADMIN_TARGET_NAME, getServiceRole(INSTANCE()));
139
128
  }
140
129
 
141
130
 
@@ -49,11 +49,6 @@ contract InstanceReader {
49
49
  revert ErrorInstanceReaderAlreadyInitialized();
50
50
  }
51
51
 
52
- // TODO cleanup
53
- // _initialized = true;
54
- // _instance = IInstance(msg.sender);
55
- // _store = _instance.getInstanceStore();
56
-
57
52
  initializeWithInstance(msg.sender);
58
53
  }
59
54