@etherisc/gif-next 0.0.2-b9e9dc3-713 → 0.0.2-bb1081a-994

Sign up to get free protection for your applications and to get access to all the features.
Files changed (270) hide show
  1. package/README.md +67 -1
  2. package/artifacts/contracts/components/Component.sol/Component.dbg.json +4 -0
  3. package/artifacts/contracts/components/Component.sol/Component.json +613 -0
  4. package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +1 -1
  5. package/artifacts/contracts/components/Distribution.sol/Distribution.json +286 -90
  6. package/artifacts/contracts/components/IComponent.sol/IComponent.dbg.json +4 -0
  7. package/artifacts/contracts/{instance/service/IComponentOwnerService.sol/IComponentOwnerService.json → components/IComponent.sol/IComponent.json} +188 -152
  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 +637 -33
  12. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +1 -1
  13. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.json +643 -5
  14. package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
  15. package/artifacts/contracts/components/Pool.sol/Pool.json +389 -167
  16. package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
  17. package/artifacts/contracts/components/Product.sol/Product.json +297 -145
  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/SM.sol/SM.json +2 -2
  37. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.dbg.json +1 -1
  38. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.json +2 -2
  39. package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.dbg.json +1 -1
  40. package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.dbg.json +1 -1
  41. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.dbg.json +4 -0
  42. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.json +764 -0
  43. package/artifacts/contracts/instance/Cloneable.sol/Cloneable.dbg.json +4 -0
  44. package/artifacts/contracts/instance/{AccessManagedSimple.sol/AccessManagedSimple.json → Cloneable.sol/Cloneable.json} +86 -2
  45. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  46. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +1657 -28
  47. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
  48. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +162 -18
  49. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  50. package/artifacts/contracts/instance/Instance.sol/Instance.json +232 -632
  51. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +1 -1
  52. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +231 -114
  53. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
  54. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +182 -58
  55. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
  56. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +328 -67
  57. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
  58. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +72 -23
  59. package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.dbg.json +4 -0
  60. package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.json +261 -0
  61. package/artifacts/contracts/instance/base/ComponentService.sol/ComponentService.dbg.json +4 -0
  62. package/artifacts/contracts/instance/base/{ServiceBase.sol/ServiceBase.json → ComponentService.sol/ComponentService.json} +151 -16
  63. package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
  64. package/artifacts/contracts/instance/base/ILifecycle.sol/ILifecycle.dbg.json +1 -1
  65. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
  66. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.json +2 -2
  67. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json +1 -1
  68. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.json +2 -2
  69. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +1 -1
  70. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.json +59 -16
  71. package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
  72. package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +1 -1
  73. package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +1 -1
  74. package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +1 -1
  75. package/artifacts/contracts/instance/module/ISetup.sol/ISetup.dbg.json +1 -1
  76. package/artifacts/contracts/instance/module/ITreasury.sol/ITreasury.dbg.json +1 -1
  77. package/artifacts/contracts/instance/service/BundleService.sol/BundleService.dbg.json +4 -0
  78. package/artifacts/contracts/instance/service/BundleService.sol/BundleService.json +1167 -0
  79. package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.dbg.json +4 -0
  80. package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.json +449 -0
  81. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +4 -0
  82. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +772 -0
  83. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +4 -0
  84. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.json +437 -0
  85. package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.dbg.json +4 -0
  86. package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.json +780 -0
  87. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +1 -1
  88. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.json +13 -18
  89. package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.dbg.json +4 -0
  90. package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.json +766 -0
  91. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +1 -1
  92. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +15 -82
  93. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +1 -1
  94. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +25 -245
  95. package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.dbg.json +4 -0
  96. package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.json +1227 -0
  97. package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +4 -0
  98. package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.json +505 -0
  99. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +4 -0
  100. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +806 -0
  101. package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.dbg.json +4 -0
  102. package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.json +437 -0
  103. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +4 -0
  104. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +856 -0
  105. package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.dbg.json +4 -0
  106. package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.json +437 -0
  107. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  108. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +2 -2
  109. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  110. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +339 -59
  111. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
  112. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +220 -111
  113. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
  114. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  115. package/artifacts/contracts/registry/Registry.sol/Registry.json +301 -188
  116. package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.dbg.json +4 -0
  117. package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.json +285 -0
  118. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
  119. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +69 -130
  120. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
  121. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +51 -91
  122. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.dbg.json +4 -0
  123. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.json +547 -0
  124. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +4 -0
  125. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +394 -0
  126. package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.dbg.json +1 -1
  127. package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +1 -1
  128. package/artifacts/contracts/shared/ERC165.sol/ERC165.json +2 -2
  129. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
  130. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  131. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +0 -5
  132. package/artifacts/contracts/shared/IService.sol/IService.dbg.json +4 -0
  133. package/artifacts/contracts/{instance/base → shared}/IService.sol/IService.json +14 -19
  134. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +1 -1
  135. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
  136. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +19 -6
  137. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +1 -1
  138. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +19 -6
  139. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  140. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +19 -11
  141. package/artifacts/contracts/shared/Service.sol/Service.dbg.json +4 -0
  142. package/artifacts/contracts/{instance/base/ComponentServiceBase.sol/ComponentServiceBase.json → shared/Service.sol/Service.json} +28 -33
  143. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
  144. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
  145. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +2 -2
  146. package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +1 -1
  147. package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json +1 -1
  148. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json +1 -1
  149. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +19 -11
  150. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +1 -1
  151. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.json +2 -2
  152. package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +1 -1
  153. package/artifacts/contracts/test/TestService.sol/TestService.json +44 -36
  154. package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json +1 -1
  155. package/artifacts/contracts/test/TestVersion.sol/TestVersion.dbg.json +1 -1
  156. package/artifacts/contracts/test/TestVersion.sol/TestVersion.json +2 -2
  157. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json +1 -1
  158. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.json +2 -2
  159. package/artifacts/contracts/test/Usdc.sol/USDC.dbg.json +1 -1
  160. package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.dbg.json +1 -1
  161. package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
  162. package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +1 -1
  163. package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.dbg.json +1 -1
  164. package/artifacts/contracts/types/Fee.sol/FeeLib.dbg.json +1 -1
  165. package/artifacts/contracts/types/Key32.sol/Key32Lib.dbg.json +1 -1
  166. package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +1 -1
  167. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
  168. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.json +26 -3
  169. package/artifacts/contracts/types/NumberId.sol/NumberIdLib.dbg.json +1 -1
  170. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
  171. package/artifacts/contracts/types/Referral.sol/ReferralLib.dbg.json +1 -1
  172. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.dbg.json +1 -1
  173. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.dbg.json +1 -1
  174. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.json +2 -2
  175. package/artifacts/contracts/types/StateId.sol/StateIdLib.dbg.json +1 -1
  176. package/artifacts/contracts/types/StateId.sol/StateIdLib.json +2 -2
  177. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json +1 -1
  178. package/artifacts/contracts/types/UFixed.sol/MathLib.dbg.json +1 -1
  179. package/artifacts/contracts/types/UFixed.sol/UFixedLib.dbg.json +1 -1
  180. package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +1 -1
  181. package/artifacts/contracts/types/Version.sol/VersionLib.json +2 -2
  182. package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +1 -1
  183. package/artifacts/contracts/types/Version.sol/VersionPartLib.json +22 -3
  184. package/contracts/components/Component.sol +247 -0
  185. package/contracts/components/Distribution.sol +31 -54
  186. package/contracts/components/IComponent.sol +50 -0
  187. package/contracts/components/IDistributionComponent.sol +5 -1
  188. package/contracts/components/IPoolComponent.sol +44 -29
  189. package/contracts/components/IProductComponent.sol +7 -3
  190. package/contracts/components/Pool.sol +143 -145
  191. package/contracts/components/Product.sol +74 -108
  192. package/contracts/instance/BundleManager.sol +125 -0
  193. package/contracts/instance/Cloneable.sol +46 -0
  194. package/contracts/instance/IInstance.sol +54 -10
  195. package/contracts/instance/IInstanceService.sol +30 -7
  196. package/contracts/instance/Instance.sol +76 -243
  197. package/contracts/instance/InstanceAccessManager.sol +88 -78
  198. package/contracts/instance/InstanceReader.sol +34 -21
  199. package/contracts/instance/InstanceService.sol +313 -53
  200. package/contracts/instance/InstanceServiceManager.sol +10 -12
  201. package/contracts/instance/ObjectManager.sol +84 -0
  202. package/contracts/instance/base/ComponentService.sol +134 -0
  203. package/contracts/instance/module/IAccess.sol +27 -17
  204. package/contracts/instance/module/IBundle.sol +1 -0
  205. package/contracts/instance/module/ISetup.sol +4 -1
  206. package/contracts/instance/service/BundleService.sol +299 -0
  207. package/contracts/instance/service/BundleServiceManager.sol +51 -0
  208. package/contracts/instance/service/DistributionService.sol +106 -0
  209. package/contracts/instance/service/DistributionServiceManager.sol +51 -0
  210. package/contracts/instance/service/IBundleService.sol +54 -0
  211. package/contracts/instance/service/IDistributionService.sol +1 -1
  212. package/contracts/instance/service/IPolicyService.sol +94 -0
  213. package/contracts/instance/service/IPoolService.sol +7 -24
  214. package/contracts/instance/service/IProductService.sol +7 -74
  215. package/contracts/instance/service/PolicyService.sol +519 -0
  216. package/contracts/instance/service/PolicyServiceManager.sol +54 -0
  217. package/contracts/instance/service/PoolService.sol +109 -0
  218. package/contracts/instance/service/PoolServiceManager.sol +51 -0
  219. package/contracts/instance/service/ProductService.sol +232 -0
  220. package/contracts/instance/service/ProductServiceManager.sol +54 -0
  221. package/contracts/registry/ChainNft.sol +1 -1
  222. package/contracts/registry/IRegistry.sol +47 -6
  223. package/contracts/registry/IRegistryService.sol +50 -20
  224. package/contracts/registry/Registry.sol +243 -214
  225. package/contracts/registry/RegistryAccessManager.sol +216 -0
  226. package/contracts/registry/RegistryService.sol +84 -262
  227. package/contracts/registry/RegistryServiceManager.sol +20 -22
  228. package/contracts/registry/ReleaseManager.sol +332 -0
  229. package/contracts/registry/TokenRegistry.sol +112 -0
  230. package/contracts/shared/ERC165.sol +6 -2
  231. package/contracts/shared/IRegisterable.sol +1 -3
  232. package/contracts/shared/IService.sol +16 -0
  233. package/contracts/shared/NftOwnable.sol +7 -4
  234. package/contracts/shared/ProxyManager.sol +1 -1
  235. package/contracts/shared/Registerable.sol +11 -14
  236. package/contracts/shared/Service.sol +60 -0
  237. package/contracts/test/TestService.sol +6 -7
  238. package/contracts/types/NftIdSet.sol +26 -24
  239. package/contracts/types/RoleId.sol +14 -6
  240. package/contracts/types/StateId.sol +4 -0
  241. package/contracts/types/Version.sol +4 -1
  242. package/package.json +1 -1
  243. package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.dbg.json +0 -4
  244. package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.json +0 -314
  245. package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.dbg.json +0 -4
  246. package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.json +0 -267
  247. package/artifacts/contracts/instance/AccessManagedSimple.sol/AccessManagedSimple.dbg.json +0 -4
  248. package/artifacts/contracts/instance/AccessManagerSimple.sol/AccessManagerSimple.dbg.json +0 -4
  249. package/artifacts/contracts/instance/AccessManagerSimple.sol/AccessManagerSimple.json +0 -1119
  250. package/artifacts/contracts/instance/IAccessManagerSimple.sol/IAccessManagerSimple.dbg.json +0 -4
  251. package/artifacts/contracts/instance/IAccessManagerSimple.sol/IAccessManagerSimple.json +0 -1082
  252. package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.dbg.json +0 -4
  253. package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.dbg.json +0 -4
  254. package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.json +0 -113
  255. package/artifacts/contracts/instance/base/IService.sol/IService.dbg.json +0 -4
  256. package/artifacts/contracts/instance/base/ServiceBase.sol/ServiceBase.dbg.json +0 -4
  257. package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.dbg.json +0 -4
  258. package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.json +0 -827
  259. package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.dbg.json +0 -4
  260. package/contracts/components/BaseComponent.sol +0 -86
  261. package/contracts/components/IBaseComponent.sol +0 -24
  262. package/contracts/instance/AccessManagedSimple.sol +0 -114
  263. package/contracts/instance/AccessManagerSimple.sol +0 -682
  264. package/contracts/instance/IAccessManagerSimple.sol +0 -391
  265. package/contracts/instance/base/ComponentServiceBase.sol +0 -49
  266. package/contracts/instance/base/IInstanceBase.sol +0 -23
  267. package/contracts/instance/base/IService.sol +0 -15
  268. package/contracts/instance/base/ServiceBase.sol +0 -44
  269. package/contracts/instance/service/ComponentOwnerService.sol +0 -317
  270. package/contracts/instance/service/IComponentOwnerService.sol +0 -20
@@ -1,18 +1,14 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
2
  pragma solidity ^0.8.20;
3
3
 
4
- import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
5
4
  import {ERC165Checker} from "@openzeppelin/contracts/utils/introspection/ERC165Checker.sol";
6
- import {IERC721Receiver} from "@openzeppelin/contracts/token/ERC721/IERC721Receiver.sol";
7
5
  import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";
8
6
 
9
7
  import {IRegistry} from "./IRegistry.sol";
10
8
  import {IInstance} from "../instance/IInstance.sol";
11
9
 
12
10
  import {ContractDeployerLib} from "../shared/ContractDeployerLib.sol";
13
- // import {IComponent, IComponentModule} from "../../contracts/instance/module/component/IComponent.sol";
14
- // import {IPool} from "../../contracts/instance/module/pool/IPoolModule.sol";
15
- import {IBaseComponent} from "../../contracts/components/IBaseComponent.sol";
11
+ import {IComponent} from "../../contracts/components/IComponent.sol";
16
12
  import {IPoolComponent} from "../../contracts/components/IPoolComponent.sol";
17
13
  import {IProductComponent} from "../../contracts/components/IProductComponent.sol";
18
14
  import {IDistributionComponent} from "../../contracts/components/IDistributionComponent.sol";
@@ -20,169 +16,52 @@ import {IDistributionComponent} from "../../contracts/components/IDistributionCo
20
16
  import {IVersionable} from "../../contracts/shared/IVersionable.sol";
21
17
  import {Versionable} from "../../contracts/shared/Versionable.sol";
22
18
  import {IRegisterable} from "../../contracts/shared/IRegisterable.sol";
19
+ import {Registerable} from "../../contracts/shared/Registerable.sol";
23
20
 
24
21
  import {RoleId, PRODUCT_OWNER_ROLE, POOL_OWNER_ROLE, ORACLE_OWNER_ROLE} from "../../contracts/types/RoleId.sol";
25
- import {ObjectType, REGISTRY, TOKEN, SERVICE, PRODUCT, ORACLE, POOL, TOKEN, 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";
26
23
  import {StateId, ACTIVE, PAUSED} from "../../contracts/types/StateId.sol";
27
24
  import {NftId, NftIdLib, zeroNftId} from "../../contracts/types/NftId.sol";
28
25
  import {Fee, FeeLib} from "../../contracts/types/Fee.sol";
29
26
  import {Version, VersionPart, VersionLib} from "../../contracts/types/Version.sol";
30
27
 
31
- import {ServiceBase} from "../../contracts/instance/base/ServiceBase.sol";
32
- import {IService} from "../../contracts/instance/base/IService.sol";
28
+ import {Service} from "../shared/Service.sol";
29
+ import {IService} from "../shared/IService.sol";
33
30
  import {IRegistryService} from "./IRegistryService.sol";
34
31
  import {Registry} from "./Registry.sol";
35
- import {ChainNft} from "./ChainNft.sol";
36
32
 
37
33
  contract RegistryService is
38
34
  AccessManagedUpgradeable,
39
- ServiceBase,
35
+ Service,
40
36
  IRegistryService
41
37
  {
42
38
  using NftIdLib for NftId;
43
39
 
44
- error SelfRegistration();
45
- error NotRegistryOwner();
46
-
47
- error NotToken();
48
- error NotService();
49
- error NotInstance();
50
- error NotProduct();
51
- error NotPool();
52
- error NotDistribution();
53
-
54
- error UnexpectedRegisterableType(ObjectType expected, ObjectType found);
55
- error NotRegisterableOwner(address expectedOwner);
56
- error RegisterableOwnerIsZero();
57
- error RegisterableOwnerIsRegistered();
58
- error InvalidInitialOwner(address initialOwner);
59
- error InvalidAddress(address registerableAddress);
60
-
61
-
62
- // Initial value for constant variable has to be compile-time constant
63
- // TODO define types as constants?
64
- //ObjectType public constant SERVICE_TYPE = REGISTRY();
65
- string public constant NAME = "RegistryService";
66
-
67
40
  // TODO update to real hash when registry is stable
68
41
  bytes32 public constant REGISTRY_CREATION_CODE_HASH = bytes32(0);
69
42
 
70
- address public constant NFT_LOCK_ADDRESS = address(0x1);
71
-
72
- /// @dev
73
- // msg.sender - ONLY registry owner
74
- // CAN NOT register itself
75
- // CAN NOT register IRegisterable address
76
- // CAN register ONLY valid object-parent types combinations for TOKEN
77
- // IMPORTANT: MUST NOT call untrusted contract inbetween calls to registry/instance (trusted contracts)
78
- // motivation: registry/instance state may change during external call
79
- // TODO it may be usefull to have transferable token nft in order to delist token, make it invalid for new beginings
80
- // TODO: MUST prohibit registration of precompiles addresses
81
- function registerToken(address tokenAddress)
82
- external
83
- returns(NftId nftId)
84
- {
85
- if(msg.sender == tokenAddress) {
86
- revert SelfRegistration();
87
- }
88
-
89
- // MUST not revert if no ERC165 support
90
- if(tokenAddress.code.length == 0 ||
91
- ERC165Checker.supportsInterface(tokenAddress, type(IRegisterable).interfaceId)) {
92
- revert NotToken();
93
- }
94
-
95
- NftId registryNftId = _registry.getNftId(address(_registry));
96
-
97
- if(msg.sender != _registry.ownerOf(registryNftId)) {
98
- revert NotRegistryOwner();
99
- }
100
-
101
- IRegistry.ObjectInfo memory info = IRegistry.ObjectInfo(
102
- zeroNftId(), // any value
103
- registryNftId, // parent nft id
104
- TOKEN(),
105
- false, // isInterceptor
106
- tokenAddress,
107
- NFT_LOCK_ADDRESS,
108
- "" // any value
109
- );
110
-
111
- nftId = _registry.register(info);
112
- }
113
-
114
- /// @dev
115
- // msg.sender - ONLY registry owner
116
- // CAN NOT register itself
117
- // CAN register ONLY valid object-parent types combinations for SERVICE
118
- // CAN register ONLY IRegisterable address he owns
119
- // IMPORTANT: MUST NOT check owner before calling external contract
120
- function registerService(IService service)
121
- external
122
- // TODO restrict access - registryService.registerService must use accessmanager for checking permissions as
123
- // services are not always owned by registry owner - actually only registry service is owned by registry owner
124
-
125
- returns(
126
- IRegistry.ObjectInfo memory info,
127
- bytes memory data
128
- )
129
- {
130
-
131
- // CAN revert if no ERC165 support -> will revert with empty message
132
- if(!service.supportsInterface(type(IService).interfaceId)) {
133
- revert NotService();
134
- }
135
-
136
- (
137
- info,
138
- data
139
- ) = _getAndVerifyContractInfo(service, SERVICE(), msg.sender);
140
-
141
- info.nftId = _registry.register(info);
142
- service.linkToRegisteredNftId();
143
- return (
144
- info,
145
- data
146
- );
147
- }
148
-
149
- // If msg.sender is approved service:
150
- // 1) add owner arg (service MUST pass it's msg.sender as owner)
151
- // 2) check service allowance
152
- // 3) comment self registrstion check
153
- //function registerInstance(IRegisterable instance, address owner)
154
- function registerInstance(IRegisterable instance)
43
+ function registerInstance(IRegisterable instance, address owner)
155
44
  external
45
+ restricted
156
46
  returns(
157
- IRegistry.ObjectInfo memory info,
158
- bytes memory data
47
+ IRegistry.ObjectInfo memory info
159
48
  )
160
49
  {
161
-
162
50
  if(!instance.supportsInterface(type(IInstance).interfaceId)) {
163
51
  revert NotInstance();
164
52
  }
165
53
 
166
- (
167
- info,
168
- data
169
- ) = _getAndVerifyContractInfo(instance, INSTANCE(), msg.sender);
170
-
54
+ info = _getAndVerifyContractInfo(instance, INSTANCE(), owner);
171
55
  info.nftId = _registry.register(info);
56
+
172
57
  instance.linkToRegisteredNftId(); // asume safe
173
-
174
- return (
175
- info,
176
- data
177
- );
178
58
  }
179
59
 
180
- function registerProduct(IBaseComponent product, address owner)
60
+ function registerProduct(IComponent product, address owner)
181
61
  external
182
62
  restricted
183
63
  returns(
184
- IRegistry.ObjectInfo memory info,
185
- bytes memory data
64
+ IRegistry.ObjectInfo memory info
186
65
  )
187
66
  {
188
67
  // CAN revert if no ERC165 support -> will revert with empty message
@@ -190,77 +69,38 @@ contract RegistryService is
190
69
  revert NotProduct();
191
70
  }
192
71
 
193
- (
194
- info,
195
- data
196
- ) = _getAndVerifyContractInfo(product, PRODUCT(), owner);
197
-
198
- NftId serviceNftId = _registry.getNftId(msg.sender);
199
-
72
+ info = _getAndVerifyContractInfo(product, PRODUCT(), owner);
200
73
  info.nftId = _registry.register(info);
201
- // TODO unsafe, let component or its owner derive nftId latter, when state assumptions and modifications of GIF contracts are finished
202
- product.linkToRegisteredNftId();
203
-
204
- return (
205
- info,
206
- data
207
- );
208
74
  }
209
75
 
210
- function registerPool(IBaseComponent pool, address owner)
76
+ function registerPool(IComponent pool, address owner)
211
77
  external
212
78
  restricted
213
79
  returns(
214
- IRegistry.ObjectInfo memory info,
215
- bytes memory data
80
+ IRegistry.ObjectInfo memory info
216
81
  )
217
82
  {
218
83
  if(!pool.supportsInterface(type(IPoolComponent).interfaceId)) {
219
84
  revert NotPool();
220
85
  }
221
86
 
222
- (
223
- info,
224
- data
225
- ) = _getAndVerifyContractInfo(pool, POOL(), owner);
226
-
227
- NftId serviceNftId = _registry.getNftId(msg.sender);
228
-
87
+ info = _getAndVerifyContractInfo(pool, POOL(), owner);
229
88
  info.nftId = _registry.register(info);
230
- pool.linkToRegisteredNftId();
231
-
232
- return (
233
- info,
234
- data
235
- );
236
89
  }
237
90
 
238
- function registerDistribution(IBaseComponent distribution, address owner)
91
+ function registerDistribution(IComponent distribution, address owner)
239
92
  external
240
93
  restricted
241
94
  returns(
242
- IRegistry.ObjectInfo memory info,
243
- bytes memory data
95
+ IRegistry.ObjectInfo memory info
244
96
  )
245
97
  {
246
98
  if(!distribution.supportsInterface(type(IDistributionComponent).interfaceId)) {
247
99
  revert NotDistribution();
248
100
  }
249
101
 
250
- (
251
- info,
252
- data
253
- ) = _getAndVerifyContractInfo(distribution, DISTRIBUTION(), owner);
254
-
255
- NftId serviceNftId = _registry.getNftId(msg.sender);
256
-
257
- info.nftId = _registry.register(info);
258
- distribution.linkToRegisteredNftId();
259
-
260
- return (
261
- info,
262
- data
263
- );
102
+ info = _getAndVerifyContractInfo(distribution, DISTRIBUTION(), owner);
103
+ info.nftId = _registry.register(info);
264
104
  }
265
105
 
266
106
  function registerPolicy(IRegistry.ObjectInfo memory info)
@@ -268,8 +108,6 @@ contract RegistryService is
268
108
  restricted
269
109
  returns(NftId nftId)
270
110
  {
271
- NftId senderNftId = _registry.getNftId(msg.sender);
272
-
273
111
  _verifyObjectInfo(info, POLICY());
274
112
 
275
113
  nftId = _registry.register(info);
@@ -280,31 +118,29 @@ contract RegistryService is
280
118
  restricted
281
119
  returns(NftId nftId)
282
120
  {
283
-
284
- NftId senderNftId = _registry.getNftId(msg.sender);
285
-
286
121
  _verifyObjectInfo(info, BUNDLE());
287
122
 
288
123
  nftId = _registry.register(info);
289
124
  }
290
125
 
126
+ function registerStake(IRegistry.ObjectInfo memory info)
127
+ external
128
+ restricted
129
+ returns(NftId nftId)
130
+ {
131
+ _verifyObjectInfo(info, STAKE());
291
132
 
292
- // From IService
293
- function getName() public pure override(IService, ServiceBase) returns(string memory) {
294
- return NAME;
133
+ nftId = _registry.register(info);
295
134
  }
296
- //function getType() public pure override(IService, ServiceBase) returns(ObjectType serviceType) {
297
- // return SERVICE_TYPE;
298
- //}
299
135
 
136
+ // From IService
137
+ function getDomain() public pure override(IService, Service) returns(ObjectType serviceDomain) {
138
+ return REGISTRY();
139
+ }
300
140
 
301
141
  // from Versionable
302
142
 
303
143
  /// @dev top level initializer
304
- // 1) registry is non upgradeable -> don't need a proxy and uses constructor !
305
- // 2) deploy registry service first -> from its initialization func it is easier to deploy registry then vice versa
306
- // 3) deploy registry -> pass registry service address as constructor argument
307
- // registry is getting instantiated and locked to registry service address forever
308
144
  function _initialize(
309
145
  address owner,
310
146
  bytes memory data
@@ -315,50 +151,65 @@ contract RegistryService is
315
151
  {
316
152
  (
317
153
  address initialAuthority,
318
- bytes memory registryByteCodeWithInitCode
319
- ) = abi.decode(data, (address, bytes));
154
+ address registry
155
+ ) = abi.decode(data, (address, address));
320
156
 
321
157
  __AccessManaged_init(initialAuthority);
322
158
 
323
- bytes memory encodedConstructorArguments = abi.encode(
324
- owner,
325
- getMajorVersion());
159
+ _initializeService(address(registry), owner);
326
160
 
327
- bytes memory registryCreationCode = ContractDeployerLib.getCreationCode(
328
- registryByteCodeWithInitCode,
329
- encodedConstructorArguments);
161
+ _registerInterface(type(IRegistryService).interfaceId);
162
+ }
330
163
 
331
- IRegistry registry = IRegistry(ContractDeployerLib.deploy(
332
- registryCreationCode,
333
- REGISTRY_CREATION_CODE_HASH));
164
+ // from IRegisterable
334
165
 
335
- NftId registryNftId = registry.getNftId(address(registry));
166
+ function getFunctionConfigs()
167
+ external
168
+ pure
169
+ returns(
170
+ FunctionConfig[] memory config
171
+ )
172
+ {
173
+ config = new FunctionConfig[](6);
336
174
 
337
- _initializeServiceBase(address(registry), registryNftId, owner);
175
+ // order of service registrations MUST be reverse to this array
176
+ /*config[-1].serviceDomain = STAKE();
177
+ config[-1].selector = RegistryService.registerStake.selector;*/
338
178
 
339
- // TODO why do registry service proxy need to keep its nftId??? -> no registryServiceNftId checks in implementation
340
- // if they are -> use registry address to obtain owner of registry service nft (works the same with any registerable and(or) implementation)
341
- linkToRegisteredNftId();
342
- _registerInterface(type(IRegistryService).interfaceId);
179
+ config[0].serviceDomain = POLICY();
180
+ config[0].selector = RegistryService.registerPolicy.selector;
181
+
182
+ config[1].serviceDomain = BUNDLE();
183
+ config[1].selector = RegistryService.registerBundle.selector;
184
+
185
+ config[2].serviceDomain = PRODUCT();
186
+ config[2].selector = RegistryService.registerProduct.selector;
187
+
188
+ config[3].serviceDomain = POOL();
189
+ config[3].selector = RegistryService.registerPool.selector;
190
+
191
+ config[4].serviceDomain = DISTRIBUTION();
192
+ config[4].selector = RegistryService.registerDistribution.selector;
193
+
194
+ // registerInstance() have no restriction
195
+ config[5].serviceDomain = INSTANCE();
196
+ config[5].selector = RegistryService.registerInstance.selector;
343
197
  }
344
198
 
345
- // parent check done in registry because of approve()
199
+ // Internal
200
+
346
201
  function _getAndVerifyContractInfo(
347
202
  IRegisterable registerable,
348
203
  ObjectType expectedType, // assume can be valid only
349
- address expectedOwner // assume can be 0
204
+ address expectedOwner // assume can be 0 when given by other service
350
205
  )
351
206
  internal
352
- view
207
+ // view
353
208
  returns(
354
- IRegistry.ObjectInfo memory info,
355
- bytes memory data
209
+ IRegistry.ObjectInfo memory info
356
210
  )
357
211
  {
358
- (
359
- info,
360
- data
361
- ) = registerable.getInitialInfo();
212
+ info = registerable.getInitialInfo();
362
213
  info.objectAddress = address(registerable);
363
214
 
364
215
  if(info.objectType != expectedType) {// type is checked in registry anyway...but service logic may depend on expected value
@@ -382,59 +233,30 @@ contract RegistryService is
382
233
  if(getRegistry().isRegistered(owner)) {
383
234
  revert RegisterableOwnerIsRegistered();
384
235
  }
385
-
386
- /*NftId parentNftId = info.parentNftId;
387
- IRegistry.ObjectInfo memory parentInfo = getRegistry().getObjectInfo(parentNftId);
388
-
389
- if(parentInfo.objectType != parentType) { // parent registration + type
390
- revert InvalidParent(parentNftId);
391
- }*/
392
-
393
- return(
394
- info,
395
- data
396
- );
397
236
  }
398
237
 
399
- // parent checks done in registry because of approve()
400
238
  function _verifyObjectInfo(
401
239
  IRegistry.ObjectInfo memory info,
402
- ObjectType objectType
240
+ ObjectType expectedType
403
241
  )
404
242
  internal
405
243
  view
406
244
  {
407
- if(info.objectAddress > address(0)) {
408
- revert InvalidAddress(info.objectAddress);
409
- }
245
+ // enforce instead of check
246
+ info.objectAddress = address(0);
410
247
 
411
- if(
412
- getRegistry().isRegistered(info.initialOwner) ||
413
- info.initialOwner == address(0)) {
414
- // TODO non registered address can register object(e.g. POLICY()) and then transfer associated nft to registered contract
415
- // what are motivations to do so?
416
- // at least registered contract can not register objects by itself, SERVICE,
417
- revert InvalidInitialOwner(info.initialOwner);
248
+ if(info.objectType != expectedType) {// type is checked in registry anyway...but service logic may depend on expected value
249
+ revert UnexpectedRegisterableType(expectedType, info.objectType);
418
250
  }
419
251
 
420
- // can catch all 3 if check that initialOwner is not registered
421
- /*if(info.initialOwner == msg.sender) {
422
- revert InitialOwnerIsParent();
423
- }
252
+ address owner = info.initialOwner;
424
253
 
425
- if(info.initialOwner == address(this)) {
426
- revert InitialOwnerIsService();
254
+ if(owner == address(0)) {
255
+ revert RegisterableOwnerIsZero();
427
256
  }
428
257
 
429
- if(info.initialOwner == address(getRegistry())) {
430
- revert InitialOwnerIsRegistry();
431
- }*/
432
-
433
- /*NftId parentNftId = info.parentNftId;
434
- IRegistry.ObjectInfo memory parentInfo = getRegistry().getObjectInfo(parentNftId);
435
-
436
- if(parentInfo.objectType != parentType) { // parent registration + type
437
- revert InvalidParent(parentNftId);
438
- }*/
258
+ if(getRegistry().isRegistered(owner)) {
259
+ revert RegisterableOwnerIsRegistered();
260
+ }
439
261
  }
440
262
  }
@@ -9,6 +9,7 @@ import {Registry} from "./Registry.sol";
9
9
  import {IVersionable} from "../shared/IVersionable.sol";
10
10
  import {ProxyManager} from "../shared/ProxyManager.sol";
11
11
  import {RegistryService} from "./RegistryService.sol";
12
+ import {TokenRegistry} from "./TokenRegistry.sol";
12
13
 
13
14
 
14
15
  contract RegistryServiceManager is
@@ -16,36 +17,41 @@ contract RegistryServiceManager is
16
17
  {
17
18
  bytes32 constant public ACCESS_MANAGER_CREATION_CODE_HASH = 0x0;
18
19
 
19
- RegistryService private _registryService;
20
-
21
- AccessManager private _accessManager;
20
+ RegistryService private immutable _registryService;
22
21
 
23
22
  /// @dev initializes proxy manager with registry service implementation and deploys registry
24
23
  constructor(
25
- address accessManager
26
- )
24
+ address initialAuthority, // used by implementation
25
+ address registry) // used by implementation
27
26
  ProxyManager()
28
27
  {
29
- _accessManager = AccessManager(accessManager);
30
-
31
- bytes memory initializationData = abi.encode(accessManager, type(Registry).creationCode);
28
+ require(initialAuthority > address(0), "RegistryServiceManager: initial authority is 0");
29
+ require(registry > address(0), "RegistryServiceManager: registry is 0");
30
+
31
+ // implementation's initializer func `data` argument
32
+ bytes memory initializationData = abi.encode(
33
+ initialAuthority,
34
+ registry);
32
35
 
33
36
  IVersionable versionable = deploy(
34
37
  address(new RegistryService()),
35
38
  initializationData);
36
39
 
37
40
  _registryService = RegistryService(address(versionable));
41
+ }
38
42
 
39
- // link ownership of registry service manager ot nft owner of registry service
40
- _linkToNftOwnable(
41
- address(_registryService.getRegistry()),
42
- address(_registryService));
43
+ // from IRegisterable
43
44
 
44
- // implies that after this constructor call only upgrade functionality is available
45
- _isDeployed = true;
45
+ // IMPORTANT: registry here and in constructor MUST be the same
46
+ function linkToNftOwnable(address registry)
47
+ public
48
+ onlyOwner
49
+ {
50
+ _linkToNftOwnable(registry, address(_registryService));
46
51
  }
47
52
 
48
53
  //--- view functions ----------------------------------------------------//
54
+
49
55
  function getRegistryService()
50
56
  external
51
57
  view
@@ -53,12 +59,4 @@ contract RegistryServiceManager is
53
59
  {
54
60
  return _registryService;
55
61
  }
56
-
57
- function getAccessManager()
58
- external
59
- view
60
- returns (AccessManager)
61
- {
62
- return _accessManager;
63
- }
64
62
  }