@etherisc/gif-next 0.0.2-78bf628-134 → 0.0.2-7acbd99-227

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 (268) hide show
  1. package/README.md +71 -25
  2. package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.dbg.json +1 -1
  3. package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.json +80 -41
  4. package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +4 -0
  5. package/artifacts/contracts/components/Distribution.sol/Distribution.json +445 -0
  6. package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.dbg.json +1 -1
  7. package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.json +43 -40
  8. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +4 -0
  9. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.json +343 -0
  10. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
  11. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.json +199 -81
  12. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +1 -1
  13. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.json +141 -47
  14. package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
  15. package/artifacts/contracts/components/Pool.sol/Pool.json +299 -84
  16. package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
  17. package/artifacts/contracts/components/Product.sol/Product.json +250 -53
  18. package/artifacts/contracts/experiment/errors/Require.sol/Require.dbg.json +1 -1
  19. package/artifacts/contracts/experiment/errors/Revert.sol/Revert.dbg.json +1 -1
  20. package/artifacts/contracts/experiment/inheritance/A.sol/A.dbg.json +1 -1
  21. package/artifacts/contracts/experiment/inheritance/A.sol/AShared.dbg.json +1 -1
  22. package/artifacts/contracts/experiment/inheritance/B.sol/B.dbg.json +1 -1
  23. package/artifacts/contracts/experiment/inheritance/C.sol/C.dbg.json +1 -1
  24. package/artifacts/contracts/experiment/inheritance/IA.sol/IA.dbg.json +1 -1
  25. package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.dbg.json +1 -1
  26. package/artifacts/contracts/experiment/inheritance/IB.sol/IB.dbg.json +1 -1
  27. package/artifacts/contracts/experiment/inheritance/IC.sol/IC.dbg.json +1 -1
  28. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.dbg.json +1 -1
  29. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.json +2 -2
  30. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.dbg.json +1 -1
  31. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.dbg.json +1 -1
  32. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.dbg.json +1 -1
  33. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.dbg.json +1 -1
  34. package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.dbg.json +1 -1
  35. package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.dbg.json +1 -1
  36. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  37. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +742 -425
  38. package/artifacts/contracts/instance/IInstanceLinked.sol/IInstanceLinked.dbg.json +1 -1
  39. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  40. package/artifacts/contracts/instance/Instance.sol/Instance.json +1014 -604
  41. package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.dbg.json +1 -1
  42. package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.json +139 -46
  43. package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.dbg.json +1 -1
  44. package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.json +33 -1
  45. package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
  46. package/artifacts/contracts/instance/base/ILifecycle.sol/ILifecycle.dbg.json +1 -1
  47. package/artifacts/contracts/instance/base/IService.sol/IService.dbg.json +1 -1
  48. package/artifacts/contracts/instance/base/IService.sol/IService.json +99 -55
  49. package/artifacts/contracts/instance/base/InstanceBase.sol/InstanceBase.dbg.json +1 -1
  50. package/artifacts/contracts/instance/base/InstanceBase.sol/InstanceBase.json +160 -48
  51. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
  52. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.json +14 -14
  53. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json +1 -1
  54. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.json +4 -4
  55. package/artifacts/contracts/instance/base/ModuleBase.sol/ModuleBase.dbg.json +1 -1
  56. package/artifacts/contracts/instance/base/ServiceBase.sol/ServiceBase.dbg.json +1 -1
  57. package/artifacts/contracts/instance/base/ServiceBase.sol/ServiceBase.json +135 -55
  58. package/artifacts/contracts/instance/module/access/Access.sol/AccessModule.dbg.json +1 -1
  59. package/artifacts/contracts/instance/module/access/IAccess.sol/IAccess.dbg.json +1 -1
  60. package/artifacts/contracts/instance/module/access/IAccess.sol/IAccessModule.dbg.json +1 -1
  61. package/artifacts/contracts/instance/module/bundle/BundleModule.sol/BundleModule.dbg.json +1 -1
  62. package/artifacts/contracts/instance/module/bundle/BundleModule.sol/BundleModule.json +55 -54
  63. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundle.dbg.json +1 -1
  64. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundleModule.dbg.json +1 -1
  65. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundleModule.json +56 -55
  66. package/artifacts/contracts/instance/module/component/ComponentModule.sol/ComponentModule.dbg.json +1 -1
  67. package/artifacts/contracts/instance/module/component/ComponentModule.sol/ComponentModule.json +12 -7
  68. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponent.dbg.json +1 -1
  69. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponentModule.dbg.json +1 -1
  70. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponentModule.json +12 -7
  71. package/artifacts/contracts/instance/module/distribution/DistributionModule.sol/DistributionModule.dbg.json +4 -0
  72. package/artifacts/contracts/instance/module/distribution/DistributionModule.sol/DistributionModule.json +10 -0
  73. package/artifacts/contracts/instance/module/distribution/IDistribution.sol/IDistribution.dbg.json +4 -0
  74. package/artifacts/contracts/instance/module/{compensation/ICompensation.sol/ICompensation.json → distribution/IDistribution.sol/IDistribution.json} +2 -2
  75. package/artifacts/contracts/instance/module/distribution/IDistribution.sol/IDistributionModule.dbg.json +4 -0
  76. package/artifacts/contracts/instance/module/{compensation/ICompensation.sol/ICompensationModule.json → distribution/IDistribution.sol/IDistributionModule.json} +2 -2
  77. package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicy.dbg.json +1 -1
  78. package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicyModule.dbg.json +1 -1
  79. package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicyModule.json +53 -40
  80. package/artifacts/contracts/instance/module/policy/PolicyModule.sol/PolicyModule.dbg.json +1 -1
  81. package/artifacts/contracts/instance/module/policy/PolicyModule.sol/PolicyModule.json +53 -40
  82. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPool.dbg.json +1 -1
  83. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPoolModule.dbg.json +1 -1
  84. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPoolModule.json +29 -14
  85. package/artifacts/contracts/instance/module/pool/PoolModule.sol/PoolModule.dbg.json +1 -1
  86. package/artifacts/contracts/instance/module/pool/PoolModule.sol/PoolModule.json +28 -13
  87. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRisk.dbg.json +1 -1
  88. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRiskModule.dbg.json +1 -1
  89. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRiskModule.json +104 -1
  90. package/artifacts/contracts/instance/module/risk/RiskModule.sol/RiskModule.dbg.json +1 -1
  91. package/artifacts/contracts/instance/module/risk/RiskModule.sol/RiskModule.json +126 -5
  92. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasury.dbg.json +1 -1
  93. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasuryModule.dbg.json +1 -1
  94. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasuryModule.json +326 -221
  95. package/artifacts/contracts/instance/module/treasury/TokenHandler.sol/TokenHandler.dbg.json +1 -1
  96. package/artifacts/contracts/instance/module/treasury/TokenHandler.sol/TokenHandler.json +2 -2
  97. package/artifacts/contracts/instance/module/treasury/TreasuryModule.sol/TreasuryModule.dbg.json +1 -1
  98. package/artifacts/contracts/instance/module/treasury/TreasuryModule.sol/TreasuryModule.json +326 -221
  99. package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.dbg.json +1 -1
  100. package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.json +251 -84
  101. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +4 -0
  102. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +526 -0
  103. package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.dbg.json +1 -1
  104. package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.json +99 -74
  105. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +4 -0
  106. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.json +369 -0
  107. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +1 -1
  108. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +158 -50
  109. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +1 -1
  110. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +246 -49
  111. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +1 -1
  112. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +230 -52
  113. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +1 -1
  114. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +361 -70
  115. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  116. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +141 -12
  117. package/artifacts/contracts/registry/IChainNft.sol/IChainNft.dbg.json +1 -1
  118. package/artifacts/contracts/registry/IChainNft.sol/IChainNft.json +5 -0
  119. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  120. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +293 -40
  121. package/artifacts/contracts/registry/IRegistryLinked.sol/IRegistryLinked.dbg.json +1 -1
  122. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +4 -0
  123. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +668 -0
  124. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +4 -0
  125. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.json +34 -0
  126. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  127. package/artifacts/contracts/registry/Registry.sol/Registry.json +471 -121
  128. package/artifacts/contracts/registry/Registry.sol/RegistryCreationCode.dbg.json +4 -0
  129. package/artifacts/contracts/registry/Registry.sol/RegistryCreationCode.json +150 -0
  130. package/artifacts/contracts/registry/RegistryInstaller.sol/RegistryInstaller.dbg.json +4 -0
  131. package/artifacts/contracts/registry/RegistryInstaller.sol/RegistryInstaller.json +344 -0
  132. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +4 -0
  133. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +861 -0
  134. package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +1 -1
  135. package/artifacts/contracts/shared/ERC165.sol/ERC165.json +2 -2
  136. package/artifacts/contracts/shared/IOwnable.sol/IOwnable.dbg.json +1 -1
  137. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  138. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +43 -40
  139. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +1 -1
  140. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.json +55 -14
  141. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +4 -0
  142. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +310 -0
  143. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  144. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +76 -37
  145. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +4 -0
  146. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +129 -0
  147. package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +1 -1
  148. package/artifacts/contracts/shared/Versionable.sol/Versionable.json +78 -14
  149. package/artifacts/contracts/test/TestDistribution.sol/TestDistribution.dbg.json +4 -0
  150. package/artifacts/contracts/test/TestDistribution.sol/TestDistribution.json +445 -0
  151. package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json +1 -1
  152. package/artifacts/contracts/test/TestFee.sol/TestFee.json +2 -2
  153. package/artifacts/contracts/test/TestPool.sol/TestPool.dbg.json +1 -1
  154. package/artifacts/contracts/test/TestPool.sol/TestPool.json +299 -84
  155. package/artifacts/contracts/test/TestProduct.sol/TestProduct.dbg.json +1 -1
  156. package/artifacts/contracts/test/TestProduct.sol/TestProduct.json +297 -58
  157. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json +1 -1
  158. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +93 -39
  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 +161 -68
  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/TestVersion.sol/TestVersion.json +2 -2
  166. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json +1 -1
  167. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.json +89 -25
  168. package/artifacts/contracts/test/Usdc.sol/USDC.dbg.json +1 -1
  169. package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.dbg.json +1 -1
  170. package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
  171. package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +1 -1
  172. package/artifacts/contracts/types/Fee.sol/FeeLib.dbg.json +1 -1
  173. package/artifacts/contracts/types/Fee.sol/FeeLib.json +50 -11
  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 +2 -2
  180. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
  181. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.json +2 -2
  182. package/artifacts/contracts/types/ReferralId.sol/ReferralIdLib.dbg.json +4 -0
  183. package/artifacts/contracts/types/ReferralId.sol/ReferralIdLib.json +99 -0
  184. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.dbg.json +4 -0
  185. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.json +86 -0
  186. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.dbg.json +1 -1
  187. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.json +2 -2
  188. package/artifacts/contracts/types/StateId.sol/StateIdLib.dbg.json +1 -1
  189. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json +1 -1
  190. package/artifacts/contracts/types/UFixed.sol/UFixedMathLib.dbg.json +1 -1
  191. package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +1 -1
  192. package/artifacts/contracts/types/Version.sol/VersionLib.json +40 -2
  193. package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +1 -1
  194. package/artifacts/contracts/types/Version.sol/VersionPartLib.json +2 -2
  195. package/contracts/components/BaseComponent.sol +12 -21
  196. package/contracts/components/Distribution.sol +155 -0
  197. package/contracts/components/IBaseComponent.sol +2 -2
  198. package/contracts/components/IDistributionComponent.sol +47 -0
  199. package/contracts/components/IPoolComponent.sol +14 -6
  200. package/contracts/components/IProductComponent.sol +26 -6
  201. package/contracts/components/Pool.sol +99 -27
  202. package/contracts/components/Product.sol +204 -22
  203. package/contracts/instance/IInstance.sol +11 -7
  204. package/contracts/instance/Instance.sol +25 -7
  205. package/contracts/instance/base/ComponentServiceBase.sol +13 -6
  206. package/contracts/instance/base/IInstanceBase.sol +6 -2
  207. package/contracts/instance/base/InstanceBase.sol +13 -8
  208. package/contracts/instance/base/Lifecycle.sol +10 -2
  209. package/contracts/instance/base/ModuleBase.sol +22 -17
  210. package/contracts/instance/base/ServiceBase.sol +19 -13
  211. package/contracts/instance/module/access/Access.sol +3 -3
  212. package/contracts/instance/module/bundle/BundleModule.sol +10 -12
  213. package/contracts/instance/module/bundle/IBundle.sol +6 -11
  214. package/contracts/instance/module/component/ComponentModule.sol +20 -24
  215. package/contracts/instance/module/component/IComponent.sol +5 -4
  216. package/contracts/instance/module/distribution/DistributionModule.sol +17 -0
  217. package/contracts/instance/module/distribution/IDistribution.sol +10 -0
  218. package/contracts/instance/module/policy/IPolicy.sol +10 -8
  219. package/contracts/instance/module/policy/PolicyModule.sol +33 -19
  220. package/contracts/instance/module/pool/IPoolModule.sol +4 -4
  221. package/contracts/instance/module/pool/PoolModule.sol +23 -15
  222. package/contracts/instance/module/risk/IRisk.sol +18 -2
  223. package/contracts/instance/module/risk/RiskModule.sol +56 -2
  224. package/contracts/instance/module/treasury/ITreasury.sol +32 -51
  225. package/contracts/instance/module/treasury/TokenHandler.sol +2 -2
  226. package/contracts/instance/module/treasury/TreasuryModule.sol +68 -89
  227. package/contracts/instance/service/ComponentOwnerService.sol +189 -79
  228. package/contracts/instance/service/DistributionService.sol +54 -0
  229. package/contracts/instance/service/IComponentOwnerService.sol +0 -2
  230. package/contracts/instance/service/IDistributionService.sol +12 -0
  231. package/contracts/instance/service/IPoolService.sol +7 -0
  232. package/contracts/instance/service/IProductService.sol +56 -7
  233. package/contracts/instance/service/PoolService.sol +49 -23
  234. package/contracts/instance/service/ProductService.sol +246 -91
  235. package/contracts/registry/ChainNft.sol +43 -15
  236. package/contracts/registry/IChainNft.sol +3 -2
  237. package/contracts/registry/IRegistry.sol +44 -28
  238. package/contracts/registry/IRegistryService.sol +29 -0
  239. package/contracts/registry/ITransferInterceptor.sol +6 -0
  240. package/contracts/registry/Registry.sol +388 -271
  241. package/contracts/registry/RegistryInstaller.sol +100 -0
  242. package/contracts/registry/RegistryService.sol +383 -0
  243. package/contracts/shared/ERC165.sol +1 -1
  244. package/contracts/shared/IRegisterable.sol +7 -9
  245. package/contracts/shared/IVersionable.sol +55 -11
  246. package/contracts/shared/ProxyManager.sol +115 -0
  247. package/contracts/shared/Registerable.sol +74 -43
  248. package/contracts/shared/UpgradableProxyWithAdmin.sol +16 -0
  249. package/contracts/shared/Versionable.sol +112 -54
  250. package/contracts/test/TestDistribution.sol +22 -0
  251. package/contracts/test/TestPool.sol +7 -2
  252. package/contracts/test/TestProduct.sol +37 -7
  253. package/contracts/test/TestRegisterable.sol +5 -6
  254. package/contracts/test/TestService.sol +5 -11
  255. package/contracts/types/Fee.sol +8 -3
  256. package/contracts/types/ObjectType.sol +17 -5
  257. package/contracts/types/ReferralId.sol +48 -0
  258. package/contracts/types/RiskId.sol +43 -0
  259. package/contracts/types/RoleId.sol +2 -2
  260. package/contracts/types/Version.sol +9 -0
  261. package/package.json +1 -1
  262. package/artifacts/contracts/instance/module/compensation/CompensationModule.sol/CompensationModule.dbg.json +0 -4
  263. package/artifacts/contracts/instance/module/compensation/CompensationModule.sol/CompensationModule.json +0 -10
  264. package/artifacts/contracts/instance/module/compensation/ICompensation.sol/ICompensation.dbg.json +0 -4
  265. package/artifacts/contracts/instance/module/compensation/ICompensation.sol/ICompensationModule.dbg.json +0 -4
  266. package/contracts/experiment/statemachine/README.md +0 -112
  267. package/contracts/instance/module/compensation/CompensationModule.sol +0 -8
  268. package/contracts/instance/module/compensation/ICompensation.sol +0 -10
@@ -1,5 +1,5 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
- pragma solidity ^0.8.19;
2
+ pragma solidity ^0.8.20;
3
3
 
4
4
  import {IRegisterable} from "../shared/IRegisterable.sol";
5
5
  import {IService} from "../instance/base/IService.sol";
@@ -8,374 +8,491 @@ import {IChainNft} from "./IChainNft.sol";
8
8
  import {ChainNft} from "./ChainNft.sol";
9
9
  import {IRegistry} from "./IRegistry.sol";
10
10
  import {NftId, toNftId, zeroNftId, NftIdLib} from "../types/NftId.sol";
11
- import {VersionPart} from "../types/Version.sol";
12
- import {ObjectType, PROTOCOL, REGISTRY, TOKEN, SERVICE, INSTANCE, STAKE, PRODUCT, COMPENSATION, ORACLE, POOL, POLICY, BUNDLE} from "../types/ObjectType.sol";
11
+ import {Version, VersionPart, VersionLib} from "../types/Version.sol";
12
+ import {ObjectType, PROTOCOL, REGISTRY, TOKEN, SERVICE, INSTANCE, STAKE, PRODUCT, DISTRIBUTION, ORACLE, POOL, POLICY, BUNDLE} from "../types/ObjectType.sol";
13
+ import {ITransferInterceptor} from "./ITransferInterceptor.sol";
14
+
15
+ import {IOwnable} from "../shared/IOwnable.sol";
16
+ import {ERC165} from "../shared/ERC165.sol";
17
+
18
+
19
+ // IMPORTANT
20
+ // Each NFT minted by registry is accosiated with:
21
+ // 1) NFT owner
22
+ // 2) registred contract OR object stored in registered (parent) contract
23
+ // Four registration flows:
24
+ // 1) non IRegisterable address by registryOwner (TOKEN)
25
+ // 2) IRegisterable address by registryOwner (SERVICE)
26
+ // 3) IRegisterable address by approved service (INSTANCE, COMPONENT)
27
+ // 4) state object by approved service (POLICY, BUNDLE, STAKE)
13
28
 
14
- // TODO make registry upgradable
15
29
  contract Registry is
16
- IRegisterable,
30
+ ERC165,
17
31
  IRegistry
18
32
  {
19
- using NftIdLib for NftId;
20
-
33
+ // register
34
+ error NotRegistryService();
35
+ error ZeroParentAddress();
36
+ error ContractAlreadyRegistered(address objectAddress);
37
+ error InvalidServiceVersion(VersionPart majorVersion);
38
+ error ServiceNameAlreadyRegistered(string name, VersionPart majorVersion);
39
+
40
+ // approve
41
+ error NotOwner();
42
+ error NotRegisteredContract(NftId registrarNftId);
43
+ error NotService(NftId registrarNftId);
44
+ error InvalidTypesCombination(ObjectType objectType, ObjectType parentType);
45
+
46
+ uint256 public constant MAJOR_VERSION_MIN = 3;
47
+
21
48
  string public constant EMPTY_URI = "";
22
49
 
23
- mapping(NftId nftId => ObjectInfo info) private _info;
24
- mapping(NftId nftId => address owner) private _owner;
25
- mapping(address object => NftId nftId) private _nftIdByAddress;
26
- mapping(ObjectType objectType => bool) private _isValidType;
27
- mapping(ObjectType objectType => mapping(ObjectType objectParentType => bool)) private _isValidParentType;
28
-
29
- mapping(NftId nftId => string stringValue) private _string;
30
- mapping(bytes32 serviceNameHash => mapping(VersionPart majorVersion => address service)) _service;
31
-
32
- NftId private _nftId;
33
- IChainNft private _chainNft;
34
- ChainNft private _chainNftInternal;
35
- address private _initialOwner;
36
-
37
- // @dev will own protocol nft and registry nft(s) minted during initialize
38
- address private _protocolOwner;
39
-
40
- // TODO refactor once registry becomes upgradable
41
- // @Dev the protocol owner will get ownership of the
42
- // protocol nft and the global registry nft minted in this
43
- // initializer function
44
- function initialize(
45
- address chainNft,
46
- address protocolOwner
47
- )
48
- public
49
- {
50
- require(
51
- address(_chainNft) == address(0),
52
- "ERROR:REG-001:ALREADY_INITIALIZED"
53
- );
50
+ address constant public NFT_LOCK_ADDRESS = address(0x1);
54
51
 
55
- _initialOwner = msg.sender;
56
- _protocolOwner = protocolOwner;
52
+ mapping(NftId nftId => ObjectInfo info) _info;
53
+ mapping(address object => NftId nftId) _nftIdByAddress;
57
54
 
58
- _chainNft = IChainNft(chainNft);
59
- _chainNftInternal = ChainNft(chainNft);
55
+ mapping(NftId registrator => mapping(
56
+ ObjectType objectType => bool)) _isApproved;
60
57
 
61
- // initial registry setup
62
- _registerProtocol();
63
- _nftId = _registerRegistry();
58
+ mapping(ObjectType objectType => mapping(
59
+ ObjectType parentType => bool)) _isValidContractCombination;
64
60
 
65
- // setup rules for further registrations
66
- _setupValidTypes();
67
- _setupValidParentTypes();
68
- }
61
+ mapping(ObjectType objectType => mapping(
62
+ ObjectType parentType => bool)) _isValidObjectCombination;
69
63
 
64
+ mapping(NftId nftId => string name) _string;
65
+ mapping(bytes32 serviceNameHash => mapping(
66
+ VersionPart majorVersion => address service)) _service;
70
67
 
71
- function register(
72
- address objectAddress
73
- )
74
- // TODO add authz (only services may register components etc)
75
- // we have to check how we do authz for registring services (just restrict to protocol owner/registry owner)
76
- external override returns (NftId nftId) {
77
- require(
78
- _nftIdByAddress[objectAddress].eqz(),
79
- "ERROR:REG-002:ALREADY_REGISTERED"
80
- );
68
+ NftId _registryNftId;
69
+ NftId _serviceNftId; // set in stone upon registry creation
70
+ IChainNft _chainNft;
71
+ ChainNft _chainNftInternal;
81
72
 
82
- IRegisterable registerable = IRegisterable(objectAddress);
83
- require(
84
- registerable.supportsInterface(type(IRegisterable).interfaceId),
85
- "ERROR:REG-003:NOT_REGISTERABLE"
86
- );
73
+ /*
74
+ modifier onlyInitialOwner() {
75
+ if(
76
+ msg.sender != getOwner() ||
77
+ msg.sender != _info[_registryNftId].initialOwner) {
78
+ revert NotInitialOwner();
79
+ }
80
+ }*/
87
81
 
88
- ObjectType objectType = registerable.getType();
89
- require(
90
- _isValidType[objectType],
91
- "ERROR:REG-004:TYPE_INVALID"
92
- );
82
+ modifier onlyOwner() {
83
+ if(msg.sender != getOwner()) {
84
+ revert NotOwner();
85
+ }
86
+ _;
87
+ }
93
88
 
94
- NftId parentNftId = registerable.getParentNftId();
95
- require(
96
- isRegistered(parentNftId),
97
- "ERROR:REG-005:PARENT_NOT_REGISTERED"
98
- );
89
+ modifier onlyRegistryService() {
90
+
91
+ if(msg.sender != _info[_serviceNftId].objectAddress) {
92
+ revert NotRegistryService();
93
+ }
94
+ _;
95
+ }
99
96
 
100
- require(
101
- _isValidParentType[objectType][_info[parentNftId].objectType],
102
- "ERROR:REG-006:PARENT_TYPE_INVALID"
103
- );
97
+ constructor(address registryOwner, VersionPart majorVersion)
98
+ {
99
+ require(registryOwner > address(0), "Registry: protocol owner is 0");
100
+ require(majorVersion.toInt() == MAJOR_VERSION_MIN, "Registry: initial major version of registry service is not MAJOR_VERSION_MIN");
104
101
 
105
- // also check that nftId and parentNFtId are on the same chain if applicable
102
+ // deploy NFT
103
+ _chainNftInternal = new ChainNft(address(this));// adds 10kb to deployment size
104
+ _chainNft = IChainNft(_chainNftInternal);
106
105
 
107
- // nft minting
108
- uint256 mintedTokenId = _chainNft.mint(
109
- registerable.getOwner(),
110
- EMPTY_URI
111
- );
106
+ // initial registry setup
107
+ _registerProtocol();
112
108
 
113
- nftId = toNftId(mintedTokenId);
109
+ _registerRegistry(registryOwner);
114
110
 
115
- // special case services
116
- if(registerable.getType() == SERVICE()) {
117
- IService service = IService(objectAddress);
118
- require(
119
- service.supportsInterface(type(IService).interfaceId),
120
- "ERROR:REG-007:NOT_SERVICE"
121
- );
122
-
123
- string memory serviceName = service.getName();
124
- VersionPart majorVersion = service.getMajorVersion();
125
- bytes32 serviceNameHash = keccak256(abi.encode(serviceName));
126
-
127
- // service specific state
128
- _string[nftId] = serviceName;
129
-
130
- require(
131
- _service[serviceNameHash][majorVersion] == address(0),
132
- "ERROR:REG-008:ALREADY_REGISTERED"
133
- );
134
- _service[serviceNameHash][majorVersion] = objectAddress;
135
- }
111
+ _registerRegistryService();
136
112
 
137
- // create object info and link nft id with it
138
- _registerObjectInfo(registerable, nftId);
139
- }
113
+ // set object parent relations
114
+ _setupValidObjectParentCombinations();
140
115
 
116
+ _registerInterface(type(IRegistry).interfaceId);
117
+ _registerInterface(type(IOwnable).interfaceId);
118
+ }
141
119
 
142
- function registerObjectForInstance(
143
- NftId parentNftId,
144
- ObjectType objectType,
145
- address initialOwner,
146
- bytes memory data
147
- )
120
+ /// @dev registry protects only from tampering existing records and invalid types pairs
121
+ // IMPORTANT: rare case when parentNftId is not registered and == next nftId -> technincally this is ZeroParentAddress error
122
+ // to catch this check parent address before minting !!!!
123
+ // TODO service registration means its approval for some type?
124
+ function register(ObjectInfo memory info)
148
125
  external
149
- override
150
- returns (
151
- // TODO add onlyRegisteredInstance
152
- NftId nftId
153
- )
126
+ onlyRegistryService
127
+ returns(NftId nftId)
154
128
  {
155
- // TODO add more validation
156
- require(
157
- objectType == POLICY() || objectType == BUNDLE(),
158
- "ERROR:REG-010:TYPE_INVALID"
159
- );
129
+ ObjectType objectType = info.objectType;
130
+ NftId parentNftId = info.parentNftId;
131
+ ObjectInfo memory parentInfo = _info[parentNftId];
132
+ ObjectType parentType = parentInfo.objectType; // see function header
133
+ address parentAddress = parentInfo.objectAddress;
134
+
135
+ // parent is contract -> need to check? -> check before minting
136
+ // special case: global registry nft as parent when not on mainnet -> global registry address is 0
137
+ // special case: when parentNftId == _chainNft.mint(), check for zero parent address before mint
138
+ // special case: when parentNftId == _chainNft.mint() && objectAddress == initialOwner
139
+ if(parentAddress == address(0)) {
140
+ revert ZeroParentAddress();
141
+ }
160
142
 
161
- uint256 mintedTokenId = _chainNft.mint(initialOwner, EMPTY_URI);
162
- nftId = toNftId(mintedTokenId);
143
+ address interceptor = _getInterceptor(info.isInterceptor, info.objectAddress, parentInfo.isInterceptor, parentAddress);
163
144
 
164
- ObjectInfo memory info = ObjectInfo(
165
- nftId,
166
- parentNftId,
167
- objectType,
168
- address(0),
169
- initialOwner,
170
- data
171
- );
145
+ uint256 mintedTokenId = _chainNft.mint(
146
+ info.initialOwner,
147
+ interceptor,
148
+ EMPTY_URI);
149
+ nftId = toNftId(mintedTokenId);
172
150
 
151
+ // TODO move nftId out of info struct
152
+ // getters by nftId -> return struct without nftId
153
+ // getters by address -> return nftId AND struct
154
+ info.nftId = nftId;
173
155
  _info[nftId] = info;
174
156
 
175
- // add logging
176
- }
157
+ if(info.objectAddress > address(0))
158
+ {
159
+ // TODO if need to add types latter -> at least call this check from registry service
160
+ // parent is registered + object-parent types are valid
161
+ if(_isValidContractCombination[objectType][parentType] == false) {
162
+ revert InvalidTypesCombination(objectType, parentType);
163
+ }
164
+
165
+ address contractAddress = info.objectAddress;
166
+
167
+ if(_nftIdByAddress[contractAddress].gtz()) {
168
+ revert ContractAlreadyRegistered(contractAddress);
169
+ }
170
+
171
+ _nftIdByAddress[contractAddress] = nftId;
172
+
173
+ // special case
174
+ if(objectType == SERVICE())
175
+ {
176
+ (
177
+ string memory serviceName,
178
+ VersionPart majorVersion
179
+ ) = abi.decode(info.data, (string, VersionPart));
180
+ bytes32 serviceNameHash = keccak256(abi.encode(serviceName));
181
+
182
+ // TODO MUST guarantee consistency of registerable.getVersion() and majorVersion here
183
+ // TODO update _serviceNftId when registryService with new major version is registered? -> it is fixed in current setup
184
+ // TODO do not use names -> each object type is registered by corresponding service -> conflicting with approve()
185
+ if(
186
+ majorVersion.toInt() < MAJOR_VERSION_MIN ||
187
+ (majorVersion.toInt() > MAJOR_VERSION_MIN &&
188
+ _service[serviceNameHash][VersionLib.toVersionPart(majorVersion.toInt() - 1)] == address(0) )
189
+ ) {
190
+ revert InvalidServiceVersion(majorVersion);
191
+ }
192
+
193
+ if(_service[serviceNameHash][majorVersion] != address(0)) {
194
+ revert ServiceNameAlreadyRegistered(serviceName, majorVersion);
195
+ }
196
+
197
+ _string[nftId] = serviceName;
198
+ _service[serviceNameHash][majorVersion] = contractAddress;
199
+
200
+ emit LogServiceNameRegistration(serviceName, majorVersion);
201
+ }
202
+ }
203
+ else
204
+ {
205
+ if(_isValidObjectCombination[objectType][parentType] == false) {
206
+ revert InvalidTypesCombination(objectType, parentType);
207
+ }
208
+ }
177
209
 
178
- function getObjectCount() external view override returns (uint256) {
179
- return _chainNft.totalSupply();
210
+ emit LogRegistration(nftId, info.parentNftId, info.objectType, info.objectAddress, info.initialOwner);
180
211
  }
181
212
 
182
- function getNftId(
183
- address object
184
- ) external view override returns (NftId id) {
185
- return _nftIdByAddress[object];
213
+ function registerFrom(
214
+ address from,
215
+ ObjectInfo memory info
216
+ ) external returns (NftId nftId)
217
+ {
218
+ revert();
186
219
  }
220
+
221
+
222
+ /// @dev
223
+ // msg.sender - registry owner
224
+ // CAN approve only registered service contract
225
+ // CAN approve any combination specified in _isValidCombination
226
+ // CAN NOT approve itself
227
+ // TODO in case where exists exactly one registered service per objectType (and major version):
228
+ // - registration and approve is a single operation, no need for separate approve() function
229
+ // - then approve can be used to adding new valid object-parent combinations???
230
+ function approve(
231
+ NftId serviceNftId,
232
+ ObjectType objectType,
233
+ ObjectType parentType
234
+ )
235
+ public
236
+ onlyOwner()
237
+ {
238
+ address serviceAddress = _info[serviceNftId].objectAddress;
239
+
240
+ if(_nftIdByAddress[serviceAddress].eqz()) {
241
+ revert NotRegisteredContract(serviceNftId);
242
+ }
187
243
 
188
- function isRegistered(
189
- NftId nftId
190
- ) public view override returns (bool) {
191
- return _info[nftId].objectType.gtz();
192
- }
244
+ if(_info[serviceNftId].objectType != SERVICE()) {
245
+ revert NotService(serviceNftId);
246
+ }
193
247
 
194
- function isRegistered(
195
- address object
196
- ) external view override returns (bool) {
197
- return _nftIdByAddress[object].gtz();
198
- }
248
+ if(
249
+ _isValidContractCombination[objectType][parentType] == false &&
250
+ _isValidObjectCombination[objectType][parentType] == false) {
251
+ revert InvalidTypesCombination(objectType, parentType);
252
+ }
199
253
 
200
- function getObjectInfo(
201
- NftId nftId
202
- ) external view override returns (ObjectInfo memory info) {
203
- return _info[nftId];
204
- }
254
+ _isApproved[serviceNftId][objectType] = true;
205
255
 
206
- function getName(
207
- NftId nftId
208
- ) external view returns (string memory name) {
209
- return _string[nftId];
256
+ emit LogApproval(serviceNftId, objectType);
210
257
  }
211
258
 
212
- function getOwner(NftId nftId) external view override returns (address) {
213
- return _chainNft.ownerOf(nftId.toInt());
259
+ /// @dev returns false for registry owner nft
260
+ // TODO allowance by address?
261
+ // TODO checked by registry service -> but registry owner can upgrade registry service not to check allowance....
262
+ function allowance(
263
+ NftId nftId,
264
+ ObjectType object
265
+ )
266
+ public
267
+ view
268
+ returns (bool)
269
+ {
270
+ return _isApproved[nftId][object];
214
271
  }
215
272
 
216
- function getChainNft() external view override returns (IChainNft) {
217
- return _chainNft;
273
+ // from IRegistry
274
+ function getObjectCount() external view override returns (uint256) {
275
+
276
+ return _chainNft.totalSupply();
218
277
  }
219
278
 
220
- // special case to retrive a gif service
221
- function getServiceAddress(string memory serviceName, VersionPart majorVersion) external view override returns (address serviceAddress) {
222
- bytes32 serviceNameHash = keccak256(abi.encode(serviceName));
223
- return _service[serviceNameHash][majorVersion];
279
+ function getNftId(address object) external view override returns (NftId id) {
280
+ return _nftIdByAddress[object];
224
281
  }
225
282
 
226
- // from IERC165
227
- function supportsInterface(bytes4 interfaceId) external pure override returns (bool) {
228
- return interfaceId == type(IRegistry).interfaceId;
283
+ function ownerOf(NftId nftId) public view override returns (address) {
284
+ return _chainNft.ownerOf(nftId.toInt());
229
285
  }
230
286
 
231
- // from IRegistryLinked
232
- function getRegistry() external view override returns (IRegistry registry) {
233
- return this;
287
+ function ownerOf(address contractAddress) public view returns (address) {
288
+
289
+ return _chainNft.ownerOf(_nftIdByAddress[contractAddress].toInt());
234
290
  }
235
291
 
236
- // from IRegisterable
237
- function register() external pure override returns (NftId nftId) {
238
- return zeroNftId();
292
+ function getObjectInfo(NftId nftId) external view override returns (ObjectInfo memory) {
293
+ return _info[nftId];
239
294
  }
240
295
 
241
- function getType() external pure override returns (ObjectType objectType) {
242
- return REGISTRY();
296
+ function getObjectInfo(address object) external view override returns (ObjectInfo memory) {
297
+
298
+ return _info[_nftIdByAddress[object]];
243
299
  }
244
300
 
245
-
246
- function getOwner() public view override returns (address owner) {
247
- return _nftId.gtz() ? this.getOwner(_nftId) : _initialOwner;
301
+ function isRegistered(NftId nftId) public view override returns (bool) {
302
+ return _info[nftId].objectType.gtz();
248
303
  }
249
304
 
250
- function getNftId() external view override (IRegisterable, IRegistry) returns (NftId nftId) {
251
- return _nftId;
305
+ function isRegistered(address object) external view override returns (bool) {
306
+ return _nftIdByAddress[object].gtz();
252
307
  }
253
308
 
254
- function getParentNftId() external view returns (NftId nftId) {
255
- // we're the global registry
256
- if(block.chainid == 1) {
257
- return toNftId(_chainNftInternal.PROTOCOL_NFT_ID());
258
- }
259
- else {
260
- return toNftId(_chainNftInternal.GLOBAL_REGISTRY_ID());
261
- }
309
+ function getServiceName(NftId nftId) external view returns (string memory) {
310
+ return _string[nftId];
262
311
  }
263
312
 
264
- function getData() external pure returns (bytes memory data) {
265
- return "";
313
+ // special case to retrive a gif service
314
+ function getServiceAddress(
315
+ string memory serviceName,
316
+ VersionPart majorVersion
317
+ ) external view returns (address)
318
+ {
319
+ bytes32 serviceNameHash = keccak256(abi.encode(serviceName));
320
+ return _service[serviceNameHash][majorVersion];
266
321
  }
267
322
 
268
- // registry specific functions
269
- function getProtocolOwner() external view override returns (address) {
270
- return _protocolOwner;
323
+ function getChainNft() external view override returns (IChainNft) {
324
+ return _chainNft;
271
325
  }
272
326
 
273
- /// @dev defines which types are allowed to register
274
- function _setupValidTypes() internal {
275
- _isValidType[REGISTRY()] = true; // only for global registry
276
- _isValidType[TOKEN()] = true;
277
- _isValidType[SERVICE()] = true;
278
- _isValidType[INSTANCE()] = true;
279
- _isValidType[STAKE()] = true;
280
- _isValidType[PRODUCT()] = true;
281
- _isValidType[ORACLE()] = true;
282
- _isValidType[POOL()] = true;
283
- _isValidType[POLICY()] = true;
284
- _isValidType[BUNDLE()] = true;
327
+ // from IOwnable
328
+ function getOwner() public view returns (address owner) {
329
+ return ownerOf(address(this));
285
330
  }
286
331
 
287
- /// @dev defines which types - parent type relations are allowed to register
288
- function _setupValidParentTypes() internal {
289
- // registry as parent
290
- _isValidParentType[TOKEN()][REGISTRY()] = true;
291
- _isValidParentType[SERVICE()][REGISTRY()] = true;
292
- _isValidParentType[INSTANCE()][REGISTRY()] = true;
293
-
294
- // instance as parent
295
- _isValidParentType[PRODUCT()][INSTANCE()] = true;
296
- _isValidParentType[COMPENSATION()][INSTANCE()] = true;
297
- _isValidParentType[ORACLE()][INSTANCE()] = true;
298
- _isValidParentType[POOL()][INSTANCE()] = true;
299
-
300
- // product as parent
301
- _isValidParentType[POLICY()][PRODUCT()] = true;
302
-
303
- // pool as parent
304
- _isValidParentType[BUNDLE()][POOL()] = true;
305
- _isValidParentType[STAKE()][POOL()] = true;
306
- }
332
+ // Internals, called only in constructor
307
333
 
308
334
  /// @dev protocol registration used to anchor the dip ecosystem relations
309
- function _registerProtocol() virtual internal {
335
+ function _registerProtocol()
336
+ internal
337
+ {
310
338
  uint256 protocolId = _chainNftInternal.PROTOCOL_NFT_ID();
311
- _chainNftInternal.mint(_protocolOwner, protocolId);
339
+ NftId protocolNftId = toNftId(protocolId);
312
340
 
313
- NftId protocolNftid = toNftId(protocolId);
314
- ObjectInfo memory protocolInfo = ObjectInfo(
315
- protocolNftid,
316
- zeroNftId(), // parent nft id
341
+ _chainNftInternal.mint(NFT_LOCK_ADDRESS, protocolId);
342
+
343
+ _info[protocolNftId] = ObjectInfo(
344
+ protocolNftId,
345
+ zeroNftId(), // parent
317
346
  PROTOCOL(),
318
- address(0), // contract address
319
- _protocolOwner,
320
- "" // data
347
+ false, // isInterceptor
348
+ address(0), // objectAddress
349
+ NFT_LOCK_ADDRESS,// initialOwner
350
+ ""
321
351
  );
322
-
323
- _info[protocolNftid] = protocolInfo;
324
352
  }
325
353
 
326
354
  /// @dev registry registration
327
355
  /// might also register the global registry when not on mainnet
328
- function _registerRegistry() virtual internal returns (NftId registryNftId) {
356
+ function _registerRegistry(address registryOwner)
357
+ internal
358
+ {
329
359
  uint256 registryId = _chainNftInternal.calculateTokenId(2);
330
- registryNftId = toNftId(registryId);
360
+ NftId registryNftId = toNftId(registryId);
361
+
362
+ NftId parentNftId;
331
363
 
332
- // we're not the global registry
333
- if(registryId != _chainNftInternal.GLOBAL_REGISTRY_ID()) {
364
+ if(registryId != _chainNftInternal.GLOBAL_REGISTRY_ID())
365
+ {// we're not the global registry
334
366
  _registerGlobalRegistry();
367
+ parentNftId = toNftId(_chainNftInternal.GLOBAL_REGISTRY_ID());
335
368
  }
369
+ else
370
+ {// we are global registry
371
+ parentNftId = toNftId(_chainNftInternal.PROTOCOL_NFT_ID());
372
+ }
373
+
374
+ _chainNftInternal.mint(registryOwner, registryId);
336
375
 
337
- _chainNftInternal.mint(_protocolOwner, registryId);
338
- _registerObjectInfo(this, registryNftId);
376
+ _info[registryNftId] = ObjectInfo(
377
+ registryNftId,
378
+ parentNftId,
379
+ REGISTRY(),
380
+ false, // isInterceptor
381
+ address(this),
382
+ registryOwner,
383
+ ""
384
+ );
385
+ _nftIdByAddress[address(this)] = registryNftId;
386
+ _registryNftId = registryNftId;
339
387
  }
340
388
 
341
389
 
342
390
  /// @dev global registry registration for non mainnet registries
343
- function _registerGlobalRegistry() virtual internal {
391
+ function _registerGlobalRegistry()
392
+ internal
393
+ {
344
394
  uint256 globalRegistryId = _chainNftInternal.GLOBAL_REGISTRY_ID();
345
- _chainNftInternal.mint(_protocolOwner, globalRegistryId);
395
+
396
+ _chainNftInternal.mint(NFT_LOCK_ADDRESS, globalRegistryId);
346
397
 
347
398
  NftId globalRegistryNftId = toNftId(globalRegistryId);
348
- ObjectInfo memory globalRegistryInfo = ObjectInfo(
399
+
400
+ _info[globalRegistryNftId] = ObjectInfo(
349
401
  globalRegistryNftId,
350
- toNftId(_chainNftInternal.PROTOCOL_NFT_ID()),
402
+ toNftId(_chainNftInternal.PROTOCOL_NFT_ID()), // parent
351
403
  REGISTRY(),
352
- address(0), // contract address
353
- _protocolOwner,
404
+ false, // isInterceptor
405
+ address(0), // objectAddress
406
+ NFT_LOCK_ADDRESS, // initialOwner
354
407
  "" // data
355
408
  );
409
+ }
410
+
411
+ function _registerRegistryService()
412
+ internal
413
+ {
414
+ uint256 serviceId = _chainNftInternal.calculateTokenId(3);
415
+ NftId serviceNftId = toNftId(serviceId);
416
+
417
+ _chainNftInternal.mint(NFT_LOCK_ADDRESS, serviceId);
418
+
419
+ _info[serviceNftId] = ObjectInfo(
420
+ serviceNftId,
421
+ _registryNftId,
422
+ SERVICE(),
423
+ false, // isInterceptor
424
+ msg.sender, // service deploys registry
425
+ NFT_LOCK_ADDRESS, // initialOwner,
426
+ ""
427
+ );
428
+
429
+ _nftIdByAddress[msg.sender] = serviceNftId;
356
430
 
357
- _info[globalRegistryNftId] = globalRegistryInfo;
431
+ string memory serviceName = "RegistryService";
432
+ bytes32 serviceNameHash = keccak256(abi.encode(serviceName));
433
+ _service[serviceNameHash][VersionLib.toVersionPart(MAJOR_VERSION_MIN)] = msg.sender;
434
+ _string[serviceNftId] = serviceName;
435
+ _serviceNftId = serviceNftId;
358
436
  }
359
437
 
438
+ /// @dev obtain interceptor address for this nft if applicable, address(0) otherwise
439
+ function _getInterceptor(
440
+ bool isInterceptor,
441
+ address objectAddress,
442
+ bool parentIsInterceptor,
443
+ address parentObjectAddress
444
+ )
445
+ internal
446
+ view
447
+ returns (address interceptor)
448
+ {
449
+ if (objectAddress == address(0)) {
450
+ if (parentIsInterceptor) {
451
+ return parentObjectAddress;
452
+ } else {
453
+ return address(0);
454
+ }
455
+ }
360
456
 
361
- function _registerObjectInfo(
362
- IRegisterable registerable,
363
- NftId nftId
364
- ) internal virtual {
365
- address objectAddress = address(registerable);
366
- ObjectInfo memory info = ObjectInfo(
367
- nftId,
368
- registerable.getParentNftId(),
369
- registerable.getType(),
370
- objectAddress,
371
- registerable.getOwner(),
372
- registerable.getData()
373
- );
457
+ if (isInterceptor) {
458
+ return objectAddress;
459
+ }
374
460
 
375
- _info[nftId] = info;
376
- _nftIdByAddress[objectAddress] = nftId;
461
+ return address(0);
462
+ }
463
+
464
+ /// @dev defines which object - parent types relations are allowed to register
465
+ // IMPORTANT:
466
+ // 1) EACH object type MUST have only one parent type across ALL mappings
467
+ // 2) DO NOT use object type (e.g. POLCY, BUNDLE, STAKE) as parent type
468
+ // 3) DO NOT use REGISTRY as object type
469
+ // 2) DO NOT use PROTOCOL and "zeroObjectType"
470
+ function _setupValidObjectParentCombinations()
471
+ internal
472
+ {
473
+ // registry as parent, ONLY registry owner
474
+ _isValidContractCombination[TOKEN()][REGISTRY()] = true;
475
+ _isValidContractCombination[SERVICE()][REGISTRY()] = true;
476
+
477
+ // registry as parent, ONLY approved
478
+ _isValidContractCombination[INSTANCE()][REGISTRY()] = true;
377
479
 
378
- // add logging
480
+ // instance as parent, ONLY approved
481
+ _isValidContractCombination[PRODUCT()][INSTANCE()] = true;
482
+ _isValidContractCombination[DISTRIBUTION()][INSTANCE()] = true;
483
+ _isValidContractCombination[ORACLE()][INSTANCE()] = true;
484
+ _isValidContractCombination[POOL()][INSTANCE()] = true;
485
+
486
+ // product as parent, ONLY approved
487
+ _isValidObjectCombination[POLICY()][PRODUCT()] = true;
488
+
489
+ // pool as parent, ONLY approved
490
+ _isValidObjectCombination[BUNDLE()][POOL()] = true;
491
+ _isValidObjectCombination[STAKE()][POOL()] = true;
379
492
  }
493
+ }
380
494
 
495
+ // use to deploy with hardhat
496
+ contract RegistryCreationCode {
497
+ bytes constant public registryCreationCode = type(Registry).creationCode;
381
498
  }