@etherisc/gif-next 0.0.2-fb8d07b-779 → 0.0.2-fbe8e04-715

Sign up to get free protection for your applications and to get access to all the features.
Files changed (219) hide show
  1. package/README.md +63 -1
  2. package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.dbg.json +1 -1
  3. package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.json +126 -0
  4. package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +1 -1
  5. package/artifacts/contracts/components/Distribution.sol/Distribution.json +136 -10
  6. package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.dbg.json +1 -1
  7. package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.json +88 -0
  8. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
  9. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
  10. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.json +28 -2
  11. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +1 -1
  12. package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
  13. package/artifacts/contracts/components/Pool.sol/Pool.json +168 -11
  14. package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
  15. package/artifacts/contracts/components/Product.sol/Product.json +144 -64
  16. package/artifacts/contracts/experiment/cloning/Cloner.sol/Cloner.dbg.json +1 -1
  17. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock1.dbg.json +1 -1
  18. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock2.dbg.json +1 -1
  19. package/artifacts/contracts/experiment/errors/Require.sol/Require.dbg.json +1 -1
  20. package/artifacts/contracts/experiment/errors/Revert.sol/Revert.dbg.json +1 -1
  21. package/artifacts/contracts/experiment/inheritance/A.sol/A.dbg.json +1 -1
  22. package/artifacts/contracts/experiment/inheritance/A.sol/AShared.dbg.json +1 -1
  23. package/artifacts/contracts/experiment/inheritance/B.sol/B.dbg.json +1 -1
  24. package/artifacts/contracts/experiment/inheritance/C.sol/C.dbg.json +1 -1
  25. package/artifacts/contracts/experiment/inheritance/IA.sol/IA.dbg.json +1 -1
  26. package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.dbg.json +1 -1
  27. package/artifacts/contracts/experiment/inheritance/IB.sol/IB.dbg.json +1 -1
  28. package/artifacts/contracts/experiment/inheritance/IC.sol/IC.dbg.json +1 -1
  29. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.dbg.json +1 -1
  30. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.dbg.json +1 -1
  31. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.dbg.json +1 -1
  32. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.dbg.json +1 -1
  33. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.dbg.json +1 -1
  34. package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.dbg.json +1 -1
  35. package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.dbg.json +1 -1
  36. package/artifacts/contracts/instance/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.dbg.json +4 -0
  37. package/artifacts/contracts/instance/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.json +1206 -0
  38. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.dbg.json +4 -0
  39. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.json +788 -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/IAccessManagerSimple.sol/IAccessManagerSimple.dbg.json +1 -1
  43. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  44. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +981 -10
  45. package/artifacts/contracts/instance/IInstanceBase.sol/IInstanceBase.dbg.json +4 -0
  46. package/artifacts/contracts/instance/IInstanceBase.sol/IInstanceBase.json +448 -0
  47. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
  48. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +6 -1
  49. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  50. package/artifacts/contracts/instance/Instance.sol/Instance.json +169 -139
  51. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +1 -1
  52. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +55 -32
  53. package/artifacts/contracts/instance/InstanceBase.sol/InstanceBase.dbg.json +4 -0
  54. package/artifacts/contracts/instance/InstanceBase.sol/InstanceBase.json +763 -0
  55. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
  56. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +74 -40
  57. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
  58. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +223 -75
  59. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
  60. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +92 -32
  61. package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.dbg.json +4 -0
  62. package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.json +285 -0
  63. package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.dbg.json +1 -1
  64. package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.json +0 -19
  65. package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.dbg.json +1 -1
  66. package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
  67. package/artifacts/contracts/instance/base/ILifecycle.sol/ILifecycle.dbg.json +1 -1
  68. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
  69. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json +1 -1
  70. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +1 -1
  71. package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
  72. package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +1 -1
  73. package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +1 -1
  74. package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +1 -1
  75. package/artifacts/contracts/instance/module/ISetup.sol/ISetup.dbg.json +1 -1
  76. package/artifacts/contracts/instance/module/ITreasury.sol/ITreasury.dbg.json +1 -1
  77. package/artifacts/contracts/instance/service/BundleService.sol/BundleService.dbg.json +4 -0
  78. package/artifacts/contracts/instance/service/BundleService.sol/BundleService.json +923 -0
  79. package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.dbg.json +4 -0
  80. package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.json +440 -0
  81. package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.dbg.json +1 -1
  82. package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.json +16 -16
  83. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +1 -1
  84. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +16 -48
  85. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
  86. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.json +13 -33
  87. package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.dbg.json +4 -0
  88. package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.json +669 -0
  89. package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.dbg.json +1 -1
  90. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +1 -1
  91. package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.dbg.json +4 -0
  92. package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.json +664 -0
  93. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +1 -1
  94. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +9 -71
  95. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +1 -1
  96. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +17 -232
  97. package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.dbg.json +4 -0
  98. package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.json +984 -0
  99. package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +4 -0
  100. package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.json +464 -0
  101. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +1 -1
  102. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +20 -157
  103. package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
  104. package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.json +13 -45
  105. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +4 -0
  106. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +768 -0
  107. package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.dbg.json +4 -0
  108. package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.json +420 -0
  109. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  110. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  111. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +2 -110
  112. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
  113. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +94 -0
  114. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
  115. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  116. package/artifacts/contracts/registry/Registry.sol/Registry.json +35 -146
  117. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
  118. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +76 -20
  119. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
  120. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +26 -34
  121. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
  122. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +12 -12
  123. package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.dbg.json +1 -1
  124. package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +1 -1
  125. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
  126. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  127. package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
  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 +2 -2
  131. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +1 -1
  132. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +2 -2
  133. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  134. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +2 -2
  135. package/artifacts/contracts/shared/RegisterableUpgradable.sol/RegisterableUpgradable.dbg.json +1 -1
  136. package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
  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 +4 -4
  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 +9 -9
  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/BaseComponent.sol +49 -8
  173. package/contracts/components/Distribution.sol +6 -3
  174. package/contracts/components/IBaseComponent.sol +6 -0
  175. package/contracts/components/IPoolComponent.sol +5 -1
  176. package/contracts/components/Pool.sol +40 -12
  177. package/contracts/components/Product.sol +41 -46
  178. package/contracts/instance/AccessManagerUpgradeableInitializeable.sol +23 -0
  179. package/contracts/instance/BundleManager.sol +129 -0
  180. package/contracts/instance/Cloneable.sol +46 -0
  181. package/contracts/instance/IInstance.sol +25 -4
  182. package/contracts/instance/IInstanceBase.sol +26 -0
  183. package/contracts/instance/IInstanceService.sol +5 -3
  184. package/contracts/instance/Instance.sol +40 -18
  185. package/contracts/instance/InstanceAccessManager.sol +6 -6
  186. package/contracts/instance/InstanceBase.sol +41 -0
  187. package/contracts/instance/InstanceReader.sol +9 -0
  188. package/contracts/instance/InstanceService.sol +116 -37
  189. package/contracts/instance/InstanceServiceManager.sol +6 -5
  190. package/contracts/instance/ObjectManager.sol +101 -0
  191. package/contracts/instance/base/ComponentServiceBase.sol +22 -75
  192. package/contracts/instance/module/ISetup.sol +3 -1
  193. package/contracts/instance/service/BundleService.sol +260 -0
  194. package/contracts/instance/service/BundleServiceManager.sol +54 -0
  195. package/contracts/instance/service/DistributionService.sol +40 -9
  196. package/contracts/instance/service/DistributionServiceManager.sol +6 -5
  197. package/contracts/instance/service/IBundleService.sol +45 -0
  198. package/contracts/instance/service/IPolicyService.sol +87 -0
  199. package/contracts/instance/service/IPoolService.sol +6 -23
  200. package/contracts/instance/service/IProductService.sol +6 -73
  201. package/contracts/instance/service/PolicyService.sol +508 -0
  202. package/contracts/instance/service/PolicyServiceManager.sol +54 -0
  203. package/contracts/instance/service/PoolService.sol +44 -113
  204. package/contracts/instance/service/PoolServiceManager.sol +6 -5
  205. package/contracts/instance/service/ProductService.sol +173 -0
  206. package/contracts/instance/service/ProductServiceManager.sol +54 -0
  207. package/contracts/registry/IRegistry.sol +5 -18
  208. package/contracts/registry/IRegistryService.sol +28 -11
  209. package/contracts/registry/Registry.sol +4 -45
  210. package/contracts/registry/RegistryService.sol +30 -71
  211. package/contracts/shared/NftOwnable.sol +2 -4
  212. package/contracts/types/NftIdSet.sol +26 -24
  213. package/contracts/types/RoleId.sol +3 -0
  214. package/package.json +1 -1
  215. package/artifacts/contracts/instance/AccessManagedSimple.sol/AccessManagedSimple.dbg.json +0 -4
  216. package/artifacts/contracts/instance/AccessManagerSimple.sol/AccessManagerSimple.dbg.json +0 -4
  217. package/artifacts/contracts/instance/AccessManagerSimple.sol/AccessManagerSimple.json +0 -1132
  218. package/contracts/instance/AccessManagedSimple.sol +0 -115
  219. package/contracts/instance/AccessManagerSimple.sol +0 -692
@@ -3,9 +3,10 @@ pragma solidity ^0.8.20;
3
3
 
4
4
  import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
5
5
  import {ShortString, ShortStrings} from "@openzeppelin/contracts/utils/ShortStrings.sol";
6
+ import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";
7
+ import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";
8
+ import {AccessManagerUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagerUpgradeable.sol";
6
9
 
7
- import {AccessManagedSimple} from "./AccessManagedSimple.sol";
8
- import {AccessManagerSimple} from "./AccessManagerSimple.sol";
9
10
  import {IAccess} from "./module/IAccess.sol";
10
11
  import {IBundle} from "./module/IBundle.sol";
11
12
  import {IPolicy} from "./module/IPolicy.sol";
@@ -15,6 +16,7 @@ import {Key32, KeyId, Key32Lib} from "../types/Key32.sol";
15
16
  import {KeyValueStore} from "./base/KeyValueStore.sol";
16
17
  import {IInstance} from "./IInstance.sol";
17
18
  import {InstanceReader} from "./InstanceReader.sol";
19
+ import {BundleManager} from "./BundleManager.sol";
18
20
  import {NftId} from "../types/NftId.sol";
19
21
  import {NumberId} from "../types/NumberId.sol";
20
22
  import {ObjectType, BUNDLE, DISTRIBUTION, INSTANCE, POLICY, POOL, ROLE, PRODUCT, TARGET} from "../types/ObjectType.sol";
@@ -27,14 +29,17 @@ import {ComponentOwnerService} from "./service/ComponentOwnerService.sol";
27
29
  import {IComponentOwnerService} from "./service/IComponentOwnerService.sol";
28
30
  import {IDistributionService} from "./service/IDistributionService.sol";
29
31
  import {IPoolService} from "./service/IPoolService.sol";
32
+ import {IProductService} from "./service/IProductService.sol";
33
+ import {IPolicyService} from "./service/IPolicyService.sol";
34
+ import {IBundleService} from "./service/IBundleService.sol";
30
35
  import {VersionPart} from "../types/Version.sol";
36
+ import {InstanceBase} from "./InstanceBase.sol";
31
37
 
32
38
  contract Instance is
33
- AccessManagedSimple,
34
- KeyValueStore,
39
+ AccessManagedUpgradeable,
35
40
  IInstance,
36
- ERC165,
37
- Registerable
41
+ // Initializable,
42
+ InstanceBase
38
43
  {
39
44
 
40
45
  uint64 public constant ADMIN_ROLE = type(uint64).min;
@@ -51,20 +56,19 @@ contract Instance is
51
56
 
52
57
  mapping(ShortString name => address target) internal _target;
53
58
 
54
- AccessManagerSimple internal _accessManager;
59
+ AccessManagerUpgradeable internal _accessManager;
55
60
  InstanceReader internal _instanceReader;
61
+ BundleManager internal _bundleManager;
56
62
 
57
- constructor(address accessManagerAddress, address registryAddress, NftId registryNftId)
63
+ function initialize(address accessManagerAddress, address registryAddress, NftId registryNftId, address initialOwner)
64
+ public
65
+ initializer
58
66
  {
59
- initialize(accessManagerAddress, registryAddress, registryNftId, msg.sender);
60
- }
61
-
62
- function initialize(address accessManagerAddress, address registryAddress, NftId registryNftId, address initialOwner) public {
63
67
  require(!_initialized, "Contract instance has already been initialized");
64
68
 
65
- initializeAccessManagedSimple(accessManagerAddress);
69
+ __AccessManaged_init(accessManagerAddress);
66
70
 
67
- _accessManager = AccessManagerSimple(accessManagerAddress);
71
+ _accessManager = AccessManagerUpgradeable(accessManagerAddress);
68
72
  _createRole(RoleIdLib.toRoleId(ADMIN_ROLE), "AdminRole", false, false);
69
73
  _createRole(RoleIdLib.toRoleId(PUBLIC_ROLE), "PublicRole", false, false);
70
74
 
@@ -423,21 +427,39 @@ contract Instance is
423
427
  return IDistributionService(_registry.getServiceAddress("DistributionService", VersionPart.wrap(3)));
424
428
  }
425
429
 
426
- // TODO reactivate when services are available
427
- // function getProductService() external view returns (IProductService) {
428
- // return ProductService(_registry.getServiceAddress("ProductService", VersionPart.wrap(3)));
429
- // }
430
+ function getProductService() external view returns (IProductService) {
431
+ return IProductService(_registry.getServiceAddress("ProductService", VersionPart.wrap(3)));
432
+ }
430
433
 
431
434
  function getPoolService() external view returns (IPoolService) {
432
435
  return IPoolService(_registry.getServiceAddress("PoolService", VersionPart.wrap(3)));
433
436
  }
434
437
 
438
+ function getPolicyService() external view returns (IPolicyService) {
439
+ return IPolicyService(_registry.getServiceAddress("PolicyService", VersionPart.wrap(3)));
440
+ }
441
+
442
+ function getBundleService() external view returns (IBundleService) {
443
+ return IBundleService(_registry.getServiceAddress("BundleService", VersionPart.wrap(3)));
444
+ }
445
+
435
446
  function setInstanceReader(InstanceReader instanceReader) external restricted() {
436
447
  require(address(_instanceReader) == address(0), "InstanceReader is set");
448
+ require(instanceReader.getInstanceNftId() == getNftId(), "NFT ID of InstanceReader does not match");
437
449
  _instanceReader = instanceReader;
438
450
  }
439
451
 
440
452
  function getInstanceReader() external view returns (InstanceReader) {
441
453
  return _instanceReader;
442
454
  }
455
+
456
+ function setBundleManager(BundleManager bundleManager) external restricted() {
457
+ require(address(_bundleManager) == address(0), "BundleManager is set");
458
+ require(bundleManager.getInstanceNftId() == getNftId(), "NFT ID of BundleManager does not match");
459
+ _bundleManager = bundleManager;
460
+ }
461
+
462
+ function getBundleManager() external view returns (BundleManager) {
463
+ return _bundleManager;
464
+ }
443
465
  }
@@ -3,9 +3,9 @@ pragma solidity ^0.8.20;
3
3
 
4
4
  import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
5
5
  import {ShortString, ShortStrings} from "@openzeppelin/contracts/utils/ShortStrings.sol";
6
+ import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";
7
+ import {AccessManagerUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagerUpgradeable.sol";
6
8
 
7
- import {AccessManagedSimple} from "./AccessManagedSimple.sol";
8
- import {AccessManagerSimple} from "./AccessManagerSimple.sol";
9
9
  import {IBundle} from "./module/IBundle.sol";
10
10
  import {IPolicy} from "./module/IPolicy.sol";
11
11
  import {IRisk} from "./module/IRisk.sol";
@@ -21,7 +21,7 @@ import {StateId, ACTIVE} from "../types/StateId.sol";
21
21
  import {Timestamp, TimestampLib} from "../types/Timestamp.sol";
22
22
 
23
23
  contract InstanceAccessManager is
24
- AccessManagedSimple
24
+ AccessManagedUpgradeable
25
25
  {
26
26
  string public constant ADMIN_ROLE_NAME = "AdminRole";
27
27
  string public constant PUBLIC_ROLE_NAME = "PublicRole";
@@ -76,12 +76,12 @@ contract InstanceAccessManager is
76
76
  mapping(ShortString name => address target) internal _targetForName;
77
77
  address [] internal _targets;
78
78
 
79
- AccessManagerSimple internal _accessManager;
79
+ AccessManagerUpgradeable internal _accessManager;
80
80
 
81
81
  constructor(address accessManager)
82
82
  {
83
- _accessManager = AccessManagerSimple(accessManager);
84
- initializeAccessManagedSimple(accessManager);
83
+ _accessManager = AccessManagerUpgradeable(accessManager);
84
+ __AccessManaged_init(accessManager);
85
85
 
86
86
  _createRole(RoleIdLib.toRoleId(_accessManager.ADMIN_ROLE()), ADMIN_ROLE_NAME, false, false);
87
87
  _createRole(RoleIdLib.toRoleId(_accessManager.PUBLIC_ROLE()), PUBLIC_ROLE_NAME, false, false);
@@ -0,0 +1,41 @@
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 {IAccess} from "./module/IAccess.sol";
8
+ import {IBundle} from "./module/IBundle.sol";
9
+ import {IPolicy} from "./module/IPolicy.sol";
10
+ import {IRisk} from "./module/IRisk.sol";
11
+ import {ISetup} from "./module/ISetup.sol";
12
+ import {Key32, KeyId, Key32Lib} from "../types/Key32.sol";
13
+ import {KeyValueStore} from "./base/KeyValueStore.sol";
14
+ import {IInstance} from "./IInstance.sol";
15
+ import {InstanceReader} from "./InstanceReader.sol";
16
+ import {BundleManager} from "./BundleManager.sol";
17
+ import {NftId} from "../types/NftId.sol";
18
+ import {NumberId} from "../types/NumberId.sol";
19
+ import {ObjectType, BUNDLE, DISTRIBUTION, INSTANCE, POLICY, POOL, ROLE, PRODUCT, TARGET} from "../types/ObjectType.sol";
20
+ import {RiskId, RiskIdLib} from "../types/RiskId.sol";
21
+ import {RoleId, RoleIdLib} from "../types/RoleId.sol";
22
+ import {StateId, ACTIVE} from "../types/StateId.sol";
23
+ import {ERC165} from "../shared/ERC165.sol";
24
+ import {Registerable} from "../shared/Registerable.sol";
25
+ import {ComponentOwnerService} from "./service/ComponentOwnerService.sol";
26
+ import {IComponentOwnerService} from "./service/IComponentOwnerService.sol";
27
+ import {IDistributionService} from "./service/IDistributionService.sol";
28
+ import {IPoolService} from "./service/IPoolService.sol";
29
+ import {IProductService} from "./service/IProductService.sol";
30
+ import {VersionPart} from "../types/Version.sol";
31
+ import {IInstanceBase} from "./IInstanceBase.sol";
32
+
33
+ contract InstanceBase is
34
+ IInstanceBase,
35
+ KeyValueStore,
36
+ ERC165,
37
+ Registerable
38
+ {
39
+
40
+
41
+ }
@@ -13,6 +13,7 @@ import {Registerable} from "../shared/Registerable.sol";
13
13
  import {RiskId} from "../types/RiskId.sol";
14
14
  import {UFixed, MathLib, UFixedLib} from "../types/UFixed.sol";
15
15
  import {Version} from "../types/Version.sol";
16
+ import {StateId} from "../types/StateId.sol";
16
17
 
17
18
  import {IRegistry} from "../registry/IRegistry.sol";
18
19
  import {IBundle} from "../instance/module/IBundle.sol";
@@ -81,6 +82,14 @@ contract InstanceReader {
81
82
  }
82
83
  }
83
84
 
85
+ function getPolicyState(NftId policyNftId)
86
+ public
87
+ view
88
+ returns (StateId state)
89
+ {
90
+ return _instance.getState(toPolicyKey(policyNftId));
91
+ }
92
+
84
93
  function getRiskInfo(RiskId riskId)
85
94
  public
86
95
  view
@@ -2,12 +2,14 @@
2
2
  pragma solidity ^0.8.20;
3
3
 
4
4
  import {Clones} from "@openzeppelin/contracts/proxy/Clones.sol";
5
+ import {AccessManagerUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagerUpgradeable.sol";
5
6
 
6
- import {AccessManagerSimple} from "./AccessManagerSimple.sol";
7
+ import {AccessManagerUpgradeableInitializeable} from "./AccessManagerUpgradeableInitializeable.sol";
7
8
  import {InstanceAccessManager} from "./InstanceAccessManager.sol";
8
9
  import {Instance} from "./Instance.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
14
  import {Registry} from "../registry/Registry.sol";
13
15
  import {RegistryService} from "../registry/RegistryService.sol";
@@ -17,7 +19,7 @@ import {ContractDeployerLib} from "../shared/ContractDeployerLib.sol";
17
19
  import {NftId, NftIdLib, zeroNftId} from "../../contracts/types/NftId.sol";
18
20
  import {RoleId} from "../types/RoleId.sol";
19
21
  import {VersionLib} from "../types/Version.sol";
20
- import {ADMIN_ROLE, INSTANCE_SERVICE_ROLE, DISTRIBUTION_SERVICE_ROLE, POOL_SERVICE_ROLE} from "../types/RoleId.sol";
22
+ import {ADMIN_ROLE, INSTANCE_SERVICE_ROLE, DISTRIBUTION_SERVICE_ROLE, POOL_SERVICE_ROLE, PRODUCT_SERVICE_ROLE, POLICY_SERVICE_ROLE, BUNDLE_SERVICE_ROLE} from "../types/RoleId.sol";
21
23
 
22
24
  contract InstanceService is Service, IInstanceService {
23
25
 
@@ -25,6 +27,7 @@ contract InstanceService is Service, IInstanceService {
25
27
  address internal _accessManagerMaster;
26
28
  address internal _instanceMaster;
27
29
  address internal _instanceReaderMaster;
30
+ address internal _instanceBundleManagerMaster;
28
31
 
29
32
  // TODO update to real hash when instance is stable
30
33
  bytes32 public constant INSTANCE_CREATION_CODE_HASH = bytes32(0);
@@ -33,10 +36,11 @@ contract InstanceService is Service, IInstanceService {
33
36
  function createInstanceClone()
34
37
  external
35
38
  returns (
36
- AccessManagerSimple clonedAccessManager,
39
+ AccessManagerUpgradeableInitializeable clonedAccessManager,
37
40
  Instance clonedInstance,
38
- NftId instanceNftId,
39
- InstanceReader clonedInstanceReader
41
+ NftId clonedInstanceNftId,
42
+ InstanceReader clonedInstanceReader,
43
+ BundleManager clonedBundleManager
40
44
  )
41
45
  {
42
46
  address instanceOwner = msg.sender;
@@ -48,30 +52,36 @@ contract InstanceService is Service, IInstanceService {
48
52
  // initially set the authority of the access managar to this (being the instance service).
49
53
  // This will allow the instance service to bootstrap the authorizations of the instance
50
54
  // 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));
55
+ clonedAccessManager = AccessManagerUpgradeableInitializeable(Clones.clone(_accessManagerMaster));
56
+ clonedAccessManager.__AccessManagerUpgradeableInitializeable_init(address(this));
53
57
 
54
58
  clonedInstance = Instance(Clones.clone(_instanceMaster));
55
59
  clonedInstance.initialize(address(clonedAccessManager), _registryAddress, registryNftId, msg.sender);
56
60
  ( IRegistry.ObjectInfo memory info, ) = registryService.registerInstance(clonedInstance);
57
- instanceNftId = info.nftId;
61
+ clonedInstanceNftId = info.nftId;
58
62
 
59
63
  clonedInstanceReader = InstanceReader(Clones.clone(address(_instanceReaderMaster)));
60
- clonedInstanceReader.initialize(_registryAddress, instanceNftId);
64
+ clonedInstanceReader.initialize(_registryAddress, clonedInstanceNftId);
65
+ clonedInstance.setInstanceReader(clonedInstanceReader);
61
66
 
62
- _grantInitialAuthorizations(clonedAccessManager, clonedInstance);
67
+ clonedBundleManager = BundleManager(Clones.clone(_instanceBundleManagerMaster));
68
+ clonedBundleManager.initialize(address(clonedAccessManager), _registryAddress, clonedInstanceNftId);
69
+ clonedInstance.setBundleManager(clonedBundleManager);
70
+
71
+ // TODO amend setters with instance specific , policy manager ...
72
+
73
+ _grantInitialAuthorizations(clonedAccessManager, clonedInstance, clonedBundleManager);
63
74
 
64
- clonedInstance.setInstanceReader(clonedInstanceReader);
65
-
66
75
  // to complete setup switch instance ownership to the instance owner
67
76
  // TODO: use a role less powerful than admin, maybe INSTANCE_ADMIN (does not exist yet)
68
77
  clonedAccessManager.grantRole(ADMIN_ROLE().toInt(), instanceOwner, 0);
69
78
  clonedAccessManager.revokeRole(ADMIN_ROLE().toInt(), address(this));
70
79
 
71
- emit LogInstanceCloned(address(clonedAccessManager), address(clonedInstance), address(clonedInstanceReader), instanceNftId);
80
+ emit LogInstanceCloned(address(clonedAccessManager), address(clonedInstance), address(clonedInstanceReader), clonedInstanceNftId);
72
81
  }
73
82
 
74
- function _grantInitialAuthorizations(AccessManagerSimple clonedAccessManager, Instance clonedInstance) internal {
83
+ function _grantInitialAuthorizations(AccessManagerUpgradeable clonedAccessManager, Instance clonedInstance, BundleManager clonedBundleManager) internal {
84
+ // configure authorization for distribution service on instance
75
85
  address distributionServiceAddress = _registry.getServiceAddress("DistributionService", VersionLib.toVersion(3, 0, 0).toMajorPart());
76
86
  clonedAccessManager.grantRole(DISTRIBUTION_SERVICE_ROLE().toInt(), distributionServiceAddress, 0);
77
87
  bytes4[] memory instanceDistributionServiceSelectors = new bytes4[](2);
@@ -82,39 +92,94 @@ contract InstanceService is Service, IInstanceService {
82
92
  instanceDistributionServiceSelectors,
83
93
  DISTRIBUTION_SERVICE_ROLE().toInt());
84
94
 
95
+ // configure authorization for pool service on instance
85
96
  address poolServiceAddress = _registry.getServiceAddress("PoolService", VersionLib.toVersion(3, 0, 0).toMajorPart());
86
97
  clonedAccessManager.grantRole(POOL_SERVICE_ROLE().toInt(), address(poolServiceAddress), 0);
87
98
  bytes4[] memory instancePoolServiceSelectors = new bytes4[](4);
88
99
  instancePoolServiceSelectors[0] = clonedInstance.createPoolSetup.selector;
89
100
  instancePoolServiceSelectors[1] = clonedInstance.updatePoolSetup.selector;
90
- instancePoolServiceSelectors[2] = clonedInstance.createBundle.selector;
91
- instancePoolServiceSelectors[3] = clonedInstance.updateBundle.selector;
92
101
  clonedAccessManager.setTargetFunctionRole(
93
102
  address(clonedInstance),
94
103
  instancePoolServiceSelectors,
95
104
  POOL_SERVICE_ROLE().toInt());
96
105
 
97
- }
106
+ // configure authorization for product service on instance
107
+ address productServiceAddress = _registry.getServiceAddress("ProductService", VersionLib.toVersion(3, 0, 0).toMajorPart());
108
+ clonedAccessManager.grantRole(PRODUCT_SERVICE_ROLE().toInt(), address(productServiceAddress), 0);
109
+ bytes4[] memory instanceProductServiceSelectors = new bytes4[](5);
110
+ instanceProductServiceSelectors[0] = clonedInstance.createProductSetup.selector;
111
+ instanceProductServiceSelectors[1] = clonedInstance.updateProductSetup.selector;
112
+ instanceProductServiceSelectors[2] = clonedInstance.createRisk.selector;
113
+ instanceProductServiceSelectors[3] = clonedInstance.updateRisk.selector;
114
+ instanceProductServiceSelectors[4] = clonedInstance.updateRiskState.selector;
115
+ clonedAccessManager.setTargetFunctionRole(
116
+ address(clonedInstance),
117
+ instanceProductServiceSelectors,
118
+ PRODUCT_SERVICE_ROLE().toInt());
98
119
 
99
- function setAccessManagerMaster(address accessManagerMaster) external {
100
- require(
101
- _accessManagerMaster == address(0),
102
- "ERROR:CRD-001:ACCESS_MANAGER_MASTER_ALREADY_SET");
103
- _accessManagerMaster = accessManagerMaster;
120
+ // configure authorization for policy service on instance
121
+ address policyServiceAddress = _registry.getServiceAddress("PolicyService", VersionLib.toVersion(3, 0, 0).toMajorPart());
122
+ clonedAccessManager.grantRole(POLICY_SERVICE_ROLE().toInt(), address(policyServiceAddress), 0);
123
+ bytes4[] memory instancePolicyServiceSelectors = new bytes4[](3);
124
+ instancePolicyServiceSelectors[0] = clonedInstance.createPolicy.selector;
125
+ instancePolicyServiceSelectors[1] = clonedInstance.updatePolicy.selector;
126
+ instancePolicyServiceSelectors[2] = clonedInstance.updatePolicyState.selector;
127
+ clonedAccessManager.setTargetFunctionRole(
128
+ address(clonedInstance),
129
+ instancePolicyServiceSelectors,
130
+ POLICY_SERVICE_ROLE().toInt());
131
+
132
+ // configure authorization for bundle service on instance
133
+ address bundleServiceAddress = _registry.getServiceAddress("BundleService", VersionLib.toVersion(3, 0, 0).toMajorPart());
134
+ clonedAccessManager.grantRole(BUNDLE_SERVICE_ROLE().toInt(), address(bundleServiceAddress), 0);
135
+ bytes4[] memory instanceBundleServiceSelectors = new bytes4[](2);
136
+ instanceBundleServiceSelectors[0] = clonedInstance.createBundle.selector;
137
+ instanceBundleServiceSelectors[1] = clonedInstance.updateBundle.selector;
138
+ clonedAccessManager.setTargetFunctionRole(
139
+ address(clonedInstance),
140
+ instanceBundleServiceSelectors,
141
+ BUNDLE_SERVICE_ROLE().toInt());
142
+
143
+ // configure authorization for bundle service on bundle manager
144
+ bytes4[] memory bundleManagerBundleServiceSelectors = new bytes4[](5);
145
+ bundleManagerBundleServiceSelectors[0] = clonedBundleManager.linkPolicy.selector;
146
+ bundleManagerBundleServiceSelectors[1] = clonedBundleManager.unlinkPolicy.selector;
147
+ bundleManagerBundleServiceSelectors[2] = clonedBundleManager.add.selector;
148
+ bundleManagerBundleServiceSelectors[3] = clonedBundleManager.lock.selector;
149
+ bundleManagerBundleServiceSelectors[4] = clonedBundleManager.unlock.selector;
150
+ clonedAccessManager.setTargetFunctionRole(
151
+ address(clonedBundleManager),
152
+ bundleManagerBundleServiceSelectors,
153
+ BUNDLE_SERVICE_ROLE().toInt());
104
154
  }
105
155
 
106
- function setInstanceMaster(address instanceMaster) external {
107
- require(
108
- _instanceMaster == address(0),
109
- "ERROR:CRD-002:INSTANCE_MASTER_ALREADY_SET");
110
- _instanceMaster = instanceMaster;
156
+ function setMasterInstance(address accessManagerAddress, address instanceAddress, address instanceReaderAddress, address bundleManagerAddress) external onlyOwner {
157
+ require( _accessManagerMaster == address(0), "ERROR:CRD-001:ACCESS_MANAGER_MASTER_ALREADY_SET");
158
+ require( _instanceMaster == address(0), "ERROR:CRD-002:INSTANCE_MASTER_ALREADY_SET");
159
+ require( _instanceBundleManagerMaster == address(0), "ERROR:CRD-004:BUNDLE_MANAGER_MASTER_ALREADY_SET");
160
+
161
+ require (accessManagerAddress != address(0), "ERROR:CRD-005:ACCESS_MANAGER_ZERO");
162
+ require (instanceAddress != address(0), "ERROR:CRD-006:INSTANCE_ZERO");
163
+ require (instanceReaderAddress != address(0), "ERROR:CRD-007:INSTANCE_READER_ZERO");
164
+ require (bundleManagerAddress != address(0), "ERROR:CRD-008:BUNDLE_MANAGER_ZERO");
165
+
166
+ Instance instance = Instance(instanceAddress);
167
+ InstanceReader instanceReader = InstanceReader(instanceReaderAddress);
168
+ BundleManager bundleManager = BundleManager(bundleManagerAddress);
169
+
170
+ require(instance.authority() == accessManagerAddress, "ERROR:CRD-009:INSTANCE_AUTHORITY_MISMATCH");
171
+ require(instanceReader.getInstanceNftId() == instance.getNftId(), "ERROR:CRD-010:INSTANCE_READER_INSTANCE_MISMATCH");
172
+ require(bundleManager.getInstanceNftId() == instance.getNftId(), "ERROR:CRD-011:BUNDLE_MANAGER_INSTANCE_MISMATCH");
173
+
174
+ _accessManagerMaster = accessManagerAddress;
175
+ _instanceMaster = instanceAddress;
176
+ _instanceReaderMaster = instanceReaderAddress;
177
+ _instanceBundleManagerMaster = bundleManagerAddress;
111
178
  }
112
179
 
113
- function setInstanceReaderMaster(address instanceReaderMaster) external {
114
- require(
115
- _instanceReaderMaster == address(0),
116
- "ERROR:CRD-003:INSTANCE_READER_MASTER_ALREADY_SET");
117
- _instanceReaderMaster = instanceReaderMaster;
180
+ function upgradeInstanceReader(NftId instanceNftId) external {
181
+ // TODO: ensure this is done by instance owner
182
+ // TODO: upgrade instance reader of this instance to latest (set above here)
118
183
  }
119
184
 
120
185
  function getInstanceReaderMaster() external view returns (address) {
@@ -129,6 +194,10 @@ contract InstanceService is Service, IInstanceService {
129
194
  return _accessManagerMaster;
130
195
  }
131
196
 
197
+ function getBundleManagerMaster() external view returns (address) {
198
+ return _instanceBundleManagerMaster;
199
+ }
200
+
132
201
  // From IService
133
202
  function getName() public pure override(IService, Service) returns(string memory) {
134
203
  return NAME;
@@ -160,18 +229,28 @@ contract InstanceService is Service, IInstanceService {
160
229
 
161
230
  address initialOwner = address(0);
162
231
  (_registryAddress, initialOwner) = abi.decode(data, (address, address));
163
-
164
- _initializeService(_registryAddress, initialOwner);
232
+ // TODO while InstanceService is not deployed in InstanceServiceManager constructor
233
+ // owner is InstanceServiceManager deployer
234
+ _initializeService(_registryAddress, owner);
165
235
 
166
236
  _registerInterface(type(IService).interfaceId);
167
237
  _registerInterface(type(IInstanceService).interfaceId);
168
238
  }
169
-
170
- function hasRole(address account, RoleId role, NftId instanceNftId) external view returns (bool) {
239
+ // TODO use instanceAddress instead of nft
240
+ /*function hasRole(address account, RoleId role, NftId instanceNftId) external view returns (bool) {
171
241
  IRegistry.ObjectInfo memory instanceObjectInfo = getRegistry().getObjectInfo(instanceNftId);
172
242
  address instanceAddress = instanceObjectInfo.objectAddress;
173
243
  Instance instance = Instance(instanceAddress);
174
- AccessManagerSimple accessManager = AccessManagerSimple(instance.authority());
244
+ AccessManagerUpgradeable accessManager = AccessManagerUpgradeable(instance.authority());
245
+ (bool isMember, uint32 executionDelay) = accessManager.hasRole(role.toInt(), account);
246
+ if (executionDelay > 0) {
247
+ return false;
248
+ }
249
+ return isMember;
250
+ }*/
251
+ function hasRole(address account, RoleId role, address instanceAddress) external view returns (bool) {
252
+ Instance instance = Instance(instanceAddress);
253
+ AccessManagerUpgradeable accessManager = AccessManagerUpgradeable(instance.authority());
175
254
  (bool isMember, uint32 executionDelay) = accessManager.hasRole(role.toInt(), account);
176
255
  if (executionDelay > 0) {
177
256
  return false;
@@ -31,14 +31,15 @@ contract InstanceServiceManager is ProxyManager {
31
31
  Registry registry = Registry(registryAddress);
32
32
  address registryServiceAddress = registry.getServiceAddress("RegistryService", VersionLib.toVersion(3, 0, 0).toMajorPart());
33
33
  RegistryService registryService = RegistryService(registryServiceAddress);
34
-
35
- registryService.registerService(_instanceService);
34
+ // TODO this must have a role or own nft to register service
35
+ //registryService.registerService(_instanceService);
36
36
  // RegistryService registryService = _instanceService.getRegistryService();
37
37
 
38
+ // TODO no nft to link yet
38
39
  // link ownership of instance service manager ot nft owner of instance service
39
- _linkToNftOwnable(
40
- address(registryAddress),
41
- address(_instanceService));
40
+ //_linkToNftOwnable(
41
+ // address(registryAddress),
42
+ // address(_instanceService));
42
43
 
43
44
  // implies that after this constructor call only upgrade functionality is available
44
45
  _isDeployed = true;
@@ -0,0 +1,101 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ pragma solidity ^0.8.20;
3
+
4
+ import {Cloneable} from "./Cloneable.sol";
5
+
6
+ import {IInstance} from "./IInstance.sol";
7
+ import {INSTANCE} from "../types/ObjectType.sol";
8
+ import {InstanceReader} from "./InstanceReader.sol";
9
+ import {IRegistry} from "../registry/IRegistry.sol";
10
+ import {LibNftIdSet} from "../types/NftIdSet.sol";
11
+ import {NftId} from "../types/NftId.sol";
12
+
13
+ contract ObjectManager is
14
+ Cloneable
15
+ {
16
+
17
+ event LogObjectManagerInitialized(NftId instanceNftId, address instanceReader);
18
+
19
+ error ErrorObjectManagerNftIdInvalid(NftId instanceNftId);
20
+ error ErrorObjectManagerAlreadyAdded(NftId componentNftId, NftId objectNftId);
21
+
22
+ mapping(NftId compnentNftId => LibNftIdSet.Set objects) internal _activeObjects;
23
+ mapping(NftId compnentNftId => LibNftIdSet.Set objects) internal _allObjects;
24
+ NftId internal _instanceNftId;
25
+ InstanceReader internal _instanceReader;
26
+
27
+ constructor() Cloneable() {
28
+ _instanceReader = InstanceReader(address(0));
29
+ }
30
+
31
+ /// @dev call to initialize MUST be made in the same transaction as cloning of the contract
32
+ function initialize(
33
+ address authority,
34
+ address registry,
35
+ NftId instanceNftId
36
+ )
37
+ external
38
+ {
39
+ initialize(authority, registry);
40
+
41
+ // check/handle instance nft id/instance reader
42
+ IRegistry.ObjectInfo memory instanceInfo = _registry.getObjectInfo(instanceNftId);
43
+ if (instanceInfo.objectType != INSTANCE()) {
44
+ revert ErrorObjectManagerNftIdInvalid(instanceNftId);
45
+ }
46
+
47
+ IInstance instance = IInstance(instanceInfo.objectAddress);
48
+ _instanceReader = instance.getInstanceReader();
49
+ _instanceNftId = instanceNftId;
50
+
51
+ emit LogObjectManagerInitialized(instanceNftId, address(_instanceReader));
52
+ }
53
+
54
+ function getInstanceReader() external view returns (InstanceReader) {
55
+ return _instanceReader;
56
+ }
57
+
58
+ function getInstanceNftId() external view returns (NftId) {
59
+ return _instanceNftId;
60
+ }
61
+
62
+ function _add(NftId componentNftId, NftId objectNftId) internal {
63
+ LibNftIdSet.Set storage allSet = _allObjects[componentNftId];
64
+ LibNftIdSet.Set storage activeSet = _activeObjects[componentNftId];
65
+
66
+ LibNftIdSet.add(allSet, objectNftId);
67
+ LibNftIdSet.add(activeSet, objectNftId);
68
+ }
69
+
70
+ function _activate(NftId componentNftId, NftId objectNftId) internal {
71
+ LibNftIdSet.add(_activeObjects[componentNftId], objectNftId);
72
+ }
73
+
74
+ function _deactivate(NftId componentNftId, NftId objectNftId) internal {
75
+ LibNftIdSet.remove(_activeObjects[componentNftId], objectNftId);
76
+ }
77
+
78
+ function _objects(NftId componentNftId) internal view returns (uint256) {
79
+ return LibNftIdSet.size(_allObjects[componentNftId]);
80
+ }
81
+
82
+ function _contains(NftId componentNftId, NftId objectNftId) internal view returns (bool) {
83
+ return LibNftIdSet.contains(_allObjects[componentNftId], objectNftId);
84
+ }
85
+
86
+ function _getObject(NftId componentNftId, uint256 idx) internal view returns (NftId) {
87
+ return LibNftIdSet.getElementAt(_allObjects[componentNftId], idx);
88
+ }
89
+
90
+ function _activeObjs(NftId componentNftId) internal view returns (uint256) {
91
+ return LibNftIdSet.size(_activeObjects[componentNftId]);
92
+ }
93
+
94
+ function _isActive(NftId componentNftId, NftId objectNftId) internal view returns (bool) {
95
+ return LibNftIdSet.contains(_activeObjects[componentNftId], objectNftId);
96
+ }
97
+
98
+ function _getActiveObject(NftId componentNftId, uint256 idx) internal view returns (NftId) {
99
+ return LibNftIdSet.getElementAt(_activeObjects[componentNftId], idx);
100
+ }
101
+ }