@etherisc/gif-next 0.0.2-6f2f76e-746 → 0.0.2-7143611-252

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