@etherisc/gif-next 0.0.2-c15bb6f-257 → 0.0.2-c2a8d66-341
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +63 -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 +311 -132
- 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 +445 -1
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.json +522 -58
- 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 +306 -182
- package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
- package/artifacts/contracts/components/Product.sol/Product.json +329 -155
- 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/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/SimpleStateMachine.sol/SimpleStateMachine.dbg.json +1 -1
- 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 +1629 -93
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +131 -19
- package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
- package/artifacts/contracts/instance/Instance.sol/Instance.json +185 -642
- package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +439 -186
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +164 -66
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +325 -102
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +49 -44
- 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/Lifecycle.sol/Lifecycle.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IAccess.sol/IAccess.json +65 -44
- 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 +1 -1
- package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +176 -40
- package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.json +34 -25
- 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 +214 -224
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +221 -93
- 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 +227 -329
- 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 +75 -112
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +51 -112
- 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 +1 -1
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +13 -29
- 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/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/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 +6 -6
- 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/TestVersionable.sol/TestVersionable.dbg.json +1 -1
- 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/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/VersionPartLib.dbg.json +1 -1
- package/contracts/components/Component.sol +216 -0
- package/contracts/components/Distribution.sol +39 -52
- package/contracts/components/IComponent.sol +43 -0
- package/contracts/components/IDistributionComponent.sol +4 -3
- package/contracts/components/IPoolComponent.sol +7 -18
- package/contracts/components/IProductComponent.sol +7 -3
- package/contracts/components/Pool.sol +59 -109
- package/contracts/components/Product.sol +77 -108
- package/contracts/instance/BundleManager.sol +125 -0
- package/contracts/instance/Cloneable.sol +46 -0
- package/contracts/instance/IInstance.sol +49 -10
- package/contracts/instance/IInstanceService.sol +16 -4
- package/contracts/instance/Instance.sol +71 -245
- package/contracts/instance/InstanceAccessManager.sol +333 -166
- package/contracts/instance/InstanceReader.sol +29 -26
- package/contracts/instance/InstanceService.sol +402 -90
- 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 +36 -20
- 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 +44 -34
- package/contracts/instance/service/DistributionServiceManager.sol +10 -12
- 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 +110 -0
- package/contracts/instance/service/PoolServiceManager.sol +51 -0
- package/contracts/instance/service/ProductService.sol +233 -0
- package/contracts/instance/service/ProductServiceManager.sol +54 -0
- package/contracts/registry/ChainNft.sol +1 -1
- package/contracts/registry/IRegistry.sol +37 -31
- package/contracts/registry/IRegistryService.sol +45 -13
- package/contracts/registry/Registry.sol +218 -250
- package/contracts/registry/RegistryAccessManager.sol +216 -0
- package/contracts/registry/RegistryService.sol +83 -220
- package/contracts/registry/RegistryServiceManager.sol +18 -36
- package/contracts/registry/ReleaseManager.sol +332 -0
- package/contracts/registry/TokenRegistry.sol +8 -7
- 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 +10 -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 +18 -13
- package/package.json +3 -3
- package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.dbg.json +0 -4
- package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.json +0 -327
- package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.dbg.json +0 -4
- package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.json +0 -280
- 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 -1132
- 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 -91
- package/contracts/components/IBaseComponent.sol +0 -25
- package/contracts/instance/AccessManagedSimple.sol +0 -115
- package/contracts/instance/AccessManagerSimple.sol +0 -692
- package/contracts/instance/IAccessManagerSimple.sol +0 -391
- package/contracts/instance/base/ComponentServiceBase.sol +0 -39
- 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
@@ -2,130 +2,363 @@
|
|
2
2
|
pragma solidity ^0.8.20;
|
3
3
|
|
4
4
|
import {Clones} from "@openzeppelin/contracts/proxy/Clones.sol";
|
5
|
+
import {ShortString, ShortStrings} from "@openzeppelin/contracts/utils/ShortStrings.sol";
|
5
6
|
|
6
|
-
import {AccessManagerSimple} from "./AccessManagerSimple.sol";
|
7
|
-
import {InstanceAccessManager} from "./InstanceAccessManager.sol";
|
8
7
|
import {Instance} from "./Instance.sol";
|
8
|
+
import {IInstance} from "./IInstance.sol";
|
9
|
+
import {InstanceAccessManager} from "./InstanceAccessManager.sol";
|
9
10
|
import {IInstanceService} from "./IInstanceService.sol";
|
10
11
|
import {InstanceReader} from "./InstanceReader.sol";
|
12
|
+
import {BundleManager} from "./BundleManager.sol";
|
11
13
|
import {IRegistry} from "../registry/IRegistry.sol";
|
12
|
-
import {
|
13
|
-
import {
|
14
|
+
import {IRegistryService} from "../registry/IRegistryService.sol";
|
15
|
+
import {ChainNft} from "../registry/ChainNft.sol";
|
14
16
|
import {Service} from "../../contracts/shared/Service.sol";
|
15
17
|
import {IService} from "../shared/IService.sol";
|
16
|
-
import {
|
17
|
-
import {
|
18
|
-
import {
|
19
|
-
|
18
|
+
import {NftId} from "../../contracts/types/NftId.sol";
|
19
|
+
import {RoleId} from "../types/RoleId.sol";
|
20
|
+
import {
|
21
|
+
ADMIN_ROLE,
|
22
|
+
INSTANCE_OWNER_ROLE,
|
23
|
+
DISTRIBUTION_OWNER_ROLE,
|
24
|
+
POOL_OWNER_ROLE,
|
25
|
+
PRODUCT_OWNER_ROLE,
|
26
|
+
INSTANCE_SERVICE_ROLE,
|
27
|
+
DISTRIBUTION_SERVICE_ROLE,
|
28
|
+
POOL_SERVICE_ROLE,
|
29
|
+
PRODUCT_SERVICE_ROLE,
|
30
|
+
POLICY_SERVICE_ROLE,
|
31
|
+
BUNDLE_SERVICE_ROLE} from "../types/RoleId.sol";
|
32
|
+
import {ObjectType, INSTANCE, BUNDLE, POLICY, PRODUCT, DISTRIBUTION, REGISTRY, POOL} from "../types/ObjectType.sol";
|
33
|
+
import {IDistributionComponent} from "../components/IDistributionComponent.sol";
|
34
|
+
import {IPoolComponent} from "../components/IPoolComponent.sol";
|
35
|
+
import {IProductComponent} from "../components/IProductComponent.sol";
|
20
36
|
|
21
37
|
contract InstanceService is Service, IInstanceService {
|
22
38
|
|
23
|
-
address internal
|
24
|
-
address internal
|
25
|
-
address internal
|
26
|
-
address internal
|
39
|
+
address internal _masterInstanceAccessManager;
|
40
|
+
address internal _masterInstance;
|
41
|
+
address internal _masterInstanceReader;
|
42
|
+
address internal _masterInstanceBundleManager;
|
27
43
|
|
28
44
|
// TODO update to real hash when instance is stable
|
29
45
|
bytes32 public constant INSTANCE_CREATION_CODE_HASH = bytes32(0);
|
30
|
-
|
46
|
+
|
47
|
+
modifier onlyInstanceOwner(NftId instanceNftId) {
|
48
|
+
if(msg.sender != getRegistry().ownerOf(instanceNftId)) {
|
49
|
+
revert ErrorInstanceServiceRequestUnauhorized(msg.sender);
|
50
|
+
}
|
51
|
+
_;
|
52
|
+
}
|
53
|
+
|
54
|
+
modifier onlyRegisteredService() {
|
55
|
+
if (! getRegistry().isRegisteredService(msg.sender)) {
|
56
|
+
revert ErrorInstanceServiceRequestUnauhorized(msg.sender);
|
57
|
+
}
|
58
|
+
_;
|
59
|
+
}
|
60
|
+
|
61
|
+
modifier onlyComponent() {
|
62
|
+
if (! getRegistry().isRegisteredComponent(msg.sender)) {
|
63
|
+
revert ErrorInstanceServiceRequestUnauhorized(msg.sender);
|
64
|
+
}
|
65
|
+
_;
|
66
|
+
}
|
31
67
|
|
32
68
|
function createInstanceClone()
|
33
69
|
external
|
34
70
|
returns (
|
35
|
-
|
71
|
+
InstanceAccessManager clonedAccessManager,
|
36
72
|
Instance clonedInstance,
|
37
|
-
NftId
|
38
|
-
InstanceReader clonedInstanceReader
|
73
|
+
NftId clonedInstanceNftId,
|
74
|
+
InstanceReader clonedInstanceReader,
|
75
|
+
BundleManager clonedBundleManager
|
39
76
|
)
|
40
77
|
{
|
41
78
|
address instanceOwner = msg.sender;
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
// initially set the authority of the access managar to this (being the instance service).
|
48
|
-
// This will allow the instance service to bootstrap the authorizations of the instance
|
49
|
-
// and then transfer the ownership of the access manager to the instance owner once everything is setup
|
50
|
-
clonedAccessManager = AccessManagerSimple(Clones.clone(_accessManagerMaster));
|
51
|
-
clonedAccessManager.initialize(address(this));
|
52
|
-
|
53
|
-
clonedInstance = Instance(Clones.clone(_instanceMaster));
|
54
|
-
clonedInstance.initialize(address(clonedAccessManager), _registryAddress, registryNftId, msg.sender);
|
55
|
-
( IRegistry.ObjectInfo memory info, ) = registryService.registerInstance(clonedInstance);
|
56
|
-
instanceNftId = info.nftId;
|
57
|
-
|
58
|
-
clonedInstanceReader = InstanceReader(Clones.clone(address(_instanceReaderMaster)));
|
59
|
-
clonedInstanceReader.initialize(_registryAddress, instanceNftId);
|
79
|
+
IRegistry registry = getRegistry();
|
80
|
+
address registryAddress = address(registry);
|
81
|
+
NftId registryNftId = registry.getNftId(registryAddress);
|
82
|
+
address registryServiceAddress = registry.getServiceAddress(REGISTRY(), getMajorVersion());
|
83
|
+
IRegistryService registryService = IRegistryService(registryServiceAddress);
|
60
84
|
|
61
|
-
|
85
|
+
// initially grants ADMIN_ROLE to this (being the instance service).
|
86
|
+
// This will allow the instance service to bootstrap the authorizations of the instance.
|
87
|
+
// Instance service will renounce ADMIN_ROLE when bootstraping is finished
|
88
|
+
clonedAccessManager = InstanceAccessManager(Clones.clone(_masterInstanceAccessManager));
|
89
|
+
clonedAccessManager.initialize(address(this), registryAddress);
|
62
90
|
|
91
|
+
clonedInstance = Instance(Clones.clone(_masterInstance));
|
92
|
+
clonedInstance.initialize(address(clonedAccessManager), registryAddress, registryNftId, instanceOwner);
|
93
|
+
|
94
|
+
clonedInstanceReader = InstanceReader(Clones.clone(address(_masterInstanceReader)));
|
95
|
+
clonedInstanceReader.initialize(registryAddress, address(clonedInstance));
|
63
96
|
clonedInstance.setInstanceReader(clonedInstanceReader);
|
64
97
|
|
65
|
-
|
66
|
-
|
67
|
-
|
68
|
-
|
98
|
+
clonedBundleManager = BundleManager(Clones.clone(_masterInstanceBundleManager));
|
99
|
+
clonedBundleManager.initialize(address(clonedAccessManager), registryAddress, address(clonedInstance));
|
100
|
+
clonedInstance.setBundleManager(clonedBundleManager);
|
101
|
+
|
102
|
+
// TODO amend setters with instance specific , policy manager ...
|
69
103
|
|
70
|
-
|
104
|
+
_grantInitialAuthorizations(clonedAccessManager, clonedInstance, clonedBundleManager, instanceOwner);
|
105
|
+
|
106
|
+
assert(clonedAccessManager.renounceRole(ADMIN_ROLE()));
|
107
|
+
|
108
|
+
IRegistry.ObjectInfo memory info = registryService.registerInstance(clonedInstance, instanceOwner);
|
109
|
+
clonedInstanceNftId = info.nftId;
|
110
|
+
// clonedInstance.linkToRegisteredNftId();
|
111
|
+
|
112
|
+
emit LogInstanceCloned(address(clonedAccessManager), address(clonedInstance), address(clonedInstanceReader), clonedInstanceNftId);
|
71
113
|
}
|
72
114
|
|
73
|
-
function _grantInitialAuthorizations(
|
74
|
-
|
75
|
-
|
76
|
-
|
115
|
+
function _grantInitialAuthorizations(
|
116
|
+
InstanceAccessManager clonedAccessManager,
|
117
|
+
Instance clonedInstance,
|
118
|
+
BundleManager clonedBundleManager,
|
119
|
+
address instanceOwner)
|
120
|
+
internal
|
121
|
+
{
|
122
|
+
_createCoreAndGifRoles(clonedAccessManager);
|
123
|
+
_createCoreTargets(clonedAccessManager, clonedInstance, clonedBundleManager);
|
124
|
+
_grantDistributionServiceAuthorizations(clonedAccessManager, clonedInstance);
|
125
|
+
_grantPoolServiceAuthorizations(clonedAccessManager, clonedInstance);
|
126
|
+
_grantProductServiceAuthorizations(clonedAccessManager, clonedInstance);
|
127
|
+
_grantPolicyServiceAuthorizations(clonedAccessManager, clonedInstance);
|
128
|
+
_grantBundleServiceAuthorizations(clonedAccessManager, clonedInstance, clonedBundleManager);
|
129
|
+
_grantInstanceServiceAuthorizations(clonedAccessManager, clonedInstance);
|
130
|
+
_grantInstanceOwnerAuthorizations(clonedAccessManager, instanceOwner);
|
131
|
+
}
|
132
|
+
|
133
|
+
function _createCoreAndGifRoles(InstanceAccessManager clonedAccessManager) internal {
|
134
|
+
// default roles controlled by INSTANCE_OWNER_ROLE -> gif roles
|
135
|
+
clonedAccessManager.createGifRole(INSTANCE_OWNER_ROLE(), "InstanceOwnerRole", ADMIN_ROLE()); // TODO admin is INSTANCE_OWNER_ROLE, see _grantInstanceOwnerAuthorizations()
|
136
|
+
clonedAccessManager.createGifRole(DISTRIBUTION_OWNER_ROLE(), "DistributionOwnerRole", INSTANCE_OWNER_ROLE());
|
137
|
+
clonedAccessManager.createGifRole(POOL_OWNER_ROLE(), "PoolOwnerRole", INSTANCE_OWNER_ROLE());
|
138
|
+
clonedAccessManager.createGifRole(PRODUCT_OWNER_ROLE(), "ProductOwnerRole", INSTANCE_OWNER_ROLE());
|
139
|
+
// default roles controlled by INSTANCE_SERVICE_ROLE -> core roles, all set/granted only once during cloning
|
140
|
+
clonedAccessManager.createCoreRole(INSTANCE_SERVICE_ROLE(), "InstanceServiceRole", ADMIN_ROLE());
|
141
|
+
clonedAccessManager.createCoreRole(DISTRIBUTION_SERVICE_ROLE(), "DistributionServiceRole", ADMIN_ROLE());
|
142
|
+
clonedAccessManager.createCoreRole(POOL_SERVICE_ROLE(), "PoolServiceRole", ADMIN_ROLE());
|
143
|
+
clonedAccessManager.createCoreRole(PRODUCT_SERVICE_ROLE(), "ProductServiceRole", ADMIN_ROLE());
|
144
|
+
clonedAccessManager.createCoreRole(POLICY_SERVICE_ROLE(), "PolicyServiceRole", ADMIN_ROLE());
|
145
|
+
clonedAccessManager.createCoreRole(BUNDLE_SERVICE_ROLE(), "BundleServiceRole", ADMIN_ROLE());
|
146
|
+
}
|
147
|
+
|
148
|
+
function _createCoreTargets(InstanceAccessManager clonedAccessManager, Instance clonedInstance, BundleManager clonedBundleManager) internal {
|
149
|
+
clonedAccessManager.createCoreTarget(address(clonedAccessManager), "InstanceAccessManager");
|
150
|
+
clonedAccessManager.createCoreTarget(address(clonedInstance), "Instance");
|
151
|
+
clonedAccessManager.createCoreTarget(address(clonedBundleManager), "BundleManager");
|
152
|
+
}
|
153
|
+
|
154
|
+
function _grantDistributionServiceAuthorizations(InstanceAccessManager clonedAccessManager, Instance clonedInstance) internal {
|
155
|
+
// configure authorization for distribution service on instance
|
156
|
+
IRegistry registry = getRegistry();
|
157
|
+
address distributionServiceAddress = registry.getServiceAddress(DISTRIBUTION(), getMajorVersion());
|
158
|
+
clonedAccessManager.grantRole(DISTRIBUTION_SERVICE_ROLE(), distributionServiceAddress);
|
77
159
|
bytes4[] memory instanceDistributionServiceSelectors = new bytes4[](2);
|
78
|
-
instanceDistributionServiceSelectors[0] = clonedInstance.createDistributionSetup.selector
|
160
|
+
instanceDistributionServiceSelectors[0] = clonedInstance.createDistributionSetup.selector;// can instance owner set another role for this function?
|
79
161
|
instanceDistributionServiceSelectors[1] = clonedInstance.updateDistributionSetup.selector;
|
80
162
|
clonedAccessManager.setTargetFunctionRole(
|
81
|
-
|
163
|
+
"Instance",
|
82
164
|
instanceDistributionServiceSelectors,
|
83
|
-
DISTRIBUTION_SERVICE_ROLE()
|
165
|
+
DISTRIBUTION_SERVICE_ROLE());
|
84
166
|
}
|
85
167
|
|
86
|
-
function
|
87
|
-
|
88
|
-
|
89
|
-
|
90
|
-
|
168
|
+
function _grantPoolServiceAuthorizations(InstanceAccessManager clonedAccessManager, Instance clonedInstance) internal {
|
169
|
+
// configure authorization for pool service on instance
|
170
|
+
address poolServiceAddress = _registry.getServiceAddress(POOL(), getMajorVersion());
|
171
|
+
clonedAccessManager.grantRole(POOL_SERVICE_ROLE(), address(poolServiceAddress));
|
172
|
+
bytes4[] memory instancePoolServiceSelectors = new bytes4[](4);
|
173
|
+
instancePoolServiceSelectors[0] = clonedInstance.createPoolSetup.selector;
|
174
|
+
instancePoolServiceSelectors[1] = clonedInstance.updatePoolSetup.selector;
|
175
|
+
clonedAccessManager.setTargetFunctionRole(
|
176
|
+
"Instance",
|
177
|
+
instancePoolServiceSelectors,
|
178
|
+
POOL_SERVICE_ROLE());
|
91
179
|
}
|
92
180
|
|
93
|
-
function
|
94
|
-
|
95
|
-
|
96
|
-
|
97
|
-
|
181
|
+
function _grantProductServiceAuthorizations(InstanceAccessManager clonedAccessManager, Instance clonedInstance) internal {
|
182
|
+
// configure authorization for product service on instance
|
183
|
+
address productServiceAddress = _registry.getServiceAddress(PRODUCT(), getMajorVersion());
|
184
|
+
clonedAccessManager.grantRole(PRODUCT_SERVICE_ROLE(), address(productServiceAddress));
|
185
|
+
bytes4[] memory instanceProductServiceSelectors = new bytes4[](5);
|
186
|
+
instanceProductServiceSelectors[0] = clonedInstance.createProductSetup.selector;
|
187
|
+
instanceProductServiceSelectors[1] = clonedInstance.updateProductSetup.selector;
|
188
|
+
instanceProductServiceSelectors[2] = clonedInstance.createRisk.selector;
|
189
|
+
instanceProductServiceSelectors[3] = clonedInstance.updateRisk.selector;
|
190
|
+
instanceProductServiceSelectors[4] = clonedInstance.updateRiskState.selector;
|
191
|
+
clonedAccessManager.setTargetFunctionRole(
|
192
|
+
"Instance",
|
193
|
+
instanceProductServiceSelectors,
|
194
|
+
PRODUCT_SERVICE_ROLE());
|
98
195
|
}
|
99
196
|
|
100
|
-
function
|
101
|
-
|
102
|
-
|
103
|
-
|
104
|
-
|
197
|
+
function _grantPolicyServiceAuthorizations(InstanceAccessManager clonedAccessManager, Instance clonedInstance) internal {
|
198
|
+
// configure authorization for policy service on instance
|
199
|
+
address policyServiceAddress = _registry.getServiceAddress(POLICY(), getMajorVersion());
|
200
|
+
clonedAccessManager.grantRole(POLICY_SERVICE_ROLE(), address(policyServiceAddress));
|
201
|
+
bytes4[] memory instancePolicyServiceSelectors = new bytes4[](3);
|
202
|
+
instancePolicyServiceSelectors[0] = clonedInstance.createPolicy.selector;
|
203
|
+
instancePolicyServiceSelectors[1] = clonedInstance.updatePolicy.selector;
|
204
|
+
instancePolicyServiceSelectors[2] = clonedInstance.updatePolicyState.selector;
|
205
|
+
clonedAccessManager.setTargetFunctionRole(
|
206
|
+
"Instance",
|
207
|
+
instancePolicyServiceSelectors,
|
208
|
+
POLICY_SERVICE_ROLE());
|
105
209
|
}
|
106
210
|
|
107
|
-
function
|
108
|
-
|
211
|
+
function _grantBundleServiceAuthorizations(InstanceAccessManager clonedAccessManager, Instance clonedInstance, BundleManager clonedBundleManager) internal {
|
212
|
+
// configure authorization for bundle service on instance
|
213
|
+
address bundleServiceAddress = _registry.getServiceAddress(BUNDLE(), getMajorVersion());
|
214
|
+
clonedAccessManager.grantRole(BUNDLE_SERVICE_ROLE(), address(bundleServiceAddress));
|
215
|
+
bytes4[] memory instanceBundleServiceSelectors = new bytes4[](2);
|
216
|
+
instanceBundleServiceSelectors[0] = clonedInstance.createBundle.selector;
|
217
|
+
instanceBundleServiceSelectors[1] = clonedInstance.updateBundle.selector;
|
218
|
+
clonedAccessManager.setTargetFunctionRole(
|
219
|
+
"Instance",
|
220
|
+
instanceBundleServiceSelectors,
|
221
|
+
BUNDLE_SERVICE_ROLE());
|
222
|
+
|
223
|
+
// configure authorization for bundle service on bundle manager
|
224
|
+
bytes4[] memory bundleManagerBundleServiceSelectors = new bytes4[](5);
|
225
|
+
bundleManagerBundleServiceSelectors[0] = clonedBundleManager.linkPolicy.selector;
|
226
|
+
bundleManagerBundleServiceSelectors[1] = clonedBundleManager.unlinkPolicy.selector;
|
227
|
+
bundleManagerBundleServiceSelectors[2] = clonedBundleManager.add.selector;
|
228
|
+
bundleManagerBundleServiceSelectors[3] = clonedBundleManager.lock.selector;
|
229
|
+
bundleManagerBundleServiceSelectors[4] = clonedBundleManager.unlock.selector;
|
230
|
+
clonedAccessManager.setTargetFunctionRole(
|
231
|
+
"BundleManager",
|
232
|
+
bundleManagerBundleServiceSelectors,
|
233
|
+
BUNDLE_SERVICE_ROLE());
|
109
234
|
}
|
110
235
|
|
111
|
-
function
|
112
|
-
|
236
|
+
function _grantInstanceServiceAuthorizations(InstanceAccessManager clonedAccessManager, Instance clonedInstance) internal {
|
237
|
+
// configure authorization for instance service on instance
|
238
|
+
address instanceServiceAddress = _registry.getServiceAddress(INSTANCE(), getMajorVersion());
|
239
|
+
clonedAccessManager.grantRole(INSTANCE_SERVICE_ROLE(), instanceServiceAddress);
|
240
|
+
bytes4[] memory instanceInstanceServiceSelectors = new bytes4[](1);
|
241
|
+
instanceInstanceServiceSelectors[0] = clonedInstance.setInstanceReader.selector;
|
242
|
+
clonedAccessManager.setTargetFunctionRole(
|
243
|
+
"Instance",
|
244
|
+
instanceInstanceServiceSelectors,
|
245
|
+
INSTANCE_SERVICE_ROLE());
|
246
|
+
|
247
|
+
// configure authorizations for instance service on instance access manager
|
248
|
+
bytes4[] memory accessManagerInstanceServiceSelectors = new bytes4[](4);
|
249
|
+
accessManagerInstanceServiceSelectors[0] = clonedAccessManager.createCoreTarget.selector;
|
250
|
+
accessManagerInstanceServiceSelectors[1] = clonedAccessManager.createGifTarget.selector;
|
251
|
+
accessManagerInstanceServiceSelectors[2] = clonedAccessManager.setTargetLocked.selector;
|
252
|
+
accessManagerInstanceServiceSelectors[3] = clonedAccessManager.setTargetFunctionRole.selector;
|
253
|
+
clonedAccessManager.setTargetFunctionRole(
|
254
|
+
"InstanceAccessManager",
|
255
|
+
accessManagerInstanceServiceSelectors,
|
256
|
+
INSTANCE_SERVICE_ROLE());
|
113
257
|
}
|
114
258
|
|
115
|
-
function
|
116
|
-
|
259
|
+
function _grantInstanceOwnerAuthorizations(InstanceAccessManager clonedAccessManager, address instanceOwner) internal {
|
260
|
+
// configure authorization for instance owner on instance access manager
|
261
|
+
clonedAccessManager.grantRole(INSTANCE_OWNER_ROLE(), instanceOwner);
|
262
|
+
// TODO instance owner can grant/revoke/renounce INSTANCE_OWNER_ROLE -> through instance service?
|
263
|
+
//clonedAccessManager.setRoleAdmin(INSTANCE_OWNER_ROLE(), INSTANCE_OWNER_ROLE()); -> invalid
|
264
|
+
bytes4[] memory accessManagerInstanceOwnerSelectors = new bytes4[](2);
|
265
|
+
accessManagerInstanceOwnerSelectors[0] = clonedAccessManager.createCustomTarget.selector;
|
266
|
+
accessManagerInstanceOwnerSelectors[1] = clonedAccessManager.setTargetFunctionCustomRole.selector;
|
267
|
+
clonedAccessManager.setTargetFunctionRole(
|
268
|
+
"InstanceAccessManager",
|
269
|
+
accessManagerInstanceOwnerSelectors,
|
270
|
+
INSTANCE_OWNER_ROLE());
|
271
|
+
}
|
272
|
+
|
273
|
+
function setAndRegisterMasterInstance(address instanceAddress)
|
274
|
+
external
|
275
|
+
onlyOwner
|
276
|
+
returns(NftId masterInstanceNftId)
|
277
|
+
{
|
278
|
+
require(_masterInstance == address(0), "ERROR:CRD-002:INSTANCE_MASTER_ALREADY_SET");
|
279
|
+
require(_masterInstanceAccessManager == address(0), "ERROR:CRD-001:ACCESS_MANAGER_MASTER_ALREADY_SET");
|
280
|
+
require(_masterInstanceBundleManager == address(0), "ERROR:CRD-004:BUNDLE_MANAGER_MASTER_ALREADY_SET");
|
281
|
+
|
282
|
+
require (instanceAddress != address(0), "ERROR:CRD-006:INSTANCE_ZERO");
|
283
|
+
|
284
|
+
IInstance instance = IInstance(instanceAddress);
|
285
|
+
InstanceAccessManager accessManager = InstanceAccessManager(instance.authority());
|
286
|
+
address accessManagerAddress = address(accessManager);
|
287
|
+
InstanceReader instanceReader = instance.getInstanceReader();
|
288
|
+
address instanceReaderAddress = address(instanceReader);
|
289
|
+
BundleManager bundleManager = instance.getBundleManager();
|
290
|
+
address bundleManagerAddress = address(bundleManager);
|
291
|
+
|
292
|
+
require (accessManagerAddress != address(0), "ERROR:CRD-005:ACCESS_MANAGER_ZERO");
|
293
|
+
require (instanceReaderAddress != address(0), "ERROR:CRD-007:INSTANCE_READER_ZERO");
|
294
|
+
require (bundleManagerAddress != address(0), "ERROR:CRD-008:BUNDLE_MANAGER_ZERO");
|
295
|
+
|
296
|
+
require(instance.authority() == accessManagerAddress, "ERROR:CRD-009:INSTANCE_AUTHORITY_MISMATCH");
|
297
|
+
require(instanceReader.getInstance() == instance, "ERROR:CRD-010:INSTANCE_READER_INSTANCE_MISMATCH");
|
298
|
+
require(bundleManager.getInstance() == instance, "ERROR:CRD-011:BUNDLE_MANAGER_INSTANCE_MISMATCH");
|
299
|
+
|
300
|
+
_masterInstanceAccessManager = accessManagerAddress;
|
301
|
+
_masterInstance = instanceAddress;
|
302
|
+
_masterInstanceReader = instanceReaderAddress;
|
303
|
+
_masterInstanceBundleManager = bundleManagerAddress;
|
304
|
+
|
305
|
+
IRegistryService registryService = IRegistryService(getRegistry().getServiceAddress(REGISTRY(), getMajorVersion()));
|
306
|
+
IInstance masterInstance = IInstance(_masterInstance);
|
307
|
+
IRegistry.ObjectInfo memory info = registryService.registerInstance(masterInstance, getOwner());
|
308
|
+
masterInstanceNftId = info.nftId;
|
309
|
+
|
310
|
+
// masterInstance.linkToRegisteredNftId();
|
311
|
+
}
|
312
|
+
|
313
|
+
function setMasterInstanceReader(address instanceReaderAddress)
|
314
|
+
external
|
315
|
+
onlyOwner
|
316
|
+
{
|
317
|
+
require(_masterInstanceReader != address(0), "ERROR:CRD-003:INSTANCE_READER_MASTER_NOT_SET");
|
318
|
+
require (instanceReaderAddress != address(0), "ERROR:CRD-012:INSTANCE_READER_ZERO");
|
319
|
+
require(instanceReaderAddress != _masterInstanceReader, "ERROR:CRD-014:INSTANCE_READER_MASTER_SAME_AS_NEW");
|
320
|
+
|
321
|
+
InstanceReader instanceReader = InstanceReader(instanceReaderAddress);
|
322
|
+
require(instanceReader.getInstance() == IInstance(_masterInstance), "ERROR:CRD-015:INSTANCE_READER_INSTANCE_MISMATCH");
|
323
|
+
|
324
|
+
_masterInstanceReader = instanceReaderAddress;
|
325
|
+
}
|
326
|
+
|
327
|
+
function upgradeInstanceReader(NftId instanceNftId)
|
328
|
+
external
|
329
|
+
onlyInstanceOwner(instanceNftId)
|
330
|
+
{
|
331
|
+
IRegistry registry = getRegistry();
|
332
|
+
IRegistry.ObjectInfo memory instanceInfo = registry.getObjectInfo(instanceNftId);
|
333
|
+
Instance instance = Instance(instanceInfo.objectAddress);
|
334
|
+
|
335
|
+
InstanceReader upgradedInstanceReaderClone = InstanceReader(Clones.clone(address(_masterInstanceReader)));
|
336
|
+
upgradedInstanceReaderClone.initialize(address(registry), address(instance));
|
337
|
+
instance.setInstanceReader(upgradedInstanceReaderClone);
|
338
|
+
}
|
339
|
+
|
340
|
+
function getMasterInstanceReader() external view returns (address) {
|
341
|
+
return _masterInstanceReader;
|
342
|
+
}
|
343
|
+
|
344
|
+
function getMasterInstance() external view returns (address) {
|
345
|
+
return _masterInstance;
|
346
|
+
}
|
347
|
+
|
348
|
+
function getMasterInstanceAccessManager() external view returns (address) {
|
349
|
+
return _masterInstanceAccessManager;
|
350
|
+
}
|
351
|
+
|
352
|
+
function getMasterInstanceBundleManager() external view returns (address) {
|
353
|
+
return _masterInstanceBundleManager;
|
117
354
|
}
|
118
355
|
|
119
356
|
// From IService
|
120
|
-
function
|
121
|
-
return
|
357
|
+
function getDomain() public pure override(Service, IService) returns(ObjectType) {
|
358
|
+
return INSTANCE();
|
122
359
|
}
|
123
360
|
|
124
361
|
/// @dev top level initializer
|
125
|
-
// 1) registry is non upgradeable -> don't need a proxy and uses constructor !
|
126
|
-
// 2) deploy registry service first -> from its initialization func it is easier to deploy registry then vice versa
|
127
|
-
// 3) deploy registry -> pass registry service address as constructor argument
|
128
|
-
// registry is getting instantiated and locked to registry service address forever
|
129
362
|
function _initialize(
|
130
363
|
address owner,
|
131
364
|
bytes memory data
|
@@ -134,28 +367,107 @@ contract InstanceService is Service, IInstanceService {
|
|
134
367
|
initializer
|
135
368
|
virtual override
|
136
369
|
{
|
137
|
-
|
138
|
-
|
370
|
+
address initialOwner;
|
371
|
+
address registryAddress;
|
372
|
+
(registryAddress, initialOwner) = abi.decode(data, (address, address));
|
373
|
+
// TODO while InstanceService is not deployed in InstanceServiceManager constructor
|
374
|
+
// owner is InstanceServiceManager deployer
|
375
|
+
_initializeService(registryAddress, owner);
|
376
|
+
|
377
|
+
_registerInterface(type(IInstanceService).interfaceId);
|
378
|
+
}
|
139
379
|
|
140
|
-
|
141
|
-
|
142
|
-
|
380
|
+
// TODO call instance access manager directlly and delete this function?
|
381
|
+
function hasRole(address account, RoleId role, address instanceAddress) public view returns (bool) {
|
382
|
+
Instance instance = Instance(instanceAddress);
|
383
|
+
InstanceAccessManager accessManager = InstanceAccessManager(instance.authority());
|
384
|
+
return accessManager.hasRole(role, account);
|
385
|
+
}
|
386
|
+
// creates gif targets only -> they have INSTANCE as parent
|
387
|
+
function createGifTarget(NftId instanceNftId, address targetAddress, string memory targetName) external onlyRegisteredService {
|
388
|
+
IRegistry registry = getRegistry();
|
389
|
+
IRegistry.ObjectInfo memory instanceInfo = registry.getObjectInfo(instanceNftId);
|
390
|
+
|
391
|
+
if(instanceInfo.objectType != INSTANCE()) {
|
392
|
+
revert ErrorInstanceServiceNotInstance(instanceNftId);
|
393
|
+
}
|
143
394
|
|
144
|
-
|
145
|
-
|
146
|
-
|
395
|
+
Instance instance = Instance(instanceInfo.objectAddress);
|
396
|
+
InstanceAccessManager accessManager = InstanceAccessManager(instance.authority());
|
397
|
+
accessManager.createGifTarget(targetAddress, targetName);
|
398
|
+
}
|
147
399
|
|
148
|
-
|
149
|
-
|
400
|
+
function grantDistributionDefaultPermissions(NftId instanceNftId, address distributionAddress, string memory distributionName) external onlyRegisteredService {
|
401
|
+
IRegistry registry = getRegistry();
|
402
|
+
IRegistry.ObjectInfo memory distributionInfo = registry.getObjectInfo(distributionAddress);
|
150
403
|
|
151
|
-
|
152
|
-
|
153
|
-
|
154
|
-
|
404
|
+
if (distributionInfo.objectType != DISTRIBUTION()) {
|
405
|
+
revert ErrorInstanceServiceInvalidComponentType(distributionAddress, DISTRIBUTION(), distributionInfo.objectType);
|
406
|
+
}
|
407
|
+
|
408
|
+
IRegistry.ObjectInfo memory instanceInfo = registry.getObjectInfo(instanceNftId);
|
409
|
+
Instance instance = Instance(instanceInfo.objectAddress);
|
410
|
+
InstanceAccessManager instanceAccessManager = InstanceAccessManager(instance.authority());
|
411
|
+
|
412
|
+
bytes4[] memory fctSelectors = new bytes4[](1);
|
413
|
+
fctSelectors[0] = IDistributionComponent.setFees.selector;
|
414
|
+
instanceAccessManager.setTargetFunctionRole(distributionName, fctSelectors, DISTRIBUTION_OWNER_ROLE());
|
415
|
+
|
416
|
+
bytes4[] memory fctSelectors2 = new bytes4[](2);
|
417
|
+
fctSelectors2[0] = IDistributionComponent.processSale.selector;
|
418
|
+
fctSelectors2[1] = IDistributionComponent.processRenewal.selector;
|
419
|
+
instanceAccessManager.setTargetFunctionRole(distributionName, fctSelectors2, PRODUCT_SERVICE_ROLE());
|
420
|
+
}
|
421
|
+
|
422
|
+
function grantPoolDefaultPermissions(NftId instanceNftId, address poolAddress, string memory poolName) external onlyRegisteredService {
|
423
|
+
IRegistry registry = getRegistry();
|
424
|
+
IRegistry.ObjectInfo memory poolInfo = registry.getObjectInfo(poolAddress);
|
425
|
+
|
426
|
+
if (poolInfo.objectType != POOL()) {
|
427
|
+
revert ErrorInstanceServiceInvalidComponentType(poolAddress, POOL(), poolInfo.objectType);
|
428
|
+
}
|
429
|
+
|
430
|
+
IRegistry.ObjectInfo memory instanceInfo = registry.getObjectInfo(instanceNftId);
|
431
|
+
Instance instance = Instance(instanceInfo.objectAddress);
|
432
|
+
InstanceAccessManager instanceAccessManager = InstanceAccessManager(instance.authority());
|
433
|
+
|
434
|
+
bytes4[] memory fctSelectors = new bytes4[](1);
|
435
|
+
fctSelectors[0] = IPoolComponent.setFees.selector;
|
436
|
+
instanceAccessManager.setTargetFunctionRole(poolName, fctSelectors, POOL_OWNER_ROLE());
|
437
|
+
|
438
|
+
bytes4[] memory fctSelectors2 = new bytes4[](1);
|
439
|
+
fctSelectors2[0] = IPoolComponent.underwrite.selector;
|
440
|
+
instanceAccessManager.setTargetFunctionRole(poolName, fctSelectors2, POLICY_SERVICE_ROLE());
|
441
|
+
}
|
442
|
+
|
443
|
+
function grantProductDefaultPermissions(NftId instanceNftId, address productAddress, string memory productName) external onlyRegisteredService {
|
444
|
+
IRegistry registry = getRegistry();
|
445
|
+
IRegistry.ObjectInfo memory productInfo = registry.getObjectInfo(productAddress);
|
446
|
+
|
447
|
+
if (productInfo.objectType != PRODUCT()) {
|
448
|
+
revert ErrorInstanceServiceInvalidComponentType(productAddress, PRODUCT(), productInfo.objectType);
|
449
|
+
}
|
450
|
+
|
451
|
+
IRegistry.ObjectInfo memory instanceInfo = registry.getObjectInfo(instanceNftId);
|
452
|
+
Instance instance = Instance(instanceInfo.objectAddress);
|
453
|
+
InstanceAccessManager instanceAccessManager = InstanceAccessManager(instance.authority());
|
454
|
+
|
455
|
+
bytes4[] memory fctSelectors = new bytes4[](1);
|
456
|
+
fctSelectors[0] = IProductComponent.setFees.selector;
|
457
|
+
instanceAccessManager.setTargetFunctionRole(productName, fctSelectors, PRODUCT_OWNER_ROLE());
|
155
458
|
}
|
156
459
|
|
157
|
-
function
|
158
|
-
|
460
|
+
function setComponentLocked(bool locked) onlyComponent external {
|
461
|
+
address componentAddress = msg.sender;
|
462
|
+
IRegistry registry = getRegistry();
|
463
|
+
NftId instanceNftId = registry.getObjectInfo(componentAddress).parentNftId;
|
464
|
+
address instanceAddress = registry.getObjectInfo(instanceNftId).objectAddress;
|
465
|
+
IInstance instance = IInstance(instanceAddress);
|
466
|
+
|
467
|
+
InstanceAccessManager accessManager = InstanceAccessManager(instance.authority());
|
468
|
+
// TODO setLocked by target address?
|
469
|
+
string memory componentName = ShortStrings.toString(accessManager.getTargetInfo(componentAddress).name);
|
470
|
+
accessManager.setTargetLocked(componentName, locked);
|
159
471
|
}
|
160
472
|
}
|
161
473
|
|
@@ -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 ----------------------------------------------------//
|