@etherisc/gif-next 0.0.2-fb8d07b-779 → 0.0.2-fbe22f0-239

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 (284) hide show
  1. package/README.md +136 -2
  2. package/artifacts/contracts/components/Component.sol/Component.dbg.json +4 -0
  3. package/artifacts/contracts/components/Component.sol/Component.json +858 -0
  4. package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +1 -1
  5. package/artifacts/contracts/components/Distribution.sol/Distribution.json +588 -92
  6. package/artifacts/contracts/components/IComponent.sol/IComponent.dbg.json +4 -0
  7. package/artifacts/contracts/{shared/RegisterableUpgradable.sol/RegisterableUpgradable.json → components/IComponent.sol/IComponent.json} +208 -143
  8. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
  9. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.json +543 -0
  10. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
  11. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.json +663 -31
  12. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +1 -1
  13. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.json +648 -5
  14. package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
  15. package/artifacts/contracts/components/Pool.sol/Pool.json +818 -273
  16. package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
  17. package/artifacts/contracts/components/Product.sol/Product.json +657 -181
  18. package/artifacts/contracts/experiment/cloning/Cloner.sol/Cloner.dbg.json +1 -1
  19. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock1.dbg.json +1 -1
  20. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock2.dbg.json +1 -1
  21. package/artifacts/contracts/experiment/errors/Require.sol/Require.dbg.json +1 -1
  22. package/artifacts/contracts/experiment/errors/Revert.sol/Revert.dbg.json +1 -1
  23. package/artifacts/contracts/experiment/inheritance/A.sol/A.dbg.json +1 -1
  24. package/artifacts/contracts/experiment/inheritance/A.sol/AShared.dbg.json +1 -1
  25. package/artifacts/contracts/experiment/inheritance/B.sol/B.dbg.json +1 -1
  26. package/artifacts/contracts/experiment/inheritance/C.sol/C.dbg.json +1 -1
  27. package/artifacts/contracts/experiment/inheritance/IA.sol/IA.dbg.json +1 -1
  28. package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.dbg.json +1 -1
  29. package/artifacts/contracts/experiment/inheritance/IB.sol/IB.dbg.json +1 -1
  30. package/artifacts/contracts/experiment/inheritance/IC.sol/IC.dbg.json +1 -1
  31. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.dbg.json +1 -1
  32. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.json +2 -2
  33. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.dbg.json +1 -1
  34. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.dbg.json +1 -1
  35. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.dbg.json +1 -1
  36. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.dbg.json +1 -1
  37. package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.dbg.json +1 -1
  38. package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.dbg.json +1 -1
  39. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.dbg.json +4 -0
  40. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.json +764 -0
  41. package/artifacts/contracts/instance/Cloneable.sol/Cloneable.dbg.json +4 -0
  42. package/artifacts/contracts/instance/{AccessManagedSimple.sol/AccessManagedSimple.json → Cloneable.sol/Cloneable.json} +86 -2
  43. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  44. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +1371 -129
  45. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
  46. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +132 -21
  47. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  48. package/artifacts/contracts/instance/Instance.sol/Instance.json +293 -656
  49. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +1 -1
  50. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +211 -144
  51. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
  52. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +89 -91
  53. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
  54. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +395 -122
  55. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
  56. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +149 -57
  57. package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.dbg.json +4 -0
  58. package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.json +261 -0
  59. package/artifacts/contracts/instance/base/ComponentService.sol/ComponentService.dbg.json +4 -0
  60. package/artifacts/contracts/instance/base/{ComponentServiceBase.sol/ComponentServiceBase.json → ComponentService.sol/ComponentService.json} +243 -55
  61. package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
  62. package/artifacts/contracts/instance/base/ILifecycle.sol/ILifecycle.dbg.json +1 -1
  63. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
  64. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.json +2 -2
  65. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json +1 -1
  66. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.json +2 -2
  67. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +1 -1
  68. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.json +59 -16
  69. package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
  70. package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +1 -1
  71. package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +1 -1
  72. package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +1 -1
  73. package/artifacts/contracts/instance/module/ISetup.sol/ISetup.dbg.json +1 -1
  74. package/artifacts/contracts/instance/module/ITreasury.sol/ITreasury.dbg.json +1 -1
  75. package/artifacts/contracts/instance/service/ApplicationService.sol/ApplicationService.dbg.json +4 -0
  76. package/artifacts/contracts/instance/service/ApplicationService.sol/ApplicationService.json +1091 -0
  77. package/artifacts/contracts/instance/service/BundleService.sol/BundleService.dbg.json +4 -0
  78. package/artifacts/contracts/instance/service/BundleService.sol/BundleService.json +1292 -0
  79. package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.dbg.json +4 -0
  80. package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.json +560 -0
  81. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +1 -1
  82. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +272 -91
  83. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
  84. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.json +140 -40
  85. package/artifacts/contracts/instance/service/IApplicationService.sol/IApplicationService.dbg.json +4 -0
  86. package/artifacts/contracts/instance/service/{IComponentOwnerService.sol/IComponentOwnerService.json → IApplicationService.sol/IApplicationService.json} +217 -58
  87. package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.dbg.json +4 -0
  88. package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.json +785 -0
  89. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +1 -1
  90. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.json +20 -20
  91. package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.dbg.json +4 -0
  92. package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.json +771 -0
  93. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +1 -1
  94. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +22 -84
  95. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +1 -1
  96. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +32 -247
  97. package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.dbg.json +4 -0
  98. package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.json +1352 -0
  99. package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +4 -0
  100. package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.json +616 -0
  101. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +1 -1
  102. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +256 -180
  103. package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
  104. package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.json +140 -52
  105. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +4 -0
  106. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +981 -0
  107. package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.dbg.json +4 -0
  108. package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.json +548 -0
  109. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  110. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +2 -2
  111. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  112. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +208 -224
  113. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
  114. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +228 -95
  115. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
  116. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  117. package/artifacts/contracts/registry/Registry.sol/Registry.json +222 -330
  118. package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.dbg.json +4 -0
  119. package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.json +285 -0
  120. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
  121. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +197 -109
  122. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
  123. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +162 -112
  124. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.dbg.json +4 -0
  125. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.json +547 -0
  126. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
  127. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +124 -29
  128. package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.dbg.json +1 -1
  129. package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +1 -1
  130. package/artifacts/contracts/shared/ERC165.sol/ERC165.json +41 -3
  131. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
  132. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.json +24 -0
  133. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +4 -0
  134. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.json +129 -0
  135. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  136. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +5 -5
  137. package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
  138. package/artifacts/contracts/shared/IService.sol/IService.json +20 -20
  139. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +1 -1
  140. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.json +2 -2
  141. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
  142. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +130 -11
  143. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +4 -0
  144. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +172 -0
  145. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +1 -1
  146. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +130 -6
  147. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  148. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +126 -11
  149. package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
  150. package/artifacts/contracts/shared/Service.sol/Service.json +153 -20
  151. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
  152. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
  153. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +2 -2
  154. package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +1 -1
  155. package/artifacts/contracts/shared/Versionable.sol/Versionable.json +2 -2
  156. package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json +1 -1
  157. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json +1 -1
  158. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +126 -11
  159. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +1 -1
  160. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.json +2 -2
  161. package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +1 -1
  162. package/artifacts/contracts/test/TestService.sol/TestService.json +171 -38
  163. package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json +1 -1
  164. package/artifacts/contracts/test/TestVersion.sol/TestVersion.dbg.json +1 -1
  165. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json +1 -1
  166. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.json +8 -8
  167. package/artifacts/contracts/test/Usdc.sol/USDC.dbg.json +1 -1
  168. package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.dbg.json +1 -1
  169. package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
  170. package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +1 -1
  171. package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.dbg.json +1 -1
  172. package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.json +2 -2
  173. package/artifacts/contracts/types/Fee.sol/FeeLib.dbg.json +1 -1
  174. package/artifacts/contracts/types/Key32.sol/Key32Lib.dbg.json +1 -1
  175. package/artifacts/contracts/types/Key32.sol/Key32Lib.json +2 -2
  176. package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +1 -1
  177. package/artifacts/contracts/types/NftId.sol/NftIdLib.json +2 -2
  178. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
  179. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.json +26 -3
  180. package/artifacts/contracts/types/NumberId.sol/NumberIdLib.dbg.json +1 -1
  181. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
  182. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.json +2 -2
  183. package/artifacts/contracts/types/Referral.sol/ReferralLib.dbg.json +1 -1
  184. package/artifacts/contracts/types/Referral.sol/ReferralLib.json +2 -2
  185. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.dbg.json +1 -1
  186. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.json +2 -2
  187. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.dbg.json +1 -1
  188. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.json +2 -2
  189. package/artifacts/contracts/types/StateId.sol/StateIdLib.dbg.json +1 -1
  190. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json +1 -1
  191. package/artifacts/contracts/types/UFixed.sol/MathLib.dbg.json +1 -1
  192. package/artifacts/contracts/types/UFixed.sol/UFixedLib.dbg.json +1 -1
  193. package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +1 -1
  194. package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +1 -1
  195. package/contracts/components/Component.sol +230 -0
  196. package/contracts/components/Distribution.sol +53 -57
  197. package/contracts/components/IComponent.sol +50 -0
  198. package/contracts/components/IDistributionComponent.sol +5 -2
  199. package/contracts/components/IPoolComponent.sol +54 -29
  200. package/contracts/components/IProductComponent.sol +7 -3
  201. package/contracts/components/Pool.sol +153 -142
  202. package/contracts/components/Product.sol +109 -128
  203. package/contracts/instance/BundleManager.sol +125 -0
  204. package/contracts/instance/Cloneable.sol +46 -0
  205. package/contracts/instance/IInstance.sol +41 -8
  206. package/contracts/instance/IInstanceService.sol +15 -4
  207. package/contracts/instance/Instance.sol +65 -240
  208. package/contracts/instance/InstanceAccessManager.sol +87 -78
  209. package/contracts/instance/InstanceReader.sol +12 -25
  210. package/contracts/instance/InstanceService.sol +347 -95
  211. package/contracts/instance/InstanceServiceManager.sol +10 -12
  212. package/contracts/instance/ObjectManager.sol +84 -0
  213. package/contracts/instance/base/ComponentService.sol +134 -0
  214. package/contracts/instance/module/IAccess.sol +27 -18
  215. package/contracts/instance/module/ISetup.sol +7 -4
  216. package/contracts/instance/service/ApplicationService.sol +268 -0
  217. package/contracts/instance/service/BundleService.sol +298 -0
  218. package/contracts/instance/service/BundleServiceManager.sol +51 -0
  219. package/contracts/instance/service/DistributionService.sol +45 -27
  220. package/contracts/instance/service/DistributionServiceManager.sol +10 -12
  221. package/contracts/instance/service/IApplicationService.sol +82 -0
  222. package/contracts/instance/service/IBundleService.sol +54 -0
  223. package/contracts/instance/service/IPolicyService.sol +88 -0
  224. package/contracts/instance/service/IPoolService.sol +6 -23
  225. package/contracts/instance/service/IProductService.sol +6 -73
  226. package/contracts/instance/service/PolicyService.sol +524 -0
  227. package/contracts/instance/service/PolicyServiceManager.sol +54 -0
  228. package/contracts/instance/service/PoolService.sol +40 -124
  229. package/contracts/instance/service/PoolServiceManager.sol +10 -12
  230. package/contracts/instance/service/ProductService.sol +233 -0
  231. package/contracts/instance/service/ProductServiceManager.sol +54 -0
  232. package/contracts/registry/ChainNft.sol +1 -1
  233. package/contracts/registry/IRegistry.sol +38 -33
  234. package/contracts/registry/IRegistryService.sol +45 -13
  235. package/contracts/registry/Registry.sol +223 -250
  236. package/contracts/registry/RegistryAccessManager.sol +216 -0
  237. package/contracts/registry/RegistryService.sol +86 -224
  238. package/contracts/registry/RegistryServiceManager.sol +18 -36
  239. package/contracts/registry/ReleaseManager.sol +332 -0
  240. package/contracts/registry/TokenRegistry.sol +11 -9
  241. package/contracts/shared/ERC165.sol +12 -11
  242. package/contracts/shared/INftOwnable.sol +6 -1
  243. package/contracts/shared/IPolicyHolder.sol +26 -0
  244. package/contracts/shared/IRegisterable.sol +4 -6
  245. package/contracts/shared/IService.sol +2 -1
  246. package/contracts/shared/IVersionable.sol +2 -2
  247. package/contracts/shared/NftOwnable.sol +93 -42
  248. package/contracts/shared/PolicyHolder.sol +52 -0
  249. package/contracts/shared/ProxyManager.sol +6 -5
  250. package/contracts/shared/Registerable.sol +15 -24
  251. package/contracts/shared/Service.sol +18 -13
  252. package/contracts/shared/Versionable.sol +3 -2
  253. package/contracts/test/TestRegisterable.sol +1 -1
  254. package/contracts/test/TestService.sol +4 -3
  255. package/contracts/types/NftIdSet.sol +26 -24
  256. package/contracts/types/ObjectType.sol +5 -1
  257. package/contracts/types/RoleId.sol +10 -9
  258. package/package.json +3 -3
  259. package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.dbg.json +0 -4
  260. package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.json +0 -327
  261. package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.dbg.json +0 -4
  262. package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.json +0 -280
  263. package/artifacts/contracts/instance/AccessManagedSimple.sol/AccessManagedSimple.dbg.json +0 -4
  264. package/artifacts/contracts/instance/AccessManagerSimple.sol/AccessManagerSimple.dbg.json +0 -4
  265. package/artifacts/contracts/instance/AccessManagerSimple.sol/AccessManagerSimple.json +0 -1132
  266. package/artifacts/contracts/instance/IAccessManagerSimple.sol/IAccessManagerSimple.dbg.json +0 -4
  267. package/artifacts/contracts/instance/IAccessManagerSimple.sol/IAccessManagerSimple.json +0 -1082
  268. package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.dbg.json +0 -4
  269. package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.dbg.json +0 -4
  270. package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.json +0 -113
  271. package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.dbg.json +0 -4
  272. package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.json +0 -827
  273. package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.dbg.json +0 -4
  274. package/artifacts/contracts/shared/RegisterableUpgradable.sol/RegisterableUpgradable.dbg.json +0 -4
  275. package/contracts/components/BaseComponent.sol +0 -91
  276. package/contracts/components/IBaseComponent.sol +0 -25
  277. package/contracts/instance/AccessManagedSimple.sol +0 -115
  278. package/contracts/instance/AccessManagerSimple.sol +0 -692
  279. package/contracts/instance/IAccessManagerSimple.sol +0 -391
  280. package/contracts/instance/base/ComponentServiceBase.sol +0 -125
  281. package/contracts/instance/base/IInstanceBase.sol +0 -23
  282. package/contracts/instance/service/ComponentOwnerService.sol +0 -317
  283. package/contracts/instance/service/IComponentOwnerService.sol +0 -20
  284. package/contracts/shared/RegisterableUpgradable.sol +0 -16
@@ -0,0 +1,216 @@
1
+ // SPDX-License-Identifier: UNLICENSED
2
+ pragma solidity ^0.8.20;
3
+
4
+ import {AccessManager} from "@openzeppelin/contracts/access/manager/AccessManager.sol";
5
+ import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";
6
+
7
+ import {RoleId, RoleIdLib,
8
+ GIF_MANAGER_ROLE,
9
+ GIF_ADMIN_ROLE,
10
+ RELEASE_MANAGER_ROLE} from "../types/RoleId.sol";
11
+
12
+ import {TokenRegistry} from "./TokenRegistry.sol";
13
+ import {ReleaseManager} from "./ReleaseManager.sol";
14
+
15
+ /*
16
+ 4 types of roles:
17
+ 1) RELEASE_MANAGER_ROLE
18
+ - has only ReleaseManager as member
19
+ - responsible for setting and granting of REGISTRAR roles
20
+ 1) REGISTRAR roles
21
+ - set and granted by RELEASE_MANAGER_ROLE
22
+ - each has 1 unique member (regular service ver.X) (subject to change)
23
+ - each set to 1 target (registry service ver.X) and 1 selector (function of registry service ver.X) (subject to change)
24
+ 2) GIF_MANAGER_ROLE
25
+ - can have arbitrary number of members
26
+ - responsible for services registrations
27
+ - responsible for token registration and activation
28
+ 3) GIF_ADMIN_ROLE
29
+ - admin of GIF_MANAGER_ROLE
30
+ - MUST have 1 member at any time
31
+ - granted/revoked ONLY in transferAdminRole() -> consider lock out situations!!!
32
+ - responsible for creation and activation of releases
33
+
34
+ */
35
+
36
+ contract RegistryAccessManager is AccessManaged
37
+ {
38
+ error NotInitialized();
39
+ error AlreadyInitialized();
40
+
41
+ uint64 public constant UNIQUE_ROLE_ID_MIN = 1000000;
42
+
43
+ AccessManager private immutable _accessManager;
44
+ address private _releaseManager;
45
+ address private _tokenRegistry;
46
+
47
+ uint64 private _idNext; // role id
48
+ bool private _isInitialized;
49
+
50
+ modifier onlyOnce() {
51
+ if(_isInitialized) {
52
+ revert AlreadyInitialized();
53
+ }
54
+ _;
55
+ _isInitialized = true;
56
+ }
57
+
58
+ modifier onlyInitialized() {
59
+ if(!_isInitialized) {
60
+ revert NotInitialized();
61
+ }
62
+ _;
63
+ }
64
+
65
+ constructor(address manager)
66
+ AccessManaged(msg.sender)
67
+ {
68
+ _accessManager = new AccessManager(address(this));
69
+ setAuthority(address(_accessManager));
70
+
71
+ _idNext = UNIQUE_ROLE_ID_MIN;
72
+
73
+ _configureAdminRoleInitial();
74
+
75
+ address admin = msg.sender;
76
+ _grantRole(GIF_ADMIN_ROLE(), admin, 0);
77
+ _grantRole(GIF_MANAGER_ROLE(), manager, 0);
78
+ }
79
+
80
+ function initialize(address releaseManager, address tokenRegistry)
81
+ external
82
+ restricted // GIF_ADMIN_ROLE
83
+ onlyOnce
84
+ {
85
+ require(
86
+ ReleaseManager(releaseManager).authority() == address(_accessManager),
87
+ "RegistryAccessManager: release manager authority is invalid");
88
+ require(tokenRegistry > address(0), "RegistryAccessManager: token registry is 0");
89
+ //require(tokenRegistry.authority() == address(_accessManager));
90
+
91
+ _releaseManager = releaseManager;
92
+ _tokenRegistry = tokenRegistry;
93
+
94
+ _configureAdminRole();
95
+ _configureManagerRole();
96
+ _configureReleaseManagerRole();
97
+
98
+ _grantRole(RELEASE_MANAGER_ROLE(), releaseManager, 0);
99
+ }
100
+
101
+ // set unique role for target, role forever have 1 member and never revoked
102
+ function setAndGrantUniqueRole(
103
+ address account,
104
+ address target,
105
+ bytes4[] memory selector
106
+ )
107
+ external
108
+ restricted // RELEASE_MANAGER_ROLE
109
+ onlyInitialized
110
+ returns(RoleId)
111
+ {
112
+ // TODO questionable check...
113
+ // target is not part of `runtime`
114
+ //if(
115
+ // target == address(this) ||
116
+ // target == address(_accessManager) ||
117
+ // target == _releaseManager ||
118
+ // target == _tokenRegistry)
119
+ //{ return TargetInvalid(); }
120
+
121
+ RoleId roleId = _getNextRoleId();
122
+
123
+ _setTargetFunctionRole(target, selector, roleId);
124
+ _grantRole(roleId, account, 0);
125
+ }
126
+
127
+ /*function transferAdmin(address to)
128
+ external
129
+ restricted // only with GIF_ADMIN_ROLE or nft owner
130
+ {
131
+ _accessManager.revoke(GIF_ADMIN_ROLE, );
132
+ _accesssManager.grant(GIF_ADMIN_ROLE, to, 0);
133
+ }*/
134
+
135
+ //--- view functions ----------------------------------------------------//
136
+
137
+ function getAccessManager()
138
+ external
139
+ view
140
+ returns (AccessManager)
141
+ {
142
+ return _accessManager;
143
+ }
144
+
145
+ //--- private functions -------------------------------------------------//
146
+
147
+ function _configureAdminRoleInitial() private
148
+ {
149
+ bytes4[] memory functionSelector = new bytes4[](1);
150
+
151
+ functionSelector[0] = RegistryAccessManager.initialize.selector;
152
+ _setTargetFunctionRole(address(this), functionSelector, GIF_ADMIN_ROLE());
153
+ }
154
+
155
+ function _configureAdminRole() private
156
+ {
157
+ bytes4[] memory functionSelector = new bytes4[](1);
158
+
159
+ // for RegistryServiceProxyManager
160
+ // TODO upgrading with releaseManager.upgrade()->proxy.upgrade()???
161
+ //functionSelector[0] = RegistryServiceManager.upgrade.selector;
162
+ //_setTargetFunctionRole(address(this), functionSelector, GIF_ADMIN_ROLE());
163
+
164
+ // for TokenRegistry
165
+
166
+ // for ReleaseManager
167
+ functionSelector[0] = ReleaseManager.createNextRelease.selector;
168
+ _setTargetFunctionRole(_releaseManager, functionSelector, GIF_ADMIN_ROLE());
169
+
170
+ functionSelector[0] = ReleaseManager.activateNextRelease.selector;
171
+ _setTargetFunctionRole(_releaseManager, functionSelector, GIF_ADMIN_ROLE());
172
+ }
173
+
174
+ function _configureManagerRole() private
175
+ {
176
+ bytes4[] memory functionSelector = new bytes4[](1);
177
+
178
+ // for TokenRegistry
179
+ functionSelector[0] = TokenRegistry.setActive.selector;
180
+ _setTargetFunctionRole(address(_tokenRegistry), functionSelector, GIF_MANAGER_ROLE());
181
+
182
+ // for ReleaseManager
183
+ functionSelector[0] = ReleaseManager.registerService.selector;
184
+ _setTargetFunctionRole(_releaseManager, functionSelector, GIF_MANAGER_ROLE());
185
+
186
+ functionSelector[0] = ReleaseManager.registerRegistryService.selector;
187
+ _setTargetFunctionRole(_releaseManager, functionSelector, GIF_MANAGER_ROLE());
188
+
189
+ // set admin
190
+ _setRoleAdmin(GIF_MANAGER_ROLE(), GIF_ADMIN_ROLE());
191
+ }
192
+
193
+ function _configureReleaseManagerRole() private
194
+ {
195
+ bytes4[] memory functionSelector = new bytes4[](1);
196
+
197
+ functionSelector[0] = RegistryAccessManager.setAndGrantUniqueRole.selector;
198
+ _setTargetFunctionRole(address(this), functionSelector, RELEASE_MANAGER_ROLE());
199
+ }
200
+
201
+ function _setTargetFunctionRole(address target, bytes4[] memory selectors, RoleId roleId) private {
202
+ _accessManager.setTargetFunctionRole(target, selectors, roleId.toInt());
203
+ }
204
+
205
+ function _setRoleAdmin(RoleId roleId, RoleId adminRoleId) private {
206
+ _accessManager.setRoleAdmin(roleId.toInt(), adminRoleId.toInt());
207
+ }
208
+
209
+ function _grantRole(RoleId roleId, address account, uint32 executionDelay) private {
210
+ _accessManager.grantRole(roleId.toInt(), account, executionDelay);
211
+ }
212
+
213
+ function _getNextRoleId() private returns(RoleId roleId) {
214
+ roleId = RoleIdLib.toRoleId(_idNext++);
215
+ }
216
+ }
@@ -8,9 +8,7 @@ import {IRegistry} from "./IRegistry.sol";
8
8
  import {IInstance} from "../instance/IInstance.sol";
9
9
 
10
10
  import {ContractDeployerLib} from "../shared/ContractDeployerLib.sol";
11
- // import {IComponent, IComponentModule} from "../../contracts/instance/module/component/IComponent.sol";
12
- // import {IPool} from "../../contracts/instance/module/pool/IPoolModule.sol";
13
- import {IBaseComponent} from "../../contracts/components/IBaseComponent.sol";
11
+ import {IComponent} from "../../contracts/components/IComponent.sol";
14
12
  import {IPoolComponent} from "../../contracts/components/IPoolComponent.sol";
15
13
  import {IProductComponent} from "../../contracts/components/IProductComponent.sol";
16
14
  import {IDistributionComponent} from "../../contracts/components/IDistributionComponent.sol";
@@ -18,9 +16,10 @@ import {IDistributionComponent} from "../../contracts/components/IDistributionCo
18
16
  import {IVersionable} from "../../contracts/shared/IVersionable.sol";
19
17
  import {Versionable} from "../../contracts/shared/Versionable.sol";
20
18
  import {IRegisterable} from "../../contracts/shared/IRegisterable.sol";
19
+ import {Registerable} from "../../contracts/shared/Registerable.sol";
21
20
 
22
21
  import {RoleId, PRODUCT_OWNER_ROLE, POOL_OWNER_ROLE, ORACLE_OWNER_ROLE} from "../../contracts/types/RoleId.sol";
23
- import {ObjectType, REGISTRY, SERVICE, PRODUCT, ORACLE, POOL, INSTANCE, DISTRIBUTION, POLICY, BUNDLE} from "../../contracts/types/ObjectType.sol";
22
+ import {ObjectType, REGISTRY, SERVICE, PRODUCT, ORACLE, POOL, INSTANCE, DISTRIBUTION, POLICY, BUNDLE, STAKE} from "../../contracts/types/ObjectType.sol";
24
23
  import {StateId, ACTIVE, PAUSED} from "../../contracts/types/StateId.sol";
25
24
  import {NftId, NftIdLib, zeroNftId} from "../../contracts/types/NftId.sol";
26
25
  import {Fee, FeeLib} from "../../contracts/types/Fee.sol";
@@ -30,7 +29,6 @@ import {Service} from "../shared/Service.sol";
30
29
  import {IService} from "../shared/IService.sol";
31
30
  import {IRegistryService} from "./IRegistryService.sol";
32
31
  import {Registry} from "./Registry.sol";
33
- import {ChainNft} from "./ChainNft.sol";
34
32
 
35
33
  contract RegistryService is
36
34
  AccessManagedUpgradeable,
@@ -39,104 +37,31 @@ contract RegistryService is
39
37
  {
40
38
  using NftIdLib for NftId;
41
39
 
42
- // TODO move errors to interface contract
43
- error SelfRegistration();
44
- error NotRegistryOwner();
45
-
46
- error NotService();
47
- error NotInstance();
48
- error NotProduct();
49
- error NotPool();
50
- error NotDistribution();
51
-
52
- error UnexpectedRegisterableType(ObjectType expected, ObjectType found);
53
- error NotRegisterableOwner(address expectedOwner);
54
- error RegisterableOwnerIsZero();
55
- error RegisterableOwnerIsRegistered();
56
- error InvalidInitialOwner(address initialOwner);
57
- error InvalidAddress(address registerableAddress);
58
-
59
- // Initial value for constant variable has to be compile-time constant
60
- // TODO define types as constants?
61
- //ObjectType public constant SERVICE_TYPE = REGISTRY();
62
- string public constant NAME = "RegistryService";
63
-
64
40
  // TODO update to real hash when registry is stable
65
41
  bytes32 public constant REGISTRY_CREATION_CODE_HASH = bytes32(0);
66
42
 
67
- address public constant NFT_LOCK_ADDRESS = address(0x1);
68
-
69
- /// @dev
70
- // msg.sender - ONLY registry owner
71
- // CAN NOT register itself
72
- // CAN register ONLY valid object-parent types combinations for SERVICE
73
- // CAN register ONLY IRegisterable address he owns
74
- // IMPORTANT: MUST NOT check owner before calling external contract
75
- function registerService(IService service)
76
- external
77
- // TODO restrict access - registryService.registerService must use accessmanager for checking permissions as
78
- // services are not always owned by registry owner - actually only registry service is owned by registry owner
79
-
80
- returns(
81
- IRegistry.ObjectInfo memory info,
82
- bytes memory data
83
- )
84
- {
85
-
86
- // CAN revert if no ERC165 support -> will revert with empty message
87
- if(!service.supportsInterface(type(IService).interfaceId)) {
88
- revert NotService();
89
- }
90
-
91
- (
92
- info,
93
- data
94
- ) = _getAndVerifyContractInfo(service, SERVICE(), msg.sender);
95
-
96
- info.nftId = _registry.register(info);
97
- service.linkToRegisteredNftId();
98
- return (
99
- info,
100
- data
101
- );
102
- }
103
-
104
- // If msg.sender is approved service:
105
- // 1) add owner arg (service MUST pass it's msg.sender as owner)
106
- // 2) check service allowance
107
- // 3) comment self registrstion check
108
- //function registerInstance(IRegisterable instance, address owner)
109
- function registerInstance(IRegisterable instance)
43
+ function registerInstance(IRegisterable instance, address owner)
110
44
  external
45
+ restricted
111
46
  returns(
112
- IRegistry.ObjectInfo memory info,
113
- bytes memory data
47
+ IRegistry.ObjectInfo memory info
114
48
  )
115
49
  {
116
50
  if(!instance.supportsInterface(type(IInstance).interfaceId)) {
117
51
  revert NotInstance();
118
52
  }
119
53
 
120
- (
121
- info,
122
- data
123
- ) = _getAndVerifyContractInfo(instance, INSTANCE(), msg.sender);
54
+ info = _getAndVerifyContractInfo(instance, INSTANCE(), owner);
55
+ info.nftId = getRegistry().register(info);
124
56
 
125
- info.nftId = _registry.register(info);
126
57
  instance.linkToRegisteredNftId(); // asume safe
127
-
128
- return (
129
- info,
130
- data
131
- );
132
58
  }
133
59
 
134
- function registerProduct(IBaseComponent product, address owner)
60
+ function registerProduct(IComponent product, address owner)
135
61
  external
136
62
  restricted
137
63
  returns(
138
- IRegistry.ObjectInfo memory info,
139
- bytes memory data
64
+ IRegistry.ObjectInfo memory info
140
65
  )
141
66
  {
142
67
  // CAN revert if no ERC165 support -> will revert with empty message
@@ -144,77 +69,38 @@ contract RegistryService is
144
69
  revert NotProduct();
145
70
  }
146
71
 
147
- (
148
- info,
149
- data
150
- ) = _getAndVerifyContractInfo(product, PRODUCT(), owner);
151
-
152
- NftId serviceNftId = _registry.getNftId(msg.sender);
153
-
154
- info.nftId = _registry.register(info);
155
- // TODO unsafe, let component or its owner derive nftId latter, when state assumptions and modifications of GIF contracts are finished
156
- product.linkToRegisteredNftId();
157
-
158
- return (
159
- info,
160
- data
161
- );
72
+ info = _getAndVerifyContractInfo(product, PRODUCT(), owner);
73
+ info.nftId = getRegistry().register(info);
162
74
  }
163
75
 
164
- function registerPool(IBaseComponent pool, address owner)
76
+ function registerPool(IComponent pool, address owner)
165
77
  external
166
78
  restricted
167
79
  returns(
168
- IRegistry.ObjectInfo memory info,
169
- bytes memory data
80
+ IRegistry.ObjectInfo memory info
170
81
  )
171
82
  {
172
83
  if(!pool.supportsInterface(type(IPoolComponent).interfaceId)) {
173
84
  revert NotPool();
174
85
  }
175
86
 
176
- (
177
- info,
178
- data
179
- ) = _getAndVerifyContractInfo(pool, POOL(), owner);
180
-
181
- NftId serviceNftId = _registry.getNftId(msg.sender);
182
-
183
- info.nftId = _registry.register(info);
184
- pool.linkToRegisteredNftId();
185
-
186
- return (
187
- info,
188
- data
189
- );
87
+ info = _getAndVerifyContractInfo(pool, POOL(), owner);
88
+ info.nftId = getRegistry().register(info);
190
89
  }
191
90
 
192
- function registerDistribution(IBaseComponent distribution, address owner)
91
+ function registerDistribution(IComponent distribution, address owner)
193
92
  external
194
93
  restricted
195
94
  returns(
196
- IRegistry.ObjectInfo memory info,
197
- bytes memory data
95
+ IRegistry.ObjectInfo memory info
198
96
  )
199
97
  {
200
98
  if(!distribution.supportsInterface(type(IDistributionComponent).interfaceId)) {
201
99
  revert NotDistribution();
202
100
  }
203
101
 
204
- (
205
- info,
206
- data
207
- ) = _getAndVerifyContractInfo(distribution, DISTRIBUTION(), owner);
208
-
209
- NftId serviceNftId = _registry.getNftId(msg.sender);
210
-
211
- info.nftId = _registry.register(info);
212
- distribution.linkToRegisteredNftId();
213
-
214
- return (
215
- info,
216
- data
217
- );
102
+ info = _getAndVerifyContractInfo(distribution, DISTRIBUTION(), owner);
103
+ info.nftId = getRegistry().register(info);
218
104
  }
219
105
 
220
106
  function registerPolicy(IRegistry.ObjectInfo memory info)
@@ -222,11 +108,9 @@ contract RegistryService is
222
108
  restricted
223
109
  returns(NftId nftId)
224
110
  {
225
- NftId senderNftId = _registry.getNftId(msg.sender);
226
-
227
111
  _verifyObjectInfo(info, POLICY());
228
112
 
229
- nftId = _registry.register(info);
113
+ nftId = getRegistry().register(info);
230
114
  }
231
115
 
232
116
  function registerBundle(IRegistry.ObjectInfo memory info)
@@ -234,31 +118,29 @@ contract RegistryService is
234
118
  restricted
235
119
  returns(NftId nftId)
236
120
  {
237
-
238
- NftId senderNftId = _registry.getNftId(msg.sender);
239
-
240
121
  _verifyObjectInfo(info, BUNDLE());
241
122
 
242
- nftId = _registry.register(info);
123
+ nftId = getRegistry().register(info);
243
124
  }
244
125
 
126
+ function registerStake(IRegistry.ObjectInfo memory info)
127
+ external
128
+ restricted
129
+ returns(NftId nftId)
130
+ {
131
+ _verifyObjectInfo(info, STAKE());
245
132
 
246
- // From IService
247
- function getName() public pure override(IService, Service) returns(string memory) {
248
- return NAME;
133
+ nftId = getRegistry().register(info);
249
134
  }
250
- //function getType() public pure override(IService, ServiceBase) returns(ObjectType serviceType) {
251
- // return SERVICE_TYPE;
252
- //}
253
135
 
136
+ // From IService
137
+ function getDomain() public pure override(IService, Service) returns(ObjectType serviceDomain) {
138
+ return REGISTRY();
139
+ }
254
140
 
255
141
  // from Versionable
256
142
 
257
143
  /// @dev top level initializer
258
- // 1) registry is non upgradeable -> don't need a proxy and uses constructor !
259
- // 2) deploy registry service first -> from its initialization func it is easier to deploy registry then vice versa
260
- // 3) deploy registry -> pass registry service address as constructor argument
261
- // registry is getting instantiated and locked to registry service address forever
262
144
  function _initialize(
263
145
  address owner,
264
146
  bytes memory data
@@ -269,50 +151,64 @@ contract RegistryService is
269
151
  {
270
152
  (
271
153
  address initialAuthority,
272
- bytes memory registryByteCodeWithInitCode
273
- ) = abi.decode(data, (address, bytes));
154
+ address registry
155
+ ) = abi.decode(data, (address, address));
274
156
 
275
157
  __AccessManaged_init(initialAuthority);
276
158
 
277
- bytes memory encodedConstructorArguments = abi.encode(
278
- owner,
279
- getMajorVersion());
159
+ initializeService(address(registry), owner);
160
+ registerInterface(type(IRegistryService).interfaceId);
161
+ }
280
162
 
281
- bytes memory registryCreationCode = ContractDeployerLib.getCreationCode(
282
- registryByteCodeWithInitCode,
283
- encodedConstructorArguments);
163
+ // from IRegisterable
284
164
 
285
- IRegistry registry = IRegistry(ContractDeployerLib.deploy(
286
- registryCreationCode,
287
- REGISTRY_CREATION_CODE_HASH));
165
+ function getFunctionConfigs()
166
+ external
167
+ pure
168
+ returns(
169
+ FunctionConfig[] memory config
170
+ )
171
+ {
172
+ config = new FunctionConfig[](6);
173
+
174
+ // order of service registrations MUST be reverse to this array
175
+ /*config[-1].serviceDomain = STAKE();
176
+ config[-1].selector = RegistryService.registerStake.selector;*/
288
177
 
289
- NftId registryNftId = registry.getNftId(address(registry));
178
+ config[0].serviceDomain = POLICY();
179
+ config[0].selector = RegistryService.registerPolicy.selector;
290
180
 
291
- _initializeService(address(registry), owner);
181
+ config[1].serviceDomain = BUNDLE();
182
+ config[1].selector = RegistryService.registerBundle.selector;
292
183
 
293
- // TODO why do registry service proxy need to keep its nftId??? -> no registryServiceNftId checks in implementation
294
- // if they are -> use registry address to obtain owner of registry service nft (works the same with any registerable and(or) implementation)
295
- linkToRegisteredNftId();
296
- _registerInterface(type(IRegistryService).interfaceId);
184
+ config[2].serviceDomain = PRODUCT();
185
+ config[2].selector = RegistryService.registerProduct.selector;
186
+
187
+ config[3].serviceDomain = POOL();
188
+ config[3].selector = RegistryService.registerPool.selector;
189
+
190
+ config[4].serviceDomain = DISTRIBUTION();
191
+ config[4].selector = RegistryService.registerDistribution.selector;
192
+
193
+ // registerInstance() have no restriction
194
+ config[5].serviceDomain = INSTANCE();
195
+ config[5].selector = RegistryService.registerInstance.selector;
297
196
  }
298
197
 
299
- // parent check done in registry because of approve()
198
+ // Internal
199
+
300
200
  function _getAndVerifyContractInfo(
301
201
  IRegisterable registerable,
302
202
  ObjectType expectedType, // assume can be valid only
303
- address expectedOwner // assume can be 0
203
+ address expectedOwner // assume can be 0 when given by other service
304
204
  )
305
205
  internal
306
- view
206
+ // view
307
207
  returns(
308
- IRegistry.ObjectInfo memory info,
309
- bytes memory data
208
+ IRegistry.ObjectInfo memory info
310
209
  )
311
210
  {
312
- (
313
- info,
314
- data
315
- ) = registerable.getInitialInfo();
211
+ info = registerable.getInitialInfo();
316
212
  info.objectAddress = address(registerable);
317
213
 
318
214
  if(info.objectType != expectedType) {// type is checked in registry anyway...but service logic may depend on expected value
@@ -321,13 +217,8 @@ contract RegistryService is
321
217
 
322
218
  address owner = info.initialOwner;
323
219
 
324
- // solhint-disable-next-line
325
- if(expectedType == INSTANCE()) {
326
- // any address may create a new instance via instance service
327
- } else {
328
- if(owner != expectedOwner) { // registerable owner protection
329
- revert NotRegisterableOwner(expectedOwner);
330
- }
220
+ if(owner != expectedOwner) { // registerable owner protection
221
+ revert NotRegisterableOwner(expectedOwner);
331
222
  }
332
223
 
333
224
  if(owner == address(registerable)) {
@@ -341,59 +232,30 @@ contract RegistryService is
341
232
  if(getRegistry().isRegistered(owner)) {
342
233
  revert RegisterableOwnerIsRegistered();
343
234
  }
344
-
345
- /*NftId parentNftId = info.parentNftId;
346
- IRegistry.ObjectInfo memory parentInfo = getRegistry().getObjectInfo(parentNftId);
347
-
348
- if(parentInfo.objectType != parentType) { // parent registration + type
349
- revert InvalidParent(parentNftId);
350
- }*/
351
-
352
- return(
353
- info,
354
- data
355
- );
356
235
  }
357
236
 
358
- // parent checks done in registry because of approve()
359
237
  function _verifyObjectInfo(
360
238
  IRegistry.ObjectInfo memory info,
361
- ObjectType objectType
239
+ ObjectType expectedType
362
240
  )
363
241
  internal
364
242
  view
365
243
  {
366
- if(info.objectAddress > address(0)) {
367
- revert InvalidAddress(info.objectAddress);
368
- }
244
+ // enforce instead of check
245
+ info.objectAddress = address(0);
369
246
 
370
- if(
371
- getRegistry().isRegistered(info.initialOwner) ||
372
- info.initialOwner == address(0)) {
373
- // TODO non registered address can register object(e.g. POLICY()) and then transfer associated nft to registered contract
374
- // what are motivations to do so?
375
- // at least registered contract can not register objects by itself, SERVICE,
376
- revert InvalidInitialOwner(info.initialOwner);
247
+ if(info.objectType != expectedType) {// type is checked in registry anyway...but service logic may depend on expected value
248
+ revert UnexpectedRegisterableType(expectedType, info.objectType);
377
249
  }
378
250
 
379
- // can catch all 3 if check that initialOwner is not registered
380
- /*if(info.initialOwner == msg.sender) {
381
- revert InitialOwnerIsParent();
382
- }
251
+ address owner = info.initialOwner;
383
252
 
384
- if(info.initialOwner == address(this)) {
385
- revert InitialOwnerIsService();
253
+ if(owner == address(0)) {
254
+ revert RegisterableOwnerIsZero();
386
255
  }
387
256
 
388
- if(info.initialOwner == address(getRegistry())) {
389
- revert InitialOwnerIsRegistry();
390
- }*/
391
-
392
- /*NftId parentNftId = info.parentNftId;
393
- IRegistry.ObjectInfo memory parentInfo = getRegistry().getObjectInfo(parentNftId);
394
-
395
- if(parentInfo.objectType != parentType) { // parent registration + type
396
- revert InvalidParent(parentNftId);
397
- }*/
257
+ if(getRegistry().isRegistered(owner)) {
258
+ revert RegisterableOwnerIsRegistered();
259
+ }
398
260
  }
399
261
  }