@etherisc/gif-next 0.0.2-f2b0fa2-473 → 0.0.2-f4f92b3-338
Sign up to get free protection for your applications and to get access to all the features.
- package/README.md +67 -1
- package/artifacts/contracts/components/Component.sol/Component.dbg.json +4 -0
- package/artifacts/contracts/components/Component.sol/Component.json +656 -0
- package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +1 -1
- package/artifacts/contracts/components/Distribution.sol/Distribution.json +329 -90
- package/artifacts/contracts/components/IComponent.sol/IComponent.dbg.json +4 -0
- package/artifacts/contracts/{shared/RegisterableUpgradable.sol/RegisterableUpgradable.json → components/IComponent.sol/IComponent.json} +171 -158
- package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.json +496 -0
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.json +568 -2
- package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.json +596 -5
- package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
- package/artifacts/contracts/components/Pool.sol/Pool.json +360 -118
- package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
- package/artifacts/contracts/components/Product.sol/Product.json +342 -147
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Cloner.dbg.json +1 -1
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock1.dbg.json +1 -1
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock2.dbg.json +1 -1
- package/artifacts/contracts/experiment/errors/Require.sol/Require.dbg.json +1 -1
- package/artifacts/contracts/experiment/errors/Revert.sol/Revert.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/A.sol/A.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/A.sol/AShared.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/B.sol/B.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/C.sol/C.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/IA.sol/IA.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/IB.sol/IB.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/IC.sol/IC.dbg.json +1 -1
- package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.dbg.json +1 -1
- package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.json +2 -2
- package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.dbg.json +1 -1
- package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.dbg.json +1 -1
- package/artifacts/contracts/experiment/statemachine/SM.sol/SM.dbg.json +1 -1
- package/artifacts/contracts/experiment/statemachine/SM.sol/SM.json +2 -2
- package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.dbg.json +1 -1
- package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.json +2 -2
- package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.dbg.json +1 -1
- package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.dbg.json +1 -1
- package/artifacts/contracts/instance/BundleManager.sol/BundleManager.dbg.json +4 -0
- package/artifacts/contracts/instance/BundleManager.sol/BundleManager.json +764 -0
- package/artifacts/contracts/instance/Cloneable.sol/Cloneable.dbg.json +4 -0
- package/artifacts/contracts/instance/{AccessManagedSimple.sol/AccessManagedSimple.json → Cloneable.sol/Cloneable.json} +86 -2
- package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstance.sol/IInstance.json +1657 -28
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +162 -18
- package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
- package/artifacts/contracts/instance/Instance.sol/Instance.json +232 -632
- package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +231 -114
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +182 -58
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +328 -67
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +72 -23
- package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.dbg.json +4 -0
- package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.json +261 -0
- package/artifacts/contracts/instance/base/ComponentService.sol/ComponentService.dbg.json +4 -0
- package/artifacts/contracts/instance/base/{ComponentServiceBase.sol/ComponentServiceBase.json → ComponentService.sol/ComponentService.json} +138 -16
- package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
- package/artifacts/contracts/instance/base/ILifecycle.sol/ILifecycle.dbg.json +1 -1
- package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
- package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.json +2 -2
- package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json +1 -1
- package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.json +2 -2
- package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IAccess.sol/IAccess.json +59 -16
- package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +1 -1
- package/artifacts/contracts/instance/module/ISetup.sol/ISetup.dbg.json +1 -1
- package/artifacts/contracts/instance/module/ITreasury.sol/ITreasury.dbg.json +1 -1
- package/artifacts/contracts/instance/service/BundleService.sol/BundleService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/BundleService.sol/BundleService.json +1102 -0
- package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.json +449 -0
- package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +772 -0
- package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.json +437 -0
- package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/{IComponentOwnerService.sol/IComponentOwnerService.json → IBundleService.sol/IBundleService.json} +295 -46
- package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.json +13 -18
- package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.json +766 -0
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +15 -82
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +25 -245
- package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.json +1227 -0
- package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.json +505 -0
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +806 -0
- package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.json +437 -0
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +856 -0
- package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.json +437 -0
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +2 -2
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +339 -59
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +220 -111
- package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
- package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
- package/artifacts/contracts/registry/Registry.sol/Registry.json +301 -188
- package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.dbg.json +4 -0
- package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.json +285 -0
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +69 -130
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +51 -91
- package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.dbg.json +4 -0
- package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.json +547 -0
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +4 -0
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +394 -0
- package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.dbg.json +1 -1
- package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +1 -1
- package/artifacts/contracts/shared/ERC165.sol/ERC165.json +2 -2
- package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +0 -5
- package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
- package/artifacts/contracts/shared/IService.sol/IService.json +13 -18
- package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +1 -1
- package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
- package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +19 -6
- package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +1 -1
- package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +19 -6
- package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
- package/artifacts/contracts/shared/Registerable.sol/Registerable.json +19 -11
- package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
- package/artifacts/contracts/shared/Service.sol/Service.json +26 -18
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
- package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
- package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +2 -2
- package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +1 -1
- package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json +1 -1
- package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json +1 -1
- package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +19 -11
- package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +1 -1
- package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.json +2 -2
- package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +1 -1
- package/artifacts/contracts/test/TestService.sol/TestService.json +44 -36
- package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json +1 -1
- package/artifacts/contracts/test/TestVersion.sol/TestVersion.dbg.json +1 -1
- package/artifacts/contracts/test/TestVersion.sol/TestVersion.json +2 -2
- package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json +1 -1
- package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.json +2 -2
- package/artifacts/contracts/test/Usdc.sol/USDC.dbg.json +1 -1
- package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.dbg.json +1 -1
- package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
- package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.dbg.json +1 -1
- package/artifacts/contracts/types/Fee.sol/FeeLib.dbg.json +1 -1
- package/artifacts/contracts/types/Key32.sol/Key32Lib.dbg.json +1 -1
- package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
- package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.json +26 -3
- package/artifacts/contracts/types/NumberId.sol/NumberIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
- package/artifacts/contracts/types/Referral.sol/ReferralLib.dbg.json +1 -1
- package/artifacts/contracts/types/RiskId.sol/RiskIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/RoleId.sol/RoleIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/RoleId.sol/RoleIdLib.json +2 -2
- package/artifacts/contracts/types/StateId.sol/StateIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/StateId.sol/StateIdLib.json +2 -2
- package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json +1 -1
- package/artifacts/contracts/types/UFixed.sol/MathLib.dbg.json +1 -1
- package/artifacts/contracts/types/UFixed.sol/UFixedLib.dbg.json +1 -1
- package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +1 -1
- package/artifacts/contracts/types/Version.sol/VersionLib.json +2 -2
- package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +1 -1
- package/artifacts/contracts/types/Version.sol/VersionPartLib.json +22 -3
- package/contracts/components/Component.sol +222 -0
- package/contracts/components/Distribution.sol +33 -55
- package/contracts/components/IComponent.sol +43 -0
- package/contracts/components/IDistributionComponent.sol +5 -1
- package/contracts/components/IPoolComponent.sol +11 -3
- package/contracts/components/IProductComponent.sol +7 -3
- package/contracts/components/Pool.sol +65 -83
- package/contracts/components/Product.sol +70 -109
- package/contracts/instance/BundleManager.sol +125 -0
- package/contracts/instance/Cloneable.sol +46 -0
- package/contracts/instance/IInstance.sol +54 -10
- package/contracts/instance/IInstanceService.sol +24 -1
- package/contracts/instance/Instance.sol +76 -243
- package/contracts/instance/InstanceAccessManager.sol +88 -78
- package/contracts/instance/InstanceReader.sol +34 -21
- package/contracts/instance/InstanceService.sol +311 -51
- package/contracts/instance/InstanceServiceManager.sol +10 -12
- package/contracts/instance/ObjectManager.sol +84 -0
- package/contracts/instance/base/ComponentService.sol +134 -0
- package/contracts/instance/module/IAccess.sol +27 -17
- package/contracts/instance/module/IBundle.sol +1 -0
- package/contracts/instance/module/ISetup.sol +3 -0
- package/contracts/instance/service/BundleService.sol +293 -0
- package/contracts/instance/service/BundleServiceManager.sol +51 -0
- package/contracts/instance/service/DistributionService.sol +106 -0
- package/contracts/instance/service/DistributionServiceManager.sol +51 -0
- package/contracts/instance/service/IBundleService.sol +44 -0
- package/contracts/instance/service/IPolicyService.sol +94 -0
- package/contracts/instance/service/IPoolService.sol +6 -23
- package/contracts/instance/service/IProductService.sol +6 -73
- package/contracts/instance/service/PolicyService.sol +538 -0
- package/contracts/instance/service/PolicyServiceManager.sol +54 -0
- package/contracts/instance/service/PoolService.sol +109 -0
- package/contracts/instance/service/PoolServiceManager.sol +51 -0
- package/contracts/instance/service/ProductService.sol +232 -0
- package/contracts/instance/service/ProductServiceManager.sol +54 -0
- package/contracts/registry/ChainNft.sol +1 -1
- package/contracts/registry/IRegistry.sol +47 -6
- package/contracts/registry/IRegistryService.sol +44 -14
- package/contracts/registry/Registry.sol +243 -214
- package/contracts/registry/RegistryAccessManager.sol +216 -0
- package/contracts/registry/RegistryService.sol +81 -258
- package/contracts/registry/RegistryServiceManager.sol +20 -22
- package/contracts/registry/ReleaseManager.sol +332 -0
- package/contracts/registry/TokenRegistry.sol +112 -0
- package/contracts/shared/ERC165.sol +6 -2
- package/contracts/shared/IRegisterable.sol +1 -3
- package/contracts/shared/IService.sol +2 -1
- package/contracts/shared/NftOwnable.sol +7 -4
- package/contracts/shared/ProxyManager.sol +1 -1
- package/contracts/shared/Registerable.sol +11 -14
- package/contracts/shared/Service.sol +14 -8
- package/contracts/test/TestService.sol +3 -2
- package/contracts/types/NftIdSet.sol +26 -24
- package/contracts/types/RoleId.sol +14 -6
- package/contracts/types/StateId.sol +4 -0
- package/contracts/types/Version.sol +4 -1
- package/package.json +1 -1
- package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.dbg.json +0 -4
- package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.json +0 -314
- package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.dbg.json +0 -4
- package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.json +0 -267
- package/artifacts/contracts/instance/AccessManagedSimple.sol/AccessManagedSimple.dbg.json +0 -4
- package/artifacts/contracts/instance/AccessManagerSimple.sol/AccessManagerSimple.dbg.json +0 -4
- package/artifacts/contracts/instance/AccessManagerSimple.sol/AccessManagerSimple.json +0 -1119
- package/artifacts/contracts/instance/IAccessManagerSimple.sol/IAccessManagerSimple.dbg.json +0 -4
- package/artifacts/contracts/instance/IAccessManagerSimple.sol/IAccessManagerSimple.json +0 -1082
- package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.dbg.json +0 -4
- package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.dbg.json +0 -4
- package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.json +0 -113
- package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.dbg.json +0 -4
- package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.json +0 -827
- package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.dbg.json +0 -4
- package/artifacts/contracts/shared/RegisterableUpgradable.sol/RegisterableUpgradable.dbg.json +0 -4
- package/contracts/components/BaseComponent.sol +0 -86
- package/contracts/components/IBaseComponent.sol +0 -24
- package/contracts/instance/AccessManagedSimple.sol +0 -114
- package/contracts/instance/AccessManagerSimple.sol +0 -682
- package/contracts/instance/IAccessManagerSimple.sol +0 -391
- package/contracts/instance/base/ComponentServiceBase.sol +0 -49
- package/contracts/instance/base/IInstanceBase.sol +0 -23
- package/contracts/instance/service/ComponentOwnerService.sol +0 -317
- package/contracts/instance/service/IComponentOwnerService.sol +0 -20
- package/contracts/shared/RegisterableUpgradable.sol +0 -16
@@ -3,66 +3,311 @@ 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";
|
8
6
|
import {Instance} from "./Instance.sol";
|
7
|
+
import {IInstance} from "./IInstance.sol";
|
8
|
+
import {InstanceAccessManager} from "./InstanceAccessManager.sol";
|
9
9
|
import {IInstanceService} from "./IInstanceService.sol";
|
10
|
-
import {
|
10
|
+
import {InstanceReader} from "./InstanceReader.sol";
|
11
|
+
import {BundleManager} from "./BundleManager.sol";
|
11
12
|
import {IRegistry} from "../registry/IRegistry.sol";
|
13
|
+
import {IRegistryService} from "../registry/IRegistryService.sol";
|
14
|
+
import {ChainNft} from "../registry/ChainNft.sol";
|
15
|
+
import {Service} from "../../contracts/shared/Service.sol";
|
12
16
|
import {IService} from "../shared/IService.sol";
|
13
|
-
import {
|
14
|
-
import {
|
17
|
+
import {NftId} from "../../contracts/types/NftId.sol";
|
18
|
+
import {RoleId} from "../types/RoleId.sol";
|
19
|
+
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";
|
20
|
+
import {ObjectType, INSTANCE, BUNDLE, POLICY, PRODUCT, DISTRIBUTION, REGISTRY, POOL} from "../types/ObjectType.sol";
|
15
21
|
|
16
22
|
contract InstanceService is Service, IInstanceService {
|
17
23
|
|
18
|
-
address internal
|
19
|
-
address internal
|
20
|
-
address internal
|
21
|
-
address internal
|
24
|
+
address internal _masterInstanceAccessManager;
|
25
|
+
address internal _masterInstance;
|
26
|
+
address internal _masterInstanceReader;
|
27
|
+
address internal _masterInstanceBundleManager;
|
22
28
|
|
23
29
|
// TODO update to real hash when instance is stable
|
24
30
|
bytes32 public constant INSTANCE_CREATION_CODE_HASH = bytes32(0);
|
25
|
-
|
31
|
+
|
32
|
+
modifier onlyInstanceOwner(NftId instanceNftId) {
|
33
|
+
IRegistry registry = getRegistry();
|
34
|
+
ChainNft chainNft = registry.getChainNft();
|
35
|
+
|
36
|
+
if( msg.sender != chainNft.ownerOf(instanceNftId.toInt())) {
|
37
|
+
revert ErrorInstanceServiceNotInstanceOwner(msg.sender, instanceNftId);
|
38
|
+
}
|
39
|
+
_;
|
40
|
+
}
|
41
|
+
|
42
|
+
modifier onlyRegisteredService() {
|
43
|
+
address caller = msg.sender;
|
44
|
+
if (! getRegistry().isRegisteredService(caller)) {
|
45
|
+
revert ErrorInstanceServiceRequestUnauhorized(caller);
|
46
|
+
}
|
47
|
+
_;
|
48
|
+
}
|
26
49
|
|
27
50
|
function createInstanceClone()
|
28
51
|
external
|
29
52
|
returns (
|
30
|
-
|
31
|
-
|
32
|
-
|
53
|
+
InstanceAccessManager clonedAccessManager,
|
54
|
+
Instance clonedInstance,
|
55
|
+
NftId clonedInstanceNftId,
|
56
|
+
InstanceReader clonedInstanceReader,
|
57
|
+
BundleManager clonedBundleManager
|
33
58
|
)
|
34
59
|
{
|
35
|
-
|
36
|
-
|
37
|
-
|
60
|
+
address instanceOwner = msg.sender;
|
61
|
+
IRegistry registry = getRegistry();
|
62
|
+
address registryAddress = address(registry);
|
63
|
+
NftId registryNftId = registry.getNftId(registryAddress);
|
64
|
+
address registryServiceAddress = registry.getServiceAddress(REGISTRY(), getMajorVersion());
|
65
|
+
IRegistryService registryService = IRegistryService(registryServiceAddress);
|
66
|
+
|
67
|
+
// initially set the authority of the access managar to this (being the instance service).
|
68
|
+
// This will allow the instance service to bootstrap the authorizations of the instance
|
69
|
+
// and then transfer the ownership of the access manager to the instance owner once everything is setup
|
70
|
+
clonedAccessManager = InstanceAccessManager(Clones.clone(_masterInstanceAccessManager));
|
71
|
+
clonedAccessManager.initialize(address(this));
|
72
|
+
|
73
|
+
clonedInstance = Instance(Clones.clone(_masterInstance));
|
74
|
+
clonedInstance.initialize(address(clonedAccessManager), registryAddress, registryNftId, msg.sender);
|
75
|
+
|
76
|
+
clonedInstanceReader = InstanceReader(Clones.clone(address(_masterInstanceReader)));
|
77
|
+
clonedInstanceReader.initialize(registryAddress, address(clonedInstance));
|
78
|
+
clonedInstance.setInstanceReader(clonedInstanceReader);
|
79
|
+
|
80
|
+
clonedBundleManager = BundleManager(Clones.clone(_masterInstanceBundleManager));
|
81
|
+
clonedBundleManager.initialize(address(clonedAccessManager), registryAddress, address(clonedInstance));
|
82
|
+
clonedInstance.setBundleManager(clonedBundleManager);
|
83
|
+
|
84
|
+
// TODO amend setters with instance specific , policy manager ...
|
85
|
+
|
86
|
+
_grantInitialAuthorizations(clonedAccessManager, clonedInstance, clonedBundleManager);
|
87
|
+
|
88
|
+
// to complete setup switch instance ownership to the instance owner
|
89
|
+
// TODO: use a role less powerful than admin, maybe INSTANCE_ADMIN (does not exist yet)
|
90
|
+
clonedAccessManager.grantRole(ADMIN_ROLE(), instanceOwner);
|
91
|
+
clonedAccessManager.revokeRole(ADMIN_ROLE(), address(this));
|
92
|
+
|
93
|
+
IRegistry.ObjectInfo memory info = registryService.registerInstance(clonedInstance, instanceOwner);
|
94
|
+
clonedInstanceNftId = info.nftId;
|
95
|
+
// clonedInstance.linkToRegisteredNftId();
|
96
|
+
|
97
|
+
emit LogInstanceCloned(address(clonedAccessManager), address(clonedInstance), address(clonedInstanceReader), clonedInstanceNftId);
|
38
98
|
}
|
39
99
|
|
40
|
-
function
|
41
|
-
|
100
|
+
function _grantInitialAuthorizations(InstanceAccessManager clonedAccessManager, Instance clonedInstance, BundleManager clonedBundleManager) internal {
|
101
|
+
_createGifRoles(clonedAccessManager);
|
102
|
+
_createGifTargets(clonedAccessManager, clonedInstance, clonedBundleManager);
|
103
|
+
_grantDistributionServiceAuthorizations(clonedAccessManager, clonedInstance);
|
104
|
+
_grantPoolServiceAuthorizations(clonedAccessManager, clonedInstance);
|
105
|
+
_grantProductServiceAuthorizations(clonedAccessManager, clonedInstance);
|
106
|
+
_grantPolicyServiceAuthorizations(clonedAccessManager, clonedInstance);
|
107
|
+
_grantBundleServiceAuthorizations(clonedAccessManager, clonedInstance, clonedBundleManager);
|
108
|
+
_grantInstanceServiceAuthorizations(clonedAccessManager, clonedInstance);
|
42
109
|
}
|
43
110
|
|
44
|
-
function
|
45
|
-
|
111
|
+
function _createGifRoles(InstanceAccessManager clonedAccessManager) internal {
|
112
|
+
clonedAccessManager.createGifRole(DISTRIBUTION_OWNER_ROLE(), "DistributionOwnerRole");
|
113
|
+
clonedAccessManager.createGifRole(POOL_OWNER_ROLE(), "PoolOwnerRole");
|
114
|
+
clonedAccessManager.createGifRole(PRODUCT_OWNER_ROLE(), "ProductOwnerRole");
|
115
|
+
|
116
|
+
clonedAccessManager.createGifRole(DISTRIBUTION_SERVICE_ROLE(), "DistributionServiceRole");
|
117
|
+
clonedAccessManager.createGifRole(POOL_SERVICE_ROLE(), "PoolServiceRole");
|
118
|
+
clonedAccessManager.createGifRole(PRODUCT_SERVICE_ROLE(), "ProductServiceRole");
|
119
|
+
clonedAccessManager.createGifRole(POLICY_SERVICE_ROLE(), "PolicyServiceRole");
|
120
|
+
clonedAccessManager.createGifRole(BUNDLE_SERVICE_ROLE(), "BundleServiceRole");
|
121
|
+
clonedAccessManager.createGifRole(INSTANCE_SERVICE_ROLE(), "InstanceServiceRole");
|
122
|
+
}
|
123
|
+
|
124
|
+
function _createGifTargets(InstanceAccessManager clonedAccessManager, Instance clonedInstance, BundleManager clonedBundleManager) internal {
|
125
|
+
clonedAccessManager.createGifTarget(address(clonedInstance), "Instance");
|
126
|
+
clonedAccessManager.createGifTarget(address(clonedBundleManager), "BundleManager");
|
127
|
+
}
|
128
|
+
|
129
|
+
function _grantDistributionServiceAuthorizations(InstanceAccessManager clonedAccessManager, Instance clonedInstance) internal {
|
130
|
+
// configure authorization for distribution service on instance
|
131
|
+
IRegistry registry = getRegistry();
|
132
|
+
address distributionServiceAddress = registry.getServiceAddress(DISTRIBUTION(), getMajorVersion());
|
133
|
+
clonedAccessManager.grantRole(DISTRIBUTION_SERVICE_ROLE(), distributionServiceAddress);
|
134
|
+
bytes4[] memory instanceDistributionServiceSelectors = new bytes4[](2);
|
135
|
+
instanceDistributionServiceSelectors[0] = clonedInstance.createDistributionSetup.selector;
|
136
|
+
instanceDistributionServiceSelectors[1] = clonedInstance.updateDistributionSetup.selector;
|
137
|
+
clonedAccessManager.setTargetFunctionRole(
|
138
|
+
"Instance",
|
139
|
+
instanceDistributionServiceSelectors,
|
140
|
+
DISTRIBUTION_SERVICE_ROLE());
|
141
|
+
}
|
142
|
+
|
143
|
+
function _grantPoolServiceAuthorizations(InstanceAccessManager clonedAccessManager, Instance clonedInstance) internal {
|
144
|
+
// configure authorization for pool service on instance
|
145
|
+
address poolServiceAddress = _registry.getServiceAddress(POOL(), getMajorVersion());
|
146
|
+
clonedAccessManager.grantRole(POOL_SERVICE_ROLE(), address(poolServiceAddress));
|
147
|
+
bytes4[] memory instancePoolServiceSelectors = new bytes4[](4);
|
148
|
+
instancePoolServiceSelectors[0] = clonedInstance.createPoolSetup.selector;
|
149
|
+
instancePoolServiceSelectors[1] = clonedInstance.updatePoolSetup.selector;
|
150
|
+
clonedAccessManager.setTargetFunctionRole(
|
151
|
+
"Instance",
|
152
|
+
instancePoolServiceSelectors,
|
153
|
+
POOL_SERVICE_ROLE());
|
154
|
+
}
|
155
|
+
|
156
|
+
function _grantProductServiceAuthorizations(InstanceAccessManager clonedAccessManager, Instance clonedInstance) internal {
|
157
|
+
// configure authorization for product service on instance
|
158
|
+
address productServiceAddress = _registry.getServiceAddress(PRODUCT(), getMajorVersion());
|
159
|
+
clonedAccessManager.grantRole(PRODUCT_SERVICE_ROLE(), address(productServiceAddress));
|
160
|
+
bytes4[] memory instanceProductServiceSelectors = new bytes4[](5);
|
161
|
+
instanceProductServiceSelectors[0] = clonedInstance.createProductSetup.selector;
|
162
|
+
instanceProductServiceSelectors[1] = clonedInstance.updateProductSetup.selector;
|
163
|
+
instanceProductServiceSelectors[2] = clonedInstance.createRisk.selector;
|
164
|
+
instanceProductServiceSelectors[3] = clonedInstance.updateRisk.selector;
|
165
|
+
instanceProductServiceSelectors[4] = clonedInstance.updateRiskState.selector;
|
166
|
+
clonedAccessManager.setTargetFunctionRole(
|
167
|
+
"Instance",
|
168
|
+
instanceProductServiceSelectors,
|
169
|
+
PRODUCT_SERVICE_ROLE());
|
46
170
|
}
|
47
171
|
|
48
|
-
function
|
49
|
-
|
172
|
+
function _grantPolicyServiceAuthorizations(InstanceAccessManager clonedAccessManager, Instance clonedInstance) internal {
|
173
|
+
// configure authorization for policy service on instance
|
174
|
+
address policyServiceAddress = _registry.getServiceAddress(POLICY(), getMajorVersion());
|
175
|
+
clonedAccessManager.grantRole(POLICY_SERVICE_ROLE(), address(policyServiceAddress));
|
176
|
+
bytes4[] memory instancePolicyServiceSelectors = new bytes4[](3);
|
177
|
+
instancePolicyServiceSelectors[0] = clonedInstance.createPolicy.selector;
|
178
|
+
instancePolicyServiceSelectors[1] = clonedInstance.updatePolicy.selector;
|
179
|
+
instancePolicyServiceSelectors[2] = clonedInstance.updatePolicyState.selector;
|
180
|
+
clonedAccessManager.setTargetFunctionRole(
|
181
|
+
"Instance",
|
182
|
+
instancePolicyServiceSelectors,
|
183
|
+
POLICY_SERVICE_ROLE());
|
50
184
|
}
|
51
185
|
|
52
|
-
function
|
53
|
-
|
54
|
-
|
186
|
+
function _grantBundleServiceAuthorizations(InstanceAccessManager clonedAccessManager, Instance clonedInstance, BundleManager clonedBundleManager) internal {
|
187
|
+
// configure authorization for bundle service on instance
|
188
|
+
address bundleServiceAddress = _registry.getServiceAddress(BUNDLE(), getMajorVersion());
|
189
|
+
clonedAccessManager.grantRole(BUNDLE_SERVICE_ROLE(), address(bundleServiceAddress));
|
190
|
+
bytes4[] memory instanceBundleServiceSelectors = new bytes4[](2);
|
191
|
+
instanceBundleServiceSelectors[0] = clonedInstance.createBundle.selector;
|
192
|
+
instanceBundleServiceSelectors[1] = clonedInstance.updateBundle.selector;
|
193
|
+
clonedAccessManager.setTargetFunctionRole(
|
194
|
+
"Instance",
|
195
|
+
instanceBundleServiceSelectors,
|
196
|
+
BUNDLE_SERVICE_ROLE());
|
197
|
+
|
198
|
+
// configure authorization for bundle service on bundle manager
|
199
|
+
bytes4[] memory bundleManagerBundleServiceSelectors = new bytes4[](5);
|
200
|
+
bundleManagerBundleServiceSelectors[0] = clonedBundleManager.linkPolicy.selector;
|
201
|
+
bundleManagerBundleServiceSelectors[1] = clonedBundleManager.unlinkPolicy.selector;
|
202
|
+
bundleManagerBundleServiceSelectors[2] = clonedBundleManager.add.selector;
|
203
|
+
bundleManagerBundleServiceSelectors[3] = clonedBundleManager.lock.selector;
|
204
|
+
bundleManagerBundleServiceSelectors[4] = clonedBundleManager.unlock.selector;
|
205
|
+
clonedAccessManager.setTargetFunctionRole(
|
206
|
+
"BundleManager",
|
207
|
+
bundleManagerBundleServiceSelectors,
|
208
|
+
BUNDLE_SERVICE_ROLE());
|
209
|
+
}
|
210
|
+
|
211
|
+
function _grantInstanceServiceAuthorizations(InstanceAccessManager clonedAccessManager, Instance clonedInstance) internal {
|
212
|
+
// configure authorization for instance service on instance
|
213
|
+
address instanceServiceAddress = _registry.getServiceAddress(INSTANCE(), getMajorVersion());
|
214
|
+
clonedAccessManager.grantRole(INSTANCE_SERVICE_ROLE(), instanceServiceAddress);
|
215
|
+
bytes4[] memory instanceInstanceServiceSelectors = new bytes4[](1);
|
216
|
+
instanceInstanceServiceSelectors[0] = clonedInstance.setInstanceReader.selector;
|
217
|
+
clonedAccessManager.setTargetFunctionRole(
|
218
|
+
"Instance",
|
219
|
+
instanceInstanceServiceSelectors,
|
220
|
+
INSTANCE_SERVICE_ROLE());
|
221
|
+
}
|
222
|
+
|
223
|
+
function setAndRegisterMasterInstance(
|
224
|
+
address accessManagerAddress,
|
225
|
+
address instanceAddress,
|
226
|
+
address instanceReaderAddress,
|
227
|
+
address bundleManagerAddress)
|
228
|
+
external
|
229
|
+
onlyOwner
|
230
|
+
returns(NftId masterInstanceNftId)
|
231
|
+
{
|
232
|
+
require(_masterInstanceAccessManager == address(0), "ERROR:CRD-001:ACCESS_MANAGER_MASTER_ALREADY_SET");
|
233
|
+
require(_masterInstance == address(0), "ERROR:CRD-002:INSTANCE_MASTER_ALREADY_SET");
|
234
|
+
require(_masterInstanceBundleManager == address(0), "ERROR:CRD-004:BUNDLE_MANAGER_MASTER_ALREADY_SET");
|
235
|
+
|
236
|
+
require (accessManagerAddress != address(0), "ERROR:CRD-005:ACCESS_MANAGER_ZERO");
|
237
|
+
require (instanceAddress != address(0), "ERROR:CRD-006:INSTANCE_ZERO");
|
238
|
+
require (instanceReaderAddress != address(0), "ERROR:CRD-007:INSTANCE_READER_ZERO");
|
239
|
+
require (bundleManagerAddress != address(0), "ERROR:CRD-008:BUNDLE_MANAGER_ZERO");
|
240
|
+
|
241
|
+
IInstance instance = IInstance(instanceAddress);
|
242
|
+
InstanceReader instanceReader = InstanceReader(instanceReaderAddress);
|
243
|
+
BundleManager bundleManager = BundleManager(bundleManagerAddress);
|
244
|
+
|
245
|
+
require(instance.authority() == accessManagerAddress, "ERROR:CRD-009:INSTANCE_AUTHORITY_MISMATCH");
|
246
|
+
require(instanceReader.getInstance() == instance, "ERROR:CRD-010:INSTANCE_READER_INSTANCE_MISMATCH");
|
247
|
+
require(bundleManager.getInstance() == instance, "ERROR:CRD-011:BUNDLE_MANAGER_INSTANCE_MISMATCH");
|
248
|
+
|
249
|
+
_masterInstanceAccessManager = accessManagerAddress;
|
250
|
+
_masterInstance = instanceAddress;
|
251
|
+
_masterInstanceReader = instanceReaderAddress;
|
252
|
+
_masterInstanceBundleManager = bundleManagerAddress;
|
253
|
+
|
254
|
+
IRegistryService registryService = IRegistryService(getRegistry().getServiceAddress(REGISTRY(), getMajorVersion()));
|
255
|
+
IInstance masterInstance = IInstance(_masterInstance);
|
256
|
+
IRegistry.ObjectInfo memory info = registryService.registerInstance(masterInstance, getOwner());
|
257
|
+
masterInstanceNftId = info.nftId;
|
258
|
+
|
259
|
+
// masterInstance.linkToRegisteredNftId();
|
260
|
+
}
|
261
|
+
|
262
|
+
function setMasterInstanceReader(address instanceReaderAddress) external onlyOwner {
|
263
|
+
require(_masterInstanceReader != address(0), "ERROR:CRD-003:INSTANCE_READER_MASTER_NOT_SET");
|
264
|
+
require (instanceReaderAddress != address(0), "ERROR:CRD-012:INSTANCE_READER_ZERO");
|
265
|
+
require(instanceReaderAddress != _masterInstanceReader, "ERROR:CRD-014:INSTANCE_READER_MASTER_SAME_AS_NEW");
|
266
|
+
|
267
|
+
InstanceReader instanceReader = InstanceReader(instanceReaderAddress);
|
268
|
+
require(instanceReader.getInstance() == IInstance(_masterInstance), "ERROR:CRD-015:INSTANCE_READER_INSTANCE_MISMATCH");
|
269
|
+
|
270
|
+
_masterInstanceReader = instanceReaderAddress;
|
271
|
+
}
|
272
|
+
|
273
|
+
// TODO access restriction
|
274
|
+
function upgradeInstanceReader(NftId instanceNftId) external {
|
275
|
+
IRegistry registry = getRegistry();
|
276
|
+
IRegistry.ObjectInfo memory instanceInfo = registry.getObjectInfo(instanceNftId);
|
277
|
+
Instance instance = Instance(instanceInfo.objectAddress);
|
278
|
+
address owner = instance.getOwner();
|
279
|
+
|
280
|
+
if (msg.sender != owner) {
|
281
|
+
revert ErrorInstanceServiceRequestUnauhorized(msg.sender);
|
282
|
+
}
|
283
|
+
|
284
|
+
InstanceReader upgradedInstanceReaderClone = InstanceReader(Clones.clone(address(_masterInstanceReader)));
|
285
|
+
upgradedInstanceReaderClone.initialize(address(registry), address(instance));
|
286
|
+
instance.setInstanceReader(upgradedInstanceReaderClone);
|
287
|
+
}
|
288
|
+
|
289
|
+
function getMasterInstanceReader() external view returns (address) {
|
290
|
+
return _masterInstanceReader;
|
291
|
+
}
|
292
|
+
|
293
|
+
function getMasterInstance() external view returns (address) {
|
294
|
+
return _masterInstance;
|
295
|
+
}
|
296
|
+
|
297
|
+
function getMasterInstanceAccessManager() external view returns (address) {
|
298
|
+
return _masterInstanceAccessManager;
|
299
|
+
}
|
300
|
+
|
301
|
+
function getMasterInstanceBundleManager() external view returns (address) {
|
302
|
+
return _masterInstanceBundleManager;
|
303
|
+
}
|
55
304
|
|
56
305
|
// From IService
|
57
|
-
function
|
58
|
-
return
|
306
|
+
function getDomain() public pure override(Service, IService) returns(ObjectType) {
|
307
|
+
return INSTANCE();
|
59
308
|
}
|
60
309
|
|
61
310
|
/// @dev top level initializer
|
62
|
-
// 1) registry is non upgradeable -> don't need a proxy and uses constructor !
|
63
|
-
// 2) deploy registry service first -> from its initialization func it is easier to deploy registry then vice versa
|
64
|
-
// 3) deploy registry -> pass registry service address as constructor argument
|
65
|
-
// registry is getting instantiated and locked to registry service address forever
|
66
311
|
function _initialize(
|
67
312
|
address owner,
|
68
313
|
bytes memory data
|
@@ -71,32 +316,47 @@ contract InstanceService is Service, IInstanceService {
|
|
71
316
|
initializer
|
72
317
|
virtual override
|
73
318
|
{
|
74
|
-
|
75
|
-
|
319
|
+
address initialOwner;
|
320
|
+
address registryAddress;
|
321
|
+
(registryAddress, initialOwner) = abi.decode(data, (address, address));
|
322
|
+
// TODO while InstanceService is not deployed in InstanceServiceManager constructor
|
323
|
+
// owner is InstanceServiceManager deployer
|
324
|
+
_initializeService(registryAddress, owner);
|
325
|
+
|
326
|
+
_registerInterface(type(IInstanceService).interfaceId);
|
327
|
+
}
|
76
328
|
|
77
|
-
|
78
|
-
|
79
|
-
|
329
|
+
function hasRole(address account, RoleId role, address instanceAddress) public view returns (bool) {
|
330
|
+
Instance instance = Instance(instanceAddress);
|
331
|
+
InstanceAccessManager accessManager = InstanceAccessManager(instance.authority());
|
332
|
+
return accessManager.hasRole(role, account);
|
333
|
+
}
|
80
334
|
|
81
|
-
|
82
|
-
|
83
|
-
|
335
|
+
function createTarget(NftId instanceNftId, address targetAddress, string memory targetName) external onlyRegisteredService {
|
336
|
+
IRegistry registry = getRegistry();
|
337
|
+
IRegistry.ObjectInfo memory instanceInfo = registry.getObjectInfo(instanceNftId);
|
338
|
+
Instance instance = Instance(instanceInfo.objectAddress);
|
339
|
+
InstanceAccessManager accessManager = InstanceAccessManager(instance.authority());
|
340
|
+
accessManager.createTarget(targetAddress, targetName);
|
341
|
+
}
|
84
342
|
|
85
|
-
|
86
|
-
|
343
|
+
function setTargetLocked(string memory targetName, bool locked) external {
|
344
|
+
address componentAddress = msg.sender;
|
345
|
+
IRegistry registry = getRegistry();
|
346
|
+
IRegistry.ObjectInfo memory componentInfo = registry.getObjectInfo(componentAddress);
|
347
|
+
if (componentInfo.nftId.eqz()) {
|
348
|
+
revert ErrorInstanceServiceComponentNotRegistered(componentAddress);
|
349
|
+
}
|
87
350
|
|
88
|
-
//
|
89
|
-
IRegistry registry = IRegistry(_registryAddress);
|
90
|
-
NftId registryNftId = registry.getNftId(_registryAddress);
|
351
|
+
// TODO validate component type
|
91
352
|
|
92
|
-
_initializeService(_registryAddress, initialOwner);
|
93
|
-
|
94
|
-
_registerInterface(type(IService).interfaceId);
|
95
|
-
_registerInterface(type(IInstanceService).interfaceId);
|
96
|
-
}
|
97
353
|
|
98
|
-
|
99
|
-
|
354
|
+
address instanceAddress = registry.getObjectInfo(componentInfo.parentNftId).objectAddress;
|
355
|
+
IInstance instance = IInstance(instanceAddress);
|
356
|
+
|
357
|
+
InstanceAccessManager accessManager = InstanceAccessManager(instance.authority());
|
358
|
+
accessManager.setTargetClosed(targetName, locked);
|
100
359
|
}
|
360
|
+
|
101
361
|
}
|
102
362
|
|
@@ -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 {
|
10
|
+
import {REGISTRY} from "../types/ObjectType.sol";
|
11
11
|
|
12
12
|
contract InstanceServiceManager is ProxyManager {
|
13
13
|
|
@@ -28,20 +28,18 @@ contract InstanceServiceManager is ProxyManager {
|
|
28
28
|
|
29
29
|
_instanceService = InstanceService(address(versionable));
|
30
30
|
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
registryService.registerService(_instanceService);
|
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
|
+
//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
|
-
|
41
|
-
|
42
|
-
|
43
|
-
// implies that after this constructor call only upgrade functionality is available
|
44
|
-
_isDeployed = true;
|
40
|
+
//_linkToNftOwnable(
|
41
|
+
// address(registryAddress),
|
42
|
+
// address(_instanceService));
|
45
43
|
}
|
46
44
|
|
47
45
|
//--- view functions ----------------------------------------------------//
|
@@ -0,0 +1,84 @@
|
|
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(address instance);
|
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
|
+
IInstance internal _instance; // store instance address -> more flexible, instance may not be registered during ObjectManager initialization
|
25
|
+
|
26
|
+
/// @dev call to initialize MUST be made in the same transaction as cloning of the contract
|
27
|
+
function initialize(
|
28
|
+
address authority,
|
29
|
+
address registry,
|
30
|
+
address instance
|
31
|
+
)
|
32
|
+
external
|
33
|
+
{
|
34
|
+
initialize(authority, registry);
|
35
|
+
|
36
|
+
_instance = IInstance(instance);
|
37
|
+
|
38
|
+
emit LogObjectManagerInitialized(instance);
|
39
|
+
}
|
40
|
+
|
41
|
+
function getInstance() external view returns (IInstance) {
|
42
|
+
return _instance;
|
43
|
+
}
|
44
|
+
|
45
|
+
function _add(NftId componentNftId, NftId objectNftId) internal {
|
46
|
+
LibNftIdSet.Set storage allSet = _allObjects[componentNftId];
|
47
|
+
LibNftIdSet.Set storage activeSet = _activeObjects[componentNftId];
|
48
|
+
|
49
|
+
LibNftIdSet.add(allSet, objectNftId);
|
50
|
+
LibNftIdSet.add(activeSet, objectNftId);
|
51
|
+
}
|
52
|
+
|
53
|
+
function _activate(NftId componentNftId, NftId objectNftId) internal {
|
54
|
+
LibNftIdSet.add(_activeObjects[componentNftId], objectNftId);
|
55
|
+
}
|
56
|
+
|
57
|
+
function _deactivate(NftId componentNftId, NftId objectNftId) internal {
|
58
|
+
LibNftIdSet.remove(_activeObjects[componentNftId], objectNftId);
|
59
|
+
}
|
60
|
+
|
61
|
+
function _objects(NftId componentNftId) internal view returns (uint256) {
|
62
|
+
return LibNftIdSet.size(_allObjects[componentNftId]);
|
63
|
+
}
|
64
|
+
|
65
|
+
function _contains(NftId componentNftId, NftId objectNftId) internal view returns (bool) {
|
66
|
+
return LibNftIdSet.contains(_allObjects[componentNftId], objectNftId);
|
67
|
+
}
|
68
|
+
|
69
|
+
function _getObject(NftId componentNftId, uint256 idx) internal view returns (NftId) {
|
70
|
+
return LibNftIdSet.getElementAt(_allObjects[componentNftId], idx);
|
71
|
+
}
|
72
|
+
|
73
|
+
function _activeObjs(NftId componentNftId) internal view returns (uint256) {
|
74
|
+
return LibNftIdSet.size(_activeObjects[componentNftId]);
|
75
|
+
}
|
76
|
+
|
77
|
+
function _isActive(NftId componentNftId, NftId objectNftId) internal view returns (bool) {
|
78
|
+
return LibNftIdSet.contains(_activeObjects[componentNftId], objectNftId);
|
79
|
+
}
|
80
|
+
|
81
|
+
function _getActiveObject(NftId componentNftId, uint256 idx) internal view returns (NftId) {
|
82
|
+
return LibNftIdSet.getElementAt(_activeObjects[componentNftId], idx);
|
83
|
+
}
|
84
|
+
}
|
@@ -0,0 +1,134 @@
|
|
1
|
+
// SPDX-License-Identifier: Apache-2.0
|
2
|
+
pragma solidity ^0.8.19;
|
3
|
+
|
4
|
+
import {IComponent} from "../../components/IComponent.sol";
|
5
|
+
import {IRegistry} from "../../registry/IRegistry.sol";
|
6
|
+
import {IRegistryService} from "../../registry/IRegistryService.sol";
|
7
|
+
import {IInstance} from "../../instance/IInstance.sol";
|
8
|
+
import {IAccess} from "../module/IAccess.sol";
|
9
|
+
import {ObjectType, INSTANCE, REGISTRY} from "../../types/ObjectType.sol";
|
10
|
+
import {NftId} from "../../types/NftId.sol";
|
11
|
+
import {RoleId} from "../../types/RoleId.sol";
|
12
|
+
|
13
|
+
import {Service} from "../../shared/Service.sol";
|
14
|
+
import {InstanceService} from "../InstanceService.sol";
|
15
|
+
import {InstanceAccessManager} from "../InstanceAccessManager.sol";
|
16
|
+
|
17
|
+
abstract contract ComponentService is Service {
|
18
|
+
|
19
|
+
error ErrorComponentServiceAlreadyRegistered(address component, NftId nftId);
|
20
|
+
error ErrorComponentServiceNotComponent(address component);
|
21
|
+
error ErrorComponentServiceInvalidType(address component, ObjectType requiredType, ObjectType componentType);
|
22
|
+
error ErrorComponentServiceSenderNotOwner(address component, address initialOwner, address sender);
|
23
|
+
error ErrorComponentServiceExpectedRoleMissing(NftId instanceNftId, RoleId requiredRole, address sender);
|
24
|
+
error ErrorComponentServiceComponentLocked(address component);
|
25
|
+
|
26
|
+
/// @dev modifier to check if caller is a registered service
|
27
|
+
modifier onlyService() {
|
28
|
+
address caller = msg.sender;
|
29
|
+
require(getRegistry().isRegisteredService(caller), "ERROR_NOT_SERVICE");
|
30
|
+
_;
|
31
|
+
}
|
32
|
+
|
33
|
+
// view functions
|
34
|
+
|
35
|
+
function getRegistryService() public view virtual returns (IRegistryService) {
|
36
|
+
address service = getRegistry().getServiceAddress(REGISTRY(), getMajorVersion());
|
37
|
+
return IRegistryService(service);
|
38
|
+
}
|
39
|
+
|
40
|
+
function getInstanceService() public view returns (InstanceService) {
|
41
|
+
address service = getRegistry().getServiceAddress(INSTANCE(), getMajorVersion());
|
42
|
+
return InstanceService(service);
|
43
|
+
}
|
44
|
+
|
45
|
+
// internal functions
|
46
|
+
function _checkComponentForRegistration(
|
47
|
+
address componentAddress,
|
48
|
+
ObjectType requiredType,
|
49
|
+
RoleId requiredRole
|
50
|
+
)
|
51
|
+
internal
|
52
|
+
view
|
53
|
+
returns (
|
54
|
+
IComponent component,
|
55
|
+
address owner,
|
56
|
+
IInstance instance,
|
57
|
+
NftId instanceNftId
|
58
|
+
)
|
59
|
+
{
|
60
|
+
// component may only be registerd by initial owner of component
|
61
|
+
owner = msg.sender;
|
62
|
+
|
63
|
+
// check component has not already been registerd
|
64
|
+
NftId compoentNftId = _registry.getNftId(componentAddress);
|
65
|
+
if(compoentNftId.gtz()) {
|
66
|
+
revert ErrorComponentServiceAlreadyRegistered(componentAddress, compoentNftId);
|
67
|
+
}
|
68
|
+
|
69
|
+
// check this is a component
|
70
|
+
component = IComponent(componentAddress);
|
71
|
+
if(!component.supportsInterface(type(IComponent).interfaceId)) {
|
72
|
+
revert ErrorComponentServiceNotComponent(componentAddress);
|
73
|
+
}
|
74
|
+
|
75
|
+
// check component is of required type
|
76
|
+
IRegistry.ObjectInfo memory componentInfo = component.getInitialInfo();
|
77
|
+
if(componentInfo.objectType != requiredType) {
|
78
|
+
revert ErrorComponentServiceInvalidType(componentAddress, requiredType, componentInfo.objectType);
|
79
|
+
}
|
80
|
+
|
81
|
+
// check msg.sender is component owner
|
82
|
+
address initialOwner = componentInfo.initialOwner;
|
83
|
+
if(owner != initialOwner) {
|
84
|
+
revert ErrorComponentServiceSenderNotOwner(componentAddress, componentInfo.initialOwner, owner);
|
85
|
+
}
|
86
|
+
|
87
|
+
// check instance has assigned required role to owner
|
88
|
+
instanceNftId = componentInfo.parentNftId;
|
89
|
+
instance = _getInstance(instanceNftId);
|
90
|
+
bool hasRole = getInstanceService().hasRole(
|
91
|
+
owner,
|
92
|
+
requiredRole,
|
93
|
+
address(instance));
|
94
|
+
|
95
|
+
if(!hasRole) {
|
96
|
+
revert ErrorComponentServiceExpectedRoleMissing(instanceNftId, requiredRole, owner);
|
97
|
+
}
|
98
|
+
}
|
99
|
+
|
100
|
+
// internal view functions
|
101
|
+
|
102
|
+
function _getInstance(NftId instanceNftId) internal view returns (IInstance) {
|
103
|
+
IRegistry.ObjectInfo memory instanceInfo = getRegistry().getObjectInfo(instanceNftId);
|
104
|
+
return IInstance(instanceInfo.objectAddress);
|
105
|
+
}
|
106
|
+
|
107
|
+
function _getAndVerifyComponentInfoAndInstance(
|
108
|
+
//address component,
|
109
|
+
ObjectType expectedType
|
110
|
+
)
|
111
|
+
internal
|
112
|
+
view
|
113
|
+
returns(
|
114
|
+
IRegistry.ObjectInfo memory info,
|
115
|
+
IInstance instance
|
116
|
+
)
|
117
|
+
{
|
118
|
+
IRegistry registry = getRegistry();
|
119
|
+
//TODO redundant check -> just check type
|
120
|
+
//NftId componentNftId = registry.getNftId(component);
|
121
|
+
//require(componentNftId.gtz(), "ERROR_COMPONENT_UNKNOWN");
|
122
|
+
|
123
|
+
info = registry.getObjectInfo(msg.sender);
|
124
|
+
require(info.objectType == expectedType, "OBJECT_TYPE_INVALID");
|
125
|
+
|
126
|
+
address instanceAddress = registry.getObjectInfo(info.parentNftId).objectAddress;
|
127
|
+
instance = IInstance(instanceAddress);
|
128
|
+
|
129
|
+
InstanceAccessManager accessManager = InstanceAccessManager(instance.authority());
|
130
|
+
if (accessManager.isTargetLocked(info.objectAddress)) {
|
131
|
+
revert IAccess.ErrorIAccessTargetLocked(info.objectAddress);
|
132
|
+
}
|
133
|
+
}
|
134
|
+
}
|