@etherisc/gif-next 0.0.2-e1e92ab-754 → 0.0.2-e20063b-144

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