@etherisc/gif-next 0.0.2-ee01d06-525 → 0.0.2-ee54ca6-863

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 (480) hide show
  1. package/README.md +32 -3
  2. package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.dbg.json +4 -0
  3. package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.json +1253 -0
  4. package/artifacts/contracts/authorization/AccessManagerCloneable.sol/AccessManagerCloneable.dbg.json +4 -0
  5. package/artifacts/contracts/authorization/AccessManagerCloneable.sol/AccessManagerCloneable.json +1206 -0
  6. package/artifacts/contracts/authorization/Authorization.sol/Authorization.dbg.json +4 -0
  7. package/artifacts/contracts/authorization/Authorization.sol/Authorization.json +358 -0
  8. package/artifacts/contracts/authorization/IAccess.sol/IAccess.dbg.json +4 -0
  9. package/artifacts/contracts/authorization/IAccess.sol/IAccess.json +10 -0
  10. package/artifacts/contracts/authorization/IAccessAdmin.sol/IAccessAdmin.dbg.json +4 -0
  11. package/artifacts/contracts/{shared → authorization}/IAccessAdmin.sol/IAccessAdmin.json +95 -252
  12. package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.dbg.json +4 -0
  13. package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.json +258 -0
  14. package/artifacts/contracts/authorization/IModuleAuthorization.sol/IModuleAuthorization.dbg.json +4 -0
  15. package/artifacts/contracts/authorization/IModuleAuthorization.sol/IModuleAuthorization.json +290 -0
  16. package/artifacts/contracts/authorization/IServiceAuthorization.sol/IServiceAuthorization.dbg.json +4 -0
  17. package/artifacts/contracts/{registry → authorization}/IServiceAuthorization.sol/IServiceAuthorization.json +10 -10
  18. package/artifacts/contracts/authorization/ModuleAuthorization.sol/ModuleAuthorization.dbg.json +4 -0
  19. package/artifacts/contracts/authorization/ModuleAuthorization.sol/ModuleAuthorization.json +390 -0
  20. package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.dbg.json +4 -0
  21. package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.json +190 -0
  22. package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.dbg.json +4 -0
  23. package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.json +1342 -0
  24. package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.dbg.json +4 -0
  25. package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.json +410 -0
  26. package/artifacts/contracts/distribution/Distribution.sol/Distribution.dbg.json +1 -1
  27. package/artifacts/contracts/distribution/Distribution.sol/Distribution.json +46 -450
  28. package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.dbg.json +1 -1
  29. package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.json +255 -233
  30. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
  31. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.json +67 -106
  32. package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
  33. package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.json +91 -160
  34. package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.dbg.json +1 -1
  35. package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.json +152 -47
  36. package/artifacts/contracts/examples/unpermissioned/SimpleDistribution.sol/SimpleDistribution.dbg.json +4 -0
  37. package/artifacts/contracts/examples/unpermissioned/SimpleDistribution.sol/SimpleDistribution.json +1411 -0
  38. package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.dbg.json +4 -0
  39. package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.json +1171 -0
  40. package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.dbg.json +4 -0
  41. package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.json +1517 -0
  42. package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.dbg.json +4 -0
  43. package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.json +1978 -0
  44. package/artifacts/contracts/instance/BundleSet.sol/BundleSet.dbg.json +4 -0
  45. package/artifacts/contracts/instance/BundleSet.sol/BundleSet.json +703 -0
  46. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  47. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +6 -19
  48. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
  49. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +32 -44
  50. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  51. package/artifacts/contracts/instance/Instance.sol/Instance.json +28 -178
  52. package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.dbg.json +1 -1
  53. package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.json +1208 -290
  54. package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.dbg.json +4 -0
  55. package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.json +601 -0
  56. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
  57. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +290 -141
  58. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
  59. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +52 -224
  60. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
  61. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +35 -110
  62. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.dbg.json +1 -1
  63. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.json +216 -226
  64. package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.dbg.json +1 -1
  65. package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.json +2 -2
  66. package/artifacts/contracts/instance/base/Cloneable.sol/Cloneable.dbg.json +1 -1
  67. package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.dbg.json +1 -1
  68. package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.json +2 -2
  69. package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.dbg.json +1 -1
  70. package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.json +6 -6
  71. package/artifacts/contracts/instance/base/ObjectSet.sol/ObjectSet.dbg.json +4 -0
  72. package/artifacts/contracts/instance/base/ObjectSet.sol/ObjectSet.json +181 -0
  73. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +1 -1
  74. package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
  75. package/artifacts/contracts/instance/module/IComponents.sol/IComponents.dbg.json +1 -1
  76. package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +1 -1
  77. package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +1 -1
  78. package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +1 -1
  79. package/artifacts/contracts/mock/Dip.sol/Dip.dbg.json +1 -1
  80. package/artifacts/contracts/mock/Dip.sol/Dip.json +2 -2
  81. package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.dbg.json +4 -0
  82. package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.json +979 -0
  83. package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.dbg.json +4 -0
  84. package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.json +418 -0
  85. package/artifacts/contracts/oracle/IOracle.sol/IOracle.dbg.json +1 -1
  86. package/artifacts/contracts/oracle/IOracle.sol/IOracle.json +43 -1
  87. package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.dbg.json +1 -1
  88. package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.json +43 -37
  89. package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.dbg.json +1 -1
  90. package/artifacts/contracts/oracle/Oracle.sol/Oracle.dbg.json +1 -1
  91. package/artifacts/contracts/oracle/Oracle.sol/Oracle.json +40 -315
  92. package/artifacts/contracts/oracle/OracleService.sol/OracleService.dbg.json +1 -1
  93. package/artifacts/contracts/oracle/OracleService.sol/OracleService.json +32 -144
  94. package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.dbg.json +1 -1
  95. package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.json +34 -85
  96. package/artifacts/contracts/pool/BasicPool.sol/BasicPool.dbg.json +4 -0
  97. package/artifacts/contracts/pool/BasicPool.sol/BasicPool.json +1248 -0
  98. package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.dbg.json +4 -0
  99. package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.json +410 -0
  100. package/artifacts/contracts/pool/BundleService.sol/BundleService.dbg.json +1 -1
  101. package/artifacts/contracts/pool/BundleService.sol/BundleService.json +402 -174
  102. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.dbg.json +1 -1
  103. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.json +111 -94
  104. package/artifacts/contracts/pool/IBundleService.sol/IBundleService.dbg.json +1 -1
  105. package/artifacts/contracts/pool/IBundleService.sol/IBundleService.json +205 -1
  106. package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
  107. package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.json +45 -290
  108. package/artifacts/contracts/pool/IPoolService.sol/IPoolService.dbg.json +1 -1
  109. package/artifacts/contracts/pool/IPoolService.sol/IPoolService.json +220 -100
  110. package/artifacts/contracts/pool/Pool.sol/Pool.dbg.json +1 -1
  111. package/artifacts/contracts/pool/Pool.sol/Pool.json +45 -576
  112. package/artifacts/contracts/pool/PoolService.sol/PoolService.dbg.json +1 -1
  113. package/artifacts/contracts/pool/PoolService.sol/PoolService.json +264 -248
  114. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
  115. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.json +40 -87
  116. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.dbg.json +1 -1
  117. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.json +31 -162
  118. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +1 -1
  119. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.json +31 -94
  120. package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.dbg.json +4 -0
  121. package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.json +1096 -0
  122. package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.dbg.json +4 -0
  123. package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.json +410 -0
  124. package/artifacts/contracts/product/ClaimService.sol/ClaimService.dbg.json +1 -1
  125. package/artifacts/contracts/product/ClaimService.sol/ClaimService.json +185 -175
  126. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +1 -1
  127. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.json +58 -105
  128. package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.dbg.json +1 -1
  129. package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.json +5 -0
  130. package/artifacts/contracts/product/IClaimService.sol/IClaimService.dbg.json +1 -1
  131. package/artifacts/contracts/product/IClaimService.sol/IClaimService.json +114 -0
  132. package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.dbg.json +1 -1
  133. package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.json +184 -119
  134. package/artifacts/contracts/product/IPricingService.sol/IPricingService.dbg.json +1 -1
  135. package/artifacts/contracts/product/IPricingService.sol/IPricingService.json +43 -43
  136. package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.dbg.json +1 -1
  137. package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.json +32 -79
  138. package/artifacts/contracts/product/IRiskService.sol/IRiskService.dbg.json +4 -0
  139. package/artifacts/contracts/product/{IProductService.sol/IProductService.json → IRiskService.sol/IRiskService.json} +2 -2
  140. package/artifacts/contracts/product/PolicyService.sol/PolicyService.dbg.json +1 -1
  141. package/artifacts/contracts/product/PolicyService.sol/PolicyService.json +242 -321
  142. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +1 -1
  143. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.json +55 -106
  144. package/artifacts/contracts/product/PricingService.sol/PricingService.dbg.json +1 -1
  145. package/artifacts/contracts/product/PricingService.sol/PricingService.json +113 -265
  146. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.dbg.json +1 -1
  147. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.json +55 -126
  148. package/artifacts/contracts/product/Product.sol/Product.dbg.json +1 -1
  149. package/artifacts/contracts/product/Product.sol/Product.json +35 -378
  150. package/artifacts/contracts/product/RiskService.sol/RiskService.dbg.json +4 -0
  151. package/artifacts/contracts/product/RiskService.sol/RiskService.json +583 -0
  152. package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.dbg.json +4 -0
  153. package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.json +651 -0
  154. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  155. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +59 -16
  156. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  157. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +246 -42
  158. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
  159. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +0 -183
  160. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
  161. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  162. package/artifacts/contracts/registry/Registry.sol/Registry.json +464 -99
  163. package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.dbg.json +1 -1
  164. package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.json +336 -376
  165. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
  166. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +18 -130
  167. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
  168. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +27 -78
  169. package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.dbg.json +1 -1
  170. package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.json +6 -6
  171. package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.dbg.json +4 -0
  172. package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.json +1169 -0
  173. package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.dbg.json +1 -1
  174. package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.json +24 -16
  175. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
  176. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +4 -4
  177. package/artifacts/contracts/shared/Component.sol/Component.dbg.json +1 -1
  178. package/artifacts/contracts/shared/Component.sol/Component.json +0 -211
  179. package/artifacts/contracts/shared/ComponentService.sol/ComponentService.dbg.json +1 -1
  180. package/artifacts/contracts/shared/ComponentService.sol/ComponentService.json +242 -185
  181. package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.dbg.json +1 -1
  182. package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.json +69 -112
  183. package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.dbg.json +1 -1
  184. package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.json +0 -112
  185. package/artifacts/contracts/shared/IComponent.sol/IComponent.dbg.json +1 -1
  186. package/artifacts/contracts/shared/IComponent.sol/IComponent.json +0 -26
  187. package/artifacts/contracts/shared/IComponentService.sol/IComponentService.dbg.json +1 -1
  188. package/artifacts/contracts/shared/IComponentService.sol/IComponentService.json +153 -0
  189. package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.dbg.json +1 -1
  190. package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.json +32 -37
  191. package/artifacts/contracts/shared/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
  192. package/artifacts/contracts/shared/ILifecycle.sol/ILifecycle.dbg.json +1 -1
  193. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
  194. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +1 -1
  195. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.json +0 -42
  196. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  197. package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +1 -1
  198. package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
  199. package/artifacts/contracts/shared/InitializableCustom.sol/InitializableCustom.dbg.json +1 -1
  200. package/artifacts/contracts/shared/InitializableERC165.sol/InitializableERC165.dbg.json +4 -0
  201. package/artifacts/contracts/shared/InitializableERC165.sol/InitializableERC165.json +53 -0
  202. package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.dbg.json +1 -1
  203. package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.json +32 -275
  204. package/artifacts/contracts/shared/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
  205. package/artifacts/contracts/shared/Lifecycle.sol/Lifecycle.dbg.json +1 -1
  206. package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.dbg.json +4 -0
  207. package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.json +306 -0
  208. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
  209. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +6 -57
  210. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +1 -1
  211. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +4 -136
  212. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  213. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +8 -97
  214. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +1 -1
  215. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +2 -15
  216. package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
  217. package/artifacts/contracts/shared/Service.sol/Service.json +0 -112
  218. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
  219. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +330 -11
  220. package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.dbg.json +4 -0
  221. package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.json +108 -0
  222. package/artifacts/contracts/staking/IStaking.sol/IStaking.dbg.json +1 -1
  223. package/artifacts/contracts/staking/IStaking.sol/IStaking.json +27 -27
  224. package/artifacts/contracts/staking/IStakingService.sol/IStakingService.dbg.json +1 -1
  225. package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.dbg.json +1 -1
  226. package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.json +85 -105
  227. package/artifacts/contracts/staking/Staking.sol/Staking.dbg.json +1 -1
  228. package/artifacts/contracts/staking/Staking.sol/Staking.json +85 -262
  229. package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.dbg.json +1 -1
  230. package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.json +6 -6
  231. package/artifacts/contracts/staking/StakingManager.sol/StakingManager.dbg.json +1 -1
  232. package/artifacts/contracts/staking/StakingManager.sol/StakingManager.json +47 -94
  233. package/artifacts/contracts/staking/StakingReader.sol/StakingReader.dbg.json +1 -1
  234. package/artifacts/contracts/staking/StakingReader.sol/StakingReader.json +6 -6
  235. package/artifacts/contracts/staking/StakingService.sol/StakingService.dbg.json +1 -1
  236. package/artifacts/contracts/staking/StakingService.sol/StakingService.json +26 -138
  237. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.dbg.json +1 -1
  238. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.json +31 -82
  239. package/artifacts/contracts/staking/StakingStore.sol/StakingStore.dbg.json +1 -1
  240. package/artifacts/contracts/staking/StakingStore.sol/StakingStore.json +139 -134
  241. package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.dbg.json +1 -1
  242. package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.json +58 -22
  243. package/artifacts/contracts/type/AddressSet.sol/LibAddressSet.dbg.json +1 -1
  244. package/artifacts/contracts/type/AddressSet.sol/LibAddressSet.json +2 -2
  245. package/artifacts/contracts/type/Amount.sol/AmountLib.dbg.json +1 -1
  246. package/artifacts/contracts/type/Amount.sol/AmountLib.json +37 -8
  247. package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
  248. package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.json +2 -2
  249. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.dbg.json +1 -1
  250. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.json +4 -4
  251. package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.dbg.json +1 -1
  252. package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.json +4 -4
  253. package/artifacts/contracts/type/Fee.sol/FeeLib.dbg.json +1 -1
  254. package/artifacts/contracts/type/Fee.sol/FeeLib.json +17 -12
  255. package/artifacts/contracts/type/Key32.sol/Key32Lib.dbg.json +1 -1
  256. package/artifacts/contracts/type/Key32.sol/Key32Lib.json +2 -2
  257. package/artifacts/contracts/type/NftId.sol/NftIdLib.dbg.json +1 -1
  258. package/artifacts/contracts/type/NftId.sol/NftIdLib.json +4 -4
  259. package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
  260. package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.json +2 -2
  261. package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
  262. package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.json +55 -2
  263. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.dbg.json +1 -1
  264. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.json +4 -4
  265. package/artifacts/contracts/type/Referral.sol/ReferralLib.dbg.json +1 -1
  266. package/artifacts/contracts/type/Referral.sol/ReferralLib.json +4 -4
  267. package/artifacts/contracts/type/RequestId.sol/RequestIdLib.dbg.json +1 -1
  268. package/artifacts/contracts/type/RequestId.sol/RequestIdLib.json +4 -4
  269. package/artifacts/contracts/type/RiskId.sol/RiskIdLib.dbg.json +1 -1
  270. package/artifacts/contracts/type/RiskId.sol/RiskIdLib.json +4 -4
  271. package/artifacts/contracts/type/RoleId.sol/RoleIdLib.dbg.json +1 -1
  272. package/artifacts/contracts/type/RoleId.sol/RoleIdLib.json +117 -14
  273. package/artifacts/contracts/type/Seconds.sol/SecondsLib.dbg.json +1 -1
  274. package/artifacts/contracts/type/Seconds.sol/SecondsLib.json +50 -2
  275. package/artifacts/contracts/type/Selector.sol/SelectorLib.dbg.json +1 -1
  276. package/artifacts/contracts/type/Selector.sol/SelectorLib.json +2 -2
  277. package/artifacts/contracts/type/Selector.sol/SelectorSetLib.dbg.json +1 -1
  278. package/artifacts/contracts/type/Selector.sol/SelectorSetLib.json +2 -2
  279. package/artifacts/contracts/type/StateId.sol/StateIdLib.dbg.json +1 -1
  280. package/artifacts/contracts/type/StateId.sol/StateIdLib.json +2 -2
  281. package/artifacts/contracts/type/String.sol/StrLib.dbg.json +1 -1
  282. package/artifacts/contracts/type/String.sol/StrLib.json +2 -2
  283. package/artifacts/contracts/type/Timestamp.sol/TimestampLib.dbg.json +1 -1
  284. package/artifacts/contracts/type/Timestamp.sol/TimestampLib.json +23 -4
  285. package/artifacts/contracts/type/UFixed.sol/MathLib.dbg.json +1 -1
  286. package/artifacts/contracts/type/UFixed.sol/MathLib.json +9 -3
  287. package/artifacts/contracts/type/UFixed.sol/UFixedLib.dbg.json +1 -1
  288. package/artifacts/contracts/type/UFixed.sol/UFixedLib.json +58 -2
  289. package/artifacts/contracts/type/Version.sol/VersionLib.dbg.json +1 -1
  290. package/artifacts/contracts/type/Version.sol/VersionLib.json +2 -2
  291. package/artifacts/contracts/type/Version.sol/VersionPartLib.dbg.json +1 -1
  292. package/artifacts/contracts/type/Version.sol/VersionPartLib.json +21 -2
  293. package/artifacts/contracts/upgradeability/IVersionable.sol/IVersionable.dbg.json +4 -0
  294. package/artifacts/contracts/{shared → upgradeability}/IVersionable.sol/IVersionable.json +1 -1
  295. package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.dbg.json +4 -0
  296. package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.json +566 -0
  297. package/artifacts/contracts/upgradeability/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +4 -0
  298. package/artifacts/contracts/upgradeability/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +129 -0
  299. package/artifacts/contracts/upgradeability/Versionable.sol/Versionable.dbg.json +4 -0
  300. package/artifacts/contracts/{shared → upgradeability}/Versionable.sol/Versionable.json +1 -1
  301. package/contracts/{shared → authorization}/AccessAdmin.sol +135 -305
  302. package/contracts/authorization/AccessManagerCloneable.sol +16 -0
  303. package/contracts/authorization/Authorization.sol +217 -0
  304. package/contracts/authorization/IAccess.sol +48 -0
  305. package/contracts/{shared → authorization}/IAccessAdmin.sol +22 -54
  306. package/contracts/authorization/IAuthorization.sol +54 -0
  307. package/contracts/authorization/IModuleAuthorization.sol +21 -0
  308. package/contracts/{registry → authorization}/IServiceAuthorization.sol +5 -5
  309. package/contracts/authorization/ModuleAuthorization.sol +78 -0
  310. package/contracts/{registry → authorization}/ServiceAuthorization.sol +17 -17
  311. package/contracts/distribution/BasicDistribution.sol +138 -0
  312. package/contracts/distribution/BasicDistributionAuthorization.sol +47 -0
  313. package/contracts/distribution/Distribution.sol +145 -111
  314. package/contracts/distribution/DistributionService.sol +80 -41
  315. package/contracts/distribution/DistributionServiceManager.sol +2 -5
  316. package/contracts/distribution/IDistributionComponent.sol +25 -39
  317. package/contracts/distribution/IDistributionService.sol +23 -3
  318. package/contracts/examples/unpermissioned/SimpleDistribution.sol +50 -0
  319. package/contracts/examples/unpermissioned/SimpleOracle.sol +137 -0
  320. package/contracts/examples/unpermissioned/SimplePool.sol +76 -0
  321. package/contracts/examples/unpermissioned/SimpleProduct.sol +351 -0
  322. package/contracts/instance/{BundleManager.sol → BundleSet.sol} +23 -23
  323. package/contracts/instance/IInstance.sol +14 -38
  324. package/contracts/instance/IInstanceService.sol +13 -18
  325. package/contracts/instance/Instance.sol +68 -102
  326. package/contracts/instance/InstanceAdmin.sol +221 -267
  327. package/contracts/instance/InstanceAuthorizationV3.sol +204 -0
  328. package/contracts/instance/InstanceReader.sol +54 -16
  329. package/contracts/instance/InstanceService.sol +112 -84
  330. package/contracts/instance/InstanceServiceManager.sol +2 -6
  331. package/contracts/instance/InstanceStore.sol +17 -2
  332. package/contracts/instance/base/ObjectLifecycle.sol +9 -4
  333. package/contracts/instance/base/{ObjectManager.sol → ObjectSet.sol} +11 -12
  334. package/contracts/instance/module/IBundle.sol +1 -1
  335. package/contracts/instance/module/IComponents.sol +1 -7
  336. package/contracts/instance/module/IDistribution.sol +0 -1
  337. package/contracts/instance/module/IPolicy.sol +22 -22
  338. package/contracts/mock/Dip.sol +1 -1
  339. package/contracts/oracle/BasicOracle.sol +48 -0
  340. package/contracts/oracle/BasicOracleAuthorization.sol +46 -0
  341. package/contracts/oracle/IOracle.sol +16 -0
  342. package/contracts/oracle/IOracleComponent.sol +2 -1
  343. package/contracts/oracle/Oracle.sol +73 -51
  344. package/contracts/oracle/OracleService.sol +4 -3
  345. package/contracts/oracle/OracleServiceManager.sol +2 -5
  346. package/contracts/pool/BasicPool.sol +166 -0
  347. package/contracts/pool/BasicPoolAuthorization.sol +58 -0
  348. package/contracts/pool/BundleService.sol +192 -50
  349. package/contracts/pool/BundleServiceManager.sol +2 -5
  350. package/contracts/pool/IBundleService.sol +33 -5
  351. package/contracts/pool/IPoolComponent.sol +6 -60
  352. package/contracts/pool/IPoolService.sol +36 -26
  353. package/contracts/pool/Pool.sol +165 -138
  354. package/contracts/pool/PoolService.sol +165 -108
  355. package/contracts/pool/PoolServiceManager.sol +2 -5
  356. package/contracts/product/ApplicationService.sol +53 -59
  357. package/contracts/product/ApplicationServiceManager.sol +2 -2
  358. package/contracts/product/BasicProduct.sol +53 -0
  359. package/contracts/product/BasicProductAuthorization.sol +43 -0
  360. package/contracts/product/ClaimService.sol +120 -75
  361. package/contracts/product/ClaimServiceManager.sol +2 -2
  362. package/contracts/product/IApplicationService.sol +1 -0
  363. package/contracts/product/IClaimService.sol +28 -5
  364. package/contracts/product/IPolicyService.sol +27 -32
  365. package/contracts/product/IPricingService.sol +7 -7
  366. package/contracts/product/IProductComponent.sol +7 -10
  367. package/contracts/product/{IProductService.sol → IRiskService.sol} +1 -1
  368. package/contracts/product/PolicyService.sol +280 -182
  369. package/contracts/product/PolicyServiceManager.sol +2 -5
  370. package/contracts/product/PricingService.sol +44 -43
  371. package/contracts/product/PricingServiceManager.sol +2 -5
  372. package/contracts/product/Product.sol +162 -114
  373. package/contracts/product/{ProductService.sol → RiskService.sol} +11 -38
  374. package/contracts/product/RiskServiceManager.sol +39 -0
  375. package/contracts/registry/ChainNft.sol +65 -32
  376. package/contracts/registry/IRegistry.sol +63 -19
  377. package/contracts/registry/IRegistryService.sol +6 -6
  378. package/contracts/registry/Registry.sol +333 -213
  379. package/contracts/registry/RegistryAdmin.sol +260 -131
  380. package/contracts/registry/RegistryService.sol +6 -20
  381. package/contracts/registry/RegistryServiceManager.sol +2 -2
  382. package/contracts/registry/{ReleaseManager.sol → ReleaseRegistry.sol} +107 -119
  383. package/contracts/registry/ServiceAuthorizationV3.sol +16 -17
  384. package/contracts/registry/TokenRegistry.sol +2 -2
  385. package/contracts/shared/Component.sol +30 -43
  386. package/contracts/shared/ComponentService.sol +99 -78
  387. package/contracts/shared/ComponentServiceManager.sol +2 -2
  388. package/contracts/shared/ComponentVerifyingService.sol +2 -2
  389. package/contracts/shared/IComponent.sol +4 -4
  390. package/contracts/shared/IComponentService.sol +15 -9
  391. package/contracts/shared/IInstanceLinkedComponent.sol +10 -7
  392. package/contracts/shared/IPolicyHolder.sol +0 -9
  393. package/contracts/shared/IService.sol +1 -1
  394. package/contracts/shared/{ERC165.sol → InitializableERC165.sol} +3 -3
  395. package/contracts/shared/InstanceLinkedComponent.sol +51 -23
  396. package/contracts/shared/{NftIdSetManager.sol → NftIdSet.sol} +1 -1
  397. package/contracts/shared/NftOwnable.sol +7 -7
  398. package/contracts/shared/PolicyHolder.sol +7 -53
  399. package/contracts/shared/Registerable.sol +4 -4
  400. package/contracts/shared/RegistryLinked.sol +3 -2
  401. package/contracts/shared/Service.sol +8 -9
  402. package/contracts/shared/TokenHandler.sol +100 -19
  403. package/contracts/shared/TokenHandlerDeployerLib.sol +12 -0
  404. package/contracts/staking/IStaking.sol +3 -3
  405. package/contracts/staking/IStakingService.sol +12 -5
  406. package/contracts/staking/StakeManagerLib.sol +18 -25
  407. package/contracts/staking/Staking.sol +26 -41
  408. package/contracts/staking/StakingManager.sol +2 -6
  409. package/contracts/staking/StakingReader.sol +12 -16
  410. package/contracts/staking/StakingService.sol +10 -14
  411. package/contracts/staking/StakingServiceManager.sol +2 -2
  412. package/contracts/staking/StakingStore.sol +12 -22
  413. package/contracts/staking/TargetManagerLib.sol +7 -3
  414. package/contracts/type/Amount.sol +12 -5
  415. package/contracts/type/Blocknumber.sol +7 -1
  416. package/contracts/type/ObjectType.sol +52 -18
  417. package/contracts/type/Referral.sol +1 -0
  418. package/contracts/type/RoleId.sol +55 -82
  419. package/contracts/type/Seconds.sol +21 -1
  420. package/contracts/type/StateId.sol +1 -0
  421. package/contracts/type/Timestamp.sol +11 -1
  422. package/contracts/type/UFixed.sol +34 -9
  423. package/contracts/type/Version.sol +3 -1
  424. package/contracts/{shared → upgradeability}/ProxyManager.sol +4 -5
  425. package/contracts/{shared → upgradeability}/UpgradableProxyWithAdmin.sol +1 -3
  426. package/package.json +3 -3
  427. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.dbg.json +0 -4
  428. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.json +0 -709
  429. package/artifacts/contracts/instance/InstanceAuthorizationsLib.sol/InstanceAuthorizationsLib.dbg.json +0 -4
  430. package/artifacts/contracts/instance/InstanceAuthorizationsLib.sol/InstanceAuthorizationsLib.json +0 -228
  431. package/artifacts/contracts/instance/base/ObjectManager.sol/ObjectManager.dbg.json +0 -4
  432. package/artifacts/contracts/instance/base/ObjectManager.sol/ObjectManager.json +0 -187
  433. package/artifacts/contracts/product/IProductService.sol/IProductService.dbg.json +0 -4
  434. package/artifacts/contracts/product/ProductService.sol/ProductService.dbg.json +0 -4
  435. package/artifacts/contracts/product/ProductService.sol/ProductService.json +0 -708
  436. package/artifacts/contracts/product/ProductServiceManager.sol/ProductServiceManager.dbg.json +0 -4
  437. package/artifacts/contracts/product/ProductServiceManager.sol/ProductServiceManager.json +0 -702
  438. package/artifacts/contracts/registry/IServiceAuthorization.sol/IServiceAuthorization.dbg.json +0 -4
  439. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.dbg.json +0 -4
  440. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.json +0 -1177
  441. package/artifacts/contracts/registry/ServiceAuthorization.sol/ServiceAuthorization.dbg.json +0 -4
  442. package/artifacts/contracts/registry/ServiceAuthorization.sol/ServiceAuthorization.json +0 -190
  443. package/artifacts/contracts/shared/AccessAdmin.sol/AccessAdmin.dbg.json +0 -4
  444. package/artifacts/contracts/shared/AccessAdmin.sol/AccessAdmin.json +0 -1559
  445. package/artifacts/contracts/shared/AccessManagerCustom.sol/AccessManagerCustom.dbg.json +0 -4
  446. package/artifacts/contracts/shared/AccessManagerCustom.sol/AccessManagerCustom.json +0 -1193
  447. package/artifacts/contracts/shared/AccessManagerExtended.sol/AccessManagerExtended.dbg.json +0 -4
  448. package/artifacts/contracts/shared/AccessManagerExtended.sol/AccessManagerExtended.json +0 -1747
  449. package/artifacts/contracts/shared/AccessManagerExtendedInitializeable.sol/AccessManagerExtendedInitializeable.dbg.json +0 -4
  450. package/artifacts/contracts/shared/AccessManagerExtendedInitializeable.sol/AccessManagerExtendedInitializeable.json +0 -1760
  451. package/artifacts/contracts/shared/AccessManagerExtendedWithDisable.sol/AccessManagerExtendedWithDisable.dbg.json +0 -4
  452. package/artifacts/contracts/shared/AccessManagerExtendedWithDisable.sol/AccessManagerExtendedWithDisable.json +0 -1838
  453. package/artifacts/contracts/shared/AccessManagerExtendedWithDisableInitializeable.sol/AccessManagerExtendedWithDisableInitializeable.dbg.json +0 -4
  454. package/artifacts/contracts/shared/AccessManagerExtendedWithDisableInitializeable.sol/AccessManagerExtendedWithDisableInitializeable.json +0 -1856
  455. package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +0 -4
  456. package/artifacts/contracts/shared/ERC165.sol/ERC165.json +0 -73
  457. package/artifacts/contracts/shared/IAccessAdmin.sol/IAccessAdmin.dbg.json +0 -4
  458. package/artifacts/contracts/shared/IAccessManagerExtended.sol/IAccessManagerExtended.dbg.json +0 -4
  459. package/artifacts/contracts/shared/IAccessManagerExtended.sol/IAccessManagerExtended.json +0 -1562
  460. package/artifacts/contracts/shared/IAccessManagerExtendedWithDisable.sol/IAccessManagerExtendedWithDisable.dbg.json +0 -4
  461. package/artifacts/contracts/shared/IAccessManagerExtendedWithDisable.sol/IAccessManagerExtendedWithDisable.json +0 -1600
  462. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +0 -4
  463. package/artifacts/contracts/shared/NftIdSetManager.sol/NftIdSetManager.dbg.json +0 -4
  464. package/artifacts/contracts/shared/NftIdSetManager.sol/NftIdSetManager.json +0 -306
  465. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +0 -4
  466. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +0 -617
  467. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +0 -4
  468. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +0 -129
  469. package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +0 -4
  470. package/contracts/instance/InstanceAuthorizationsLib.sol +0 -377
  471. package/contracts/product/ProductServiceManager.sol +0 -42
  472. package/contracts/shared/AccessManagerCustom.sol +0 -741
  473. package/contracts/shared/AccessManagerExtended.sol +0 -481
  474. package/contracts/shared/AccessManagerExtendedInitializeable.sol +0 -13
  475. package/contracts/shared/AccessManagerExtendedWithDisable.sol +0 -137
  476. package/contracts/shared/AccessManagerExtendedWithDisableInitializeable.sol +0 -14
  477. package/contracts/shared/IAccessManagerExtended.sol +0 -74
  478. package/contracts/shared/IAccessManagerExtendedWithDisable.sol +0 -18
  479. /package/contracts/{shared → upgradeability}/IVersionable.sol +0 -0
  480. /package/contracts/{shared → upgradeability}/Versionable.sol +0 -0
@@ -1,17 +1,17 @@
1
1
  // SPDX-License-Identifier: UNLICENSED
2
2
  pragma solidity ^0.8.20;
3
3
 
4
- import {AccessAdmin} from "../shared/AccessAdmin.sol";
5
- import {IAccessAdmin} from "../shared/IAccessAdmin.sol";
4
+ import {AccessAdmin} from "../authorization/AccessAdmin.sol";
5
+ import {IAccess} from "../authorization/IAccess.sol";
6
6
  import {IRegistry} from "./IRegistry.sol";
7
7
  import {IService} from "../shared/IService.sol";
8
- import {IServiceAuthorization} from "./IServiceAuthorization.sol";
8
+ import {IServiceAuthorization} from "../authorization/IServiceAuthorization.sol";
9
9
  import {IStaking} from "../staking/IStaking.sol";
10
- import {ObjectType, ObjectTypeLib, ALL, POOL, RELEASE} from "../type/ObjectType.sol";
11
- import {ReleaseManager} from "./ReleaseManager.sol";
10
+ import {ObjectType, ObjectTypeLib, ALL, REGISTRY, STAKING, POOL, RELEASE} from "../type/ObjectType.sol";
11
+ import {ReleaseRegistry} from "./ReleaseRegistry.sol";
12
12
  import {RoleId, RoleIdLib, ADMIN_ROLE, GIF_MANAGER_ROLE, GIF_ADMIN_ROLE, PUBLIC_ROLE} from "../type/RoleId.sol";
13
13
  import {StakingStore} from "../staking/StakingStore.sol";
14
- import {STAKING} from "../type/ObjectType.sol";
14
+ import {TokenHandler} from "../shared/TokenHandler.sol";
15
15
  import {TokenRegistry} from "./TokenRegistry.sol";
16
16
  import {VersionPart} from "../type/Version.sol";
17
17
 
@@ -26,33 +26,33 @@ import {VersionPart} from "../type/Version.sol";
26
26
  - MUST have 1 member at any time
27
27
  - granted/revoked ONLY in transferAdminRole() -> consider lock out situations!!!
28
28
  - responsible for creation and activation of releases
29
-
30
- createServiceTarget(type, release)
31
- createServiceRole(type,release)
32
- getServiceRole(type, release)
33
29
  */
34
30
  contract RegistryAdmin is
35
31
  AccessAdmin
36
32
  {
37
- error ErrorRegistryAdminIsAlreadySetUp();
38
-
39
33
  string public constant GIF_ADMIN_ROLE_NAME = "GifAdminRole";
40
34
  string public constant GIF_MANAGER_ROLE_NAME = "GifManagerRole";
41
- string public constant STAKING_SERVICE_ROLE_NAME = "StakingServiceRole";
42
35
  string public constant POOL_SERVICE_ROLE_NAME = "PoolServiceRole";
36
+ string public constant RELEASE_REGISTRY_ROLE_NAME = "ReleaseRegistryRole";
37
+ string public constant REGISTRY_SERVICE_ROLE_NAME = "RegistryServiceRole";
38
+ string public constant STAKING_SERVICE_ROLE_NAME = "StakingServiceRole";
39
+ string public constant STAKING_ROLE_NAME = "StakingRole";
43
40
 
44
- string public constant RELEASE_MANAGER_TARGET_NAME = "ReleaseManagerTarget";
45
- string public constant TOKEN_REGISTRY_TARGET_NAME = "TokenRegistryTarget";
46
- string public constant STAKING_TARGET_NAME = "StakingTarget";
47
- string public constant STAKING_STORE_TARGET_NAME = "StakingStoreTarget";
41
+ string public constant REGISTRY_TARGET_NAME = "Registry";
42
+ string public constant RELEASE_REGISTRY_TARGET_NAME = "ReleaseRegistry";
43
+ string public constant TOKEN_REGISTRY_TARGET_NAME = "TokenRegistry";
44
+ string public constant STAKING_TARGET_NAME = "Staking";
45
+ string public constant STAKING_STORE_TARGET_NAME = "StakingStore";
48
46
 
47
+ uint8 public constant MAX_NUM_RELEASES = 99;
48
+ // TODO consider deleting this
49
49
  mapping(address service => VersionPart majorVersion) private _ServiceRelease;
50
50
 
51
- address private _releaseManager;
51
+ address internal _registry;
52
+ address private _releaseRegistry;
52
53
  address private _tokenRegistry;
53
54
  address private _staking;
54
55
  address private _stakingStore;
55
- bool private _setupCompleted;
56
56
 
57
57
  constructor() AccessAdmin() { }
58
58
 
@@ -62,24 +62,24 @@ contract RegistryAdmin is
62
62
  address gifManager
63
63
  )
64
64
  external
65
+ initializer
65
66
  onlyDeployer()
66
67
  {
67
- if (_setupCompleted) { revert ErrorRegistryAdminIsAlreadySetUp(); }
68
- else { _setupCompleted = true; }
69
-
70
- _releaseManager = registry.getReleaseManagerAddress();
68
+ _registry = address(registry);
69
+ _releaseRegistry = registry.getReleaseRegistryAddress();
71
70
  _tokenRegistry = registry.getTokenRegistryAddress();
72
71
  _staking = registry.getStakingAddress();
73
72
  _stakingStore = address(
74
73
  IStaking(_staking).getStakingStore());
75
74
 
76
75
  // at this moment all registry contracts are deployed and fully intialized
77
- _createTarget(_tokenRegistry, TOKEN_REGISTRY_TARGET_NAME);
76
+ _createTarget(_tokenRegistry, TOKEN_REGISTRY_TARGET_NAME, true, false);
78
77
 
79
78
  _setupGifAdminRole(gifAdmin);
80
79
  _setupGifManagerRole(gifManager);
81
80
 
82
- _setupReleaseManager();
81
+ _setupReleaseRegistry();
82
+ _setupRegistry();
83
83
  _setupStaking();
84
84
  }
85
85
 
@@ -89,15 +89,46 @@ contract RegistryAdmin is
89
89
  /// Permissioned function: Access is restricted to release manager.
90
90
  function authorizeService(
91
91
  IServiceAuthorization serviceAuthorization,
92
- IService service
92
+ IService service,
93
+ ObjectType serviceDomain,
94
+ VersionPart releaseVersion
93
95
  )
94
96
  external
95
97
  restricted()
96
98
  {
97
- _createServiceTargetAndRole(service);
98
- _authorizeServiceFunctions(serviceAuthorization, service);
99
+ _createServiceTargetAndRole(service, serviceDomain, releaseVersion);
100
+ _authorizeServiceFunctions(serviceAuthorization, service, serviceDomain, releaseVersion);
99
101
  }
100
102
 
103
+ function grantServiceRole(
104
+ IService service,
105
+ ObjectType domain,
106
+ VersionPart version
107
+ )
108
+ external
109
+ restricted()
110
+ {
111
+ _grantRoleToAccount(
112
+ RoleIdLib.roleForTypeAndVersion(
113
+ domain,
114
+ version),
115
+ address(service));
116
+ }
117
+
118
+ function revokeServiceRole(
119
+ IService service,
120
+ ObjectType domain,
121
+ VersionPart version
122
+ )
123
+ external
124
+ restricted()
125
+ {
126
+ _revokeRoleFromAccount(
127
+ RoleIdLib.roleForTypeAndVersion(
128
+ domain,
129
+ version),
130
+ address(service));
131
+ }
101
132
 
102
133
  function grantServiceRoleForAllVersions(IService service, ObjectType domain)
103
134
  external
@@ -108,69 +139,88 @@ contract RegistryAdmin is
108
139
  address(service));
109
140
  }
110
141
 
142
+ function revokeServiceRoleForAllVersions(IService service, ObjectType domain)
143
+ external
144
+ restricted()
145
+ {
146
+ _revokeRoleFromAccount(
147
+ RoleIdLib.roleForTypeAndAllVersions(domain),
148
+ address(service));
149
+ }
111
150
 
112
- function _createServiceTargetAndRole(IService service)
151
+ /*function transferAdmin(address to)
152
+ external
153
+ restricted // only with GIF_ADMIN_ROLE or nft owner
154
+ {
155
+ _accessManager.revoke(GIF_ADMIN_ROLE, );
156
+ _accesssManager.grant(GIF_ADMIN_ROLE, to, 0);
157
+ }*/
158
+
159
+ //--- view functions ----------------------------------------------------//
160
+
161
+ function getGifAdminRole() external view returns (RoleId) {
162
+ return GIF_ADMIN_ROLE();
163
+ }
164
+
165
+ function getGifManagerRole() external view returns (RoleId) {
166
+ return GIF_MANAGER_ROLE();
167
+ }
168
+
169
+ //--- private functions -------------------------------------------------//
170
+
171
+ function _createServiceTargetAndRole(
172
+ IService service,
173
+ ObjectType serviceDomain,
174
+ VersionPart releaseVersion
175
+ )
113
176
  private
114
177
  {
115
- ObjectType domain = service.getDomain();
116
- string memory baseName = ObjectTypeLib.toName(domain);
117
- VersionPart version = service.getVersion().toMajorPart();
118
- uint256 versionInt = version.toInt();
119
- string memory versionName = "_v0";
120
- string memory versionNumber = ObjectTypeLib.toString(versionInt);
121
-
122
- if (versionInt >= 10) {
123
- versionName = "_v";
124
- }
178
+ string memory baseName = ObjectTypeLib.toName(serviceDomain);
179
+ uint256 versionInt = releaseVersion.toInt();
125
180
 
126
181
  // create service target
127
- string memory serviceTargetName = string(
128
- abi.encodePacked(
129
- baseName,
130
- "Service",
131
- versionName,
132
- versionNumber));
182
+ string memory serviceTargetName = ObjectTypeLib.toVersionedName(
183
+ baseName, "Service", versionInt);
133
184
 
134
185
  _createTarget(
135
186
  address(service),
136
- serviceTargetName);
187
+ serviceTargetName,
188
+ true,
189
+ false);
137
190
 
138
191
  // create service role
139
- string memory serviceRoleName = string(
140
- abi.encodePacked(
141
- baseName,
142
- "ServiceRole",
143
- versionName,
144
- versionNumber));
145
-
146
- RoleId roleId = RoleIdLib.roleForTypeAndVersion(
147
- domain,
148
- version);
192
+ RoleId serviceRoleId = RoleIdLib.roleForTypeAndVersion(
193
+ serviceDomain,
194
+ releaseVersion);
149
195
 
150
196
  _createRole(
151
- roleId,
152
- ADMIN_ROLE(),
153
- serviceRoleName,
154
- 1, // service roles must only be given to this unique service
155
- true); // it must not be possible to remove this role once granted
197
+ serviceRoleId,
198
+ toRole({
199
+ adminRoleId: ADMIN_ROLE(),
200
+ roleType: RoleType.Contract,
201
+ maxMemberCount: 1,
202
+ name: ObjectTypeLib.toVersionedName(
203
+ baseName,
204
+ "ServiceRole",
205
+ versionInt)}));
156
206
 
157
207
  _grantRoleToAccount(
158
- roleId,
208
+ serviceRoleId,
159
209
  address(service));
160
210
  }
161
211
 
162
212
 
163
213
  function _authorizeServiceFunctions(
164
214
  IServiceAuthorization serviceAuthorization,
165
- IService service
215
+ IService service,
216
+ ObjectType serviceDomain,
217
+ VersionPart releaseVersion
166
218
  )
167
219
  private
168
220
  {
169
- ObjectType serviceDomain = service.getDomain();
170
221
  ObjectType authorizedDomain;
171
222
  RoleId authorizedRoleId;
172
223
 
173
- VersionPart release = service.getVersion().toMajorPart();
174
224
  ObjectType[] memory authorizedDomains = serviceAuthorization.getAuthorizedDomains(serviceDomain);
175
225
 
176
226
  for (uint256 i = 0; i < authorizedDomains.length; i++) {
@@ -182,11 +232,11 @@ contract RegistryAdmin is
182
232
  } else {
183
233
  authorizedRoleId = RoleIdLib.roleForTypeAndVersion(
184
234
  authorizedDomain,
185
- release);
235
+ releaseVersion);
186
236
  }
187
237
 
188
238
  // get authorized functions for authorized domain
189
- IAccessAdmin.Function[] memory authorizatedFunctions = serviceAuthorization.getAuthorizedFunctions(
239
+ IAccess.FunctionInfo[] memory authorizatedFunctions = serviceAuthorization.getAuthorizedFunctions(
190
240
  serviceDomain,
191
241
  authorizedDomain);
192
242
 
@@ -197,50 +247,54 @@ contract RegistryAdmin is
197
247
  }
198
248
  }
199
249
 
200
- /*function transferAdmin(address to)
201
- external
202
- restricted // only with GIF_ADMIN_ROLE or nft owner
203
- {
204
- _accessManager.revoke(GIF_ADMIN_ROLE, );
205
- _accesssManager.grant(GIF_ADMIN_ROLE, to, 0);
206
- }*/
207
-
208
- //--- view functions ----------------------------------------------------//
209
-
210
- function getGifAdminRole() external view returns (RoleId) {
211
- return GIF_ADMIN_ROLE();
212
- }
213
-
214
- function getGifManagerRole() external view returns (RoleId) {
215
- return GIF_MANAGER_ROLE();
216
- }
250
+ //--- private initialization functions -------------------------------------------//
217
251
 
218
- //--- private functions -------------------------------------------------//
252
+ function _setupGifAdminRole(address gifAdmin)
253
+ private
254
+ onlyInitializing()
255
+ {
256
+
257
+ _createRole(
258
+ GIF_ADMIN_ROLE(),
259
+ toRole({
260
+ adminRoleId: ADMIN_ROLE(),
261
+ roleType: RoleType.Gif,
262
+ maxMemberCount: 2, // TODO decide on max member count
263
+ name: GIF_ADMIN_ROLE_NAME}));
264
+
265
+ // for Registry
266
+ FunctionInfo[] memory functions;
267
+ functions = new FunctionInfo[](1);
268
+ functions[0] = toFunction(IRegistry.registerRegistry.selector, "registerRegistry");
269
+ _authorizeTargetFunctions(_registry, GIF_ADMIN_ROLE(), functions);
270
+
271
+ // for ReleaseRegistry
272
+ functions = new FunctionInfo[](4);
273
+ functions[0] = toFunction(ReleaseRegistry.createNextRelease.selector, "createNextRelease");
274
+ functions[1] = toFunction(ReleaseRegistry.activateNextRelease.selector, "activateNextRelease");
275
+ functions[2] = toFunction(ReleaseRegistry.pauseRelease.selector, "pauseRelease");
276
+ functions[3] = toFunction(ReleaseRegistry.unpauseRelease.selector, "unpauseRelease");
277
+ _authorizeTargetFunctions(_releaseRegistry, GIF_ADMIN_ROLE(), functions);
219
278
 
220
- function _setupGifAdminRole(address gifAdmin) private {
221
- // TODO decide on max member count
222
- _createRole(GIF_ADMIN_ROLE(), getAdminRole(), GIF_ADMIN_ROLE_NAME, 2, false);
223
279
  _grantRoleToAccount(GIF_ADMIN_ROLE(), gifAdmin);
224
-
225
- // for ReleaseManager
226
- Function[] memory functions;
227
- functions = new Function[](4);
228
- functions[0] = toFunction(ReleaseManager.createNextRelease.selector, "createNextRelease");
229
- functions[1] = toFunction(ReleaseManager.activateNextRelease.selector, "activateNextRelease");
230
- functions[2] = toFunction(ReleaseManager.pauseRelease.selector, "pauseRelease");
231
- functions[3] = toFunction(ReleaseManager.unpauseRelease.selector, "unpauseRelease");
232
- _authorizeTargetFunctions(_releaseManager, GIF_ADMIN_ROLE(), functions);
233
-
234
- // for Staking
235
280
  }
236
281
 
237
- function _setupGifManagerRole(address gifManager) private {
238
- _createRole(GIF_MANAGER_ROLE(), GIF_ADMIN_ROLE(), GIF_MANAGER_ROLE_NAME, 1, false);
239
- _grantRoleToAccount(GIF_MANAGER_ROLE(), gifManager);
282
+ function _setupGifManagerRole(address gifManager)
283
+ private
284
+ onlyInitializing()
285
+ {
286
+
287
+ _createRole(
288
+ GIF_MANAGER_ROLE(),
289
+ toRole({
290
+ adminRoleId: ADMIN_ROLE(),
291
+ roleType: RoleType.Gif,
292
+ maxMemberCount: 1,
293
+ name: GIF_MANAGER_ROLE_NAME}));
240
294
 
241
295
  // for TokenRegistry
242
- Function[] memory functions;
243
- functions = new Function[](5);
296
+ FunctionInfo[] memory functions;
297
+ functions = new FunctionInfo[](5);
244
298
  functions[0] = toFunction(TokenRegistry.registerToken.selector, "registerToken");
245
299
  functions[1] = toFunction(TokenRegistry.registerRemoteToken.selector, "registerRemoteToken");
246
300
  functions[2] = toFunction(TokenRegistry.setActive.selector, "setActive");
@@ -249,42 +303,96 @@ contract RegistryAdmin is
249
303
  functions[4] = toFunction(TokenRegistry.setActiveWithVersionCheck.selector, "setActiveWithVersionCheck");
250
304
  _authorizeTargetFunctions(_tokenRegistry, GIF_MANAGER_ROLE(), functions);
251
305
 
252
- // for ReleaseManager
253
- functions = new Function[](2);
254
- functions[0] = toFunction(ReleaseManager.prepareNextRelease.selector, "prepareNextRelease");
255
- functions[1] = toFunction(ReleaseManager.registerService.selector, "registerService");
256
- _authorizeTargetFunctions(_releaseManager, GIF_MANAGER_ROLE(), functions);
306
+ // for ReleaseRegistry
307
+ functions = new FunctionInfo[](2);
308
+ functions[0] = toFunction(ReleaseRegistry.prepareNextRelease.selector, "prepareNextRelease");
309
+ functions[1] = toFunction(ReleaseRegistry.registerService.selector, "registerService");
310
+ _authorizeTargetFunctions(_releaseRegistry, GIF_MANAGER_ROLE(), functions);
257
311
 
258
- // for Staking
312
+ _grantRoleToAccount(GIF_MANAGER_ROLE(), gifManager);
259
313
  }
260
314
 
261
315
 
262
- function _setupReleaseManager() private {
263
- _createTarget(_releaseManager, RELEASE_MANAGER_TARGET_NAME);
316
+ function _setupReleaseRegistry()
317
+ private
318
+ onlyInitializing()
319
+ {
264
320
 
265
- RoleId releaseManagerRoleId = RoleIdLib.roleForType(RELEASE());
266
- _createRole(releaseManagerRoleId, ADMIN_ROLE(), RELEASE_MANAGER_TARGET_NAME, 1, true);
267
- _grantRoleToAccount(releaseManagerRoleId, _releaseManager);
321
+ _createTarget(_releaseRegistry, RELEASE_REGISTRY_TARGET_NAME, true, false);
268
322
 
269
- Function[] memory functions;
270
- functions = new Function[](2);
323
+ RoleId releaseRegistryRoleId = RoleIdLib.roleForType(RELEASE());
324
+ _createRole(
325
+ releaseRegistryRoleId,
326
+ toRole({
327
+ adminRoleId: ADMIN_ROLE(),
328
+ roleType: RoleType.Contract,
329
+ maxMemberCount: 1,
330
+ name: RELEASE_REGISTRY_ROLE_NAME}));
331
+
332
+ FunctionInfo[] memory functions;
333
+ functions = new FunctionInfo[](5);
271
334
  functions[0] = toFunction(RegistryAdmin.authorizeService.selector, "authorizeService");
272
335
  functions[1] = toFunction(RegistryAdmin.grantServiceRoleForAllVersions.selector, "grantServiceRoleForAllVersions");
273
- _authorizeTargetFunctions(address(this), releaseManagerRoleId, functions);
336
+ functions[2] = toFunction(RegistryAdmin.revokeServiceRoleForAllVersions.selector, "revokeServiceRoleForAllVersions");
337
+ functions[3] = toFunction(RegistryAdmin.grantServiceRole.selector, "grantServiceRole");
338
+ functions[4] = toFunction(RegistryAdmin.revokeServiceRole.selector, "revokeServiceRole");
339
+ _authorizeTargetFunctions(address(this), releaseRegistryRoleId, functions);
340
+
341
+ _grantRoleToAccount(releaseRegistryRoleId, _releaseRegistry);
274
342
  }
275
343
 
276
344
 
277
- function _setupStaking() private {
278
- _createTarget(_staking, STAKING_TARGET_NAME);
279
- _createTarget(_stakingStore, STAKING_STORE_TARGET_NAME);
345
+ function _setupRegistry()
346
+ internal
347
+ virtual
348
+ onlyInitializing()
349
+ {
350
+ _createTarget(_registry, REGISTRY_TARGET_NAME, true, false);
351
+
352
+ // registry function authorization for registry service
353
+ RoleId registryServiceRoleId = RoleIdLib.roleForTypeAndAllVersions(REGISTRY());
354
+ _createRole(
355
+ registryServiceRoleId,
356
+ toRole({
357
+ adminRoleId: ADMIN_ROLE(),
358
+ roleType: RoleType.Contract,
359
+ maxMemberCount: MAX_NUM_RELEASES,
360
+ name: REGISTRY_SERVICE_ROLE_NAME}));
361
+
362
+ // authorize registry service
363
+ FunctionInfo[] memory functions;
364
+ functions = new FunctionInfo[](2);
365
+ functions[0] = toFunction(IRegistry.register.selector, "register");
366
+ functions[1] = toFunction(IRegistry.registerWithCustomType.selector, "registerWithCustomType");
367
+ _authorizeTargetFunctions(_registry, registryServiceRoleId, functions);
368
+
369
+ // authorize release registry
370
+ RoleId releaseRegistryRoleId = RoleIdLib.roleForType(RELEASE());
371
+ functions = new FunctionInfo[](1);
372
+ functions[0] = toFunction(IRegistry.registerService.selector, "registerService");
373
+ _authorizeTargetFunctions(_registry, releaseRegistryRoleId, functions);
374
+ }
375
+
280
376
 
377
+ function _setupStaking()
378
+ private
379
+ onlyInitializing()
380
+ {
381
+ _createTarget(_staking, STAKING_TARGET_NAME, true, false);
382
+ _createTarget(_stakingStore, STAKING_STORE_TARGET_NAME, true, false);
281
383
 
282
384
  // staking function authorization for staking service
283
385
  RoleId stakingServiceRoleId = RoleIdLib.roleForTypeAndAllVersions(STAKING());
284
- _createRole(stakingServiceRoleId, ADMIN_ROLE(), STAKING_SERVICE_ROLE_NAME, 1, true);
285
-
286
- Function[] memory functions;
287
- functions = new Function[](13);
386
+ _createRole(
387
+ stakingServiceRoleId,
388
+ toRole({
389
+ adminRoleId: ADMIN_ROLE(),
390
+ roleType: RoleType.Contract,
391
+ maxMemberCount: MAX_NUM_RELEASES,
392
+ name: STAKING_SERVICE_ROLE_NAME}));
393
+
394
+ FunctionInfo[] memory functions;
395
+ functions = new FunctionInfo[](13);
288
396
  functions[0] = toFunction(IStaking.registerTarget.selector, "registerTarget");
289
397
  functions[1] = toFunction(IStaking.setLockingPeriod.selector, "setLockingPeriod");
290
398
  functions[2] = toFunction(IStaking.setRewardRate.selector, "setRewardRate");
@@ -302,20 +410,31 @@ contract RegistryAdmin is
302
410
 
303
411
  // staking function authorization for pool service
304
412
  RoleId poolServiceRoleId = RoleIdLib.roleForTypeAndAllVersions(POOL());
305
- _createRole(poolServiceRoleId, ADMIN_ROLE(), POOL_SERVICE_ROLE_NAME, 1, true);
413
+ _createRole(
414
+ poolServiceRoleId,
415
+ toRole({
416
+ adminRoleId: ADMIN_ROLE(),
417
+ roleType: RoleType.Contract,
418
+ maxMemberCount: MAX_NUM_RELEASES,
419
+ name: POOL_SERVICE_ROLE_NAME}));
306
420
 
307
421
  // staking function authorizations
308
- functions = new Function[](2);
422
+ functions = new FunctionInfo[](2);
309
423
  functions[0] = toFunction(IStaking.increaseTotalValueLocked.selector, "increaseTotalValueLocked");
310
424
  functions[1] = toFunction(IStaking.decreaseTotalValueLocked.selector, "decreaseTotalValueLocked");
311
425
  _authorizeTargetFunctions(_staking, poolServiceRoleId, functions);
312
426
 
313
427
  // staking store function authorizations
314
428
  RoleId stakingRoleId = RoleIdLib.roleForType(STAKING());
315
- _createRole(stakingRoleId, ADMIN_ROLE(), STAKING_TARGET_NAME, 1, true);
316
- _grantRoleToAccount(stakingRoleId, _staking);
317
-
318
- functions = new Function[](14);
429
+ _createRole(
430
+ stakingRoleId,
431
+ toRole({
432
+ adminRoleId: ADMIN_ROLE(),
433
+ roleType: RoleType.Contract,
434
+ maxMemberCount: 1,
435
+ name: STAKING_ROLE_NAME}));
436
+
437
+ functions = new FunctionInfo[](14);
319
438
  functions[0] = toFunction(StakingStore.setStakingRate.selector, "setStakingRate");
320
439
  functions[1] = toFunction(StakingStore.createTarget.selector, "createTarget");
321
440
  functions[2] = toFunction(StakingStore.updateTarget.selector, "updateTarget");
@@ -331,5 +450,15 @@ contract RegistryAdmin is
331
450
  functions[12] = toFunction(StakingStore.claimUpTo.selector, "claimUpTo");
332
451
  functions[13] = toFunction(StakingStore.unstakeUpTo.selector, "unstakeUpTo");
333
452
  _authorizeTargetFunctions(_stakingStore, stakingRoleId, functions);
453
+
454
+ _grantRoleToAccount(stakingRoleId, _staking);
455
+
456
+ // grant token handler authorizations
457
+ IStaking staking = IStaking(_staking);
458
+ functions = new FunctionInfo[](2);
459
+ functions[0] = toFunction(TokenHandler.collectTokens.selector, "collectTokens");
460
+ functions[1] = toFunction(TokenHandler.distributeTokens.selector, "distributeTokens");
461
+
462
+ _authorizeTargetFunctions(address(staking.getTokenHandler()), stakingRoleId, functions);
334
463
  }
335
464
  }
@@ -1,32 +1,18 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
2
  pragma solidity ^0.8.20;
3
3
 
4
- import {ERC165Checker} from "@openzeppelin/contracts/utils/introspection/ERC165Checker.sol";
5
- // import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";
6
-
7
- import {IRegistry} from "./IRegistry.sol";
8
- import {IInstance} from "../instance/IInstance.sol";
9
-
10
4
  import {IComponent} from "../../contracts/shared/IComponent.sol";
5
+ import {IDistributionComponent} from "../../contracts/distribution/IDistributionComponent.sol";
6
+ import {IInstance} from "../instance/IInstance.sol";
11
7
  import {IPoolComponent} from "../../contracts/pool/IPoolComponent.sol";
12
8
  import {IProductComponent} from "../../contracts/product/IProductComponent.sol";
13
- import {IDistributionComponent} from "../../contracts/distribution/IDistributionComponent.sol";
14
-
15
- import {IVersionable} from "../../contracts/shared/IVersionable.sol";
16
- import {Versionable} from "../../contracts/shared/Versionable.sol";
17
9
  import {IRegisterable} from "../../contracts/shared/IRegisterable.sol";
10
+ import {IRegistry} from "./IRegistry.sol";
11
+ import {IRegistryService} from "./IRegistryService.sol";
18
12
 
19
- import {RoleId, PRODUCT_OWNER_ROLE, POOL_OWNER_ROLE, ORACLE_OWNER_ROLE} from "../../contracts/type/RoleId.sol";
20
13
  import {ObjectType, REGISTRY, SERVICE, PRODUCT, ORACLE, POOL, INSTANCE, COMPONENT, DISTRIBUTION, DISTRIBUTOR, APPLICATION, POLICY, CLAIM, BUNDLE, STAKE, STAKING, PRICE} from "../../contracts/type/ObjectType.sol";
21
- import {StateId, ACTIVE, PAUSED} from "../../contracts/type/StateId.sol";
22
14
  import {NftId, NftIdLib} from "../../contracts/type/NftId.sol";
23
- import {Fee, FeeLib} from "../../contracts/type/Fee.sol";
24
- import {Version, VersionPart, VersionLib} from "../../contracts/type/Version.sol";
25
-
26
15
  import {Service} from "../shared/Service.sol";
27
- import {IService} from "../shared/IService.sol";
28
- import {IRegistryService} from "./IRegistryService.sol";
29
- import {Registry} from "./Registry.sol";
30
16
 
31
17
  contract RegistryService is
32
18
  Service,
@@ -53,8 +39,8 @@ contract RegistryService is
53
39
  address initialAuthority
54
40
  ) = abi.decode(data, (address, address));
55
41
 
56
- initializeService(registryAddress, initialAuthority, owner);
57
- registerInterface(type(IRegistryService).interfaceId);
42
+ _initializeService(registryAddress, initialAuthority, owner);
43
+ _registerInterface(type(IRegistryService).interfaceId);
58
44
  }
59
45
 
60
46
 
@@ -1,8 +1,8 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
2
  pragma solidity ^0.8.20;
3
3
 
4
- import {IVersionable} from "../shared/IVersionable.sol";
5
- import {ProxyManager} from "../shared/ProxyManager.sol";
4
+ import {IVersionable} from "../upgradeability/IVersionable.sol";
5
+ import {ProxyManager} from "../upgradeability/ProxyManager.sol";
6
6
  import {RegistryService} from "./RegistryService.sol";
7
7
 
8
8
  contract RegistryServiceManager is