@etherisc/gif-next 0.0.2-e1e92ab-754 → 0.0.2-e2d8c7d-942

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 (370) hide show
  1. package/README.md +160 -2
  2. package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.dbg.json +1 -1
  3. package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.json +152 -0
  4. package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +1 -1
  5. package/artifacts/contracts/components/Distribution.sol/Distribution.json +220 -33
  6. package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.dbg.json +1 -1
  7. package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.json +114 -0
  8. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
  9. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.json +0 -25
  10. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
  11. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.json +24 -57
  12. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +1 -1
  13. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.json +0 -50
  14. package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
  15. package/artifacts/contracts/components/Pool.sol/Pool.json +291 -68
  16. package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
  17. package/artifacts/contracts/components/Product.sol/Product.json +299 -58
  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 +807 -1023
  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 +496 -0
  58. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  59. package/artifacts/contracts/instance/Instance.sol/Instance.json +2290 -1055
  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 +1079 -0
  68. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +4 -0
  69. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +560 -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 +40 -0
  74. package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.dbg.json +1 -1
  75. package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
  76. package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.json +27 -158
  77. package/artifacts/contracts/instance/base/ILifecycle.sol/ILifecycle.dbg.json +1 -1
  78. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
  79. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.json +37 -245
  80. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json +1 -1
  81. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.json +2 -2
  82. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +4 -0
  83. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.json +211 -0
  84. package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +4 -0
  85. package/artifacts/contracts/instance/module/{bundle/IBundle.sol → IBundle.sol}/IBundle.json +1 -1
  86. package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +4 -0
  87. package/artifacts/contracts/instance/module/{distribution/IDistribution.sol → IDistribution.sol}/IDistribution.json +1 -1
  88. package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +4 -0
  89. package/artifacts/contracts/instance/module/{policy/IPolicy.sol → IPolicy.sol}/IPolicy.json +1 -1
  90. package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +4 -0
  91. package/artifacts/contracts/instance/module/{risk/IRisk.sol → IRisk.sol}/IRisk.json +1 -1
  92. package/artifacts/contracts/instance/module/ISetup.sol/ISetup.dbg.json +4 -0
  93. package/artifacts/contracts/instance/{base/ModuleBase.sol/ModuleBase.json → module/ISetup.sol/ISetup.json} +2 -2
  94. package/artifacts/contracts/instance/module/ITreasury.sol/ITreasury.dbg.json +4 -0
  95. package/artifacts/contracts/instance/module/{treasury/ITreasury.sol → ITreasury.sol}/ITreasury.json +1 -1
  96. package/artifacts/contracts/instance/service/BundleService.sol/BundleService.dbg.json +4 -0
  97. package/artifacts/contracts/instance/service/BundleService.sol/BundleService.json +923 -0
  98. package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.dbg.json +4 -0
  99. package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.json +440 -0
  100. package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.dbg.json +1 -1
  101. package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.json +47 -47
  102. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +1 -1
  103. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +95 -41
  104. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +4 -0
  105. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.json +428 -0
  106. package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.dbg.json +4 -0
  107. package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.json +669 -0
  108. package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.dbg.json +1 -1
  109. package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.json +1 -1
  110. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +1 -1
  111. package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.dbg.json +4 -0
  112. package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.json +664 -0
  113. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +1 -1
  114. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +9 -71
  115. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +1 -1
  116. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +17 -232
  117. package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.dbg.json +4 -0
  118. package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.json +984 -0
  119. package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +4 -0
  120. package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.json +464 -0
  121. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +1 -1
  122. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +81 -116
  123. package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.dbg.json +4 -0
  124. package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.json +428 -0
  125. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +1 -1
  126. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +76 -376
  127. package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.dbg.json +4 -0
  128. package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.json +420 -0
  129. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  130. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +47 -2
  131. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  132. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +202 -1
  133. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
  134. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +94 -19
  135. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
  136. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  137. package/artifacts/contracts/registry/Registry.sol/Registry.json +173 -50
  138. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
  139. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +75 -27
  140. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
  141. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +61 -34
  142. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +4 -0
  143. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +410 -0
  144. package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.dbg.json +1 -1
  145. package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +1 -1
  146. package/artifacts/contracts/shared/ERC165.sol/ERC165.json +2 -2
  147. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
  148. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  149. package/artifacts/contracts/shared/IService.sol/IService.dbg.json +4 -0
  150. package/artifacts/contracts/{instance/base → shared}/IService.sol/IService.json +1 -1
  151. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +1 -1
  152. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
  153. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +2 -2
  154. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +1 -1
  155. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +2 -2
  156. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  157. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +4 -4
  158. package/artifacts/contracts/shared/RegisterableUpgradable.sol/RegisterableUpgradable.dbg.json +4 -0
  159. package/artifacts/contracts/{instance/base/InstanceBase.sol/InstanceBase.json → shared/RegisterableUpgradable.sol/RegisterableUpgradable.json} +2 -104
  160. package/artifacts/contracts/shared/Service.sol/Service.dbg.json +4 -0
  161. package/artifacts/contracts/{instance/base/ServiceBase.sol/ServiceBase.json → shared/Service.sol/Service.json} +2 -2
  162. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +4 -0
  163. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +96 -0
  164. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
  165. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +2 -2
  166. package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +1 -1
  167. package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json +1 -1
  168. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json +1 -1
  169. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +4 -4
  170. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +1 -1
  171. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.json +14 -14
  172. package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +1 -1
  173. package/artifacts/contracts/test/TestService.sol/TestService.json +26 -10
  174. package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json +1 -1
  175. package/artifacts/contracts/test/TestVersion.sol/TestVersion.dbg.json +1 -1
  176. package/artifacts/contracts/test/TestVersion.sol/TestVersion.json +2 -2
  177. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json +1 -1
  178. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.json +18 -2
  179. package/artifacts/contracts/test/Usdc.sol/USDC.dbg.json +1 -1
  180. package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.dbg.json +1 -1
  181. package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
  182. package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +1 -1
  183. package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.dbg.json +4 -0
  184. package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.json +104 -0
  185. package/artifacts/contracts/types/Fee.sol/FeeLib.dbg.json +1 -1
  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 +2 -2
  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/Referral.sol/ReferralLib.dbg.json +4 -0
  197. package/artifacts/contracts/types/Referral.sol/ReferralLib.json +123 -0
  198. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.dbg.json +1 -1
  199. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.json +2 -2
  200. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.dbg.json +1 -1
  201. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.json +134 -8
  202. package/artifacts/contracts/types/StateId.sol/StateIdLib.dbg.json +1 -1
  203. package/artifacts/contracts/types/StateId.sol/StateIdLib.json +2 -2
  204. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json +1 -1
  205. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.json +15 -2
  206. package/artifacts/contracts/types/UFixed.sol/MathLib.dbg.json +1 -1
  207. package/artifacts/contracts/types/UFixed.sol/UFixedLib.dbg.json +1 -1
  208. package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +1 -1
  209. package/artifacts/contracts/types/Version.sol/VersionLib.json +2 -2
  210. package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +1 -1
  211. package/artifacts/contracts/types/Version.sol/VersionPartLib.json +22 -3
  212. package/contracts/components/BaseComponent.sol +64 -11
  213. package/contracts/components/Distribution.sol +23 -15
  214. package/contracts/components/IBaseComponent.sol +14 -2
  215. package/contracts/components/IDistributionComponent.sol +2 -4
  216. package/contracts/components/IPoolComponent.sol +5 -3
  217. package/contracts/components/IProductComponent.sol +2 -4
  218. package/contracts/components/Pool.sol +57 -32
  219. package/contracts/components/Product.sol +59 -66
  220. package/contracts/experiment/cloning/Cloner.sol +47 -0
  221. package/contracts/instance/AccessManagerUpgradeableInitializeable.sol +23 -0
  222. package/contracts/instance/BundleManager.sol +129 -0
  223. package/contracts/instance/Cloneable.sol +46 -0
  224. package/contracts/instance/IAccessManagerSimple.sol +391 -0
  225. package/contracts/instance/IInstance.sol +52 -44
  226. package/contracts/instance/IInstanceBase.sol +26 -0
  227. package/contracts/instance/IInstanceService.sol +34 -0
  228. package/contracts/instance/Instance.sol +444 -63
  229. package/contracts/instance/InstanceAccessManager.sol +288 -0
  230. package/contracts/instance/InstanceBase.sol +41 -0
  231. package/contracts/instance/InstanceReader.sol +315 -0
  232. package/contracts/instance/InstanceService.sol +299 -0
  233. package/contracts/instance/InstanceServiceManager.sol +57 -0
  234. package/contracts/instance/ObjectManager.sol +101 -0
  235. package/contracts/instance/base/ComponentServiceBase.sol +44 -21
  236. package/contracts/instance/base/IKeyValueStore.sol +13 -14
  237. package/contracts/instance/base/ILifecycle.sol +3 -3
  238. package/contracts/instance/base/KeyValueStore.sol +49 -38
  239. package/contracts/instance/base/Lifecycle.sol +1 -1
  240. package/contracts/instance/module/IAccess.sol +38 -0
  241. package/contracts/instance/module/IBundle.sol +20 -0
  242. package/contracts/instance/module/IDistribution.sol +39 -0
  243. package/contracts/instance/module/IPolicy.sol +45 -0
  244. package/contracts/instance/module/IRisk.sol +11 -0
  245. package/contracts/instance/module/ISetup.sol +46 -0
  246. package/contracts/instance/module/ITreasury.sol +23 -0
  247. package/contracts/instance/service/BundleService.sol +260 -0
  248. package/contracts/instance/service/BundleServiceManager.sol +54 -0
  249. package/contracts/instance/service/ComponentOwnerService.sol +62 -60
  250. package/contracts/instance/service/DistributionService.sol +79 -15
  251. package/contracts/instance/service/DistributionServiceManager.sol +54 -0
  252. package/contracts/instance/service/IBundleService.sol +45 -0
  253. package/contracts/instance/service/IComponentOwnerService.sol +1 -1
  254. package/contracts/instance/service/IDistributionService.sol +1 -1
  255. package/contracts/instance/service/IPolicyService.sol +87 -0
  256. package/contracts/instance/service/IPoolService.sol +7 -24
  257. package/contracts/instance/service/IProductService.sol +9 -76
  258. package/contracts/instance/service/PolicyService.sol +508 -0
  259. package/contracts/instance/service/PolicyServiceManager.sol +54 -0
  260. package/contracts/instance/service/PoolService.sol +79 -104
  261. package/contracts/instance/service/PoolServiceManager.sol +54 -0
  262. package/contracts/instance/service/ProductService.sol +97 -434
  263. package/contracts/instance/service/ProductServiceManager.sol +54 -0
  264. package/contracts/registry/ChainNft.sol +38 -23
  265. package/contracts/registry/IRegistry.sol +28 -4
  266. package/contracts/registry/IRegistryService.sol +34 -19
  267. package/contracts/registry/Registry.sol +82 -60
  268. package/contracts/registry/RegistryService.sol +42 -125
  269. package/contracts/registry/RegistryServiceManager.sol +24 -7
  270. package/contracts/registry/TokenRegistry.sol +111 -0
  271. package/contracts/shared/ERC165.sol +6 -2
  272. package/contracts/{instance/base → shared}/IService.sol +3 -3
  273. package/contracts/shared/NftOwnable.sol +2 -4
  274. package/contracts/shared/Registerable.sol +1 -0
  275. package/contracts/shared/RegisterableUpgradable.sol +16 -0
  276. package/contracts/shared/Service.sol +55 -0
  277. package/contracts/shared/TokenHandler.sol +27 -0
  278. package/contracts/shared/Versionable.sol +2 -2
  279. package/contracts/test/TestRoleId.sol +1 -1
  280. package/contracts/test/TestService.sol +3 -5
  281. package/contracts/types/DistributorType.sol +55 -0
  282. package/contracts/types/Key32.sol +8 -3
  283. package/contracts/types/NftIdSet.sol +26 -24
  284. package/contracts/types/NumberId.sol +52 -0
  285. package/contracts/types/ObjectType.sol +35 -14
  286. package/contracts/types/Referral.sol +85 -0
  287. package/contracts/types/RoleId.sol +62 -15
  288. package/contracts/types/StateId.sol +5 -1
  289. package/contracts/types/Timestamp.sol +7 -3
  290. package/contracts/types/Version.sol +4 -1
  291. package/package.json +1 -1
  292. package/artifacts/contracts/instance/IInstanceLinked.sol/IInstanceLinked.dbg.json +0 -4
  293. package/artifacts/contracts/instance/IInstanceLinked.sol/IInstanceLinked.json +0 -24
  294. package/artifacts/contracts/instance/base/IService.sol/IService.dbg.json +0 -4
  295. package/artifacts/contracts/instance/base/InstanceBase.sol/InstanceBase.dbg.json +0 -4
  296. package/artifacts/contracts/instance/base/ModuleBase.sol/ModuleBase.dbg.json +0 -4
  297. package/artifacts/contracts/instance/base/ServiceBase.sol/ServiceBase.dbg.json +0 -4
  298. package/artifacts/contracts/instance/module/bundle/BundleModule.sol/BundleModule.dbg.json +0 -4
  299. package/artifacts/contracts/instance/module/bundle/BundleModule.sol/BundleModule.json +0 -297
  300. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundle.dbg.json +0 -4
  301. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundleModule.dbg.json +0 -4
  302. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundleModule.json +0 -297
  303. package/artifacts/contracts/instance/module/component/ComponentModule.sol/ComponentModule.dbg.json +0 -4
  304. package/artifacts/contracts/instance/module/component/ComponentModule.sol/ComponentModule.json +0 -117
  305. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponent.dbg.json +0 -4
  306. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponent.json +0 -10
  307. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponentModule.dbg.json +0 -4
  308. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponentModule.json +0 -117
  309. package/artifacts/contracts/instance/module/distribution/DistributionModule.sol/DistributionModule.dbg.json +0 -4
  310. package/artifacts/contracts/instance/module/distribution/DistributionModule.sol/DistributionModule.json +0 -10
  311. package/artifacts/contracts/instance/module/distribution/IDistribution.sol/IDistribution.dbg.json +0 -4
  312. package/artifacts/contracts/instance/module/distribution/IDistribution.sol/IDistributionModule.dbg.json +0 -4
  313. package/artifacts/contracts/instance/module/distribution/IDistribution.sol/IDistributionModule.json +0 -10
  314. package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicy.dbg.json +0 -4
  315. package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicyModule.dbg.json +0 -4
  316. package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicyModule.json +0 -271
  317. package/artifacts/contracts/instance/module/policy/PolicyModule.sol/PolicyModule.dbg.json +0 -4
  318. package/artifacts/contracts/instance/module/policy/PolicyModule.sol/PolicyModule.json +0 -271
  319. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPool.dbg.json +0 -4
  320. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPool.json +0 -10
  321. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPoolModule.dbg.json +0 -4
  322. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPoolModule.json +0 -164
  323. package/artifacts/contracts/instance/module/pool/PoolModule.sol/PoolModule.dbg.json +0 -4
  324. package/artifacts/contracts/instance/module/pool/PoolModule.sol/PoolModule.json +0 -164
  325. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRisk.dbg.json +0 -4
  326. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRiskModule.dbg.json +0 -4
  327. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRiskModule.json +0 -113
  328. package/artifacts/contracts/instance/module/risk/RiskModule.sol/RiskModule.dbg.json +0 -4
  329. package/artifacts/contracts/instance/module/risk/RiskModule.sol/RiskModule.json +0 -131
  330. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasury.dbg.json +0 -4
  331. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasuryModule.dbg.json +0 -4
  332. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasuryModule.json +0 -638
  333. package/artifacts/contracts/instance/module/treasury/TokenHandler.sol/TokenHandler.dbg.json +0 -4
  334. package/artifacts/contracts/instance/module/treasury/TokenHandler.sol/TokenHandler.json +0 -76
  335. package/artifacts/contracts/instance/module/treasury/TreasuryModule.sol/TreasuryModule.dbg.json +0 -4
  336. package/artifacts/contracts/instance/module/treasury/TreasuryModule.sol/TreasuryModule.json +0 -638
  337. package/artifacts/contracts/registry/IChainNft.sol/IChainNft.dbg.json +0 -4
  338. package/artifacts/contracts/registry/IChainNft.sol/IChainNft.json +0 -457
  339. package/artifacts/contracts/test/TestDistribution.sol/TestDistribution.dbg.json +0 -4
  340. package/artifacts/contracts/test/TestDistribution.sol/TestDistribution.json +0 -557
  341. package/artifacts/contracts/test/TestPool.sol/TestPool.dbg.json +0 -4
  342. package/artifacts/contracts/test/TestPool.sol/TestPool.json +0 -716
  343. package/artifacts/contracts/test/TestProduct.sol/TestProduct.dbg.json +0 -4
  344. package/artifacts/contracts/test/TestProduct.sol/TestProduct.json +0 -744
  345. package/artifacts/contracts/types/ReferralId.sol/ReferralIdLib.dbg.json +0 -4
  346. package/artifacts/contracts/types/ReferralId.sol/ReferralIdLib.json +0 -99
  347. package/contracts/instance/IInstanceLinked.sol +0 -8
  348. package/contracts/instance/base/InstanceBase.sol +0 -89
  349. package/contracts/instance/base/ModuleBase.sol +0 -57
  350. package/contracts/instance/base/ServiceBase.sol +0 -44
  351. package/contracts/instance/module/bundle/BundleModule.sol +0 -134
  352. package/contracts/instance/module/bundle/IBundle.sol +0 -53
  353. package/contracts/instance/module/component/ComponentModule.sol +0 -71
  354. package/contracts/instance/module/component/IComponent.sol +0 -28
  355. package/contracts/instance/module/distribution/DistributionModule.sol +0 -17
  356. package/contracts/instance/module/distribution/IDistribution.sol +0 -10
  357. package/contracts/instance/module/policy/IPolicy.sol +0 -63
  358. package/contracts/instance/module/policy/PolicyModule.sol +0 -91
  359. package/contracts/instance/module/pool/IPoolModule.sol +0 -41
  360. package/contracts/instance/module/pool/PoolModule.sol +0 -95
  361. package/contracts/instance/module/risk/IRisk.sol +0 -26
  362. package/contracts/instance/module/risk/RiskModule.sol +0 -62
  363. package/contracts/instance/module/treasury/ITreasury.sol +0 -84
  364. package/contracts/instance/module/treasury/TokenHandler.sol +0 -48
  365. package/contracts/instance/module/treasury/TreasuryModule.sol +0 -131
  366. package/contracts/registry/IChainNft.sol +0 -22
  367. package/contracts/test/TestDistribution.sol +0 -22
  368. package/contracts/test/TestPool.sol +0 -27
  369. package/contracts/test/TestProduct.sol +0 -74
  370. package/contracts/types/ReferralId.sol +0 -48
@@ -0,0 +1,299 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ pragma solidity ^0.8.20;
3
+
4
+ import {Clones} from "@openzeppelin/contracts/proxy/Clones.sol";
5
+ import {AccessManagerUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagerUpgradeable.sol";
6
+
7
+ import {AccessManagerUpgradeableInitializeable} from "./AccessManagerUpgradeableInitializeable.sol";
8
+ import {Instance} from "./Instance.sol";
9
+ import {IInstanceService} from "./IInstanceService.sol";
10
+ import {InstanceReader} from "./InstanceReader.sol";
11
+ import {BundleManager} from "./BundleManager.sol";
12
+ import {IRegistry} from "../registry/IRegistry.sol";
13
+ import {RegistryService} from "../registry/RegistryService.sol";
14
+ import {Service} from "../../contracts/shared/Service.sol";
15
+ import {IService} from "../shared/IService.sol";
16
+ import {NftId} from "../../contracts/types/NftId.sol";
17
+ import {RoleId} from "../types/RoleId.sol";
18
+ import {VersionLib} from "../types/Version.sol";
19
+ import {ADMIN_ROLE, INSTANCE_SERVICE_ROLE, DISTRIBUTION_SERVICE_ROLE, POOL_SERVICE_ROLE, PRODUCT_SERVICE_ROLE, POLICY_SERVICE_ROLE, BUNDLE_SERVICE_ROLE} from "../types/RoleId.sol";
20
+
21
+ contract InstanceService is Service, IInstanceService {
22
+
23
+ address internal _masterInstanceAccessManager;
24
+ address internal _masterInstance;
25
+ address internal _masterInstanceReader;
26
+ address internal _masterInstanceBundleManager;
27
+
28
+ // TODO update to real hash when instance is stable
29
+ bytes32 public constant INSTANCE_CREATION_CODE_HASH = bytes32(0);
30
+ string public constant NAME = "InstanceService";
31
+
32
+ function createInstanceClone()
33
+ external
34
+ returns (
35
+ AccessManagerUpgradeableInitializeable clonedAccessManager,
36
+ Instance clonedInstance,
37
+ NftId clonedInstanceNftId,
38
+ InstanceReader clonedInstanceReader,
39
+ BundleManager clonedBundleManager
40
+ )
41
+ {
42
+ address instanceOwner = msg.sender;
43
+ IRegistry registry = getRegistry();
44
+ address registryAddress = address(registry);
45
+ NftId registryNftId = registry.getNftId(registryAddress);
46
+ address registryServiceAddress = registry.getServiceAddress("RegistryService", VersionLib.toVersion(3, 0, 0).toMajorPart());
47
+ RegistryService registryService = RegistryService(registryServiceAddress);
48
+
49
+ // initially set the authority of the access managar to this (being the instance service).
50
+ // This will allow the instance service to bootstrap the authorizations of the instance
51
+ // and then transfer the ownership of the access manager to the instance owner once everything is setup
52
+ clonedAccessManager = AccessManagerUpgradeableInitializeable(Clones.clone(_masterInstanceAccessManager));
53
+ clonedAccessManager.__AccessManagerUpgradeableInitializeable_init(address(this));
54
+
55
+ clonedInstance = Instance(Clones.clone(_masterInstance));
56
+ clonedInstance.initialize(address(clonedAccessManager), registryAddress, registryNftId, msg.sender);
57
+ ( IRegistry.ObjectInfo memory info, ) = registryService.registerInstance(clonedInstance);
58
+ clonedInstanceNftId = info.nftId;
59
+
60
+ clonedInstanceReader = InstanceReader(Clones.clone(address(_masterInstanceReader)));
61
+ clonedInstanceReader.initialize(registryAddress, clonedInstanceNftId);
62
+ clonedInstance.setInstanceReader(clonedInstanceReader);
63
+
64
+ clonedBundleManager = BundleManager(Clones.clone(_masterInstanceBundleManager));
65
+ clonedBundleManager.initialize(address(clonedAccessManager), registryAddress, clonedInstanceNftId);
66
+ clonedInstance.setBundleManager(clonedBundleManager);
67
+
68
+ // TODO amend setters with instance specific , policy manager ...
69
+
70
+ _grantInitialAuthorizations(clonedAccessManager, clonedInstance, clonedBundleManager);
71
+
72
+ // to complete setup switch instance ownership to the instance owner
73
+ // TODO: use a role less powerful than admin, maybe INSTANCE_ADMIN (does not exist yet)
74
+ clonedAccessManager.grantRole(ADMIN_ROLE().toInt(), instanceOwner, 0);
75
+ clonedAccessManager.revokeRole(ADMIN_ROLE().toInt(), address(this));
76
+
77
+ emit LogInstanceCloned(address(clonedAccessManager), address(clonedInstance), address(clonedInstanceReader), clonedInstanceNftId);
78
+ }
79
+
80
+ function _grantInitialAuthorizations(AccessManagerUpgradeable clonedAccessManager, Instance clonedInstance, BundleManager clonedBundleManager) internal {
81
+ _grantRegistryServiceAuthorizations(clonedAccessManager, clonedInstance);
82
+ _grantPoolServiceAuthorizations(clonedAccessManager, clonedInstance);
83
+ _grantProductServiceAuthorizations(clonedAccessManager, clonedInstance);
84
+ _grantPolicyServiceAuthorizations(clonedAccessManager, clonedInstance);
85
+ _grantBundleServiceAuthorizations(clonedAccessManager, clonedInstance, clonedBundleManager);
86
+ _grantInstanceServiceAuthorizations(clonedAccessManager, clonedInstance);
87
+ }
88
+
89
+ function _grantRegistryServiceAuthorizations(AccessManagerUpgradeable clonedAccessManager, Instance clonedInstance) internal {
90
+ // configure authorization for distribution service on instance
91
+ IRegistry registry = getRegistry();
92
+ address distributionServiceAddress = _registry.getServiceAddress("DistributionService", VersionLib.toVersion(3, 0, 0).toMajorPart());
93
+ clonedAccessManager.grantRole(DISTRIBUTION_SERVICE_ROLE().toInt(), distributionServiceAddress, 0);
94
+ bytes4[] memory instanceDistributionServiceSelectors = new bytes4[](2);
95
+ instanceDistributionServiceSelectors[0] = clonedInstance.createDistributionSetup.selector;
96
+ instanceDistributionServiceSelectors[1] = clonedInstance.updateDistributionSetup.selector;
97
+ clonedAccessManager.setTargetFunctionRole(
98
+ address(clonedInstance),
99
+ instanceDistributionServiceSelectors,
100
+ DISTRIBUTION_SERVICE_ROLE().toInt());
101
+ }
102
+
103
+ function _grantPoolServiceAuthorizations(AccessManagerUpgradeable clonedAccessManager, Instance clonedInstance) internal {
104
+ // configure authorization for pool service on instance
105
+ address poolServiceAddress = _registry.getServiceAddress("PoolService", VersionLib.toVersion(3, 0, 0).toMajorPart());
106
+ clonedAccessManager.grantRole(POOL_SERVICE_ROLE().toInt(), address(poolServiceAddress), 0);
107
+ bytes4[] memory instancePoolServiceSelectors = new bytes4[](4);
108
+ instancePoolServiceSelectors[0] = clonedInstance.createPoolSetup.selector;
109
+ instancePoolServiceSelectors[1] = clonedInstance.updatePoolSetup.selector;
110
+ clonedAccessManager.setTargetFunctionRole(
111
+ address(clonedInstance),
112
+ instancePoolServiceSelectors,
113
+ POOL_SERVICE_ROLE().toInt());
114
+ }
115
+
116
+ function _grantProductServiceAuthorizations(AccessManagerUpgradeable clonedAccessManager, Instance clonedInstance) internal {
117
+ // configure authorization for product service on instance
118
+ address productServiceAddress = _registry.getServiceAddress("ProductService", VersionLib.toVersion(3, 0, 0).toMajorPart());
119
+ clonedAccessManager.grantRole(PRODUCT_SERVICE_ROLE().toInt(), address(productServiceAddress), 0);
120
+ bytes4[] memory instanceProductServiceSelectors = new bytes4[](5);
121
+ instanceProductServiceSelectors[0] = clonedInstance.createProductSetup.selector;
122
+ instanceProductServiceSelectors[1] = clonedInstance.updateProductSetup.selector;
123
+ instanceProductServiceSelectors[2] = clonedInstance.createRisk.selector;
124
+ instanceProductServiceSelectors[3] = clonedInstance.updateRisk.selector;
125
+ instanceProductServiceSelectors[4] = clonedInstance.updateRiskState.selector;
126
+ clonedAccessManager.setTargetFunctionRole(
127
+ address(clonedInstance),
128
+ instanceProductServiceSelectors,
129
+ PRODUCT_SERVICE_ROLE().toInt());
130
+ }
131
+
132
+ function _grantPolicyServiceAuthorizations(AccessManagerUpgradeable clonedAccessManager, Instance clonedInstance) internal {
133
+ // configure authorization for policy service on instance
134
+ address policyServiceAddress = _registry.getServiceAddress("PolicyService", VersionLib.toVersion(3, 0, 0).toMajorPart());
135
+ clonedAccessManager.grantRole(POLICY_SERVICE_ROLE().toInt(), address(policyServiceAddress), 0);
136
+ bytes4[] memory instancePolicyServiceSelectors = new bytes4[](3);
137
+ instancePolicyServiceSelectors[0] = clonedInstance.createPolicy.selector;
138
+ instancePolicyServiceSelectors[1] = clonedInstance.updatePolicy.selector;
139
+ instancePolicyServiceSelectors[2] = clonedInstance.updatePolicyState.selector;
140
+ clonedAccessManager.setTargetFunctionRole(
141
+ address(clonedInstance),
142
+ instancePolicyServiceSelectors,
143
+ POLICY_SERVICE_ROLE().toInt());
144
+ }
145
+
146
+ function _grantBundleServiceAuthorizations(AccessManagerUpgradeable clonedAccessManager, Instance clonedInstance, BundleManager clonedBundleManager) internal {
147
+ // configure authorization for bundle service on instance
148
+ address bundleServiceAddress = _registry.getServiceAddress("BundleService", VersionLib.toVersion(3, 0, 0).toMajorPart());
149
+ clonedAccessManager.grantRole(BUNDLE_SERVICE_ROLE().toInt(), address(bundleServiceAddress), 0);
150
+ bytes4[] memory instanceBundleServiceSelectors = new bytes4[](2);
151
+ instanceBundleServiceSelectors[0] = clonedInstance.createBundle.selector;
152
+ instanceBundleServiceSelectors[1] = clonedInstance.updateBundle.selector;
153
+ clonedAccessManager.setTargetFunctionRole(
154
+ address(clonedInstance),
155
+ instanceBundleServiceSelectors,
156
+ BUNDLE_SERVICE_ROLE().toInt());
157
+
158
+ // configure authorization for bundle service on bundle manager
159
+ bytes4[] memory bundleManagerBundleServiceSelectors = new bytes4[](5);
160
+ bundleManagerBundleServiceSelectors[0] = clonedBundleManager.linkPolicy.selector;
161
+ bundleManagerBundleServiceSelectors[1] = clonedBundleManager.unlinkPolicy.selector;
162
+ bundleManagerBundleServiceSelectors[2] = clonedBundleManager.add.selector;
163
+ bundleManagerBundleServiceSelectors[3] = clonedBundleManager.lock.selector;
164
+ bundleManagerBundleServiceSelectors[4] = clonedBundleManager.unlock.selector;
165
+ clonedAccessManager.setTargetFunctionRole(
166
+ address(clonedBundleManager),
167
+ bundleManagerBundleServiceSelectors,
168
+ BUNDLE_SERVICE_ROLE().toInt());
169
+ }
170
+
171
+ function _grantInstanceServiceAuthorizations(AccessManagerUpgradeable clonedAccessManager, Instance clonedInstance) internal {
172
+ // configure authorization for instance service on instance
173
+ address instanceServiceAddress = _registry.getServiceAddress("InstanceService", VersionLib.toVersion(3, 0, 0).toMajorPart());
174
+ clonedAccessManager.grantRole(INSTANCE_SERVICE_ROLE().toInt(), instanceServiceAddress, 0);
175
+ bytes4[] memory instanceInstanceServiceSelectors = new bytes4[](1);
176
+ instanceInstanceServiceSelectors[0] = clonedInstance.setInstanceReader.selector;
177
+ clonedAccessManager.setTargetFunctionRole(
178
+ address(clonedInstance),
179
+ instanceInstanceServiceSelectors,
180
+ INSTANCE_SERVICE_ROLE().toInt());
181
+ }
182
+
183
+ function setMasterInstance(address accessManagerAddress, address instanceAddress, address instanceReaderAddress, address bundleManagerAddress) external onlyOwner {
184
+ require(_masterInstanceAccessManager == address(0), "ERROR:CRD-001:ACCESS_MANAGER_MASTER_ALREADY_SET");
185
+ require(_masterInstance == address(0), "ERROR:CRD-002:INSTANCE_MASTER_ALREADY_SET");
186
+ require(_masterInstanceBundleManager == address(0), "ERROR:CRD-004:BUNDLE_MANAGER_MASTER_ALREADY_SET");
187
+
188
+ require (accessManagerAddress != address(0), "ERROR:CRD-005:ACCESS_MANAGER_ZERO");
189
+ require (instanceAddress != address(0), "ERROR:CRD-006:INSTANCE_ZERO");
190
+ require (instanceReaderAddress != address(0), "ERROR:CRD-007:INSTANCE_READER_ZERO");
191
+ require (bundleManagerAddress != address(0), "ERROR:CRD-008:BUNDLE_MANAGER_ZERO");
192
+
193
+ Instance instance = Instance(instanceAddress);
194
+ InstanceReader instanceReader = InstanceReader(instanceReaderAddress);
195
+ BundleManager bundleManager = BundleManager(bundleManagerAddress);
196
+
197
+ require(instance.authority() == accessManagerAddress, "ERROR:CRD-009:INSTANCE_AUTHORITY_MISMATCH");
198
+ require(instanceReader.getInstanceNftId() == instance.getNftId(), "ERROR:CRD-010:INSTANCE_READER_INSTANCE_MISMATCH");
199
+ require(bundleManager.getInstanceNftId() == instance.getNftId(), "ERROR:CRD-011:BUNDLE_MANAGER_INSTANCE_MISMATCH");
200
+
201
+ _masterInstanceAccessManager = accessManagerAddress;
202
+ _masterInstance = instanceAddress;
203
+ _masterInstanceReader = instanceReaderAddress;
204
+ _masterInstanceBundleManager = bundleManagerAddress;
205
+ }
206
+
207
+ function setMasterInstanceReader(address instanceReaderAddress) external onlyOwner {
208
+ require(_masterInstanceReader != address(0), "ERROR:CRD-003:INSTANCE_READER_MASTER_NOT_SET");
209
+ require (instanceReaderAddress != address(0), "ERROR:CRD-012:INSTANCE_READER_ZERO");
210
+ require(instanceReaderAddress != _masterInstanceReader, "ERROR:CRD-014:INSTANCE_READER_MASTER_SAME_AS_NEW");
211
+
212
+ InstanceReader instanceReader = InstanceReader(instanceReaderAddress);
213
+ require(instanceReader.getInstanceNftId() == Instance(_masterInstance).getNftId(), "ERROR:CRD-015:INSTANCE_READER_INSTANCE_MISMATCH");
214
+
215
+ _masterInstanceReader = instanceReaderAddress;
216
+ }
217
+
218
+ function upgradeInstanceReader(NftId instanceNftId) external {
219
+ IRegistry registry = getRegistry();
220
+ IRegistry.ObjectInfo memory instanceInfo = registry.getObjectInfo(instanceNftId);
221
+ Instance instance = Instance(instanceInfo.objectAddress);
222
+ address owner = instance.getOwner();
223
+
224
+ if (msg.sender != owner) {
225
+ revert ErrorInstanceServiceRequestUnauhorized(msg.sender);
226
+ }
227
+
228
+ InstanceReader upgradedInstanceReaderClone = InstanceReader(Clones.clone(address(_masterInstanceReader)));
229
+ upgradedInstanceReaderClone.initialize(address(registry), instanceNftId);
230
+ instance.setInstanceReader(upgradedInstanceReaderClone);
231
+ }
232
+
233
+ function getMasterInstanceReader() external view returns (address) {
234
+ return _masterInstanceReader;
235
+ }
236
+
237
+ function getMasterInstance() external view returns (address) {
238
+ return _masterInstance;
239
+ }
240
+
241
+ function getMasterInstanceAccessManager() external view returns (address) {
242
+ return _masterInstanceAccessManager;
243
+ }
244
+
245
+ function getMasterInstanceBundleManager() external view returns (address) {
246
+ return _masterInstanceBundleManager;
247
+ }
248
+
249
+ // From IService
250
+ function getName() public pure override(IService, Service) returns(string memory) {
251
+ return NAME;
252
+ }
253
+
254
+ /// @dev top level initializer
255
+ // 1) registry is non upgradeable -> don't need a proxy and uses constructor !
256
+ // 2) deploy registry service first -> from its initialization func it is easier to deploy registry then vice versa
257
+ // 3) deploy registry -> pass registry service address as constructor argument
258
+ // registry is getting instantiated and locked to registry service address forever
259
+ function _initialize(
260
+ address owner,
261
+ bytes memory data
262
+ )
263
+ internal
264
+ initializer
265
+ virtual override
266
+ {
267
+ address initialOwner = address(0);
268
+ address registryAddress = address(0);
269
+ (registryAddress, initialOwner) = abi.decode(data, (address, address));
270
+ // TODO while InstanceService is not deployed in InstanceServiceManager constructor
271
+ // owner is InstanceServiceManager deployer
272
+ _initializeService(registryAddress, owner);
273
+
274
+ _registerInterface(type(IService).interfaceId);
275
+ _registerInterface(type(IInstanceService).interfaceId);
276
+ }
277
+ // TODO use instanceAddress instead of nft
278
+ /*function hasRole(address account, RoleId role, NftId instanceNftId) external view returns (bool) {
279
+ IRegistry.ObjectInfo memory instanceObjectInfo = getRegistry().getObjectInfo(instanceNftId);
280
+ address instanceAddress = instanceObjectInfo.objectAddress;
281
+ Instance instance = Instance(instanceAddress);
282
+ AccessManagerUpgradeable accessManager = AccessManagerUpgradeable(instance.authority());
283
+ (bool isMember, uint32 executionDelay) = accessManager.hasRole(role.toInt(), account);
284
+ if (executionDelay > 0) {
285
+ return false;
286
+ }
287
+ return isMember;
288
+ }*/
289
+ function hasRole(address account, RoleId role, address instanceAddress) external view returns (bool) {
290
+ Instance instance = Instance(instanceAddress);
291
+ AccessManagerUpgradeable accessManager = AccessManagerUpgradeable(instance.authority());
292
+ (bool isMember, uint32 executionDelay) = accessManager.hasRole(role.toInt(), account);
293
+ if (executionDelay > 0) {
294
+ return false;
295
+ }
296
+ return isMember;
297
+ }
298
+ }
299
+
@@ -0,0 +1,57 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ pragma solidity ^0.8.20;
3
+
4
+ import {Instance} from "./Instance.sol";
5
+ import {IVersionable} from "../shared/IVersionable.sol";
6
+ import {ProxyManager} from "../shared/ProxyManager.sol";
7
+ import {InstanceService} from "./InstanceService.sol";
8
+ import {Registry} from "../registry/Registry.sol";
9
+ import {RegistryService} from "../registry/RegistryService.sol";
10
+ import {VersionLib} from "../types/Version.sol";
11
+
12
+ contract InstanceServiceManager is ProxyManager {
13
+
14
+ InstanceService private _instanceService;
15
+
16
+ /// @dev initializes proxy manager with instance service implementation and deploys instance
17
+ constructor(
18
+ address registryAddress
19
+ )
20
+ ProxyManager()
21
+ {
22
+ InstanceService instSrv = new InstanceService();
23
+ // bytes memory initCode = type(InstanceService).creationCode;
24
+ bytes memory data = abi.encode(registryAddress, address(this));
25
+ IVersionable versionable = deploy(
26
+ address(instSrv),
27
+ data);
28
+
29
+ _instanceService = InstanceService(address(versionable));
30
+
31
+ Registry registry = Registry(registryAddress);
32
+ address registryServiceAddress = registry.getServiceAddress("RegistryService", VersionLib.toVersion(3, 0, 0).toMajorPart());
33
+ RegistryService registryService = RegistryService(registryServiceAddress);
34
+ // TODO this must have a role or own nft to register service
35
+ //registryService.registerService(_instanceService);
36
+ // RegistryService registryService = _instanceService.getRegistryService();
37
+
38
+ // TODO no nft to link yet
39
+ // link ownership of instance service manager ot nft owner of instance service
40
+ //_linkToNftOwnable(
41
+ // address(registryAddress),
42
+ // address(_instanceService));
43
+
44
+ // implies that after this constructor call only upgrade functionality is available
45
+ _isDeployed = true;
46
+ }
47
+
48
+ //--- view functions ----------------------------------------------------//
49
+ function getInstanceService()
50
+ external
51
+ view
52
+ returns (InstanceService instanceService)
53
+ {
54
+ return _instanceService;
55
+ }
56
+
57
+ }
@@ -0,0 +1,101 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ pragma solidity ^0.8.20;
3
+
4
+ import {Cloneable} from "./Cloneable.sol";
5
+
6
+ import {IInstance} from "./IInstance.sol";
7
+ import {INSTANCE} from "../types/ObjectType.sol";
8
+ import {InstanceReader} from "./InstanceReader.sol";
9
+ import {IRegistry} from "../registry/IRegistry.sol";
10
+ import {LibNftIdSet} from "../types/NftIdSet.sol";
11
+ import {NftId} from "../types/NftId.sol";
12
+
13
+ contract ObjectManager is
14
+ Cloneable
15
+ {
16
+
17
+ event LogObjectManagerInitialized(NftId instanceNftId, address instanceReader);
18
+
19
+ error ErrorObjectManagerNftIdInvalid(NftId instanceNftId);
20
+ error ErrorObjectManagerAlreadyAdded(NftId componentNftId, NftId objectNftId);
21
+
22
+ mapping(NftId compnentNftId => LibNftIdSet.Set objects) internal _activeObjects;
23
+ mapping(NftId compnentNftId => LibNftIdSet.Set objects) internal _allObjects;
24
+ NftId internal _instanceNftId;
25
+ InstanceReader internal _instanceReader;
26
+
27
+ constructor() Cloneable() {
28
+ _instanceReader = InstanceReader(address(0));
29
+ }
30
+
31
+ /// @dev call to initialize MUST be made in the same transaction as cloning of the contract
32
+ function initialize(
33
+ address authority,
34
+ address registry,
35
+ NftId instanceNftId
36
+ )
37
+ external
38
+ {
39
+ initialize(authority, registry);
40
+
41
+ // check/handle instance nft id/instance reader
42
+ IRegistry.ObjectInfo memory instanceInfo = _registry.getObjectInfo(instanceNftId);
43
+ if (instanceInfo.objectType != INSTANCE()) {
44
+ revert ErrorObjectManagerNftIdInvalid(instanceNftId);
45
+ }
46
+
47
+ IInstance instance = IInstance(instanceInfo.objectAddress);
48
+ _instanceReader = instance.getInstanceReader();
49
+ _instanceNftId = instanceNftId;
50
+
51
+ emit LogObjectManagerInitialized(instanceNftId, address(_instanceReader));
52
+ }
53
+
54
+ function getInstanceReader() external view returns (InstanceReader) {
55
+ return _instanceReader;
56
+ }
57
+
58
+ function getInstanceNftId() external view returns (NftId) {
59
+ return _instanceNftId;
60
+ }
61
+
62
+ function _add(NftId componentNftId, NftId objectNftId) internal {
63
+ LibNftIdSet.Set storage allSet = _allObjects[componentNftId];
64
+ LibNftIdSet.Set storage activeSet = _activeObjects[componentNftId];
65
+
66
+ LibNftIdSet.add(allSet, objectNftId);
67
+ LibNftIdSet.add(activeSet, objectNftId);
68
+ }
69
+
70
+ function _activate(NftId componentNftId, NftId objectNftId) internal {
71
+ LibNftIdSet.add(_activeObjects[componentNftId], objectNftId);
72
+ }
73
+
74
+ function _deactivate(NftId componentNftId, NftId objectNftId) internal {
75
+ LibNftIdSet.remove(_activeObjects[componentNftId], objectNftId);
76
+ }
77
+
78
+ function _objects(NftId componentNftId) internal view returns (uint256) {
79
+ return LibNftIdSet.size(_allObjects[componentNftId]);
80
+ }
81
+
82
+ function _contains(NftId componentNftId, NftId objectNftId) internal view returns (bool) {
83
+ return LibNftIdSet.contains(_allObjects[componentNftId], objectNftId);
84
+ }
85
+
86
+ function _getObject(NftId componentNftId, uint256 idx) internal view returns (NftId) {
87
+ return LibNftIdSet.getElementAt(_allObjects[componentNftId], idx);
88
+ }
89
+
90
+ function _activeObjs(NftId componentNftId) internal view returns (uint256) {
91
+ return LibNftIdSet.size(_activeObjects[componentNftId]);
92
+ }
93
+
94
+ function _isActive(NftId componentNftId, NftId objectNftId) internal view returns (bool) {
95
+ return LibNftIdSet.contains(_activeObjects[componentNftId], objectNftId);
96
+ }
97
+
98
+ function _getActiveObject(NftId componentNftId, uint256 idx) internal view returns (NftId) {
99
+ return LibNftIdSet.getElementAt(_activeObjects[componentNftId], idx);
100
+ }
101
+ }
@@ -4,26 +4,52 @@ pragma solidity ^0.8.19;
4
4
  import {IRegistry} from "../../registry/IRegistry.sol";
5
5
  import {IRegistryService} from "../../registry/IRegistryService.sol";
6
6
  import {IInstance} from "../../instance/IInstance.sol";
7
- import {ObjectType, INSTANCE, PRODUCT, POOL} from "../../types/ObjectType.sol";
7
+ import {ObjectType, INSTANCE, PRODUCT, POOL, DISTRIBUTION, ORACLE} from "../../types/ObjectType.sol";
8
8
  import {NftId, NftIdLib} from "../../types/NftId.sol";
9
+ import {RoleId, PRODUCT_OWNER_ROLE, POOL_OWNER_ROLE, DISTRIBUTION_OWNER_ROLE, ORACLE_OWNER_ROLE} from "../../types/RoleId.sol";
9
10
 
10
- import {ServiceBase} from "./ServiceBase.sol";
11
+ import {BaseComponent} from "../../components/BaseComponent.sol";
12
+ import {Product} from "../../components/Product.sol";
13
+ import {INftOwnable} from "../../shared/INftOwnable.sol";
14
+ import {Service} from "../../shared/Service.sol";
15
+ import {InstanceService} from "../InstanceService.sol";
11
16
  import {Version, VersionPart, VersionLib} from "../../types/Version.sol";
12
17
 
13
- abstract contract ComponentServiceBase is ServiceBase {
18
+ abstract contract ComponentServiceBase is Service {
14
19
 
15
- constructor(
16
- address registry,
17
- NftId registryNftId,
18
- address initialOwner
19
- )
20
- {
21
- _initializeServiceBase(registry, registryNftId, initialOwner);
20
+ error ExpectedRoleMissing(RoleId expected, address caller);
21
+ error ComponentTypeInvalid(ObjectType componentType);
22
+
23
+
24
+ /// @dev modifier to check if caller is a registered service
25
+ modifier onlyService() {
26
+ address caller = msg.sender;
27
+ require(getRegistry().isRegisteredService(caller), "ERROR_NOT_SERVICE");
28
+ _;
22
29
  }
23
30
 
31
+ // view functions
32
+
33
+ function getRegistryService() public view virtual returns (IRegistryService) {
34
+ address service = getRegistry().getServiceAddress("RegistryService", getMajorVersion());
35
+ return IRegistryService(service);
36
+ }
37
+
38
+ function getInstanceService() public view returns (InstanceService) {
39
+ return InstanceService(getRegistry().getServiceAddress("InstanceService", getMajorVersion()));
40
+ }
41
+
42
+ // internal view functions
43
+
44
+ function _getInstance(IRegistry.ObjectInfo memory compObjInfo) internal view returns (IInstance) {
45
+ IRegistry registry = getRegistry();
46
+ IRegistry.ObjectInfo memory instanceInfo = registry.getObjectInfo(compObjInfo.parentNftId);
47
+ return IInstance(instanceInfo.objectAddress);
48
+ }
24
49
 
25
50
  function _getAndVerifyComponentInfoAndInstance(
26
- ObjectType objectType
51
+ //address component,
52
+ ObjectType expectedType
27
53
  )
28
54
  internal
29
55
  view
@@ -32,18 +58,15 @@ abstract contract ComponentServiceBase is ServiceBase {
32
58
  IInstance instance
33
59
  )
34
60
  {
35
- NftId componentNftId = getRegistry().getNftId(msg.sender);
36
- require(componentNftId.gtz(), "ERROR_COMPONENT_UNKNOWN");
61
+ IRegistry registry = getRegistry();
62
+ //TODO redundant check -> just check type
63
+ //NftId componentNftId = registry.getNftId(component);
64
+ //require(componentNftId.gtz(), "ERROR_COMPONENT_UNKNOWN");
37
65
 
38
- info = getRegistry().getObjectInfo(componentNftId);
39
- require(info.objectType == objectType, "OBJECT_TYPE_INVALID");
66
+ info = registry.getObjectInfo(msg.sender);
67
+ require(info.objectType == expectedType, "OBJECT_TYPE_INVALID");
40
68
 
41
- address instanceAddress = getRegistry().getObjectInfo(info.parentNftId).objectAddress;
69
+ address instanceAddress = registry.getObjectInfo(info.parentNftId).objectAddress;
42
70
  instance = IInstance(instanceAddress);
43
71
  }
44
-
45
- function getRegistryService() public view virtual returns (IRegistryService) {
46
- address service = getRegistry().getServiceAddress("RegistryService", getMajorVersion());
47
- return IRegistryService(service);
48
- }
49
72
  }
@@ -1,5 +1,5 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
- pragma solidity ^0.8.19;
2
+ pragma solidity ^0.8.20;
3
3
 
4
4
  import {Blocknumber, blockBlocknumber, zeroBlocknumber} from "../../types/Blocknumber.sol";
5
5
  import {Key32, KeyId} from "../../types/Key32.sol";
@@ -9,13 +9,9 @@ import {StateId} from "../../types/StateId.sol";
9
9
 
10
10
  import {ILifecycle} from "./ILifecycle.sol";
11
11
 
12
+ // TODO remove - internal only?
12
13
  interface IKeyValueStore is ILifecycle {
13
14
 
14
- struct Key {
15
- ObjectType objectType;
16
- KeyId id;
17
- }
18
-
19
15
  struct Value {
20
16
  Metadata metadata;
21
17
  bytes data;
@@ -24,20 +20,24 @@ interface IKeyValueStore is ILifecycle {
24
20
  struct Metadata {
25
21
  ObjectType objectType;
26
22
  StateId state;
23
+ // TODO updatedBy needs concept that says what value should go here
24
+ // eg account outside gif objects that initiated the tx
25
+ // implies the caller needs to be propagated through all calls up to key values store itself
26
+ // to always have the instance address there doesn't seem to make sense
27
27
  address updatedBy;
28
28
  Blocknumber updatedIn;
29
29
  Blocknumber createdIn;
30
30
  }
31
31
 
32
- event LogInfoCreated(Key key, StateId state, address createdBy, address txOrigin);
33
- event LogInfoUpdated(Key key, StateId state, address updatedBy, address txOrigin, Blocknumber lastUpdatedIn);
34
- event LogStateUpdated(Key key, StateId stateOld, StateId stateNew, address updatedBy, address txOrigin, Blocknumber lastUpdatedIn);
32
+ event LogInfoCreated(ObjectType objectType, KeyId keyId, StateId state, address createdBy, address txOrigin);
33
+ event LogInfoUpdated(ObjectType objectType, KeyId keyId, StateId state, address updatedBy, address txOrigin, Blocknumber lastUpdatedIn);
34
+ event LogStateUpdated(ObjectType objectType, KeyId keyId, StateId stateOld, StateId stateNew, address updatedBy, address txOrigin, Blocknumber lastUpdatedIn);
35
35
 
36
36
  // generic state changing functions
37
- function create(Key32 key, ObjectType objectType, bytes memory data) external;
38
- function update(Key32 key, StateId state, bytes memory data) external;
39
- function updateData(Key32 key, bytes memory data) external;
40
- function updateState(Key32 key, StateId state) external;
37
+ // function create(Key32 key, bytes memory data) external;
38
+ // function update(Key32 key, bytes memory data, StateId state) external;
39
+ // function updateData(Key32 key, bytes memory data) external;
40
+ // function updateState(Key32 key, StateId state) external;
41
41
 
42
42
  function exists(Key32 key) external view returns (bool);
43
43
  function get(Key32 key) external view returns (Value memory value);
@@ -46,5 +46,4 @@ interface IKeyValueStore is ILifecycle {
46
46
  function getState(Key32 key) external view returns (StateId state);
47
47
 
48
48
  function toKey32(ObjectType objectType, KeyId id) external pure returns(Key32);
49
- function toKey(Key32 key32) external pure returns(Key memory key);
50
49
  }
@@ -1,9 +1,9 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
- pragma solidity ^0.8.19;
2
+ pragma solidity ^0.8.20;
3
3
 
4
- import {ObjectType} from "../../types/ObjectType.sol";
5
- import {StateId, toStateId, zeroStateId} from "../../types/StateId.sol";
6
4
  import {NftId} from "../../types/NftId.sol";
5
+ import {ObjectType} from "../../types/ObjectType.sol";
6
+ import {StateId} from "../../types/StateId.sol";
7
7
 
8
8
  interface ILifecycle {
9
9