@etherisc/gif-next 0.0.2-e1f23dc-329 → 0.0.2-e2a57af-971

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 (250) hide show
  1. package/README.md +63 -1
  2. package/artifacts/contracts/components/Component.sol/Component.dbg.json +4 -0
  3. package/artifacts/contracts/components/Component.sol/Component.json +656 -0
  4. package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +1 -1
  5. package/artifacts/contracts/components/Distribution.sol/Distribution.json +318 -87
  6. package/artifacts/contracts/components/IComponent.sol/IComponent.dbg.json +4 -0
  7. package/artifacts/contracts/{shared/RegisterableUpgradable.sol/RegisterableUpgradable.json → components/IComponent.sol/IComponent.json} +171 -158
  8. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
  9. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.json +496 -0
  10. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
  11. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.json +550 -30
  12. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +1 -1
  13. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.json +596 -5
  14. package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
  15. package/artifacts/contracts/components/Pool.sol/Pool.json +340 -152
  16. package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
  17. package/artifacts/contracts/components/Product.sol/Product.json +329 -99
  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/ISM.sol/ISM.dbg.json +1 -1
  33. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.dbg.json +1 -1
  34. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.dbg.json +1 -1
  35. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.dbg.json +1 -1
  36. package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.dbg.json +1 -1
  37. package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.dbg.json +1 -1
  38. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.dbg.json +4 -0
  39. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.json +764 -0
  40. package/artifacts/contracts/instance/Cloneable.sol/Cloneable.dbg.json +4 -0
  41. package/artifacts/contracts/instance/{AccessManagedSimple.sol/AccessManagedSimple.json → Cloneable.sol/Cloneable.json} +86 -2
  42. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  43. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +327 -2
  44. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
  45. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +125 -19
  46. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  47. package/artifacts/contracts/instance/Instance.sol/Instance.json +176 -669
  48. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +1 -1
  49. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +231 -114
  50. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
  51. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +56 -82
  52. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
  53. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +260 -167
  54. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
  55. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +41 -76
  56. package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.dbg.json +4 -0
  57. package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.json +261 -0
  58. package/artifacts/contracts/instance/base/ComponentService.sol/ComponentService.dbg.json +4 -0
  59. package/artifacts/contracts/instance/base/{ComponentServiceBase.sol/ComponentServiceBase.json → ComponentService.sol/ComponentService.json} +124 -61
  60. package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
  61. package/artifacts/contracts/instance/base/ILifecycle.sol/ILifecycle.dbg.json +1 -1
  62. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
  63. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json +1 -1
  64. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +1 -1
  65. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.json +59 -16
  66. package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
  67. package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +1 -1
  68. package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +1 -1
  69. package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +1 -1
  70. package/artifacts/contracts/instance/module/ISetup.sol/ISetup.dbg.json +1 -1
  71. package/artifacts/contracts/instance/module/ITreasury.sol/ITreasury.dbg.json +1 -1
  72. package/artifacts/contracts/instance/service/BundleService.sol/BundleService.dbg.json +4 -0
  73. package/artifacts/contracts/instance/service/BundleService.sol/BundleService.json +1102 -0
  74. package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.dbg.json +4 -0
  75. package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.json +449 -0
  76. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +1 -1
  77. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +149 -93
  78. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
  79. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.json +29 -36
  80. package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.dbg.json +4 -0
  81. package/artifacts/contracts/instance/service/{IComponentOwnerService.sol/IComponentOwnerService.json → IBundleService.sol/IBundleService.json} +295 -46
  82. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +1 -1
  83. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.json +13 -18
  84. package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.dbg.json +4 -0
  85. package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.json +766 -0
  86. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +1 -1
  87. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +15 -169
  88. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +1 -1
  89. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +17 -225
  90. package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.dbg.json +4 -0
  91. package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.json +1227 -0
  92. package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +4 -0
  93. package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.json +505 -0
  94. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +1 -1
  95. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +148 -268
  96. package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
  97. package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.json +29 -40
  98. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +1 -1
  99. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +150 -388
  100. package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.dbg.json +1 -1
  101. package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.json +29 -64
  102. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  103. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +2 -2
  104. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  105. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +212 -133
  106. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
  107. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +127 -93
  108. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
  109. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  110. package/artifacts/contracts/registry/Registry.sol/Registry.json +224 -234
  111. package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.dbg.json +4 -0
  112. package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.json +285 -0
  113. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
  114. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +68 -161
  115. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
  116. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +51 -104
  117. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.dbg.json +4 -0
  118. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.json +547 -0
  119. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
  120. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +13 -29
  121. package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.dbg.json +1 -1
  122. package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +1 -1
  123. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
  124. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  125. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +0 -5
  126. package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
  127. package/artifacts/contracts/shared/IService.sol/IService.json +13 -18
  128. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +1 -1
  129. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
  130. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +19 -6
  131. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +1 -1
  132. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +19 -6
  133. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  134. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +19 -11
  135. package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
  136. package/artifacts/contracts/shared/Service.sol/Service.json +26 -18
  137. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
  138. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
  139. package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +1 -1
  140. package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json +1 -1
  141. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json +1 -1
  142. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +19 -11
  143. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +1 -1
  144. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.json +2 -2
  145. package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +1 -1
  146. package/artifacts/contracts/test/TestService.sol/TestService.json +44 -36
  147. package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json +1 -1
  148. package/artifacts/contracts/test/TestVersion.sol/TestVersion.dbg.json +1 -1
  149. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json +1 -1
  150. package/artifacts/contracts/test/Usdc.sol/USDC.dbg.json +1 -1
  151. package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.dbg.json +1 -1
  152. package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
  153. package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +1 -1
  154. package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.dbg.json +1 -1
  155. package/artifacts/contracts/types/Fee.sol/FeeLib.dbg.json +1 -1
  156. package/artifacts/contracts/types/Key32.sol/Key32Lib.dbg.json +1 -1
  157. package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +1 -1
  158. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
  159. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.json +26 -3
  160. package/artifacts/contracts/types/NumberId.sol/NumberIdLib.dbg.json +1 -1
  161. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
  162. package/artifacts/contracts/types/Referral.sol/ReferralLib.dbg.json +1 -1
  163. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.dbg.json +1 -1
  164. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.dbg.json +1 -1
  165. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.json +2 -2
  166. package/artifacts/contracts/types/StateId.sol/StateIdLib.dbg.json +1 -1
  167. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json +1 -1
  168. package/artifacts/contracts/types/UFixed.sol/MathLib.dbg.json +1 -1
  169. package/artifacts/contracts/types/UFixed.sol/UFixedLib.dbg.json +1 -1
  170. package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +1 -1
  171. package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +1 -1
  172. package/contracts/components/Component.sol +216 -0
  173. package/contracts/components/Distribution.sol +41 -49
  174. package/contracts/components/IComponent.sol +43 -0
  175. package/contracts/components/IDistributionComponent.sol +5 -2
  176. package/contracts/components/IPoolComponent.sol +11 -13
  177. package/contracts/components/IProductComponent.sol +7 -3
  178. package/contracts/components/Pool.sol +74 -89
  179. package/contracts/components/Product.sol +68 -87
  180. package/contracts/instance/BundleManager.sol +125 -0
  181. package/contracts/instance/Cloneable.sol +46 -0
  182. package/contracts/instance/IInstance.sol +27 -9
  183. package/contracts/instance/IInstanceService.sol +15 -4
  184. package/contracts/instance/Instance.sol +60 -234
  185. package/contracts/instance/InstanceAccessManager.sol +88 -78
  186. package/contracts/instance/InstanceReader.sol +3 -25
  187. package/contracts/instance/InstanceService.sol +347 -103
  188. package/contracts/instance/InstanceServiceManager.sol +5 -8
  189. package/contracts/instance/ObjectManager.sol +84 -0
  190. package/contracts/instance/base/ComponentService.sol +134 -0
  191. package/contracts/instance/module/IAccess.sol +27 -17
  192. package/contracts/instance/module/ISetup.sol +3 -1
  193. package/contracts/instance/service/BundleService.sol +293 -0
  194. package/contracts/instance/service/BundleServiceManager.sol +51 -0
  195. package/contracts/instance/service/DistributionService.sol +43 -25
  196. package/contracts/instance/service/DistributionServiceManager.sol +6 -9
  197. package/contracts/instance/service/IBundleService.sol +44 -0
  198. package/contracts/instance/service/IPolicyService.sol +94 -0
  199. package/contracts/instance/service/IPoolService.sol +4 -25
  200. package/contracts/instance/service/IProductService.sol +3 -70
  201. package/contracts/instance/service/PolicyService.sol +538 -0
  202. package/contracts/instance/service/PolicyServiceManager.sol +54 -0
  203. package/contracts/instance/service/PoolService.sol +36 -127
  204. package/contracts/instance/service/PoolServiceManager.sol +5 -8
  205. package/contracts/instance/service/ProductService.sol +123 -453
  206. package/contracts/registry/ChainNft.sol +1 -1
  207. package/contracts/registry/IRegistry.sol +34 -17
  208. package/contracts/registry/IRegistryService.sol +28 -13
  209. package/contracts/registry/Registry.sol +214 -210
  210. package/contracts/registry/RegistryAccessManager.sol +216 -0
  211. package/contracts/registry/RegistryService.sol +61 -157
  212. package/contracts/registry/RegistryServiceManager.sol +18 -36
  213. package/contracts/registry/ReleaseManager.sol +332 -0
  214. package/contracts/registry/TokenRegistry.sol +8 -7
  215. package/contracts/shared/IRegisterable.sol +1 -3
  216. package/contracts/shared/IService.sol +2 -1
  217. package/contracts/shared/NftOwnable.sol +5 -0
  218. package/contracts/shared/ProxyManager.sol +1 -1
  219. package/contracts/shared/Registerable.sol +10 -14
  220. package/contracts/shared/Service.sol +13 -8
  221. package/contracts/test/TestService.sol +3 -2
  222. package/contracts/types/NftIdSet.sol +26 -24
  223. package/contracts/types/RoleId.sol +10 -10
  224. package/package.json +1 -1
  225. package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.dbg.json +0 -4
  226. package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.json +0 -327
  227. package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.dbg.json +0 -4
  228. package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.json +0 -280
  229. package/artifacts/contracts/instance/AccessManagedSimple.sol/AccessManagedSimple.dbg.json +0 -4
  230. package/artifacts/contracts/instance/AccessManagerSimple.sol/AccessManagerSimple.dbg.json +0 -4
  231. package/artifacts/contracts/instance/AccessManagerSimple.sol/AccessManagerSimple.json +0 -1132
  232. package/artifacts/contracts/instance/IAccessManagerSimple.sol/IAccessManagerSimple.dbg.json +0 -4
  233. package/artifacts/contracts/instance/IAccessManagerSimple.sol/IAccessManagerSimple.json +0 -1082
  234. package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.dbg.json +0 -4
  235. package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.dbg.json +0 -4
  236. package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.json +0 -113
  237. package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.dbg.json +0 -4
  238. package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.json +0 -827
  239. package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.dbg.json +0 -4
  240. package/artifacts/contracts/shared/RegisterableUpgradable.sol/RegisterableUpgradable.dbg.json +0 -4
  241. package/contracts/components/BaseComponent.sol +0 -91
  242. package/contracts/components/IBaseComponent.sol +0 -25
  243. package/contracts/instance/AccessManagedSimple.sol +0 -115
  244. package/contracts/instance/AccessManagerSimple.sol +0 -692
  245. package/contracts/instance/IAccessManagerSimple.sol +0 -391
  246. package/contracts/instance/base/ComponentServiceBase.sol +0 -134
  247. package/contracts/instance/base/IInstanceBase.sol +0 -23
  248. package/contracts/instance/service/ComponentOwnerService.sol +0 -317
  249. package/contracts/instance/service/IComponentOwnerService.sol +0 -20
  250. package/contracts/shared/RegisterableUpgradable.sol +0 -16
@@ -3,157 +3,325 @@ pragma solidity ^0.8.20;
3
3
 
4
4
  import {Clones} from "@openzeppelin/contracts/proxy/Clones.sol";
5
5
 
6
- import {AccessManagerSimple} from "./AccessManagerSimple.sol";
7
- import {InstanceAccessManager} from "./InstanceAccessManager.sol";
6
+ import {Component} from "../components/Component.sol";
8
7
  import {Instance} from "./Instance.sol";
8
+ import {IInstance} from "./IInstance.sol";
9
+ import {InstanceAccessManager} from "./InstanceAccessManager.sol";
9
10
  import {IInstanceService} from "./IInstanceService.sol";
10
11
  import {InstanceReader} from "./InstanceReader.sol";
12
+ import {BundleManager} from "./BundleManager.sol";
11
13
  import {IRegistry} from "../registry/IRegistry.sol";
12
- import {Registry} from "../registry/Registry.sol";
13
- import {RegistryService} from "../registry/RegistryService.sol";
14
+ import {IRegistryService} from "../registry/IRegistryService.sol";
15
+ import {ChainNft} from "../registry/ChainNft.sol";
14
16
  import {Service} from "../../contracts/shared/Service.sol";
15
17
  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 {NftId} from "../../contracts/types/NftId.sol";
18
19
  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";
20
+ import {ADMIN_ROLE, DISTRIBUTION_OWNER_ROLE, POOL_OWNER_ROLE, PRODUCT_OWNER_ROLE, INSTANCE_SERVICE_ROLE, DISTRIBUTION_SERVICE_ROLE, POOL_SERVICE_ROLE, PRODUCT_SERVICE_ROLE, POLICY_SERVICE_ROLE, BUNDLE_SERVICE_ROLE} from "../types/RoleId.sol";
21
+ import {ObjectType, INSTANCE, BUNDLE, POLICY, PRODUCT, DISTRIBUTION, REGISTRY, POOL} from "../types/ObjectType.sol";
22
+ import {IDistributionComponent} from "../components/IDistributionComponent.sol";
23
+ import {IPoolComponent} from "../components/IPoolComponent.sol";
24
+ import {IProductComponent} from "../components/IProductComponent.sol";
21
25
 
22
26
  contract InstanceService is Service, IInstanceService {
23
27
 
24
- address internal _registryAddress;
25
- address internal _accessManagerMaster;
26
- address internal _instanceMaster;
27
- address internal _instanceReaderMaster;
28
+ address internal _masterInstanceAccessManager;
29
+ address internal _masterInstance;
30
+ address internal _masterInstanceReader;
31
+ address internal _masterInstanceBundleManager;
28
32
 
29
33
  // TODO update to real hash when instance is stable
30
34
  bytes32 public constant INSTANCE_CREATION_CODE_HASH = bytes32(0);
31
- string public constant NAME = "InstanceService";
35
+
36
+ modifier onlyInstanceOwner(NftId instanceNftId) {
37
+ IRegistry registry = getRegistry();
38
+ ChainNft chainNft = registry.getChainNft();
39
+
40
+ if( msg.sender != chainNft.ownerOf(instanceNftId.toInt())) {
41
+ revert ErrorInstanceServiceNotInstanceOwner(msg.sender, instanceNftId);
42
+ }
43
+ _;
44
+ }
45
+
46
+ modifier onlyRegisteredService() {
47
+ address caller = msg.sender;
48
+ if (! getRegistry().isRegisteredService(caller)) {
49
+ revert ErrorInstanceServiceRequestUnauhorized(caller);
50
+ }
51
+ _;
52
+ }
32
53
 
33
54
  function createInstanceClone()
34
55
  external
35
56
  returns (
36
- AccessManagerSimple clonedAccessManager,
57
+ InstanceAccessManager clonedAccessManager,
37
58
  Instance clonedInstance,
38
- NftId instanceNftId,
39
- InstanceReader clonedInstanceReader
59
+ NftId clonedInstanceNftId,
60
+ InstanceReader clonedInstanceReader,
61
+ BundleManager clonedBundleManager
40
62
  )
41
63
  {
42
64
  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);
65
+ IRegistry registry = getRegistry();
66
+ address registryAddress = address(registry);
67
+ NftId registryNftId = registry.getNftId(registryAddress);
68
+ address registryServiceAddress = registry.getServiceAddress(REGISTRY(), getMajorVersion());
69
+ IRegistryService registryService = IRegistryService(registryServiceAddress);
47
70
 
48
71
  // initially set the authority of the access managar to this (being the instance service).
49
72
  // This will allow the instance service to bootstrap the authorizations of the instance
50
73
  // and then transfer the ownership of the access manager to the instance owner once everything is setup
51
- clonedAccessManager = AccessManagerSimple(Clones.clone(_accessManagerMaster));
74
+ clonedAccessManager = InstanceAccessManager(Clones.clone(_masterInstanceAccessManager));
52
75
  clonedAccessManager.initialize(address(this));
53
76
 
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;
77
+ clonedInstance = Instance(Clones.clone(_masterInstance));
78
+ clonedInstance.initialize(address(clonedAccessManager), registryAddress, registryNftId, msg.sender);
58
79
 
59
- clonedInstanceReader = InstanceReader(Clones.clone(address(_instanceReaderMaster)));
60
- clonedInstanceReader.initialize(_registryAddress, instanceNftId);
80
+ clonedInstanceReader = InstanceReader(Clones.clone(address(_masterInstanceReader)));
81
+ clonedInstanceReader.initialize(registryAddress, address(clonedInstance));
82
+ clonedInstance.setInstanceReader(clonedInstanceReader);
61
83
 
62
- _grantInitialAuthorizations(clonedAccessManager, clonedInstance);
84
+ clonedBundleManager = BundleManager(Clones.clone(_masterInstanceBundleManager));
85
+ clonedBundleManager.initialize(address(clonedAccessManager), registryAddress, address(clonedInstance));
86
+ clonedInstance.setBundleManager(clonedBundleManager);
87
+
88
+ // TODO amend setters with instance specific , policy manager ...
89
+
90
+ _grantInitialAuthorizations(clonedAccessManager, clonedInstance, clonedBundleManager);
63
91
 
64
- clonedInstance.setInstanceReader(clonedInstanceReader);
65
-
66
92
  // to complete setup switch instance ownership to the instance owner
67
93
  // 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));
94
+ clonedAccessManager.grantRole(ADMIN_ROLE(), instanceOwner);
95
+ clonedAccessManager.revokeRole(ADMIN_ROLE(), address(this));
96
+
97
+ IRegistry.ObjectInfo memory info = registryService.registerInstance(clonedInstance, instanceOwner);
98
+ clonedInstanceNftId = info.nftId;
99
+ // clonedInstance.linkToRegisteredNftId();
100
+
101
+ emit LogInstanceCloned(address(clonedAccessManager), address(clonedInstance), address(clonedInstanceReader), clonedInstanceNftId);
102
+ }
70
103
 
71
- emit LogInstanceCloned(address(clonedAccessManager), address(clonedInstance), address(clonedInstanceReader), instanceNftId);
104
+ function _grantInitialAuthorizations(InstanceAccessManager clonedAccessManager, Instance clonedInstance, BundleManager clonedBundleManager) internal {
105
+ _createGifRoles(clonedAccessManager);
106
+ _createGifTargets(clonedAccessManager, clonedInstance, clonedBundleManager);
107
+ _grantDistributionServiceAuthorizations(clonedAccessManager, clonedInstance);
108
+ _grantPoolServiceAuthorizations(clonedAccessManager, clonedInstance);
109
+ _grantProductServiceAuthorizations(clonedAccessManager, clonedInstance);
110
+ _grantPolicyServiceAuthorizations(clonedAccessManager, clonedInstance);
111
+ _grantBundleServiceAuthorizations(clonedAccessManager, clonedInstance, clonedBundleManager);
112
+ _grantInstanceServiceAuthorizations(clonedAccessManager, clonedInstance);
72
113
  }
73
114
 
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);
115
+ function _createGifRoles(InstanceAccessManager clonedAccessManager) internal {
116
+ clonedAccessManager.createGifRole(DISTRIBUTION_OWNER_ROLE(), "DistributionOwnerRole");
117
+ clonedAccessManager.createGifRole(POOL_OWNER_ROLE(), "PoolOwnerRole");
118
+ clonedAccessManager.createGifRole(PRODUCT_OWNER_ROLE(), "ProductOwnerRole");
119
+
120
+ clonedAccessManager.createGifRole(DISTRIBUTION_SERVICE_ROLE(), "DistributionServiceRole");
121
+ clonedAccessManager.createGifRole(POOL_SERVICE_ROLE(), "PoolServiceRole");
122
+ clonedAccessManager.createGifRole(PRODUCT_SERVICE_ROLE(), "ProductServiceRole");
123
+ clonedAccessManager.createGifRole(POLICY_SERVICE_ROLE(), "PolicyServiceRole");
124
+ clonedAccessManager.createGifRole(BUNDLE_SERVICE_ROLE(), "BundleServiceRole");
125
+ clonedAccessManager.createGifRole(INSTANCE_SERVICE_ROLE(), "InstanceServiceRole");
126
+ }
127
+
128
+ function _createGifTargets(InstanceAccessManager clonedAccessManager, Instance clonedInstance, BundleManager clonedBundleManager) internal {
129
+ clonedAccessManager.createGifTarget(address(clonedAccessManager), "InstanceAccessManager");
130
+ clonedAccessManager.createGifTarget(address(clonedInstance), "Instance");
131
+ clonedAccessManager.createGifTarget(address(clonedBundleManager), "BundleManager");
132
+ }
133
+
134
+ function _grantDistributionServiceAuthorizations(InstanceAccessManager clonedAccessManager, Instance clonedInstance) internal {
135
+ // configure authorization for distribution service on instance
136
+ IRegistry registry = getRegistry();
137
+ address distributionServiceAddress = registry.getServiceAddress(DISTRIBUTION(), getMajorVersion());
138
+ clonedAccessManager.grantRole(DISTRIBUTION_SERVICE_ROLE(), distributionServiceAddress);
77
139
  bytes4[] memory instanceDistributionServiceSelectors = new bytes4[](2);
78
140
  instanceDistributionServiceSelectors[0] = clonedInstance.createDistributionSetup.selector;
79
141
  instanceDistributionServiceSelectors[1] = clonedInstance.updateDistributionSetup.selector;
80
142
  clonedAccessManager.setTargetFunctionRole(
81
- address(clonedInstance),
143
+ "Instance",
82
144
  instanceDistributionServiceSelectors,
83
- DISTRIBUTION_SERVICE_ROLE().toInt());
145
+ DISTRIBUTION_SERVICE_ROLE());
146
+ }
84
147
 
85
- address poolServiceAddress = _registry.getServiceAddress("PoolService", VersionLib.toVersion(3, 0, 0).toMajorPart());
86
- clonedAccessManager.grantRole(POOL_SERVICE_ROLE().toInt(), address(poolServiceAddress), 0);
148
+ function _grantPoolServiceAuthorizations(InstanceAccessManager clonedAccessManager, Instance clonedInstance) internal {
149
+ // configure authorization for pool service on instance
150
+ address poolServiceAddress = _registry.getServiceAddress(POOL(), getMajorVersion());
151
+ clonedAccessManager.grantRole(POOL_SERVICE_ROLE(), address(poolServiceAddress));
87
152
  bytes4[] memory instancePoolServiceSelectors = new bytes4[](4);
88
153
  instancePoolServiceSelectors[0] = clonedInstance.createPoolSetup.selector;
89
154
  instancePoolServiceSelectors[1] = clonedInstance.updatePoolSetup.selector;
90
- instancePoolServiceSelectors[2] = clonedInstance.createBundle.selector;
91
- instancePoolServiceSelectors[3] = clonedInstance.updateBundle.selector;
92
155
  clonedAccessManager.setTargetFunctionRole(
93
- address(clonedInstance),
156
+ "Instance",
94
157
  instancePoolServiceSelectors,
95
- POOL_SERVICE_ROLE().toInt());
158
+ POOL_SERVICE_ROLE());
159
+ }
96
160
 
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);
161
+ function _grantProductServiceAuthorizations(InstanceAccessManager clonedAccessManager, Instance clonedInstance) internal {
162
+ // configure authorization for product service on instance
163
+ address productServiceAddress = _registry.getServiceAddress(PRODUCT(), getMajorVersion());
164
+ clonedAccessManager.grantRole(PRODUCT_SERVICE_ROLE(), address(productServiceAddress));
165
+ bytes4[] memory instanceProductServiceSelectors = new bytes4[](5);
100
166
  instanceProductServiceSelectors[0] = clonedInstance.createProductSetup.selector;
101
167
  instanceProductServiceSelectors[1] = clonedInstance.updateProductSetup.selector;
102
168
  instanceProductServiceSelectors[2] = clonedInstance.createRisk.selector;
103
169
  instanceProductServiceSelectors[3] = clonedInstance.updateRisk.selector;
104
170
  instanceProductServiceSelectors[4] = clonedInstance.updateRiskState.selector;
105
- instanceProductServiceSelectors[5] = clonedInstance.createPolicy.selector;
106
- instanceProductServiceSelectors[6] = clonedInstance.updatePolicy.selector;
107
- instanceProductServiceSelectors[7] = clonedInstance.updatePolicyState.selector;
108
171
  clonedAccessManager.setTargetFunctionRole(
109
- address(clonedInstance),
172
+ "Instance",
110
173
  instanceProductServiceSelectors,
111
- PRODUCT_SERVICE_ROLE().toInt());
174
+ PRODUCT_SERVICE_ROLE());
175
+ }
176
+
177
+ function _grantPolicyServiceAuthorizations(InstanceAccessManager clonedAccessManager, Instance clonedInstance) internal {
178
+ // configure authorization for policy service on instance
179
+ address policyServiceAddress = _registry.getServiceAddress(POLICY(), getMajorVersion());
180
+ clonedAccessManager.grantRole(POLICY_SERVICE_ROLE(), address(policyServiceAddress));
181
+ bytes4[] memory instancePolicyServiceSelectors = new bytes4[](3);
182
+ instancePolicyServiceSelectors[0] = clonedInstance.createPolicy.selector;
183
+ instancePolicyServiceSelectors[1] = clonedInstance.updatePolicy.selector;
184
+ instancePolicyServiceSelectors[2] = clonedInstance.updatePolicyState.selector;
185
+ clonedAccessManager.setTargetFunctionRole(
186
+ "Instance",
187
+ instancePolicyServiceSelectors,
188
+ POLICY_SERVICE_ROLE());
189
+ }
190
+
191
+ function _grantBundleServiceAuthorizations(InstanceAccessManager clonedAccessManager, Instance clonedInstance, BundleManager clonedBundleManager) internal {
192
+ // configure authorization for bundle service on instance
193
+ address bundleServiceAddress = _registry.getServiceAddress(BUNDLE(), getMajorVersion());
194
+ clonedAccessManager.grantRole(BUNDLE_SERVICE_ROLE(), address(bundleServiceAddress));
195
+ bytes4[] memory instanceBundleServiceSelectors = new bytes4[](2);
196
+ instanceBundleServiceSelectors[0] = clonedInstance.createBundle.selector;
197
+ instanceBundleServiceSelectors[1] = clonedInstance.updateBundle.selector;
198
+ clonedAccessManager.setTargetFunctionRole(
199
+ "Instance",
200
+ instanceBundleServiceSelectors,
201
+ BUNDLE_SERVICE_ROLE());
202
+
203
+ // configure authorization for bundle service on bundle manager
204
+ bytes4[] memory bundleManagerBundleServiceSelectors = new bytes4[](5);
205
+ bundleManagerBundleServiceSelectors[0] = clonedBundleManager.linkPolicy.selector;
206
+ bundleManagerBundleServiceSelectors[1] = clonedBundleManager.unlinkPolicy.selector;
207
+ bundleManagerBundleServiceSelectors[2] = clonedBundleManager.add.selector;
208
+ bundleManagerBundleServiceSelectors[3] = clonedBundleManager.lock.selector;
209
+ bundleManagerBundleServiceSelectors[4] = clonedBundleManager.unlock.selector;
210
+ clonedAccessManager.setTargetFunctionRole(
211
+ "BundleManager",
212
+ bundleManagerBundleServiceSelectors,
213
+ BUNDLE_SERVICE_ROLE());
214
+ }
215
+
216
+ function _grantInstanceServiceAuthorizations(InstanceAccessManager clonedAccessManager, Instance clonedInstance) internal {
217
+ // configure authorization for instance service on instance
218
+ address instanceServiceAddress = _registry.getServiceAddress(INSTANCE(), getMajorVersion());
219
+ clonedAccessManager.grantRole(INSTANCE_SERVICE_ROLE(), instanceServiceAddress);
220
+ bytes4[] memory instanceInstanceServiceSelectors = new bytes4[](1);
221
+ instanceInstanceServiceSelectors[0] = clonedInstance.setInstanceReader.selector;
222
+ clonedAccessManager.setTargetFunctionRole(
223
+ "Instance",
224
+ instanceInstanceServiceSelectors,
225
+ INSTANCE_SERVICE_ROLE());
226
+
227
+ bytes4[] memory instanceAccessManagerInstanceServiceSelectors = new bytes4[](1);
228
+ instanceAccessManagerInstanceServiceSelectors[0] = clonedAccessManager.createGifTarget.selector;
229
+ clonedAccessManager.setTargetFunctionRole(
230
+ "InstanceAccessManager",
231
+ instanceAccessManagerInstanceServiceSelectors,
232
+ INSTANCE_SERVICE_ROLE());
233
+ }
234
+
235
+ function setAndRegisterMasterInstance(address instanceAddress)
236
+ external
237
+ onlyOwner
238
+ returns(NftId masterInstanceNftId)
239
+ {
240
+ require(_masterInstance == address(0), "ERROR:CRD-002:INSTANCE_MASTER_ALREADY_SET");
241
+ require(_masterInstanceAccessManager == address(0), "ERROR:CRD-001:ACCESS_MANAGER_MASTER_ALREADY_SET");
242
+ require(_masterInstanceBundleManager == address(0), "ERROR:CRD-004:BUNDLE_MANAGER_MASTER_ALREADY_SET");
243
+
244
+ require (instanceAddress != address(0), "ERROR:CRD-006:INSTANCE_ZERO");
245
+
246
+ IInstance instance = IInstance(instanceAddress);
247
+ InstanceAccessManager accessManager = InstanceAccessManager(instance.authority());
248
+ address accessManagerAddress = address(accessManager);
249
+ InstanceReader instanceReader = instance.getInstanceReader();
250
+ address instanceReaderAddress = address(instanceReader);
251
+ BundleManager bundleManager = instance.getBundleManager();
252
+ address bundleManagerAddress = address(bundleManager);
253
+
254
+ require (accessManagerAddress != address(0), "ERROR:CRD-005:ACCESS_MANAGER_ZERO");
255
+ require (instanceReaderAddress != address(0), "ERROR:CRD-007:INSTANCE_READER_ZERO");
256
+ require (bundleManagerAddress != address(0), "ERROR:CRD-008:BUNDLE_MANAGER_ZERO");
257
+
258
+
259
+ require(instance.authority() == accessManagerAddress, "ERROR:CRD-009:INSTANCE_AUTHORITY_MISMATCH");
260
+ require(instanceReader.getInstance() == instance, "ERROR:CRD-010:INSTANCE_READER_INSTANCE_MISMATCH");
261
+ require(bundleManager.getInstance() == instance, "ERROR:CRD-011:BUNDLE_MANAGER_INSTANCE_MISMATCH");
262
+
263
+ _masterInstanceAccessManager = accessManagerAddress;
264
+ _masterInstance = instanceAddress;
265
+ _masterInstanceReader = instanceReaderAddress;
266
+ _masterInstanceBundleManager = bundleManagerAddress;
267
+
268
+ IRegistryService registryService = IRegistryService(getRegistry().getServiceAddress(REGISTRY(), getMajorVersion()));
269
+ IInstance masterInstance = IInstance(_masterInstance);
270
+ IRegistry.ObjectInfo memory info = registryService.registerInstance(masterInstance, getOwner());
271
+ masterInstanceNftId = info.nftId;
272
+
273
+ // masterInstance.linkToRegisteredNftId();
112
274
  }
113
275
 
114
- function setAccessManagerMaster(address accessManagerMaster) external {
115
- require(
116
- _accessManagerMaster == address(0),
117
- "ERROR:CRD-001:ACCESS_MANAGER_MASTER_ALREADY_SET");
118
- _accessManagerMaster = accessManagerMaster;
276
+ function setMasterInstanceReader(address instanceReaderAddress) external onlyOwner {
277
+ require(_masterInstanceReader != address(0), "ERROR:CRD-003:INSTANCE_READER_MASTER_NOT_SET");
278
+ require (instanceReaderAddress != address(0), "ERROR:CRD-012:INSTANCE_READER_ZERO");
279
+ require(instanceReaderAddress != _masterInstanceReader, "ERROR:CRD-014:INSTANCE_READER_MASTER_SAME_AS_NEW");
280
+
281
+ InstanceReader instanceReader = InstanceReader(instanceReaderAddress);
282
+ require(instanceReader.getInstance() == IInstance(_masterInstance), "ERROR:CRD-015:INSTANCE_READER_INSTANCE_MISMATCH");
283
+
284
+ _masterInstanceReader = instanceReaderAddress;
119
285
  }
120
286
 
121
- function setInstanceMaster(address instanceMaster) external {
122
- require(
123
- _instanceMaster == address(0),
124
- "ERROR:CRD-002:INSTANCE_MASTER_ALREADY_SET");
125
- _instanceMaster = instanceMaster;
287
+ // TODO access restriction
288
+ function upgradeInstanceReader(NftId instanceNftId) external {
289
+ IRegistry registry = getRegistry();
290
+ IRegistry.ObjectInfo memory instanceInfo = registry.getObjectInfo(instanceNftId);
291
+ Instance instance = Instance(instanceInfo.objectAddress);
292
+ address owner = instance.getOwner();
293
+
294
+ if (msg.sender != owner) {
295
+ revert ErrorInstanceServiceRequestUnauhorized(msg.sender);
296
+ }
297
+
298
+ InstanceReader upgradedInstanceReaderClone = InstanceReader(Clones.clone(address(_masterInstanceReader)));
299
+ upgradedInstanceReaderClone.initialize(address(registry), address(instance));
300
+ instance.setInstanceReader(upgradedInstanceReaderClone);
126
301
  }
127
302
 
128
- function setInstanceReaderMaster(address instanceReaderMaster) external {
129
- require(
130
- _instanceReaderMaster == address(0),
131
- "ERROR:CRD-003:INSTANCE_READER_MASTER_ALREADY_SET");
132
- _instanceReaderMaster = instanceReaderMaster;
303
+ function getMasterInstanceReader() external view returns (address) {
304
+ return _masterInstanceReader;
133
305
  }
134
306
 
135
- function getInstanceReaderMaster() external view returns (address) {
136
- return _instanceReaderMaster;
307
+ function getMasterInstance() external view returns (address) {
308
+ return _masterInstance;
137
309
  }
138
310
 
139
- function getInstanceMaster() external view returns (address) {
140
- return _instanceMaster;
311
+ function getMasterInstanceAccessManager() external view returns (address) {
312
+ return _masterInstanceAccessManager;
141
313
  }
142
314
 
143
- function getAccessManagerMaster() external view returns (address) {
144
- return _accessManagerMaster;
315
+ function getMasterInstanceBundleManager() external view returns (address) {
316
+ return _masterInstanceBundleManager;
145
317
  }
146
318
 
147
319
  // From IService
148
- function getName() public pure override(IService, Service) returns(string memory) {
149
- return NAME;
320
+ function getDomain() public pure override(Service, IService) returns(ObjectType) {
321
+ return INSTANCE();
150
322
  }
151
323
 
152
324
  /// @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
325
  function _initialize(
158
326
  address owner,
159
327
  bytes memory data
@@ -162,37 +330,113 @@ contract InstanceService is Service, IInstanceService {
162
330
  initializer
163
331
  virtual override
164
332
  {
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));
333
+ address initialOwner;
334
+ address registryAddress;
335
+ (registryAddress, initialOwner) = abi.decode(data, (address, address));
178
336
  // TODO while InstanceService is not deployed in InstanceServiceManager constructor
179
337
  // owner is InstanceServiceManager deployer
180
- _initializeService(_registryAddress, owner);
338
+ _initializeService(registryAddress, owner);
181
339
 
182
- _registerInterface(type(IService).interfaceId);
183
340
  _registerInterface(type(IInstanceService).interfaceId);
184
341
  }
185
342
 
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;
343
+ function hasRole(address account, RoleId role, address instanceAddress) public view returns (bool) {
189
344
  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;
345
+ InstanceAccessManager accessManager = InstanceAccessManager(instance.authority());
346
+ return accessManager.hasRole(role, account);
347
+ }
348
+
349
+ function createGifTarget(NftId instanceNftId, address targetAddress, string memory targetName) external onlyRegisteredService {
350
+ IRegistry registry = getRegistry();
351
+ IRegistry.ObjectInfo memory instanceInfo = registry.getObjectInfo(instanceNftId);
352
+ Instance instance = Instance(instanceInfo.objectAddress);
353
+ InstanceAccessManager accessManager = InstanceAccessManager(instance.authority());
354
+ accessManager.createGifTarget(targetAddress, targetName);
196
355
  }
356
+
357
+ function grantDistributionDefaultPermissions(NftId instanceNftId, IDistributionComponent distribution) external onlyRegisteredService {
358
+ IRegistry registry = getRegistry();
359
+ IRegistry.ObjectInfo memory distributionInfo = registry.getObjectInfo(address(distribution));
360
+
361
+ if (distributionInfo.objectType != DISTRIBUTION()) {
362
+ revert ErrorInstanceServiceInvalidComponentType(address(distribution), DISTRIBUTION(), distributionInfo.objectType);
363
+ }
364
+
365
+ IRegistry.ObjectInfo memory instanceInfo = registry.getObjectInfo(instanceNftId);
366
+ Instance instance = Instance(instanceInfo.objectAddress);
367
+ InstanceAccessManager instanceAccessManager = InstanceAccessManager(instance.authority());
368
+
369
+ bytes4[] memory fctSelectors = new bytes4[](3);
370
+ fctSelectors[0] = distribution.setFees.selector;
371
+ fctSelectors[1] = Component.lock.selector;
372
+ fctSelectors[2] = Component.unlock.selector;
373
+ instanceAccessManager.setTargetFunctionRole(distribution.getName(), fctSelectors, DISTRIBUTION_OWNER_ROLE());
374
+
375
+ bytes4[] memory fctSelectors2 = new bytes4[](2);
376
+ fctSelectors2[0] = distribution.processSale.selector;
377
+ fctSelectors2[1] = distribution.processRenewal.selector;
378
+ instanceAccessManager.setTargetFunctionRole(distribution.getName(), fctSelectors2, PRODUCT_SERVICE_ROLE());
379
+ }
380
+
381
+ function grantPoolDefaultPermissions(NftId instanceNftId, IPoolComponent pool) external onlyRegisteredService {
382
+ IRegistry registry = getRegistry();
383
+ IRegistry.ObjectInfo memory poolInfo = registry.getObjectInfo(address(pool));
384
+
385
+ if (poolInfo.objectType != POOL()) {
386
+ revert ErrorInstanceServiceInvalidComponentType(address(pool), POOL(), poolInfo.objectType);
387
+ }
388
+
389
+ IRegistry.ObjectInfo memory instanceInfo = registry.getObjectInfo(instanceNftId);
390
+ Instance instance = Instance(instanceInfo.objectAddress);
391
+ InstanceAccessManager instanceAccessManager = InstanceAccessManager(instance.authority());
392
+
393
+ bytes4[] memory fctSelectors = new bytes4[](3);
394
+ fctSelectors[0] = pool.setFees.selector;
395
+ fctSelectors[1] = Component.lock.selector;
396
+ fctSelectors[2] = Component.unlock.selector;
397
+ instanceAccessManager.setTargetFunctionRole(pool.getName(), fctSelectors, POOL_OWNER_ROLE());
398
+
399
+ bytes4[] memory fctSelectors2 = new bytes4[](1);
400
+ fctSelectors2[0] = pool.underwrite.selector;
401
+ instanceAccessManager.setTargetFunctionRole(pool.getName(), fctSelectors2, POLICY_SERVICE_ROLE());
402
+ }
403
+
404
+ function grantProductDefaultPermissions(NftId instanceNftId, IProductComponent product) external onlyRegisteredService {
405
+ IRegistry registry = getRegistry();
406
+ IRegistry.ObjectInfo memory productInfo = registry.getObjectInfo(address(product));
407
+
408
+ if (productInfo.objectType != PRODUCT()) {
409
+ revert ErrorInstanceServiceInvalidComponentType(address(product), PRODUCT(), productInfo.objectType);
410
+ }
411
+
412
+ IRegistry.ObjectInfo memory instanceInfo = registry.getObjectInfo(instanceNftId);
413
+ Instance instance = Instance(instanceInfo.objectAddress);
414
+ InstanceAccessManager instanceAccessManager = InstanceAccessManager(instance.authority());
415
+
416
+ bytes4[] memory fctSelectors = new bytes4[](3);
417
+ fctSelectors[0] = product.setFees.selector;
418
+ fctSelectors[1] = Component.lock.selector;
419
+ fctSelectors[2] = Component.unlock.selector;
420
+ instanceAccessManager.setTargetFunctionRole(product.getName(), fctSelectors, PRODUCT_OWNER_ROLE());
421
+ }
422
+
423
+ function setTargetLocked(string memory targetName, bool locked) external {
424
+ address componentAddress = msg.sender;
425
+ IRegistry registry = getRegistry();
426
+ IRegistry.ObjectInfo memory componentInfo = registry.getObjectInfo(componentAddress);
427
+ if (componentInfo.nftId.eqz()) {
428
+ revert ErrorInstanceServiceComponentNotRegistered(componentAddress);
429
+ }
430
+
431
+ // TODO validate component type
432
+
433
+
434
+ address instanceAddress = registry.getObjectInfo(componentInfo.parentNftId).objectAddress;
435
+ IInstance instance = IInstance(instanceAddress);
436
+
437
+ InstanceAccessManager accessManager = InstanceAccessManager(instance.authority());
438
+ accessManager.setTargetClosed(targetName, locked);
439
+ }
440
+
197
441
  }
198
442
 
@@ -7,7 +7,7 @@ import {ProxyManager} from "../shared/ProxyManager.sol";
7
7
  import {InstanceService} from "./InstanceService.sol";
8
8
  import {Registry} from "../registry/Registry.sol";
9
9
  import {RegistryService} from "../registry/RegistryService.sol";
10
- import {VersionLib} from "../types/Version.sol";
10
+ import {REGISTRY} from "../types/ObjectType.sol";
11
11
 
12
12
  contract InstanceServiceManager is ProxyManager {
13
13
 
@@ -28,10 +28,10 @@ contract InstanceServiceManager is ProxyManager {
28
28
 
29
29
  _instanceService = InstanceService(address(versionable));
30
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
31
+ // TODO `this` must have a role or own nft to register service
32
+ //Registry registry = Registry(registryAddress);
33
+ //address registryServiceAddress = registry.getServiceAddress(REGISTRY(), _instanceService.getMajorVersion());
34
+ //RegistryService registryService = RegistryService(registryServiceAddress);
35
35
  //registryService.registerService(_instanceService);
36
36
  // RegistryService registryService = _instanceService.getRegistryService();
37
37
 
@@ -40,9 +40,6 @@ contract InstanceServiceManager is ProxyManager {
40
40
  //_linkToNftOwnable(
41
41
  // address(registryAddress),
42
42
  // address(_instanceService));
43
-
44
- // implies that after this constructor call only upgrade functionality is available
45
- _isDeployed = true;
46
43
  }
47
44
 
48
45
  //--- view functions ----------------------------------------------------//