@etherisc/gif-next 0.0.2-e46206a-486 → 0.0.2-e59218b-293

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 (309) hide show
  1. package/README.md +4 -0
  2. package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.dbg.json +1 -1
  3. package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.json +26 -0
  4. package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +1 -1
  5. package/artifacts/contracts/components/Distribution.sol/Distribution.json +94 -33
  6. package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.dbg.json +1 -1
  7. package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.json +26 -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 +0 -59
  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 +131 -65
  16. package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
  17. package/artifacts/contracts/components/Product.sol/Product.json +168 -58
  18. package/artifacts/contracts/experiment/cloning/Cloner.sol/Cloner.dbg.json +1 -1
  19. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock1.dbg.json +1 -1
  20. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock2.dbg.json +1 -1
  21. package/artifacts/contracts/experiment/errors/Require.sol/Require.dbg.json +1 -1
  22. package/artifacts/contracts/experiment/errors/Revert.sol/Revert.dbg.json +1 -1
  23. package/artifacts/contracts/experiment/inheritance/A.sol/A.dbg.json +1 -1
  24. package/artifacts/contracts/experiment/inheritance/A.sol/AShared.dbg.json +1 -1
  25. package/artifacts/contracts/experiment/inheritance/B.sol/B.dbg.json +1 -1
  26. package/artifacts/contracts/experiment/inheritance/C.sol/C.dbg.json +1 -1
  27. package/artifacts/contracts/experiment/inheritance/IA.sol/IA.dbg.json +1 -1
  28. package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.dbg.json +1 -1
  29. package/artifacts/contracts/experiment/inheritance/IB.sol/IB.dbg.json +1 -1
  30. package/artifacts/contracts/experiment/inheritance/IC.sol/IC.dbg.json +1 -1
  31. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.dbg.json +1 -1
  32. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.json +2 -2
  33. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.dbg.json +1 -1
  34. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.dbg.json +1 -1
  35. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.dbg.json +1 -1
  36. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.json +2 -2
  37. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.dbg.json +1 -1
  38. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.json +2 -2
  39. package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.dbg.json +1 -1
  40. package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.dbg.json +1 -1
  41. package/artifacts/contracts/instance/AccessManagedSimple.sol/AccessManagedSimple.dbg.json +4 -0
  42. package/artifacts/contracts/instance/AccessManagedSimple.sol/AccessManagedSimple.json +101 -0
  43. package/artifacts/contracts/instance/AccessManagerSimple.sol/AccessManagerSimple.dbg.json +4 -0
  44. package/artifacts/contracts/instance/AccessManagerSimple.sol/AccessManagerSimple.json +1132 -0
  45. package/artifacts/contracts/instance/IAccessManagerSimple.sol/IAccessManagerSimple.dbg.json +4 -0
  46. package/artifacts/contracts/instance/IAccessManagerSimple.sol/IAccessManagerSimple.json +1082 -0
  47. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  48. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +745 -1020
  49. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +4 -0
  50. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +480 -0
  51. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  52. package/artifacts/contracts/instance/Instance.sol/Instance.json +2238 -1030
  53. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +4 -0
  54. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +917 -0
  55. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +4 -0
  56. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +1412 -0
  57. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +4 -0
  58. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +931 -0
  59. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +4 -0
  60. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +508 -0
  61. package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.dbg.json +1 -1
  62. package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.json +59 -0
  63. package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.dbg.json +1 -1
  64. package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
  65. package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.json +27 -158
  66. package/artifacts/contracts/instance/base/ILifecycle.sol/ILifecycle.dbg.json +1 -1
  67. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
  68. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.json +37 -253
  69. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json +1 -1
  70. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.json +2 -2
  71. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +4 -0
  72. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.json +211 -0
  73. package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +4 -0
  74. package/artifacts/contracts/instance/module/{bundle/IBundle.sol → IBundle.sol}/IBundle.json +1 -1
  75. package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +4 -0
  76. package/artifacts/contracts/instance/module/{distribution/IDistribution.sol → IDistribution.sol}/IDistribution.json +1 -1
  77. package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +4 -0
  78. package/artifacts/contracts/instance/module/{policy/IPolicy.sol → IPolicy.sol}/IPolicy.json +1 -1
  79. package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +4 -0
  80. package/artifacts/contracts/instance/module/{risk/IRisk.sol → IRisk.sol}/IRisk.json +1 -1
  81. package/artifacts/contracts/instance/module/ISetup.sol/ISetup.dbg.json +4 -0
  82. package/artifacts/contracts/instance/{base/ModuleBase.sol/ModuleBase.json → module/ISetup.sol/ISetup.json} +2 -2
  83. package/artifacts/contracts/instance/module/ITreasury.sol/ITreasury.dbg.json +4 -0
  84. package/artifacts/contracts/instance/module/{treasury/ITreasury.sol → ITreasury.sol}/ITreasury.json +1 -1
  85. package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.dbg.json +1 -1
  86. package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.json +32 -48
  87. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +1 -1
  88. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +111 -41
  89. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +4 -0
  90. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.json +444 -0
  91. package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.dbg.json +1 -1
  92. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +1 -1
  93. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +1 -1
  94. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +87 -0
  95. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +1 -1
  96. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +40 -31
  97. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +1 -1
  98. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +200 -43
  99. package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.dbg.json +4 -0
  100. package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.json +448 -0
  101. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +1 -1
  102. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +176 -105
  103. package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.dbg.json +4 -0
  104. package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.json +488 -0
  105. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  106. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  107. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +201 -0
  108. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
  109. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +94 -19
  110. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
  111. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  112. package/artifacts/contracts/registry/Registry.sol/Registry.json +172 -49
  113. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
  114. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +61 -29
  115. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
  116. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +47 -34
  117. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +4 -0
  118. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +410 -0
  119. package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.dbg.json +1 -1
  120. package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +1 -1
  121. package/artifacts/contracts/shared/ERC165.sol/ERC165.json +2 -2
  122. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
  123. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  124. package/artifacts/contracts/shared/IService.sol/IService.dbg.json +4 -0
  125. package/artifacts/contracts/{instance/base → shared}/IService.sol/IService.json +1 -1
  126. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +1 -1
  127. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
  128. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +2 -2
  129. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +1 -1
  130. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +2 -2
  131. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  132. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +4 -4
  133. package/artifacts/contracts/shared/RegisterableUpgradable.sol/RegisterableUpgradable.dbg.json +4 -0
  134. package/artifacts/contracts/{instance/base/InstanceBase.sol/InstanceBase.json → shared/RegisterableUpgradable.sol/RegisterableUpgradable.json} +2 -104
  135. package/artifacts/contracts/shared/Service.sol/Service.dbg.json +4 -0
  136. package/artifacts/contracts/{instance/base/ServiceBase.sol/ServiceBase.json → shared/Service.sol/Service.json} +2 -2
  137. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +4 -0
  138. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +96 -0
  139. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
  140. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +2 -2
  141. package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +1 -1
  142. package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json +1 -1
  143. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json +1 -1
  144. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +4 -4
  145. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +1 -1
  146. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.json +2 -2
  147. package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +1 -1
  148. package/artifacts/contracts/test/TestService.sol/TestService.json +11 -11
  149. package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json +1 -1
  150. package/artifacts/contracts/test/TestVersion.sol/TestVersion.dbg.json +1 -1
  151. package/artifacts/contracts/test/TestVersion.sol/TestVersion.json +2 -2
  152. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json +1 -1
  153. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.json +2 -2
  154. package/artifacts/contracts/test/Usdc.sol/USDC.dbg.json +1 -1
  155. package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.dbg.json +1 -1
  156. package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
  157. package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +1 -1
  158. package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.dbg.json +1 -1
  159. package/artifacts/contracts/types/Fee.sol/FeeLib.dbg.json +1 -1
  160. package/artifacts/contracts/types/Key32.sol/Key32Lib.dbg.json +1 -1
  161. package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +1 -1
  162. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
  163. package/artifacts/contracts/types/NumberId.sol/NumberIdLib.dbg.json +1 -1
  164. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
  165. package/artifacts/contracts/types/Referral.sol/ReferralLib.dbg.json +1 -1
  166. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.dbg.json +1 -1
  167. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.dbg.json +1 -1
  168. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.json +2 -2
  169. package/artifacts/contracts/types/StateId.sol/StateIdLib.dbg.json +1 -1
  170. package/artifacts/contracts/types/StateId.sol/StateIdLib.json +2 -2
  171. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json +1 -1
  172. package/artifacts/contracts/types/UFixed.sol/MathLib.dbg.json +1 -1
  173. package/artifacts/contracts/types/UFixed.sol/UFixedLib.dbg.json +1 -1
  174. package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +1 -1
  175. package/artifacts/contracts/types/Version.sol/VersionLib.json +2 -2
  176. package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +1 -1
  177. package/artifacts/contracts/types/Version.sol/VersionPartLib.json +22 -3
  178. package/contracts/components/BaseComponent.sol +15 -3
  179. package/contracts/components/Distribution.sol +22 -14
  180. package/contracts/components/IBaseComponent.sol +8 -2
  181. package/contracts/components/IDistributionComponent.sol +1 -3
  182. package/contracts/components/IPoolComponent.sol +0 -2
  183. package/contracts/components/IProductComponent.sol +1 -3
  184. package/contracts/components/Pool.sol +26 -26
  185. package/contracts/components/Product.sol +49 -60
  186. package/contracts/instance/AccessManagedSimple.sol +115 -0
  187. package/contracts/instance/AccessManagerSimple.sol +692 -0
  188. package/contracts/instance/IAccessManagerSimple.sol +391 -0
  189. package/contracts/instance/IInstance.sol +46 -44
  190. package/contracts/instance/IInstanceService.sol +30 -0
  191. package/contracts/instance/Instance.sol +423 -63
  192. package/contracts/instance/InstanceAccessManager.sol +288 -0
  193. package/contracts/instance/InstanceReader.sol +315 -0
  194. package/contracts/instance/InstanceService.sol +198 -0
  195. package/contracts/instance/InstanceServiceManager.sol +57 -0
  196. package/contracts/instance/base/ComponentServiceBase.sol +93 -8
  197. package/contracts/instance/base/IKeyValueStore.sol +13 -14
  198. package/contracts/instance/base/ILifecycle.sol +3 -3
  199. package/contracts/instance/base/KeyValueStore.sol +49 -39
  200. package/contracts/instance/base/Lifecycle.sol +1 -1
  201. package/contracts/instance/module/IAccess.sol +38 -0
  202. package/contracts/instance/module/IBundle.sol +20 -0
  203. package/contracts/instance/module/IDistribution.sol +39 -0
  204. package/contracts/instance/module/IPolicy.sol +45 -0
  205. package/contracts/instance/module/IRisk.sol +11 -0
  206. package/contracts/instance/module/ISetup.sol +45 -0
  207. package/contracts/instance/module/ITreasury.sol +23 -0
  208. package/contracts/instance/service/ComponentOwnerService.sol +62 -60
  209. package/contracts/instance/service/DistributionService.sol +49 -15
  210. package/contracts/instance/service/DistributionServiceManager.sol +54 -0
  211. package/contracts/instance/service/IComponentOwnerService.sol +1 -1
  212. package/contracts/instance/service/IDistributionService.sol +1 -1
  213. package/contracts/instance/service/IPoolService.sol +5 -1
  214. package/contracts/instance/service/IProductService.sol +8 -5
  215. package/contracts/instance/service/PoolService.sol +104 -52
  216. package/contracts/instance/service/PoolServiceManager.sol +54 -0
  217. package/contracts/instance/service/ProductService.sol +168 -111
  218. package/contracts/instance/service/ProductServiceManager.sol +54 -0
  219. package/contracts/registry/IRegistry.sol +26 -2
  220. package/contracts/registry/IRegistryService.sol +34 -19
  221. package/contracts/registry/Registry.sol +61 -36
  222. package/contracts/registry/RegistryService.sol +42 -125
  223. package/contracts/registry/RegistryServiceManager.sol +21 -5
  224. package/contracts/registry/TokenRegistry.sol +111 -0
  225. package/contracts/shared/ERC165.sol +6 -2
  226. package/contracts/{instance/base → shared}/IService.sol +3 -3
  227. package/contracts/shared/NftOwnable.sol +2 -4
  228. package/contracts/shared/Registerable.sol +1 -0
  229. package/contracts/shared/RegisterableUpgradable.sol +16 -0
  230. package/contracts/shared/Service.sol +55 -0
  231. package/contracts/shared/TokenHandler.sol +27 -0
  232. package/contracts/test/TestService.sol +3 -5
  233. package/contracts/types/RoleId.sol +8 -0
  234. package/contracts/types/StateId.sol +4 -0
  235. package/contracts/types/Version.sol +4 -1
  236. package/package.json +1 -1
  237. package/artifacts/contracts/instance/IInstanceLinked.sol/IInstanceLinked.dbg.json +0 -4
  238. package/artifacts/contracts/instance/IInstanceLinked.sol/IInstanceLinked.json +0 -24
  239. package/artifacts/contracts/instance/base/IService.sol/IService.dbg.json +0 -4
  240. package/artifacts/contracts/instance/base/InstanceBase.sol/InstanceBase.dbg.json +0 -4
  241. package/artifacts/contracts/instance/base/ModuleBase.sol/ModuleBase.dbg.json +0 -4
  242. package/artifacts/contracts/instance/base/ServiceBase.sol/ServiceBase.dbg.json +0 -4
  243. package/artifacts/contracts/instance/module/bundle/BundleModule.sol/BundleModule.dbg.json +0 -4
  244. package/artifacts/contracts/instance/module/bundle/BundleModule.sol/BundleModule.json +0 -297
  245. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundle.dbg.json +0 -4
  246. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundleModule.dbg.json +0 -4
  247. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundleModule.json +0 -297
  248. package/artifacts/contracts/instance/module/component/ComponentModule.sol/ComponentModule.dbg.json +0 -4
  249. package/artifacts/contracts/instance/module/component/ComponentModule.sol/ComponentModule.json +0 -117
  250. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponent.dbg.json +0 -4
  251. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponent.json +0 -10
  252. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponentModule.dbg.json +0 -4
  253. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponentModule.json +0 -117
  254. package/artifacts/contracts/instance/module/distribution/DistributionModule.sol/DistributionModule.dbg.json +0 -4
  255. package/artifacts/contracts/instance/module/distribution/DistributionModule.sol/DistributionModule.json +0 -10
  256. package/artifacts/contracts/instance/module/distribution/IDistribution.sol/IDistribution.dbg.json +0 -4
  257. package/artifacts/contracts/instance/module/distribution/IDistribution.sol/IDistributionModule.dbg.json +0 -4
  258. package/artifacts/contracts/instance/module/distribution/IDistribution.sol/IDistributionModule.json +0 -10
  259. package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicy.dbg.json +0 -4
  260. package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicyModule.dbg.json +0 -4
  261. package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicyModule.json +0 -271
  262. package/artifacts/contracts/instance/module/policy/PolicyModule.sol/PolicyModule.dbg.json +0 -4
  263. package/artifacts/contracts/instance/module/policy/PolicyModule.sol/PolicyModule.json +0 -271
  264. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPool.dbg.json +0 -4
  265. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPool.json +0 -10
  266. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPoolModule.dbg.json +0 -4
  267. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPoolModule.json +0 -164
  268. package/artifacts/contracts/instance/module/pool/PoolModule.sol/PoolModule.dbg.json +0 -4
  269. package/artifacts/contracts/instance/module/pool/PoolModule.sol/PoolModule.json +0 -164
  270. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRisk.dbg.json +0 -4
  271. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRiskModule.dbg.json +0 -4
  272. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRiskModule.json +0 -113
  273. package/artifacts/contracts/instance/module/risk/RiskModule.sol/RiskModule.dbg.json +0 -4
  274. package/artifacts/contracts/instance/module/risk/RiskModule.sol/RiskModule.json +0 -131
  275. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasury.dbg.json +0 -4
  276. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasuryModule.dbg.json +0 -4
  277. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasuryModule.json +0 -638
  278. package/artifacts/contracts/instance/module/treasury/TokenHandler.sol/TokenHandler.dbg.json +0 -4
  279. package/artifacts/contracts/instance/module/treasury/TokenHandler.sol/TokenHandler.json +0 -76
  280. package/artifacts/contracts/instance/module/treasury/TreasuryModule.sol/TreasuryModule.dbg.json +0 -4
  281. package/artifacts/contracts/instance/module/treasury/TreasuryModule.sol/TreasuryModule.json +0 -638
  282. package/artifacts/contracts/test/TestDistribution.sol/TestDistribution.dbg.json +0 -4
  283. package/artifacts/contracts/test/TestDistribution.sol/TestDistribution.json +0 -557
  284. package/artifacts/contracts/test/TestPool.sol/TestPool.dbg.json +0 -4
  285. package/artifacts/contracts/test/TestPool.sol/TestPool.json +0 -716
  286. package/artifacts/contracts/test/TestProduct.sol/TestProduct.dbg.json +0 -4
  287. package/artifacts/contracts/test/TestProduct.sol/TestProduct.json +0 -744
  288. package/contracts/instance/IInstanceLinked.sol +0 -8
  289. package/contracts/instance/base/InstanceBase.sol +0 -89
  290. package/contracts/instance/base/ModuleBase.sol +0 -57
  291. package/contracts/instance/base/ServiceBase.sol +0 -44
  292. package/contracts/instance/module/bundle/BundleModule.sol +0 -134
  293. package/contracts/instance/module/bundle/IBundle.sol +0 -53
  294. package/contracts/instance/module/component/ComponentModule.sol +0 -71
  295. package/contracts/instance/module/component/IComponent.sol +0 -28
  296. package/contracts/instance/module/distribution/DistributionModule.sol +0 -17
  297. package/contracts/instance/module/distribution/IDistribution.sol +0 -10
  298. package/contracts/instance/module/policy/IPolicy.sol +0 -63
  299. package/contracts/instance/module/policy/PolicyModule.sol +0 -91
  300. package/contracts/instance/module/pool/IPoolModule.sol +0 -41
  301. package/contracts/instance/module/pool/PoolModule.sol +0 -95
  302. package/contracts/instance/module/risk/IRisk.sol +0 -26
  303. package/contracts/instance/module/risk/RiskModule.sol +0 -62
  304. package/contracts/instance/module/treasury/ITreasury.sol +0 -84
  305. package/contracts/instance/module/treasury/TokenHandler.sol +0 -48
  306. package/contracts/instance/module/treasury/TreasuryModule.sol +0 -131
  307. package/contracts/test/TestDistribution.sol +0 -22
  308. package/contracts/test/TestPool.sol +0 -27
  309. package/contracts/test/TestProduct.sol +0 -74
@@ -0,0 +1,198 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ pragma solidity ^0.8.20;
3
+
4
+ import {Clones} from "@openzeppelin/contracts/proxy/Clones.sol";
5
+
6
+ import {AccessManagerSimple} from "./AccessManagerSimple.sol";
7
+ import {InstanceAccessManager} from "./InstanceAccessManager.sol";
8
+ import {Instance} from "./Instance.sol";
9
+ import {IInstanceService} from "./IInstanceService.sol";
10
+ import {InstanceReader} from "./InstanceReader.sol";
11
+ import {IRegistry} from "../registry/IRegistry.sol";
12
+ import {Registry} from "../registry/Registry.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 {ContractDeployerLib} from "../shared/ContractDeployerLib.sol";
17
+ import {NftId, NftIdLib, zeroNftId} from "../../contracts/types/NftId.sol";
18
+ import {RoleId} from "../types/RoleId.sol";
19
+ import {VersionLib} from "../types/Version.sol";
20
+ import {ADMIN_ROLE, INSTANCE_SERVICE_ROLE, DISTRIBUTION_SERVICE_ROLE, POOL_SERVICE_ROLE, PRODUCT_SERVICE_ROLE} from "../types/RoleId.sol";
21
+
22
+ contract InstanceService is Service, IInstanceService {
23
+
24
+ address internal _registryAddress;
25
+ address internal _accessManagerMaster;
26
+ address internal _instanceMaster;
27
+ address internal _instanceReaderMaster;
28
+
29
+ // TODO update to real hash when instance is stable
30
+ bytes32 public constant INSTANCE_CREATION_CODE_HASH = bytes32(0);
31
+ string public constant NAME = "InstanceService";
32
+
33
+ function createInstanceClone()
34
+ external
35
+ returns (
36
+ AccessManagerSimple clonedAccessManager,
37
+ Instance clonedInstance,
38
+ NftId instanceNftId,
39
+ InstanceReader clonedInstanceReader
40
+ )
41
+ {
42
+ address instanceOwner = msg.sender;
43
+ Registry registry = Registry(_registryAddress);
44
+ NftId registryNftId = registry.getNftId(_registryAddress);
45
+ address registryServiceAddress = registry.getServiceAddress("RegistryService", VersionLib.toVersion(3, 0, 0).toMajorPart());
46
+ RegistryService registryService = RegistryService(registryServiceAddress);
47
+
48
+ // initially set the authority of the access managar to this (being the instance service).
49
+ // This will allow the instance service to bootstrap the authorizations of the instance
50
+ // and then transfer the ownership of the access manager to the instance owner once everything is setup
51
+ clonedAccessManager = AccessManagerSimple(Clones.clone(_accessManagerMaster));
52
+ clonedAccessManager.initialize(address(this));
53
+
54
+ clonedInstance = Instance(Clones.clone(_instanceMaster));
55
+ clonedInstance.initialize(address(clonedAccessManager), _registryAddress, registryNftId, msg.sender);
56
+ ( IRegistry.ObjectInfo memory info, ) = registryService.registerInstance(clonedInstance);
57
+ instanceNftId = info.nftId;
58
+
59
+ clonedInstanceReader = InstanceReader(Clones.clone(address(_instanceReaderMaster)));
60
+ clonedInstanceReader.initialize(_registryAddress, instanceNftId);
61
+
62
+ _grantInitialAuthorizations(clonedAccessManager, clonedInstance);
63
+
64
+ clonedInstance.setInstanceReader(clonedInstanceReader);
65
+
66
+ // to complete setup switch instance ownership to the instance owner
67
+ // TODO: use a role less powerful than admin, maybe INSTANCE_ADMIN (does not exist yet)
68
+ clonedAccessManager.grantRole(ADMIN_ROLE().toInt(), instanceOwner, 0);
69
+ clonedAccessManager.revokeRole(ADMIN_ROLE().toInt(), address(this));
70
+
71
+ emit LogInstanceCloned(address(clonedAccessManager), address(clonedInstance), address(clonedInstanceReader), instanceNftId);
72
+ }
73
+
74
+ function _grantInitialAuthorizations(AccessManagerSimple clonedAccessManager, Instance clonedInstance) internal {
75
+ address distributionServiceAddress = _registry.getServiceAddress("DistributionService", VersionLib.toVersion(3, 0, 0).toMajorPart());
76
+ clonedAccessManager.grantRole(DISTRIBUTION_SERVICE_ROLE().toInt(), distributionServiceAddress, 0);
77
+ bytes4[] memory instanceDistributionServiceSelectors = new bytes4[](2);
78
+ instanceDistributionServiceSelectors[0] = clonedInstance.createDistributionSetup.selector;
79
+ instanceDistributionServiceSelectors[1] = clonedInstance.updateDistributionSetup.selector;
80
+ clonedAccessManager.setTargetFunctionRole(
81
+ address(clonedInstance),
82
+ instanceDistributionServiceSelectors,
83
+ DISTRIBUTION_SERVICE_ROLE().toInt());
84
+
85
+ address poolServiceAddress = _registry.getServiceAddress("PoolService", VersionLib.toVersion(3, 0, 0).toMajorPart());
86
+ clonedAccessManager.grantRole(POOL_SERVICE_ROLE().toInt(), address(poolServiceAddress), 0);
87
+ bytes4[] memory instancePoolServiceSelectors = new bytes4[](4);
88
+ instancePoolServiceSelectors[0] = clonedInstance.createPoolSetup.selector;
89
+ instancePoolServiceSelectors[1] = clonedInstance.updatePoolSetup.selector;
90
+ instancePoolServiceSelectors[2] = clonedInstance.createBundle.selector;
91
+ instancePoolServiceSelectors[3] = clonedInstance.updateBundle.selector;
92
+ clonedAccessManager.setTargetFunctionRole(
93
+ address(clonedInstance),
94
+ instancePoolServiceSelectors,
95
+ POOL_SERVICE_ROLE().toInt());
96
+
97
+ address productServiceAddress = _registry.getServiceAddress("ProductService", VersionLib.toVersion(3, 0, 0).toMajorPart());
98
+ clonedAccessManager.grantRole(PRODUCT_SERVICE_ROLE().toInt(), address(productServiceAddress), 0);
99
+ bytes4[] memory instanceProductServiceSelectors = new bytes4[](9);
100
+ instanceProductServiceSelectors[0] = clonedInstance.createProductSetup.selector;
101
+ instanceProductServiceSelectors[1] = clonedInstance.updateProductSetup.selector;
102
+ instanceProductServiceSelectors[2] = clonedInstance.createRisk.selector;
103
+ instanceProductServiceSelectors[3] = clonedInstance.updateRisk.selector;
104
+ instanceProductServiceSelectors[4] = clonedInstance.updateRiskState.selector;
105
+ instanceProductServiceSelectors[5] = clonedInstance.createPolicy.selector;
106
+ instanceProductServiceSelectors[6] = clonedInstance.updatePolicy.selector;
107
+ instanceProductServiceSelectors[7] = clonedInstance.updatePolicyState.selector;
108
+ clonedAccessManager.setTargetFunctionRole(
109
+ address(clonedInstance),
110
+ instanceProductServiceSelectors,
111
+ PRODUCT_SERVICE_ROLE().toInt());
112
+ }
113
+
114
+ function setAccessManagerMaster(address accessManagerMaster) external {
115
+ require(
116
+ _accessManagerMaster == address(0),
117
+ "ERROR:CRD-001:ACCESS_MANAGER_MASTER_ALREADY_SET");
118
+ _accessManagerMaster = accessManagerMaster;
119
+ }
120
+
121
+ function setInstanceMaster(address instanceMaster) external {
122
+ require(
123
+ _instanceMaster == address(0),
124
+ "ERROR:CRD-002:INSTANCE_MASTER_ALREADY_SET");
125
+ _instanceMaster = instanceMaster;
126
+ }
127
+
128
+ function setInstanceReaderMaster(address instanceReaderMaster) external {
129
+ require(
130
+ _instanceReaderMaster == address(0),
131
+ "ERROR:CRD-003:INSTANCE_READER_MASTER_ALREADY_SET");
132
+ _instanceReaderMaster = instanceReaderMaster;
133
+ }
134
+
135
+ function getInstanceReaderMaster() external view returns (address) {
136
+ return _instanceReaderMaster;
137
+ }
138
+
139
+ function getInstanceMaster() external view returns (address) {
140
+ return _instanceMaster;
141
+ }
142
+
143
+ function getAccessManagerMaster() external view returns (address) {
144
+ return _accessManagerMaster;
145
+ }
146
+
147
+ // From IService
148
+ function getName() public pure override(IService, Service) returns(string memory) {
149
+ return NAME;
150
+ }
151
+
152
+ /// @dev top level initializer
153
+ // 1) registry is non upgradeable -> don't need a proxy and uses constructor !
154
+ // 2) deploy registry service first -> from its initialization func it is easier to deploy registry then vice versa
155
+ // 3) deploy registry -> pass registry service address as constructor argument
156
+ // registry is getting instantiated and locked to registry service address forever
157
+ function _initialize(
158
+ address owner,
159
+ bytes memory data
160
+ )
161
+ internal
162
+ initializer
163
+ virtual override
164
+ {
165
+ // bytes memory encodedConstructorArguments = abi.encode(
166
+ // _registryAddress);
167
+
168
+ // bytes memory instanceCreationCode = ContractDeployerLib.getCreationCode(
169
+ // instanceByteCodeWithInitCode,
170
+ // encodedConstructorArguments);
171
+
172
+ // address instanceAddress = ContractDeployerLib.deploy(
173
+ // instanceCreationCode,
174
+ // INSTANCE_CREATION_CODE_HASH);
175
+
176
+ address initialOwner = address(0);
177
+ (_registryAddress, initialOwner) = abi.decode(data, (address, address));
178
+ // TODO while InstanceService is not deployed in InstanceServiceManager constructor
179
+ // owner is InstanceServiceManager deployer
180
+ _initializeService(_registryAddress, owner);
181
+
182
+ _registerInterface(type(IService).interfaceId);
183
+ _registerInterface(type(IInstanceService).interfaceId);
184
+ }
185
+
186
+ function hasRole(address account, RoleId role, NftId instanceNftId) external view returns (bool) {
187
+ IRegistry.ObjectInfo memory instanceObjectInfo = getRegistry().getObjectInfo(instanceNftId);
188
+ address instanceAddress = instanceObjectInfo.objectAddress;
189
+ Instance instance = Instance(instanceAddress);
190
+ AccessManagerSimple accessManager = AccessManagerSimple(instance.authority());
191
+ (bool isMember, uint32 executionDelay) = accessManager.hasRole(role.toInt(), account);
192
+ if (executionDelay > 0) {
193
+ return false;
194
+ }
195
+ return isMember;
196
+ }
197
+ }
198
+
@@ -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
+ }
@@ -4,23 +4,108 @@ 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,
20
+ error ExpectedRoleMissing(RoleId expected, address caller);
21
+ error ComponentTypeInvalid(ObjectType componentType);
22
+
23
+ mapping (ObjectType => RoleId) internal _objectTypeToExpectedRole;
24
+
25
+ /// @dev modifier to check if caller has a role on the instance the component is registered in
26
+ modifier onlyComponentOwnerRole(address componentAddress) {
27
+ BaseComponent component = BaseComponent(componentAddress);
28
+ ObjectType objectType = _getObjectType(component);
29
+ RoleId expectedRole = _objectTypeToExpectedRole[objectType];
30
+
31
+ address componentOwner = msg.sender;
32
+ INftOwnable nftOwnable = INftOwnable(address(component.getInstance()));
33
+ if(! getInstanceService().hasRole(componentOwner, expectedRole, nftOwnable.getNftId())) {
34
+ revert ExpectedRoleMissing(expectedRole, componentOwner);
35
+ }
36
+ _;
37
+ }
38
+
39
+ /// @dev modifier to check if caller is a registered service
40
+ modifier onlyService() {
41
+ address caller = msg.sender;
42
+ require(getRegistry().isRegisteredService(caller), "ERROR_NOT_SERVICE");
43
+ _;
44
+ }
45
+
46
+ function _initializeService(
47
+ address registry,
18
48
  address initialOwner
19
49
  )
50
+ internal
51
+ override
20
52
  {
21
- _initializeServiceBase(registry, registryNftId, initialOwner);
53
+ super._initializeService(registry, initialOwner);
54
+ _objectTypeToExpectedRole[PRODUCT()] = PRODUCT_OWNER_ROLE();
55
+ _objectTypeToExpectedRole[POOL()] = POOL_OWNER_ROLE();
56
+ _objectTypeToExpectedRole[DISTRIBUTION()] = DISTRIBUTION_OWNER_ROLE();
57
+ _objectTypeToExpectedRole[ORACLE()] = ORACLE_OWNER_ROLE();
58
+ }
59
+
60
+ function getInstanceService() public view returns (InstanceService) {
61
+ return InstanceService(getRegistry().getServiceAddress("InstanceService", getMajorVersion()));
22
62
  }
23
63
 
64
+ function register(address componentAddress)
65
+ external
66
+ onlyComponentOwnerRole(componentAddress)
67
+ returns (NftId componentNftId)
68
+ {
69
+ address componentOwner = msg.sender;
70
+ BaseComponent component = BaseComponent(componentAddress);
71
+ ObjectType objectType = _getObjectType(component);
72
+ IRegistryService registryService = getRegistryService();
73
+
74
+ IRegistry.ObjectInfo memory objInfo;
75
+ bytes memory initialObjData;
76
+
77
+ if (objectType == DISTRIBUTION()) {
78
+ (objInfo, initialObjData) = registryService.registerDistribution(component, componentOwner);
79
+ } else if (objectType == PRODUCT()) {
80
+ (objInfo, initialObjData) = registryService.registerProduct(component, componentOwner);
81
+ } else if (objectType == POOL()) {
82
+ (objInfo, initialObjData) = registryService.registerPool(component, componentOwner);
83
+ // TODO: implement this for oracle - currently missing in registry
84
+ // } else if (objectType == ORACLE()) {
85
+ // (objInfo, initialObjData) = registryService.registerOracle(component, componentOwner);
86
+ } else {
87
+ revert ComponentTypeInvalid(objectType);
88
+ }
89
+
90
+ componentNftId = objInfo.nftId;
91
+ {
92
+ IInstance instance = _getInstance(objInfo);
93
+ _finalizeComponentRegistration(componentNftId, initialObjData, instance);
94
+ }
95
+ }
96
+
97
+ function _finalizeComponentRegistration(NftId componentNftId, bytes memory initialObjData, IInstance instance) internal virtual;
98
+
99
+ function _getObjectType(BaseComponent component) internal view returns (ObjectType) {
100
+ (IRegistry.ObjectInfo memory compInitialInfo, ) = component.getInitialInfo();
101
+ return compInitialInfo.objectType;
102
+ }
103
+
104
+ function _getInstance(IRegistry.ObjectInfo memory compObjInfo) internal view returns (IInstance) {
105
+ IRegistry registry = getRegistry();
106
+ IRegistry.ObjectInfo memory instanceInfo = registry.getObjectInfo(compObjInfo.parentNftId);
107
+ return IInstance(instanceInfo.objectAddress);
108
+ }
24
109
 
25
110
  function _getAndVerifyComponentInfoAndInstance(
26
111
  ObjectType objectType
@@ -32,7 +117,7 @@ abstract contract ComponentServiceBase is ServiceBase {
32
117
  IInstance instance
33
118
  )
34
119
  {
35
- NftId componentNftId = getRegistry().getNftId(msg.sender);
120
+ NftId componentNftId = _registry.getNftId(msg.sender);
36
121
  require(componentNftId.gtz(), "ERROR_COMPONENT_UNKNOWN");
37
122
 
38
123
  info = getRegistry().getObjectInfo(componentNftId);
@@ -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
 
@@ -1,12 +1,12 @@
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, Key32Lib} from "../../types/Key32.sol";
6
6
  import {NftId} from "../../types/NftId.sol";
7
7
  import {ObjectType} from "../../types/ObjectType.sol";
8
8
  import {StateId, ACTIVE} from "../../types/StateId.sol";
9
- import {Timestamp, zeroTimestamp} from "../../types/Timestamp.sol";
9
+ import {Timestamp, TimestampLib} from "../../types/Timestamp.sol";
10
10
 
11
11
  import {Lifecycle} from "./Lifecycle.sol";
12
12
  import {IKeyValueStore} from "./IKeyValueStore.sol";
@@ -14,27 +14,23 @@ import {IKeyValueStore} from "./IKeyValueStore.sol";
14
14
  contract KeyValueStore is Lifecycle, IKeyValueStore {
15
15
 
16
16
  mapping(Key32 key32 => Value value) private _value;
17
- address private _owner;
18
17
 
19
- modifier onlyOwner() {
20
- require(
21
- msg.sender == _owner,
22
- "ERROR:KVS-001:NOT_OWNER");
23
- _;
24
- }
25
-
26
- constructor() {
27
- _owner = msg.sender;
18
+ function create(
19
+ Key32 key32,
20
+ bytes memory data
21
+ )
22
+ internal
23
+ {
24
+ _create(key32, data);
28
25
  }
29
26
 
30
- function create(
27
+ function _create(
31
28
  Key32 key32,
32
- ObjectType objectType,
33
29
  bytes memory data
34
30
  )
35
- public
36
- onlyOwner
31
+ internal
37
32
  {
33
+ ObjectType objectType = key32.toObjectType();
38
34
  require(objectType.gtz(), "ERROR:KVS-010:TYPE_UNDEFINED");
39
35
 
40
36
  Metadata storage metadata = _value[key32].metadata;
@@ -55,12 +51,25 @@ contract KeyValueStore is Lifecycle, IKeyValueStore {
55
51
  _value[key32].data = data;
56
52
 
57
53
  // solhint-disable-next-line avoid-tx-origin
58
- emit LogInfoCreated(toKey(key32), initialState, createdBy, tx.origin);
54
+ emit LogInfoCreated(key32.toObjectType(), key32.toKeyId(), initialState, createdBy, tx.origin);
59
55
  }
60
56
 
61
- function update(Key32 key32, StateId state, bytes memory data)
62
- public
63
- onlyOwner
57
+ function update(
58
+ Key32 key32,
59
+ bytes memory data,
60
+ StateId state
61
+ )
62
+ internal
63
+ {
64
+ _update(key32, data, state);
65
+ }
66
+
67
+ function _update(
68
+ Key32 key32,
69
+ bytes memory data,
70
+ StateId state
71
+ )
72
+ internal
64
73
  {
65
74
  require(state.gtz(), "ERROR:KVS-020:STATE_UNDEFINED");
66
75
  Metadata storage metadata = _value[key32].metadata;
@@ -78,16 +87,20 @@ contract KeyValueStore is Lifecycle, IKeyValueStore {
78
87
  metadata.updatedIn = blockBlocknumber();
79
88
 
80
89
  // create log entries
81
- Key memory key = toKey(key32);
82
- // solhint-disable-next-line avoid-tx-origin
83
- emit LogStateUpdated(key, state, stateOld, updatedBy, tx.origin, lastUpdatedIn);
84
- // solhint-disable-next-line avoid-tx-origin
85
- emit LogInfoUpdated(key, state, updatedBy, tx.origin, lastUpdatedIn);
90
+ // solhint-disable avoid-tx-origin
91
+ emit LogStateUpdated(key32.toObjectType(), key32.toKeyId(), state, stateOld, updatedBy, tx.origin, lastUpdatedIn);
92
+ emit LogInfoUpdated(key32.toObjectType(), key32.toKeyId(), state, updatedBy, tx.origin, lastUpdatedIn);
93
+ // solhing-enable
86
94
  }
87
95
 
88
96
  function updateData(Key32 key32, bytes memory data)
89
- public
90
- onlyOwner
97
+ internal
98
+ {
99
+ _updateData(key32, data);
100
+ }
101
+
102
+ function _updateData(Key32 key32, bytes memory data)
103
+ internal
91
104
  {
92
105
  Metadata storage metadata = _value[key32].metadata;
93
106
  StateId state = metadata.state;
@@ -103,14 +116,18 @@ contract KeyValueStore is Lifecycle, IKeyValueStore {
103
116
  metadata.updatedIn = blockBlocknumber();
104
117
 
105
118
  // create log entry
106
- Key memory key = toKey(key32);
107
119
  // solhint-disable-next-line avoid-tx-origin
108
- emit LogInfoUpdated(key, state, updatedBy, tx.origin, lastUpdatedIn);
120
+ emit LogInfoUpdated(key32.toObjectType(), key32.toKeyId(), state, updatedBy, tx.origin, lastUpdatedIn);
109
121
  }
110
122
 
111
123
  function updateState(Key32 key32, StateId state)
112
- public
113
- onlyOwner
124
+ internal
125
+ {
126
+ _updateState(key32, state);
127
+ }
128
+
129
+ function _updateState(Key32 key32, StateId state)
130
+ internal
114
131
  {
115
132
  require(state.gtz(), "ERROR:KVS-040:STATE_UNDEFINED");
116
133
  Metadata storage metadata = _value[key32].metadata;
@@ -125,9 +142,8 @@ contract KeyValueStore is Lifecycle, IKeyValueStore {
125
142
  metadata.updatedIn = blockBlocknumber();
126
143
 
127
144
  // create log entry
128
- Key memory key = toKey(key32);
129
145
  // solhint-disable-next-line avoid-tx-origin
130
- emit LogStateUpdated(key, state, stateOld, updatedBy, tx.origin, lastUpdatedIn);
146
+ emit LogStateUpdated(key32.toObjectType(), key32.toKeyId(), state, stateOld, updatedBy, tx.origin, lastUpdatedIn);
131
147
  }
132
148
 
133
149
  function exists(Key32 key32) public view returns (bool) {
@@ -153,10 +169,4 @@ contract KeyValueStore is Lifecycle, IKeyValueStore {
153
169
  function toKey32(ObjectType objectType, KeyId id) external pure override returns(Key32) {
154
170
  return Key32Lib.toKey32(objectType, id);
155
171
  }
156
-
157
- function toKey(Key32 key32) public pure override returns (Key memory key) {
158
- ObjectType objectType = key32.toObjectType();
159
- KeyId id = key32.toKeyId();
160
- return Key(objectType, id);
161
- }
162
172
  }
@@ -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 {NftId} from "../../types/NftId.sol";
5
5
  import {ObjectType, COMPONENT, BUNDLE, POLICY, RISK} from "../../types/ObjectType.sol";
@@ -0,0 +1,38 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ pragma solidity ^0.8.20;
3
+
4
+ import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
5
+ import {ShortString, ShortStrings} from "@openzeppelin/contracts/utils/ShortStrings.sol";
6
+
7
+ import {RoleId} from "../../types/RoleId.sol";
8
+
9
+ interface IAccess {
10
+ struct RoleInfo {
11
+ ShortString name;
12
+ bool isCustom;
13
+ }
14
+
15
+ struct TargetInfo {
16
+ ShortString name;
17
+ bool isCustom;
18
+ }
19
+
20
+ error ErrorTargetAddressZero();
21
+ error ErrorTargetAlreadyExists(address target, ShortString name);
22
+ error ErrorTargetDoesNotExist(address target);
23
+ error ErrorTargetNameEmpty(address target);
24
+ error ErrorTargetNameExists(address target, address existingTarget, ShortString name);
25
+
26
+ error ErrorRoleIdInvalid(RoleId roleId);
27
+ error ErrorRoleIdTooBig(RoleId roleId);
28
+ error ErrorRoleIdTooSmall(RoleId roleId);
29
+ error ErrorRoleIdAlreadyExists(RoleId roleId, ShortString name);
30
+ error ErrorRoleIdNotActive(RoleId roleId);
31
+ error ErrorRoleNameEmpty(RoleId roleId);
32
+ error ErrorRoleNameNotUnique(RoleId roleId, ShortString name);
33
+ error ErrorRoleInvalidUpdate(RoleId roleId, bool isCustom);
34
+ error ErrorGrantNonexstentRole(RoleId roleId);
35
+ error ErrorRevokeNonexstentRole(RoleId roleId);
36
+ error ErrorRenounceNonexstentRole(RoleId roleId);
37
+
38
+ }