@etherisc/gif-next 0.0.2-cc253b3 → 0.0.2-cd89a0b-062

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