@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
@@ -1,40 +1,32 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
2
|
pragma solidity ^0.8.19;
|
3
3
|
|
4
|
+
import {IBaseComponent} from "../../components/IBaseComponent.sol";
|
4
5
|
import {IRegistry} from "../../registry/IRegistry.sol";
|
5
6
|
import {IRegistryService} from "../../registry/IRegistryService.sol";
|
6
7
|
import {IInstance} from "../../instance/IInstance.sol";
|
7
|
-
import {
|
8
|
-
import {
|
9
|
-
import {
|
8
|
+
import {IAccess} from "../module/IAccess.sol";
|
9
|
+
import {ObjectType, INSTANCE, REGISTRY} from "../../types/ObjectType.sol";
|
10
|
+
import {NftId} from "../../types/NftId.sol";
|
11
|
+
import {RoleId} from "../../types/RoleId.sol";
|
10
12
|
|
11
|
-
import {BaseComponent} from "../../components/BaseComponent.sol";
|
12
|
-
import {Product} from "../../components/Product.sol";
|
13
|
-
import {INftOwnable} from "../../shared/INftOwnable.sol";
|
14
13
|
import {Service} from "../../shared/Service.sol";
|
15
14
|
import {InstanceService} from "../InstanceService.sol";
|
16
|
-
import {
|
15
|
+
import {InstanceAccessManager} from "../InstanceAccessManager.sol";
|
17
16
|
|
18
17
|
abstract contract ComponentServiceBase is Service {
|
19
18
|
|
20
|
-
error ExpectedRoleMissing(RoleId expected, address caller);
|
21
|
-
error ComponentTypeInvalid(ObjectType componentType);
|
22
19
|
|
23
|
-
|
20
|
+
error ErrorComponentServiceAlreadyRegistered(address component, NftId nftId);
|
21
|
+
error ErrorComponentServiceNotComponent(address component);
|
22
|
+
error ErrorComponentServiceInvalidType(address component, ObjectType requiredType, ObjectType componentType);
|
23
|
+
error ErrorComponentServiceSenderNotOwner(address component, address initialOwner, address sender);
|
24
|
+
error ErrorComponentServiceExpectedRoleMissing(NftId instanceNftId, RoleId requiredRole, address sender);
|
24
25
|
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
ObjectType objectType = _getObjectType(component);
|
29
|
-
RoleId expectedRole = _objectTypeToExpectedRole[objectType];
|
26
|
+
error ErrorComponentServiceBaseComponentLocked(address componentAddress);
|
27
|
+
error ExpectedRoleMissing(RoleId expected, address caller);
|
28
|
+
error ComponentTypeInvalid(ObjectType componentType);
|
30
29
|
|
31
|
-
address componentOwner = msg.sender;
|
32
|
-
INftOwnable nftOwnable = INftOwnable(address(component.getInstance()));
|
33
|
-
if(! getInstanceService().hasRole(componentOwner, expectedRole, nftOwnable.getNftId())) {
|
34
|
-
revert ExpectedRoleMissing(expectedRole, componentOwner);
|
35
|
-
}
|
36
|
-
_;
|
37
|
-
}
|
38
30
|
|
39
31
|
/// @dev modifier to check if caller is a registered service
|
40
32
|
modifier onlyService() {
|
@@ -43,72 +35,82 @@ abstract contract ComponentServiceBase is Service {
|
|
43
35
|
_;
|
44
36
|
}
|
45
37
|
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
override
|
52
|
-
{
|
53
|
-
super._initializeService(registry, initialOwner);
|
54
|
-
_objectTypeToExpectedRole[PRODUCT()] = PRODUCT_OWNER_ROLE();
|
55
|
-
_objectTypeToExpectedRole[POOL()] = POOL_OWNER_ROLE();
|
56
|
-
_objectTypeToExpectedRole[DISTRIBUTION()] = DISTRIBUTION_OWNER_ROLE();
|
57
|
-
_objectTypeToExpectedRole[ORACLE()] = ORACLE_OWNER_ROLE();
|
38
|
+
// view functions
|
39
|
+
|
40
|
+
function getRegistryService() public view virtual returns (IRegistryService) {
|
41
|
+
address service = getRegistry().getServiceAddress(REGISTRY(), getMajorVersion());
|
42
|
+
return IRegistryService(service);
|
58
43
|
}
|
59
44
|
|
60
45
|
function getInstanceService() public view returns (InstanceService) {
|
61
|
-
|
46
|
+
address service = getRegistry().getServiceAddress(INSTANCE(), getMajorVersion());
|
47
|
+
return InstanceService(service);
|
62
48
|
}
|
63
49
|
|
64
|
-
|
65
|
-
|
66
|
-
|
67
|
-
|
50
|
+
// internal functions
|
51
|
+
function _checkComponentForRegistration(
|
52
|
+
address componentAddress,
|
53
|
+
ObjectType requiredType,
|
54
|
+
RoleId requiredRole
|
55
|
+
)
|
56
|
+
internal
|
57
|
+
returns (
|
58
|
+
IBaseComponent component,
|
59
|
+
address owner,
|
60
|
+
IInstance instance,
|
61
|
+
NftId instanceNftId
|
62
|
+
)
|
68
63
|
{
|
69
|
-
|
70
|
-
|
71
|
-
|
72
|
-
|
73
|
-
|
74
|
-
|
75
|
-
|
76
|
-
|
77
|
-
if (objectType == DISTRIBUTION()) {
|
78
|
-
(objInfo, initialObjData) = registryService.registerDistribution(component, componentOwner);
|
79
|
-
} else if (objectType == PRODUCT()) {
|
80
|
-
(objInfo, initialObjData) = registryService.registerProduct(component, componentOwner);
|
81
|
-
} else if (objectType == POOL()) {
|
82
|
-
(objInfo, initialObjData) = registryService.registerPool(component, componentOwner);
|
83
|
-
// TODO: implement this for oracle - currently missing in registry
|
84
|
-
// } else if (objectType == ORACLE()) {
|
85
|
-
// (objInfo, initialObjData) = registryService.registerOracle(component, componentOwner);
|
86
|
-
} else {
|
87
|
-
revert ComponentTypeInvalid(objectType);
|
64
|
+
// component may only be registerd by initial owner of component
|
65
|
+
owner = msg.sender;
|
66
|
+
|
67
|
+
// check component has not already been registerd
|
68
|
+
NftId compoentNftId = _registry.getNftId(componentAddress);
|
69
|
+
if(compoentNftId.gtz()) {
|
70
|
+
revert ErrorComponentServiceAlreadyRegistered(componentAddress, compoentNftId);
|
88
71
|
}
|
89
72
|
|
90
|
-
|
91
|
-
|
92
|
-
|
93
|
-
|
73
|
+
// check this is a component
|
74
|
+
component = IBaseComponent(componentAddress);
|
75
|
+
if(!component.supportsInterface(type(IBaseComponent).interfaceId)) {
|
76
|
+
revert ErrorComponentServiceNotComponent(componentAddress);
|
77
|
+
}
|
78
|
+
|
79
|
+
// check component is of required type
|
80
|
+
(IRegistry.ObjectInfo memory componentInfo, ) = component.getInitialInfo();
|
81
|
+
if(componentInfo.objectType != requiredType) {
|
82
|
+
revert ErrorComponentServiceInvalidType(componentAddress, requiredType, componentInfo.objectType);
|
94
83
|
}
|
95
|
-
}
|
96
84
|
|
97
|
-
|
85
|
+
// check msg.sender is component owner
|
86
|
+
address initialOwner = componentInfo.initialOwner;
|
87
|
+
if(owner != initialOwner) {
|
88
|
+
revert ErrorComponentServiceSenderNotOwner(componentAddress, componentInfo.initialOwner, owner);
|
89
|
+
}
|
90
|
+
|
91
|
+
// check instance has assigned required role to owner
|
92
|
+
instanceNftId = componentInfo.parentNftId;
|
93
|
+
instance = _getInstance(instanceNftId);
|
94
|
+
bool hasRole = getInstanceService().hasRole(
|
95
|
+
owner,
|
96
|
+
requiredRole,
|
97
|
+
address(instance));
|
98
98
|
|
99
|
-
|
100
|
-
|
101
|
-
|
99
|
+
if(!hasRole) {
|
100
|
+
revert ErrorComponentServiceExpectedRoleMissing(instanceNftId, requiredRole, owner);
|
101
|
+
}
|
102
102
|
}
|
103
|
-
|
104
|
-
|
105
|
-
|
106
|
-
|
103
|
+
|
104
|
+
// internal view functions
|
105
|
+
|
106
|
+
function _getInstance(NftId instanceNftId) internal view returns (IInstance) {
|
107
|
+
IRegistry.ObjectInfo memory instanceInfo = getRegistry().getObjectInfo(instanceNftId);
|
107
108
|
return IInstance(instanceInfo.objectAddress);
|
108
109
|
}
|
109
110
|
|
110
111
|
function _getAndVerifyComponentInfoAndInstance(
|
111
|
-
|
112
|
+
//address component,
|
113
|
+
ObjectType expectedType
|
112
114
|
)
|
113
115
|
internal
|
114
116
|
view
|
@@ -117,18 +119,20 @@ abstract contract ComponentServiceBase is Service {
|
|
117
119
|
IInstance instance
|
118
120
|
)
|
119
121
|
{
|
120
|
-
|
121
|
-
|
122
|
+
IRegistry registry = getRegistry();
|
123
|
+
//TODO redundant check -> just check type
|
124
|
+
//NftId componentNftId = registry.getNftId(component);
|
125
|
+
//require(componentNftId.gtz(), "ERROR_COMPONENT_UNKNOWN");
|
122
126
|
|
123
|
-
info =
|
124
|
-
require(info.objectType ==
|
127
|
+
info = registry.getObjectInfo(msg.sender);
|
128
|
+
require(info.objectType == expectedType, "OBJECT_TYPE_INVALID");
|
125
129
|
|
126
|
-
address instanceAddress =
|
130
|
+
address instanceAddress = registry.getObjectInfo(info.parentNftId).objectAddress;
|
127
131
|
instance = IInstance(instanceAddress);
|
128
|
-
}
|
129
132
|
|
130
|
-
|
131
|
-
|
132
|
-
|
133
|
+
InstanceAccessManager accessManager = InstanceAccessManager(instance.authority());
|
134
|
+
if (accessManager.isTargetLocked(info.objectAddress)) {
|
135
|
+
revert IAccess.ErrorIAccessTargetLocked(info.objectAddress);
|
136
|
+
}
|
133
137
|
}
|
134
138
|
}
|
@@ -6,7 +6,6 @@ import {StateId} from "../../types/StateId.sol";
|
|
6
6
|
|
7
7
|
import {IKeyValueStore} from "./IKeyValueStore.sol";
|
8
8
|
|
9
|
-
import {IComponentOwnerService} from "../service/IComponentOwnerService.sol";
|
10
9
|
import {IDistributionService} from "../service/IDistributionService.sol";
|
11
10
|
import {IProductService} from "../service/IProductService.sol";
|
12
11
|
import {IPoolService} from "../service/IPoolService.sol";
|
@@ -16,7 +15,6 @@ interface IInstanceBase {
|
|
16
15
|
function updateState(Key32 key, StateId state) external;
|
17
16
|
function getState(Key32 key) external view returns (StateId state);
|
18
17
|
|
19
|
-
function getComponentOwnerService() external view returns(IComponentOwnerService);
|
20
18
|
function getDistributionService() external view returns(IDistributionService);
|
21
19
|
function getProductService() external view returns(IProductService service);
|
22
20
|
function getPoolService() external view returns(IPoolService service);
|
@@ -5,34 +5,44 @@ import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet
|
|
5
5
|
import {ShortString, ShortStrings} from "@openzeppelin/contracts/utils/ShortStrings.sol";
|
6
6
|
|
7
7
|
import {RoleId} from "../../types/RoleId.sol";
|
8
|
+
import {Timestamp} from "../../types/Timestamp.sol";
|
8
9
|
|
9
10
|
interface IAccess {
|
11
|
+
|
10
12
|
struct RoleInfo {
|
11
13
|
ShortString name;
|
12
14
|
bool isCustom;
|
15
|
+
bool isLocked;
|
16
|
+
Timestamp createdAt;
|
17
|
+
Timestamp updatedAt;
|
13
18
|
}
|
14
19
|
|
15
20
|
struct TargetInfo {
|
16
21
|
ShortString name;
|
17
22
|
bool isCustom;
|
23
|
+
bool isLocked;
|
24
|
+
Timestamp createdAt;
|
25
|
+
Timestamp updatedAt;
|
18
26
|
}
|
19
27
|
|
20
|
-
error
|
21
|
-
error
|
22
|
-
error
|
23
|
-
error
|
24
|
-
error
|
25
|
-
|
26
|
-
error
|
27
|
-
error
|
28
|
-
error
|
29
|
-
error
|
30
|
-
error
|
31
|
-
error
|
32
|
-
error
|
33
|
-
error ErrorRoleInvalidUpdate(RoleId roleId, bool isCustom);
|
34
|
-
error ErrorGrantNonexstentRole(RoleId roleId);
|
35
|
-
error ErrorRevokeNonexstentRole(RoleId roleId);
|
36
|
-
error ErrorRenounceNonexstentRole(RoleId roleId);
|
28
|
+
error ErrorIAccessRoleIdInvalid(RoleId roleId);
|
29
|
+
error ErrorIAccessRoleIdTooBig(RoleId roleId);
|
30
|
+
error ErrorIAccessRoleIdTooSmall(RoleId roleId);
|
31
|
+
error ErrorIAccessRoleIdAlreadyExists(RoleId roleId, ShortString name);
|
32
|
+
error ErrorIAccessRoleIdNotActive(RoleId roleId);
|
33
|
+
error ErrorIAccessRoleNameEmpty(RoleId roleId);
|
34
|
+
error ErrorIAccessRoleNameNotUnique(RoleId roleId, ShortString name);
|
35
|
+
error ErrorIAccessRoleInvalidUpdate(RoleId roleId, bool isCustom);
|
36
|
+
error ErrorIAccessRoleIsCustomIsImmutable(RoleId roleId, bool isCustom, bool isCustomExisting);
|
37
|
+
error ErrorIAccessSetLockedForNonexstentRole(RoleId roleId);
|
38
|
+
error ErrorIAccessGrantNonexstentRole(RoleId roleId);
|
39
|
+
error ErrorIAccessRevokeNonexstentRole(RoleId roleId);
|
40
|
+
error ErrorIAccessRenounceNonexstentRole(RoleId roleId);
|
37
41
|
|
42
|
+
error ErrorIAccessTargetAddressZero();
|
43
|
+
error ErrorIAccessTargetAlreadyExists(address target, ShortString name);
|
44
|
+
error ErrorIAccessTargetNameEmpty(address target);
|
45
|
+
error ErrorIAccessTargetNameExists(address target, address existingTarget, ShortString name);
|
46
|
+
error ErrorIAccessSetLockedForNonexstentTarget(address target);
|
47
|
+
error ErrorIAccessTargetLocked(address target);
|
38
48
|
}
|
@@ -5,7 +5,6 @@ import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IER
|
|
5
5
|
|
6
6
|
import {Fee} from "../../types/Fee.sol";
|
7
7
|
import {NftId} from "../../types/NftId.sol";
|
8
|
-
import {LibNftIdSet} from "../../types/NftIdSet.sol";
|
9
8
|
import {UFixed} from "../../types/UFixed.sol";
|
10
9
|
import {TokenHandler} from "../../shared/TokenHandler.sol";
|
11
10
|
|
@@ -21,6 +20,7 @@ interface ISetup {
|
|
21
20
|
Fee poolFee; // pool fee on net premium
|
22
21
|
Fee stakingFee; // pool fee on staked capital from investor
|
23
22
|
Fee performanceFee; // pool fee on profits from capital investors
|
23
|
+
bool isIntercepting; // intercepts nft transfers (for products)
|
24
24
|
address wallet;
|
25
25
|
}
|
26
26
|
|
@@ -40,6 +40,7 @@ interface ISetup {
|
|
40
40
|
Fee stakingFee; // pool fee on staked capital from investor
|
41
41
|
Fee performanceFee; // pool fee on profits from capital investors
|
42
42
|
bool isIntercepting; // intercepts nft transfers (for bundles)
|
43
|
+
bool isConfirmingApplication; // confirms applications before they are underwritten
|
43
44
|
address wallet;
|
44
45
|
}
|
45
46
|
}
|
@@ -0,0 +1,294 @@
|
|
1
|
+
// SPDX-License-Identifier: Apache-2.0
|
2
|
+
pragma solidity ^0.8.19;
|
3
|
+
|
4
|
+
import {Pool} from "../../components/Pool.sol";
|
5
|
+
import {IRegistry} from "../../registry/IRegistry.sol";
|
6
|
+
import {IInstance} from "../../instance/IInstance.sol";
|
7
|
+
import {IBundle} from "../../instance/module/IBundle.sol";
|
8
|
+
import {TokenHandler} from "../../instance/module/ITreasury.sol";
|
9
|
+
import {ISetup} from "../module/ISetup.sol";
|
10
|
+
import {IPolicy} from "../module/IPolicy.sol";
|
11
|
+
|
12
|
+
import {IVersionable} from "../../shared/IVersionable.sol";
|
13
|
+
import {Versionable} from "../../shared/Versionable.sol";
|
14
|
+
import {INftOwnable} from "../../shared/INftOwnable.sol";
|
15
|
+
|
16
|
+
import {NftId, NftIdLib, zeroNftId} from "../../types/NftId.sol";
|
17
|
+
import {ObjectType, POOL, BUNDLE} from "../../types/ObjectType.sol";
|
18
|
+
import {POOL_OWNER_ROLE, RoleId} from "../../types/RoleId.sol";
|
19
|
+
import {Fee, FeeLib} from "../../types/Fee.sol";
|
20
|
+
import {Version, VersionLib} from "../../types/Version.sol";
|
21
|
+
import {KEEP_STATE, StateId} from "../../types/StateId.sol";
|
22
|
+
import {TimestampLib, zeroTimestamp} from "../../types/Timestamp.sol";
|
23
|
+
|
24
|
+
import {IService} from "../../shared/IService.sol";
|
25
|
+
import {Service} from "../../shared/Service.sol";
|
26
|
+
import {BundleManager} from "../BundleManager.sol";
|
27
|
+
import {ComponentServiceBase} from "../base/ComponentServiceBase.sol";
|
28
|
+
import {IBundleService} from "./IBundleService.sol";
|
29
|
+
import {IRegistryService} from "../../registry/IRegistryService.sol";
|
30
|
+
import {InstanceService} from "../InstanceService.sol";
|
31
|
+
import {InstanceReader} from "../InstanceReader.sol";
|
32
|
+
import {IBaseComponent} from "../../components/IBaseComponent.sol";
|
33
|
+
|
34
|
+
string constant BUNDLE_SERVICE_NAME = "BundleService";
|
35
|
+
|
36
|
+
contract BundleService is
|
37
|
+
ComponentServiceBase,
|
38
|
+
IBundleService
|
39
|
+
{
|
40
|
+
using NftIdLib for NftId;
|
41
|
+
|
42
|
+
string public constant NAME = "BundleService";
|
43
|
+
|
44
|
+
address internal _registryAddress;
|
45
|
+
|
46
|
+
function _initialize(
|
47
|
+
address owner,
|
48
|
+
bytes memory data
|
49
|
+
)
|
50
|
+
internal
|
51
|
+
initializer
|
52
|
+
virtual override
|
53
|
+
{
|
54
|
+
address registryAddress;
|
55
|
+
address initialOwner;
|
56
|
+
(registryAddress, initialOwner) = abi.decode(data, (address, address));
|
57
|
+
// TODO while PoolService is not deployed in PoolServiceManager constructor
|
58
|
+
// owner is PoolServiceManager deployer
|
59
|
+
_initializeService(registryAddress, owner);
|
60
|
+
|
61
|
+
_registerInterface(type(IBundleService).interfaceId);
|
62
|
+
}
|
63
|
+
|
64
|
+
function getDomain() public pure override(Service, IService) returns(ObjectType) {
|
65
|
+
return BUNDLE();
|
66
|
+
}
|
67
|
+
|
68
|
+
function createBundle(
|
69
|
+
address owner,
|
70
|
+
Fee memory fee,
|
71
|
+
uint256 stakingAmount,
|
72
|
+
uint256 lifetime,
|
73
|
+
bytes calldata filter
|
74
|
+
)
|
75
|
+
external
|
76
|
+
override
|
77
|
+
returns(NftId bundleNftId)
|
78
|
+
{
|
79
|
+
(IRegistry.ObjectInfo memory info, IInstance instance) = _getAndVerifyComponentInfoAndInstance(POOL());
|
80
|
+
InstanceReader instanceReader = instance.getInstanceReader();
|
81
|
+
NftId poolNftId = info.nftId;
|
82
|
+
|
83
|
+
IBundle.BundleInfo memory bundleInfo = IBundle.BundleInfo(
|
84
|
+
poolNftId,
|
85
|
+
fee,
|
86
|
+
filter,
|
87
|
+
stakingAmount,
|
88
|
+
0,
|
89
|
+
stakingAmount,
|
90
|
+
lifetime,
|
91
|
+
zeroTimestamp(),
|
92
|
+
zeroTimestamp()
|
93
|
+
);
|
94
|
+
|
95
|
+
// register bundle with registry
|
96
|
+
bundleNftId = getRegistryService().registerBundle(
|
97
|
+
IRegistry.ObjectInfo(
|
98
|
+
zeroNftId(),
|
99
|
+
poolNftId,
|
100
|
+
BUNDLE(),
|
101
|
+
false, // intercepting property for bundles is defined on pool
|
102
|
+
address(0),
|
103
|
+
owner,
|
104
|
+
abi.encode(bundleInfo)
|
105
|
+
)
|
106
|
+
);
|
107
|
+
|
108
|
+
// create bundle info in instance
|
109
|
+
instance.createBundle(bundleNftId, bundleInfo);
|
110
|
+
|
111
|
+
BundleManager bundleManager = instance.getBundleManager();
|
112
|
+
bundleManager.add(bundleNftId);
|
113
|
+
|
114
|
+
_processStakingByTreasury(
|
115
|
+
instanceReader,
|
116
|
+
poolNftId,
|
117
|
+
bundleNftId,
|
118
|
+
stakingAmount);
|
119
|
+
|
120
|
+
// TODO add logging
|
121
|
+
}
|
122
|
+
|
123
|
+
function setBundleFee(
|
124
|
+
NftId bundleNftId,
|
125
|
+
Fee memory fee
|
126
|
+
)
|
127
|
+
external
|
128
|
+
override
|
129
|
+
{
|
130
|
+
(IRegistry.ObjectInfo memory info , IInstance instance) = _getAndVerifyComponentInfoAndInstance(POOL());
|
131
|
+
InstanceReader instanceReader = instance.getInstanceReader();
|
132
|
+
NftId poolNftId = info.nftId;
|
133
|
+
|
134
|
+
IBundle.BundleInfo memory bundleInfo = instanceReader.getBundleInfo(bundleNftId);
|
135
|
+
require(bundleInfo.poolNftId.gtz(), "ERROR:PLS-010:BUNDLE_UNKNOWN");
|
136
|
+
require(poolNftId == bundleInfo.poolNftId, "ERROR:PLS-011:BUNDLE_POOL_MISMATCH");
|
137
|
+
|
138
|
+
bundleInfo.fee = fee;
|
139
|
+
|
140
|
+
instance.updateBundle(bundleNftId, bundleInfo, KEEP_STATE());
|
141
|
+
}
|
142
|
+
|
143
|
+
function updateBundle(NftId instanceNftId, NftId bundleNftId, IBundle.BundleInfo memory bundleInfo, StateId state)
|
144
|
+
external
|
145
|
+
onlyService
|
146
|
+
{
|
147
|
+
IRegistry.ObjectInfo memory instanceInfo = getRegistry().getObjectInfo(instanceNftId);
|
148
|
+
IInstance instance = IInstance(instanceInfo.objectAddress);
|
149
|
+
instance.updateBundle(bundleNftId, bundleInfo, state);
|
150
|
+
}
|
151
|
+
|
152
|
+
function lockBundle(NftId bundleNftId)
|
153
|
+
external
|
154
|
+
{
|
155
|
+
(, IInstance instance) = _getAndVerifyComponentInfoAndInstance(POOL());
|
156
|
+
BundleManager bundleManager = instance.getBundleManager();
|
157
|
+
bundleManager.lock(bundleNftId);
|
158
|
+
}
|
159
|
+
|
160
|
+
function unlockBundle(NftId bundleNftId)
|
161
|
+
external
|
162
|
+
{
|
163
|
+
(, IInstance instance) = _getAndVerifyComponentInfoAndInstance(POOL());
|
164
|
+
BundleManager bundleManager = instance.getBundleManager();
|
165
|
+
bundleManager.unlock(bundleNftId);
|
166
|
+
}
|
167
|
+
|
168
|
+
function underwritePolicy(IInstance instance,
|
169
|
+
NftId policyNftId,
|
170
|
+
NftId bundleNftId,
|
171
|
+
uint256 collateralAmount,
|
172
|
+
uint256 netPremiumAmount
|
173
|
+
)
|
174
|
+
external
|
175
|
+
onlyService
|
176
|
+
{
|
177
|
+
InstanceReader instanceReader = instance.getInstanceReader();
|
178
|
+
IBundle.BundleInfo memory bundleInfo = instanceReader.getBundleInfo(bundleNftId);
|
179
|
+
|
180
|
+
// lock collateral
|
181
|
+
bundleInfo.lockedAmount += collateralAmount;
|
182
|
+
bundleInfo.balanceAmount += netPremiumAmount;
|
183
|
+
|
184
|
+
instance.updateBundle(bundleNftId, bundleInfo, KEEP_STATE());
|
185
|
+
|
186
|
+
linkPolicy(instance, policyNftId);
|
187
|
+
}
|
188
|
+
|
189
|
+
function increaseBalance(IInstance instance,
|
190
|
+
NftId bundleNftId,
|
191
|
+
uint256 amount
|
192
|
+
)
|
193
|
+
external
|
194
|
+
onlyService
|
195
|
+
{
|
196
|
+
InstanceReader instanceReader = instance.getInstanceReader();
|
197
|
+
IBundle.BundleInfo memory bundleInfo = instanceReader.getBundleInfo(bundleNftId);
|
198
|
+
|
199
|
+
bundleInfo.balanceAmount += amount;
|
200
|
+
|
201
|
+
instance.updateBundle(bundleNftId, bundleInfo, KEEP_STATE());
|
202
|
+
}
|
203
|
+
|
204
|
+
function closePolicy(IInstance instance,
|
205
|
+
NftId policyNftId,
|
206
|
+
NftId bundleNftId,
|
207
|
+
uint256 collateralAmount
|
208
|
+
)
|
209
|
+
external
|
210
|
+
onlyService
|
211
|
+
{
|
212
|
+
InstanceReader instanceReader = instance.getInstanceReader();
|
213
|
+
IBundle.BundleInfo memory bundleInfo = instanceReader.getBundleInfo(bundleNftId);
|
214
|
+
|
215
|
+
// lock collateral
|
216
|
+
bundleInfo.lockedAmount -= collateralAmount;
|
217
|
+
|
218
|
+
instance.updateBundle(bundleNftId, bundleInfo, KEEP_STATE());
|
219
|
+
|
220
|
+
unlinkPolicy(instance, policyNftId);
|
221
|
+
}
|
222
|
+
|
223
|
+
/// @dev links policy to bundle
|
224
|
+
function linkPolicy(IInstance instance, NftId policyNftId)
|
225
|
+
internal
|
226
|
+
onlyService
|
227
|
+
{
|
228
|
+
InstanceReader instanceReader = instance.getInstanceReader();
|
229
|
+
IPolicy.PolicyInfo memory policyInfo = instanceReader.getPolicyInfo(policyNftId);
|
230
|
+
|
231
|
+
// ensure policy has not yet been activated
|
232
|
+
if (policyInfo.activatedAt.gtz()) {
|
233
|
+
revert BundleManager.ErrorBundleManagerErrorPolicyAlreadyActivated(policyNftId);
|
234
|
+
}
|
235
|
+
|
236
|
+
BundleManager bundleManager = instance.getBundleManager();
|
237
|
+
bundleManager.linkPolicy(policyNftId);
|
238
|
+
}
|
239
|
+
|
240
|
+
/// @dev unlinks policy from bundle
|
241
|
+
function unlinkPolicy(IInstance instance, NftId policyNftId)
|
242
|
+
internal
|
243
|
+
onlyService
|
244
|
+
{
|
245
|
+
InstanceReader instanceReader = instance.getInstanceReader();
|
246
|
+
IPolicy.PolicyInfo memory policyInfo = instanceReader.getPolicyInfo(policyNftId);
|
247
|
+
|
248
|
+
// ensure policy has no open claims
|
249
|
+
if (policyInfo.openClaimsCount > 0) {
|
250
|
+
revert BundleManager.ErrorBundleManagerPolicyWithOpenClaims(
|
251
|
+
policyNftId,
|
252
|
+
policyInfo.openClaimsCount);
|
253
|
+
}
|
254
|
+
|
255
|
+
// ensure policy is closeable
|
256
|
+
if ( TimestampLib.blockTimestamp() < policyInfo.expiredAt
|
257
|
+
&& policyInfo.payoutAmount < policyInfo.sumInsuredAmount)
|
258
|
+
{
|
259
|
+
revert BundleManager.ErrorBundleManagerPolicyNotCloseable(policyNftId);
|
260
|
+
}
|
261
|
+
|
262
|
+
BundleManager bundleManager = instance.getBundleManager();
|
263
|
+
bundleManager.unlinkPolicy(policyNftId);
|
264
|
+
}
|
265
|
+
|
266
|
+
function _processStakingByTreasury(
|
267
|
+
InstanceReader instanceReader,
|
268
|
+
NftId poolNftId,
|
269
|
+
NftId bundleNftId,
|
270
|
+
uint256 stakingAmount
|
271
|
+
)
|
272
|
+
internal
|
273
|
+
{
|
274
|
+
// process token transfer(s)
|
275
|
+
if(stakingAmount > 0) {
|
276
|
+
ISetup.PoolSetupInfo memory poolInfo = instanceReader.getPoolSetupInfo(poolNftId);
|
277
|
+
TokenHandler tokenHandler = poolInfo.tokenHandler;
|
278
|
+
address bundleOwner = getRegistry().ownerOf(bundleNftId);
|
279
|
+
Fee memory stakingFee = poolInfo.stakingFee;
|
280
|
+
|
281
|
+
tokenHandler.transfer(
|
282
|
+
bundleOwner,
|
283
|
+
poolInfo.wallet,
|
284
|
+
stakingAmount
|
285
|
+
);
|
286
|
+
|
287
|
+
|
288
|
+
if (! FeeLib.feeIsZero(stakingFee)) {
|
289
|
+
(uint256 stakingFeeAmount, uint256 netAmount) = FeeLib.calculateFee(stakingFee, stakingAmount);
|
290
|
+
// TODO: track staking fees in pool's state (issue #177)
|
291
|
+
}
|
292
|
+
}
|
293
|
+
}
|
294
|
+
}
|
@@ -0,0 +1,51 @@
|
|
1
|
+
// SPDX-License-Identifier: Apache-2.0
|
2
|
+
pragma solidity ^0.8.20;
|
3
|
+
|
4
|
+
import {IVersionable} from "../../shared/IVersionable.sol";
|
5
|
+
import {ProxyManager} from "../../shared/ProxyManager.sol";
|
6
|
+
import {BundleService} from "./BundleService.sol";
|
7
|
+
import {Registry} from "../../registry/Registry.sol";
|
8
|
+
import {RegistryService} from "../../registry/RegistryService.sol";
|
9
|
+
import {ObjectType, REGISTRY} from "../../types/ObjectType.sol";
|
10
|
+
|
11
|
+
contract BundleServiceManager is ProxyManager {
|
12
|
+
|
13
|
+
BundleService private _bundleService;
|
14
|
+
|
15
|
+
/// @dev initializes proxy manager with pool service implementation
|
16
|
+
constructor(
|
17
|
+
address registryAddress
|
18
|
+
)
|
19
|
+
ProxyManager()
|
20
|
+
{
|
21
|
+
BundleService bundleSrv = new BundleService();
|
22
|
+
bytes memory data = abi.encode(registryAddress, address(this));
|
23
|
+
IVersionable versionable = deploy(
|
24
|
+
address(bundleSrv),
|
25
|
+
data);
|
26
|
+
|
27
|
+
_bundleService = BundleService(address(versionable));
|
28
|
+
|
29
|
+
// TODO `this` must have a role or own nft to register service
|
30
|
+
//Registry registry = Registry(registryAddress);
|
31
|
+
//address registryServiceAddress = registry.getServiceAddress(REGISTRY(), _bundleService.getMajorVersion());
|
32
|
+
//RegistryService registryService = RegistryService(registryServiceAddress);
|
33
|
+
//registryService.registerService(_poolService);
|
34
|
+
|
35
|
+
// TODO no nft to link yet
|
36
|
+
// link ownership of instance service manager ot nft owner of instance service
|
37
|
+
//_linkToNftOwnable(
|
38
|
+
// address(registryAddress),
|
39
|
+
// address(_poolService));
|
40
|
+
}
|
41
|
+
|
42
|
+
//--- view functions ----------------------------------------------------//
|
43
|
+
function getBundleService()
|
44
|
+
external
|
45
|
+
view
|
46
|
+
returns (BundleService)
|
47
|
+
{
|
48
|
+
return _bundleService;
|
49
|
+
}
|
50
|
+
|
51
|
+
}
|