@etherisc/gif-next 0.0.2-f9bc4c7-556 → 0.0.2-fbe8e04-715

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