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