@etherisc/gif-next 0.0.2-e59218b-293 → 0.0.2-e5a2253-213
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/BaseComponent.sol/BaseComponent.dbg.json +1 -1
- package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.json +166 -0
- package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +1 -1
- package/artifacts/contracts/components/Distribution.sol/Distribution.json +153 -85
- package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.json +128 -0
- package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.json +28 -2
- package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.json +5 -5
- package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
- package/artifacts/contracts/components/Pool.sol/Pool.json +185 -114
- package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
- package/artifacts/contracts/components/Product.sol/Product.json +160 -98
- 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/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.dbg.json +4 -0
- package/artifacts/contracts/instance/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.json +1206 -0
- package/artifacts/contracts/instance/BundleManager.sol/BundleManager.dbg.json +4 -0
- package/artifacts/contracts/instance/BundleManager.sol/BundleManager.json +788 -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 +138 -2
- package/artifacts/contracts/instance/IInstanceBase.sol/IInstanceBase.dbg.json +4 -0
- package/artifacts/contracts/instance/IInstanceBase.sol/IInstanceBase.json +448 -0
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +104 -14
- package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
- package/artifacts/contracts/instance/Instance.sol/Instance.json +107 -660
- package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +244 -114
- package/artifacts/contracts/instance/InstanceBase.sol/InstanceBase.dbg.json +4 -0
- package/artifacts/contracts/instance/InstanceBase.sol/InstanceBase.json +763 -0
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +38 -28
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +183 -151
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +26 -74
- package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.dbg.json +4 -0
- package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.json +285 -0
- package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.dbg.json +1 -1
- package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.json +114 -32
- package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.dbg.json +1 -1
- package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.json +0 -13
- 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 +4 -0
- package/artifacts/contracts/instance/service/BundleService.sol/BundleService.json +1121 -0
- package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.json +436 -0
- package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +141 -66
- package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.json +14 -34
- 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 -41
- package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.json +13 -13
- package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.json +771 -0
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +15 -164
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +17 -241
- package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.json +1246 -0
- package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.json +492 -0
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +140 -241
- package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.json +14 -38
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +129 -401
- package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.json +14 -78
- 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 +132 -133
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +94 -65
- 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 +145 -227
- 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 +30 -128
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +38 -104
- package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.dbg.json +4 -0
- package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.json +530 -0
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +14 -27
- 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/IService.sol/IService.dbg.json +1 -1
- package/artifacts/contracts/shared/IService.sol/IService.json +13 -13
- 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 +2 -2
- package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +1 -1
- package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +2 -2
- package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
- package/artifacts/contracts/shared/Registerable.sol/Registerable.json +2 -2
- package/artifacts/contracts/shared/RegisterableUpgradable.sol/RegisterableUpgradable.dbg.json +1 -1
- package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
- package/artifacts/contracts/shared/Service.sol/Service.json +13 -13
- 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 +2 -2
- 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 +31 -31
- 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/BaseComponent.sol +91 -14
- package/contracts/components/Distribution.sol +2 -11
- package/contracts/components/IBaseComponent.sol +11 -1
- package/contracts/components/IPoolComponent.sol +5 -1
- package/contracts/components/IProductComponent.sol +2 -2
- package/contracts/components/Pool.sol +38 -26
- package/contracts/components/Product.sol +28 -21
- package/contracts/instance/AccessManagerUpgradeableInitializeable.sol +23 -0
- package/contracts/instance/BundleManager.sol +129 -0
- package/contracts/instance/Cloneable.sol +46 -0
- package/contracts/instance/IInstance.sol +9 -3
- package/contracts/instance/IInstanceBase.sol +25 -0
- package/contracts/instance/IInstanceService.sol +13 -3
- package/contracts/instance/Instance.sol +43 -224
- package/contracts/instance/InstanceAccessManager.sol +93 -78
- package/contracts/instance/InstanceBase.sol +39 -0
- package/contracts/instance/InstanceService.sol +247 -100
- package/contracts/instance/InstanceServiceManager.sol +5 -8
- package/contracts/instance/ObjectManager.sol +101 -0
- package/contracts/instance/base/ComponentServiceBase.sol +85 -81
- package/contracts/instance/base/IInstanceBase.sol +0 -2
- package/contracts/instance/module/IAccess.sol +27 -17
- package/contracts/instance/module/ISetup.sol +2 -1
- package/contracts/instance/service/BundleService.sol +294 -0
- package/contracts/instance/service/BundleServiceManager.sol +51 -0
- package/contracts/instance/service/DistributionService.sol +48 -21
- package/contracts/instance/service/DistributionServiceManager.sol +6 -9
- package/contracts/instance/service/IBundleService.sol +44 -0
- package/contracts/instance/service/IPolicyService.sol +94 -0
- package/contracts/instance/service/IPoolService.sol +4 -25
- package/contracts/instance/service/IProductService.sol +2 -72
- package/contracts/instance/service/PolicyService.sol +539 -0
- package/contracts/instance/service/PolicyServiceManager.sol +54 -0
- package/contracts/instance/service/PoolService.sol +65 -124
- package/contracts/instance/service/PoolServiceManager.sol +5 -8
- package/contracts/instance/service/ProductService.sol +96 -454
- package/contracts/registry/ChainNft.sol +1 -1
- package/contracts/registry/IRegistry.sol +26 -16
- package/contracts/registry/IRegistryService.sol +13 -5
- package/contracts/registry/Registry.sol +149 -201
- package/contracts/registry/RegistryAccessManager.sol +210 -0
- package/contracts/registry/RegistryService.sol +50 -88
- package/contracts/registry/RegistryServiceManager.sol +18 -36
- package/contracts/registry/ReleaseManager.sol +342 -0
- package/contracts/registry/TokenRegistry.sol +5 -6
- package/contracts/shared/IRegisterable.sol +0 -2
- package/contracts/shared/IService.sol +2 -1
- package/contracts/shared/ProxyManager.sol +1 -1
- package/contracts/shared/Service.sol +10 -7
- package/contracts/test/TestService.sol +3 -2
- package/contracts/types/NftIdSet.sol +26 -24
- package/contracts/types/RoleId.sol +10 -10
- package/package.json +1 -1
- 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/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/contracts/instance/AccessManagedSimple.sol +0 -115
- package/contracts/instance/AccessManagerSimple.sol +0 -692
- package/contracts/instance/IAccessManagerSimple.sol +0 -391
- package/contracts/instance/service/ComponentOwnerService.sol +0 -317
- package/contracts/instance/service/IComponentOwnerService.sol +0 -20
@@ -0,0 +1,129 @@
|
|
1
|
+
// SPDX-License-Identifier: Apache-2.0
|
2
|
+
pragma solidity ^0.8.20;
|
3
|
+
|
4
|
+
import {IInstance} from "./IInstance.sol";
|
5
|
+
import {INSTANCE} from "../types/ObjectType.sol";
|
6
|
+
import {InstanceReader} from "./InstanceReader.sol";
|
7
|
+
import {IPolicy} from "../instance/module/IPolicy.sol";
|
8
|
+
import {IRegistry} from "../registry/IRegistry.sol";
|
9
|
+
import {LibNftIdSet} from "../types/NftIdSet.sol";
|
10
|
+
import {NftId} from "../types/NftId.sol";
|
11
|
+
import {TimestampLib} from "../types/Timestamp.sol";
|
12
|
+
|
13
|
+
import {ObjectManager} from "./ObjectManager.sol";
|
14
|
+
|
15
|
+
contract BundleManager is
|
16
|
+
ObjectManager
|
17
|
+
{
|
18
|
+
|
19
|
+
event LogBundleManagerPolicyLinked(NftId bundleNftId, NftId policyNftId);
|
20
|
+
event LogBundleManagerPolicyUnlinked(NftId bundleNftId, NftId policyNftId);
|
21
|
+
|
22
|
+
event LogBundleManagerBundleAdded(NftId poolNftId, NftId bundleNftId);
|
23
|
+
event LogBundleManagerBundleUnlocked(NftId poolNftId, NftId bundleNftId);
|
24
|
+
event LogBundleManagerBundleLocked(NftId poolNftId, NftId bundleNftId);
|
25
|
+
|
26
|
+
error ErrorBundleManagerErrorPolicyAlreadyActivated(NftId policyNftId);
|
27
|
+
error ErrorBundleManagerErrorBundleLocked(NftId bundleNftId, NftId policyNftId);
|
28
|
+
error ErrorBundleManagerPolicyWithOpenClaims(NftId policyNftId, uint256 openClaimsCount);
|
29
|
+
error ErrorBundleManagerPolicyNotCloseable(NftId policyNftId);
|
30
|
+
error ErrorBundleManagerBundleUnknown(NftId bundleNftId);
|
31
|
+
error ErrorBundleManagerBundleNotRegistered(NftId bundleNftId);
|
32
|
+
|
33
|
+
mapping(NftId bundleNftId => LibNftIdSet.Set policies) internal _activePolicies;
|
34
|
+
|
35
|
+
constructor() ObjectManager() {
|
36
|
+
}
|
37
|
+
|
38
|
+
|
39
|
+
/// @dev links a policy with its bundle
|
40
|
+
// to link a policy it MUST NOT yet have been activated
|
41
|
+
// the bundle MUST be unlocked (active) for linking (underwriting) and registered with this instance
|
42
|
+
function linkPolicy(NftId policyNftId) external restricted() {
|
43
|
+
NftId bundleNftId = _instanceReader.getPolicyInfo(policyNftId).bundleNftId;
|
44
|
+
// decision will likely depend on the decision what to check here and what in the service
|
45
|
+
NftId poolNftId = _instanceReader.getBundleInfo(bundleNftId).poolNftId;
|
46
|
+
|
47
|
+
// ensure bundle is unlocked (in active set) and registered with this instance
|
48
|
+
if (!_isActive(poolNftId, bundleNftId)) {
|
49
|
+
revert ErrorBundleManagerErrorBundleLocked(bundleNftId, policyNftId);
|
50
|
+
}
|
51
|
+
|
52
|
+
LibNftIdSet.add(_activePolicies[bundleNftId], policyNftId);
|
53
|
+
emit LogBundleManagerPolicyLinked(bundleNftId, policyNftId);
|
54
|
+
}
|
55
|
+
|
56
|
+
|
57
|
+
/// @dev unlinks a policy from its bundle
|
58
|
+
// to unlink a policy it must closable, ie. meet one of the following criterias
|
59
|
+
// - the policy MUST be past its expiry period and it MUST NOT have any open claims
|
60
|
+
// - the policy's payoutAmount MUST be equal to its sumInsuredAmount and MUST NOT have any open claims
|
61
|
+
function unlinkPolicy(NftId policyNftId) external restricted() {
|
62
|
+
IPolicy.PolicyInfo memory policyInfo = _instanceReader.getPolicyInfo(policyNftId);
|
63
|
+
|
64
|
+
NftId bundleNftId = policyInfo.bundleNftId;
|
65
|
+
// decision will likely depend on the decision what to check here and what in the service
|
66
|
+
NftId poolNftId = _instanceReader.getBundleInfo(bundleNftId).poolNftId;
|
67
|
+
|
68
|
+
// ensure bundle is registered with this instance
|
69
|
+
if (!_contains(poolNftId, bundleNftId)) {
|
70
|
+
revert ErrorBundleManagerBundleUnknown(bundleNftId);
|
71
|
+
}
|
72
|
+
|
73
|
+
LibNftIdSet.remove(_activePolicies[bundleNftId], policyNftId);
|
74
|
+
emit LogBundleManagerPolicyUnlinked(policyInfo.bundleNftId, policyNftId);
|
75
|
+
}
|
76
|
+
|
77
|
+
|
78
|
+
/// @dev add a new bundle to a riskpool registerd with this instance
|
79
|
+
// the corresponding pool is fetched via instance reader
|
80
|
+
function add(NftId bundleNftId) external restricted() {
|
81
|
+
NftId poolNftId = _instanceReader.getBundleInfo(bundleNftId).poolNftId;
|
82
|
+
|
83
|
+
// ensure pool is registered with instance
|
84
|
+
if(poolNftId.eqz()) {
|
85
|
+
revert ErrorBundleManagerBundleNotRegistered(bundleNftId);
|
86
|
+
}
|
87
|
+
|
88
|
+
_add(poolNftId, bundleNftId);
|
89
|
+
emit LogBundleManagerBundleAdded(poolNftId, bundleNftId);
|
90
|
+
}
|
91
|
+
|
92
|
+
/// @dev unlocked (active) bundles are available to underwrite new policies
|
93
|
+
function unlock(NftId bundleNftId) external restricted() {
|
94
|
+
NftId poolNftId = _instanceReader.getBundleInfo(bundleNftId).poolNftId;
|
95
|
+
_activate(poolNftId, bundleNftId);
|
96
|
+
emit LogBundleManagerBundleUnlocked(poolNftId, bundleNftId);
|
97
|
+
}
|
98
|
+
|
99
|
+
/// @dev locked (deactivated) bundles may not underwrite any new policies
|
100
|
+
function lock(NftId bundleNftId) external restricted() {
|
101
|
+
NftId poolNftId = _instanceReader.getBundleInfo(bundleNftId).poolNftId;
|
102
|
+
_deactivate(poolNftId, bundleNftId);
|
103
|
+
emit LogBundleManagerBundleLocked(poolNftId, bundleNftId);
|
104
|
+
}
|
105
|
+
|
106
|
+
function bundles(NftId poolNftId) external view returns(uint256) {
|
107
|
+
return _objects(poolNftId);
|
108
|
+
}
|
109
|
+
|
110
|
+
function getBundleNftId(NftId poolNftId, uint256 idx) external view returns(NftId bundleNftId) {
|
111
|
+
return _getObject(poolNftId, idx);
|
112
|
+
}
|
113
|
+
|
114
|
+
function activeBundles(NftId poolNftId) external view returns(uint256) {
|
115
|
+
return _activeObjs(poolNftId);
|
116
|
+
}
|
117
|
+
|
118
|
+
function getActiveBundleNftId(NftId poolNftId, uint256 idx) external view returns(NftId bundleNftId) {
|
119
|
+
return _getActiveObject(poolNftId, idx);
|
120
|
+
}
|
121
|
+
|
122
|
+
function activePolicies(NftId bundleNftId) external view returns(uint256) {
|
123
|
+
return LibNftIdSet.size(_activePolicies[bundleNftId]);
|
124
|
+
}
|
125
|
+
|
126
|
+
function getActivePolicy(NftId bundleNftId, uint256 idx) external view returns(NftId policyNftId) {
|
127
|
+
return LibNftIdSet.getElementAt(_activePolicies[bundleNftId], idx);
|
128
|
+
}
|
129
|
+
}
|
@@ -0,0 +1,46 @@
|
|
1
|
+
// SPDX-License-Identifier: Apache-2.0
|
2
|
+
pragma solidity ^0.8.20;
|
3
|
+
|
4
|
+
import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";
|
5
|
+
import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
|
6
|
+
|
7
|
+
import {IRegistry} from "../registry/IRegistry.sol";
|
8
|
+
|
9
|
+
abstract contract Cloneable is
|
10
|
+
AccessManagedUpgradeable
|
11
|
+
{
|
12
|
+
event CloneableInitialized(address authority, address registry);
|
13
|
+
|
14
|
+
error CloneableRegistryInvalid(address registry);
|
15
|
+
|
16
|
+
IRegistry internal _registry;
|
17
|
+
|
18
|
+
constructor() {
|
19
|
+
_registry = IRegistry(address(0));
|
20
|
+
}
|
21
|
+
|
22
|
+
/// @dev call to initialize MUST be made in the same transaction as cloning of the contract
|
23
|
+
function initialize(
|
24
|
+
address authority,
|
25
|
+
address registry
|
26
|
+
)
|
27
|
+
public
|
28
|
+
initializer
|
29
|
+
{
|
30
|
+
// check/handle access managed
|
31
|
+
__AccessManaged_init(authority);
|
32
|
+
|
33
|
+
// check/handle registry
|
34
|
+
if (registry.code.length == 0) {
|
35
|
+
revert CloneableRegistryInvalid(registry);
|
36
|
+
}
|
37
|
+
|
38
|
+
_registry = IRegistry(registry);
|
39
|
+
|
40
|
+
emit CloneableInitialized(authority, registry);
|
41
|
+
}
|
42
|
+
|
43
|
+
function getRegistry() external view returns (IRegistry) {
|
44
|
+
return _registry;
|
45
|
+
}
|
46
|
+
}
|
@@ -2,13 +2,17 @@
|
|
2
2
|
pragma solidity ^0.8.20;
|
3
3
|
|
4
4
|
import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
|
5
|
+
import {IAccessManaged} from "@openzeppelin/contracts/access/manager/IAccessManaged.sol";
|
5
6
|
|
7
|
+
import {BundleManager} from "./BundleManager.sol";
|
6
8
|
import {InstanceReader} from "./InstanceReader.sol";
|
7
9
|
|
8
|
-
import {
|
10
|
+
import {InstanceAccessManager} from "./InstanceAccessManager.sol";
|
9
11
|
import {IDistributionService} from "./service/IDistributionService.sol";
|
10
12
|
import {IPoolService} from "./service/IPoolService.sol";
|
11
13
|
import {IProductService} from "./service/IProductService.sol";
|
14
|
+
import {IPolicyService} from "./service/IPolicyService.sol";
|
15
|
+
import {IBundleService} from "./service/IBundleService.sol";
|
12
16
|
import {IBundle} from "./module/IBundle.sol";
|
13
17
|
import {ISetup} from "./module/ISetup.sol";
|
14
18
|
import {NftId} from "../types/NftId.sol";
|
@@ -19,12 +23,13 @@ import {IPolicy} from "./module/IPolicy.sol";
|
|
19
23
|
import {IKeyValueStore} from "./base/IKeyValueStore.sol";
|
20
24
|
|
21
25
|
|
22
|
-
interface IInstance is IERC165, IKeyValueStore {
|
26
|
+
interface IInstance is IERC165, IKeyValueStore, IAccessManaged {
|
23
27
|
|
24
|
-
function getComponentOwnerService() external view returns (IComponentOwnerService);
|
25
28
|
function getDistributionService() external view returns (IDistributionService);
|
26
29
|
function getProductService() external view returns (IProductService);
|
27
30
|
function getPoolService() external view returns (IPoolService);
|
31
|
+
function getPolicyService() external view returns (IPolicyService);
|
32
|
+
function getBundleService() external view returns (IBundleService);
|
28
33
|
|
29
34
|
function createDistributionSetup(NftId distributionNftId, ISetup.DistributionSetupInfo memory setup) external;
|
30
35
|
function updateDistributionSetup(NftId distributionNftId, ISetup.DistributionSetupInfo memory setup, StateId newState) external;
|
@@ -51,4 +56,5 @@ interface IInstance is IERC165, IKeyValueStore {
|
|
51
56
|
function updatePolicyState(NftId policyNftId, StateId newState) external;
|
52
57
|
|
53
58
|
function getInstanceReader() external view returns (InstanceReader);
|
59
|
+
function getBundleManager() external view returns (BundleManager);
|
54
60
|
}
|
@@ -0,0 +1,25 @@
|
|
1
|
+
// SPDX-License-Identifier: Apache-2.0
|
2
|
+
pragma solidity ^0.8.20;
|
3
|
+
|
4
|
+
import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
|
5
|
+
|
6
|
+
import {BundleManager} from "./BundleManager.sol";
|
7
|
+
import {InstanceReader} from "./InstanceReader.sol";
|
8
|
+
|
9
|
+
import {IDistributionService} from "./service/IDistributionService.sol";
|
10
|
+
import {IPoolService} from "./service/IPoolService.sol";
|
11
|
+
import {IProductService} from "./service/IProductService.sol";
|
12
|
+
import {IBundle} from "./module/IBundle.sol";
|
13
|
+
import {ISetup} from "./module/ISetup.sol";
|
14
|
+
import {NftId} from "../types/NftId.sol";
|
15
|
+
import {StateId} from "../types/StateId.sol";
|
16
|
+
import {RiskId} from "../types/RiskId.sol";
|
17
|
+
import {IRisk} from "./module/IRisk.sol";
|
18
|
+
import {IPolicy} from "./module/IPolicy.sol";
|
19
|
+
import {IKeyValueStore} from "./base/IKeyValueStore.sol";
|
20
|
+
|
21
|
+
|
22
|
+
interface IInstanceBase is IERC165, IKeyValueStore {
|
23
|
+
|
24
|
+
|
25
|
+
}
|
@@ -10,21 +10,31 @@ import {IRegistry} from "../registry/IRegistry.sol";
|
|
10
10
|
import {IRegisterable} from "../shared/IRegisterable.sol";
|
11
11
|
import {IBaseComponent} from "../components/IBaseComponent.sol";
|
12
12
|
|
13
|
-
import {
|
13
|
+
import {InstanceAccessManager} from "./InstanceAccessManager.sol";
|
14
14
|
import {Instance} from "./Instance.sol";
|
15
15
|
import {InstanceReader} from "./InstanceReader.sol";
|
16
|
+
import {BundleManager} from "./BundleManager.sol";
|
16
17
|
|
17
18
|
interface IInstanceService is IService {
|
18
19
|
|
20
|
+
error ErrorInstanceServiceRequestUnauhorized(address caller);
|
21
|
+
error ErrorInstanceServiceNotInstanceOwner(address caller, NftId instanceNftId);
|
22
|
+
error ErrorInstanceServiceComponentNotRegistered(address componentAddress);
|
23
|
+
|
19
24
|
event LogInstanceCloned(address clonedAccessManagerAddress, address clonedInstanceAddress, address clonedInstanceReaderAddress, NftId clonedInstanceNftId);
|
20
25
|
|
21
26
|
function createInstanceClone()
|
22
27
|
external
|
23
28
|
returns (
|
24
|
-
|
29
|
+
InstanceAccessManager clonedAccessManager,
|
25
30
|
Instance clonedInstance,
|
26
31
|
NftId instanceNftId,
|
27
|
-
InstanceReader clonedInstanceReader
|
32
|
+
InstanceReader clonedInstanceReader,
|
33
|
+
BundleManager clonedBundleManager
|
28
34
|
);
|
35
|
+
|
36
|
+
function hasRole(address account, RoleId role, address instanceAddress) external returns (bool);
|
37
|
+
function setTargetLocked(string memory targetName, bool locked) external;
|
38
|
+
|
29
39
|
}
|
30
40
|
|
@@ -3,9 +3,9 @@ pragma solidity ^0.8.20;
|
|
3
3
|
|
4
4
|
import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
|
5
5
|
import {ShortString, ShortStrings} from "@openzeppelin/contracts/utils/ShortStrings.sol";
|
6
|
+
import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";
|
7
|
+
import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";
|
6
8
|
|
7
|
-
import {AccessManagedSimple} from "./AccessManagedSimple.sol";
|
8
|
-
import {AccessManagerSimple} from "./AccessManagerSimple.sol";
|
9
9
|
import {IAccess} from "./module/IAccess.sol";
|
10
10
|
import {IBundle} from "./module/IBundle.sol";
|
11
11
|
import {IPolicy} from "./module/IPolicy.sol";
|
@@ -15,27 +15,26 @@ import {Key32, KeyId, Key32Lib} from "../types/Key32.sol";
|
|
15
15
|
import {KeyValueStore} from "./base/KeyValueStore.sol";
|
16
16
|
import {IInstance} from "./IInstance.sol";
|
17
17
|
import {InstanceReader} from "./InstanceReader.sol";
|
18
|
+
import {InstanceAccessManager} from "./InstanceAccessManager.sol";
|
19
|
+
import {BundleManager} from "./BundleManager.sol";
|
18
20
|
import {NftId} from "../types/NftId.sol";
|
19
21
|
import {NumberId} from "../types/NumberId.sol";
|
20
|
-
import {ObjectType, BUNDLE, DISTRIBUTION, INSTANCE, POLICY, POOL, ROLE, PRODUCT, TARGET} from "../types/ObjectType.sol";
|
21
|
-
import {RiskId
|
22
|
-
import {
|
23
|
-
import {StateId, ACTIVE} from "../types/StateId.sol";
|
24
|
-
import {ERC165} from "../shared/ERC165.sol";
|
25
|
-
import {Registerable} from "../shared/Registerable.sol";
|
26
|
-
import {ComponentOwnerService} from "./service/ComponentOwnerService.sol";
|
27
|
-
import {IComponentOwnerService} from "./service/IComponentOwnerService.sol";
|
22
|
+
import {ObjectType, BUNDLE, DISTRIBUTION, INSTANCE, POLICY, POOL, ROLE, PRODUCT, TARGET, COMPONENT} from "../types/ObjectType.sol";
|
23
|
+
import {RiskId} from "../types/RiskId.sol";
|
24
|
+
import {StateId} from "../types/StateId.sol";
|
28
25
|
import {IDistributionService} from "./service/IDistributionService.sol";
|
29
26
|
import {IPoolService} from "./service/IPoolService.sol";
|
30
27
|
import {IProductService} from "./service/IProductService.sol";
|
28
|
+
import {IPolicyService} from "./service/IPolicyService.sol";
|
29
|
+
import {IBundleService} from "./service/IBundleService.sol";
|
31
30
|
import {VersionPart} from "../types/Version.sol";
|
31
|
+
import {InstanceBase} from "./InstanceBase.sol";
|
32
32
|
|
33
33
|
contract Instance is
|
34
|
-
|
35
|
-
KeyValueStore,
|
34
|
+
AccessManagedUpgradeable,
|
36
35
|
IInstance,
|
37
|
-
|
38
|
-
|
36
|
+
// Initializable,
|
37
|
+
InstanceBase
|
39
38
|
{
|
40
39
|
|
41
40
|
uint64 public constant ADMIN_ROLE = type(uint64).min;
|
@@ -46,155 +45,26 @@ contract Instance is
|
|
46
45
|
|
47
46
|
bool private _initialized;
|
48
47
|
|
49
|
-
|
50
|
-
mapping(RoleId roleId => EnumerableSet.AddressSet roleMembers) internal _roleMembers;
|
51
|
-
RoleId [] internal _roles;
|
52
|
-
|
53
|
-
mapping(ShortString name => address target) internal _target;
|
54
|
-
|
55
|
-
AccessManagerSimple internal _accessManager;
|
48
|
+
InstanceAccessManager internal _accessManager;
|
56
49
|
InstanceReader internal _instanceReader;
|
50
|
+
BundleManager internal _bundleManager;
|
57
51
|
|
58
|
-
|
52
|
+
function initialize(address accessManagerAddress, address registryAddress, NftId registryNftId, address initialOwner)
|
53
|
+
public
|
54
|
+
initializer
|
59
55
|
{
|
60
|
-
initialize(accessManagerAddress, registryAddress, registryNftId, msg.sender);
|
61
|
-
}
|
62
|
-
|
63
|
-
function initialize(address accessManagerAddress, address registryAddress, NftId registryNftId, address initialOwner) public {
|
64
56
|
require(!_initialized, "Contract instance has already been initialized");
|
65
57
|
|
66
|
-
|
58
|
+
__AccessManaged_init(accessManagerAddress);
|
67
59
|
|
68
|
-
_accessManager =
|
69
|
-
|
70
|
-
_createRole(RoleIdLib.toRoleId(PUBLIC_ROLE), "PublicRole", false, false);
|
71
|
-
|
60
|
+
_accessManager = InstanceAccessManager(accessManagerAddress);
|
61
|
+
|
72
62
|
_initializeRegisterable(registryAddress, registryNftId, INSTANCE(), false, initialOwner, "");
|
73
63
|
|
74
64
|
_registerInterface(type(IInstance).interfaceId);
|
75
65
|
_initialized = true;
|
76
66
|
}
|
77
67
|
|
78
|
-
//--- Role ------------------------------------------------------//
|
79
|
-
function createStandardRole(RoleId roleId, string memory name) external restricted() {
|
80
|
-
_createRole(roleId, name, false, true);
|
81
|
-
}
|
82
|
-
|
83
|
-
function createCustomRole(RoleId roleId, string memory name) external restricted() {
|
84
|
-
_createRole(roleId, name, true, true);
|
85
|
-
}
|
86
|
-
|
87
|
-
function updateRole(RoleId roleId, string memory name, StateId newState) external restricted() {
|
88
|
-
(bool isCustom,) = _validateRoleParameters(roleId, name, false);
|
89
|
-
IAccess.RoleInfo memory role = _toRole(roleId, name, isCustom);
|
90
|
-
update(toRoleKey32(roleId), abi.encode(role), newState);
|
91
|
-
}
|
92
|
-
|
93
|
-
function updateRoleState(RoleId roleId, StateId newState) external restricted() {
|
94
|
-
updateState(toRoleKey32(roleId), newState);
|
95
|
-
}
|
96
|
-
|
97
|
-
function grantRole(RoleId roleId, address member) external restricted() returns (bool granted) {
|
98
|
-
Key32 roleKey = toRoleKey32(roleId);
|
99
|
-
|
100
|
-
if (!exists(roleKey)) {
|
101
|
-
revert IAccess.ErrorGrantNonexstentRole(roleId);
|
102
|
-
}
|
103
|
-
|
104
|
-
if (getState(roleKey) != ACTIVE()) {
|
105
|
-
revert IAccess.ErrorRoleIdNotActive(roleId);
|
106
|
-
}
|
107
|
-
|
108
|
-
if (!EnumerableSet.contains(_roleMembers[roleId], member)) {
|
109
|
-
_accessManager.grantRole(roleId.toInt(), member, EXECUTION_DELAY);
|
110
|
-
EnumerableSet.add(_roleMembers[roleId], member);
|
111
|
-
return true;
|
112
|
-
}
|
113
|
-
|
114
|
-
return false;
|
115
|
-
}
|
116
|
-
|
117
|
-
function revokeRole(RoleId roleId, address member) external restricted() returns (bool revoked) {
|
118
|
-
Key32 roleKey = toRoleKey32(roleId);
|
119
|
-
|
120
|
-
if (!exists(roleKey)) {
|
121
|
-
revert IAccess.ErrorRevokeNonexstentRole(roleId);
|
122
|
-
}
|
123
|
-
|
124
|
-
if (EnumerableSet.contains(_roleMembers[roleId], member)) {
|
125
|
-
_accessManager.revokeRole(roleId.toInt(), member);
|
126
|
-
EnumerableSet.remove(_roleMembers[roleId], member);
|
127
|
-
return true;
|
128
|
-
}
|
129
|
-
|
130
|
-
return false;
|
131
|
-
}
|
132
|
-
|
133
|
-
/// @dev not restricted function by intention
|
134
|
-
/// the restriction to role members is already enforced by the call to the access manger
|
135
|
-
function renounceRole(RoleId roleId) external returns (bool revoked) {
|
136
|
-
address member = msg.sender;
|
137
|
-
Key32 roleKey = toRoleKey32(roleId);
|
138
|
-
|
139
|
-
if (!exists(roleKey)) {
|
140
|
-
revert IAccess.ErrorRenounceNonexstentRole(roleId);
|
141
|
-
}
|
142
|
-
|
143
|
-
if (EnumerableSet.contains(_roleMembers[roleId], member)) {
|
144
|
-
_accessManager.renounceRole(roleId.toInt(), member);
|
145
|
-
EnumerableSet.remove(_roleMembers[roleId], member);
|
146
|
-
return true;
|
147
|
-
}
|
148
|
-
|
149
|
-
return false;
|
150
|
-
}
|
151
|
-
|
152
|
-
function roles() external view returns (uint256 numberOfRoles) {
|
153
|
-
return _roles.length;
|
154
|
-
}
|
155
|
-
|
156
|
-
function getRoleId(uint256 idx) external view returns (RoleId roleId) {
|
157
|
-
return _roles[idx];
|
158
|
-
}
|
159
|
-
|
160
|
-
function getRole(RoleId roleId) external view returns (IAccess.RoleInfo memory role) {
|
161
|
-
return abi.decode(getData(roleId.toKey32()), (IAccess.RoleInfo));
|
162
|
-
}
|
163
|
-
|
164
|
-
function roleMembers(RoleId roleId) external view returns (uint256 numberOfMembers) {
|
165
|
-
return EnumerableSet.length(_roleMembers[roleId]);
|
166
|
-
}
|
167
|
-
|
168
|
-
function getRoleMember(RoleId roleId, uint256 idx) external view returns (address roleMember) {
|
169
|
-
return EnumerableSet.at(_roleMembers[roleId], idx);
|
170
|
-
}
|
171
|
-
|
172
|
-
function _createRole(RoleId roleId, string memory name, bool isCustom, bool validateParameters) internal {
|
173
|
-
if (validateParameters) {
|
174
|
-
_validateRoleParameters(roleId, name, isCustom);
|
175
|
-
}
|
176
|
-
|
177
|
-
IAccess.RoleInfo memory role = _toRole(roleId, name, isCustom);
|
178
|
-
_role[role.name] = roleId;
|
179
|
-
_roles.push(roleId);
|
180
|
-
|
181
|
-
create(toRoleKey32(roleId), abi.encode(role));
|
182
|
-
}
|
183
|
-
|
184
|
-
//--- Target ------------------------------------------------------//
|
185
|
-
function createTarget(address target, IAccess.TargetInfo memory targetInfo) external restricted() {
|
186
|
-
_validateTargetParameters(target, targetInfo);
|
187
|
-
create(toTargetKey32(target), abi.encode(targetInfo));
|
188
|
-
}
|
189
|
-
|
190
|
-
function setTargetClosed(address target, bool closed) external restricted() {
|
191
|
-
if (!exists(toTargetKey32(target))) {
|
192
|
-
revert IAccess.ErrorTargetDoesNotExist(target);
|
193
|
-
}
|
194
|
-
|
195
|
-
_accessManager.setTargetClosed(target, closed);
|
196
|
-
}
|
197
|
-
|
198
68
|
//--- ProductSetup ------------------------------------------------------//
|
199
69
|
function createProductSetup(NftId productNftId, ISetup.ProductSetupInfo memory setup) external restricted() {
|
200
70
|
create(_toNftKey32(productNftId, PRODUCT()), abi.encode(setup));
|
@@ -339,71 +209,6 @@ contract Instance is
|
|
339
209
|
}
|
340
210
|
|
341
211
|
//--- internal view/pure functions --------------------------------------//
|
342
|
-
function _toRole(RoleId roleId, string memory name, bool isCustom)
|
343
|
-
internal
|
344
|
-
pure
|
345
|
-
returns (IAccess.RoleInfo memory role)
|
346
|
-
{
|
347
|
-
return IAccess.RoleInfo(
|
348
|
-
ShortStrings.toShortString(name),
|
349
|
-
isCustom);
|
350
|
-
}
|
351
|
-
|
352
|
-
function _validateRoleParameters(
|
353
|
-
RoleId roleId,
|
354
|
-
string memory name,
|
355
|
-
bool isCustom
|
356
|
-
)
|
357
|
-
internal
|
358
|
-
view
|
359
|
-
returns (
|
360
|
-
bool roleExists,
|
361
|
-
bool roleIsCustom
|
362
|
-
)
|
363
|
-
{
|
364
|
-
Key32 roleKey = toRoleKey32(roleId);
|
365
|
-
roleExists = exists(roleKey);
|
366
|
-
if (roleExists) {
|
367
|
-
roleIsCustom = abi.decode(getData(roleKey), (IAccess.RoleInfo)).isCustom;
|
368
|
-
} else {
|
369
|
-
roleIsCustom = isCustom;
|
370
|
-
}
|
371
|
-
|
372
|
-
// check role id
|
373
|
-
uint64 roleIdInt = RoleId.unwrap(roleId);
|
374
|
-
if(roleIdInt == ADMIN_ROLE || roleIdInt == PUBLIC_ROLE) {
|
375
|
-
revert IAccess.ErrorRoleIdInvalid(roleId);
|
376
|
-
}
|
377
|
-
|
378
|
-
if (roleIsCustom && roleIdInt < CUSTOM_ROLE_ID_MIN) {
|
379
|
-
revert IAccess.ErrorRoleIdTooSmall(roleId);
|
380
|
-
} else if (roleIsCustom && roleIdInt >= CUSTOM_ROLE_ID_MIN) {
|
381
|
-
revert IAccess.ErrorRoleIdTooBig(roleId);
|
382
|
-
}
|
383
|
-
|
384
|
-
// role name checks
|
385
|
-
ShortString nameShort = ShortStrings.toShortString(name);
|
386
|
-
if (ShortStrings.byteLength(nameShort) == 0) {
|
387
|
-
revert IAccess.ErrorRoleNameEmpty(roleId);
|
388
|
-
}
|
389
|
-
|
390
|
-
if (_role[nameShort] != RoleIdLib.zero() && _role[nameShort] != roleId) {
|
391
|
-
revert IAccess.ErrorRoleNameNotUnique(_role[nameShort], nameShort);
|
392
|
-
}
|
393
|
-
}
|
394
|
-
|
395
|
-
function _validateTargetParameters(address target, IAccess.TargetInfo memory targetInfo) internal view {
|
396
|
-
|
397
|
-
}
|
398
|
-
|
399
|
-
function toRoleKey32(RoleId roleId) public pure returns (Key32) {
|
400
|
-
return roleId.toKey32();
|
401
|
-
}
|
402
|
-
|
403
|
-
function toTargetKey32(address target) public pure returns (Key32) {
|
404
|
-
return Key32Lib.toKey32(TARGET(), KeyId.wrap(bytes20(target)));
|
405
|
-
}
|
406
|
-
|
407
212
|
function _toNftKey32(NftId nftId, ObjectType objectType) internal pure returns (Key32) {
|
408
213
|
return nftId.toKey32(objectType);
|
409
214
|
}
|
@@ -416,28 +221,42 @@ contract Instance is
|
|
416
221
|
return policyNftId.toKey32(POLICY());
|
417
222
|
}
|
418
223
|
|
419
|
-
function getComponentOwnerService() external view returns (IComponentOwnerService) {
|
420
|
-
return ComponentOwnerService(_registry.getServiceAddress("ComponentOwnerService", VersionPart.wrap(3)));
|
421
|
-
}
|
422
|
-
|
423
224
|
function getDistributionService() external view returns (IDistributionService) {
|
424
|
-
return IDistributionService(_registry.getServiceAddress(
|
225
|
+
return IDistributionService(_registry.getServiceAddress(DISTRIBUTION(), VersionPart.wrap(3)));
|
425
226
|
}
|
426
227
|
|
427
228
|
function getProductService() external view returns (IProductService) {
|
428
|
-
return IProductService(_registry.getServiceAddress(
|
229
|
+
return IProductService(_registry.getServiceAddress(PRODUCT(), VersionPart.wrap(3)));
|
429
230
|
}
|
430
231
|
|
431
232
|
function getPoolService() external view returns (IPoolService) {
|
432
|
-
return IPoolService(_registry.getServiceAddress(
|
233
|
+
return IPoolService(_registry.getServiceAddress(POOL(), VersionPart.wrap(3)));
|
234
|
+
}
|
235
|
+
|
236
|
+
function getPolicyService() external view returns (IPolicyService) {
|
237
|
+
return IPolicyService(_registry.getServiceAddress(POLICY(), VersionPart.wrap(3)));
|
238
|
+
}
|
239
|
+
|
240
|
+
function getBundleService() external view returns (IBundleService) {
|
241
|
+
return IBundleService(_registry.getServiceAddress(BUNDLE(), VersionPart.wrap(3)));
|
433
242
|
}
|
434
243
|
|
435
244
|
function setInstanceReader(InstanceReader instanceReader) external restricted() {
|
436
|
-
require(
|
245
|
+
require(instanceReader.getInstanceNftId() == getNftId(), "NFT ID of InstanceReader does not match");
|
437
246
|
_instanceReader = instanceReader;
|
438
247
|
}
|
439
248
|
|
440
249
|
function getInstanceReader() external view returns (InstanceReader) {
|
441
250
|
return _instanceReader;
|
442
251
|
}
|
252
|
+
|
253
|
+
function setBundleManager(BundleManager bundleManager) external restricted() {
|
254
|
+
require(address(_bundleManager) == address(0), "BundleManager is set");
|
255
|
+
require(bundleManager.getInstanceNftId() == getNftId(), "NFT ID of BundleManager does not match");
|
256
|
+
_bundleManager = bundleManager;
|
257
|
+
}
|
258
|
+
|
259
|
+
function getBundleManager() external view returns (BundleManager) {
|
260
|
+
return _bundleManager;
|
261
|
+
}
|
443
262
|
}
|