@etherisc/gif-next 0.0.2-cf68d0c-530 → 0.0.2-d10d6b3-916
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 +43 -0
- package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.dbg.json +1 -1
- package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +1 -1
- package/artifacts/contracts/components/Distribution.sol/Distribution.json +10 -62
- package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.json +0 -52
- 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/Pool.sol/Pool.dbg.json +1 -1
- package/artifacts/contracts/components/Pool.sol/Pool.json +42 -19
- package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
- package/artifacts/contracts/components/Product.sol/Product.json +18 -64
- 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/AccessManagedSimple.sol/AccessManagedSimple.dbg.json +1 -1
- package/artifacts/contracts/instance/AccessManagerSimple.sol/AccessManagerSimple.dbg.json +1 -1
- package/artifacts/contracts/instance/BundleManager.sol/BundleManager.dbg.json +4 -0
- package/artifacts/contracts/instance/BundleManager.sol/BundleManager.json +775 -0
- package/artifacts/contracts/instance/Cloneable.sol/Cloneable.dbg.json +4 -0
- package/artifacts/contracts/instance/Cloneable.sol/Cloneable.json +185 -0
- package/artifacts/contracts/instance/IAccessManagerSimple.sol/IAccessManagerSimple.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstance.sol/IInstance.json +1347 -93
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +5 -0
- package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
- package/artifacts/contracts/instance/Instance.sol/Instance.json +176 -84
- package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +2 -2
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +177 -38
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +193 -50
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +70 -26
- package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.dbg.json +4 -0
- package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.json +272 -0
- package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.dbg.json +1 -1
- package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.json +59 -0
- package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.dbg.json +1 -1
- 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/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/ComponentOwnerService.sol/ComponentOwnerService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.json +16 -16
- package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +100 -25
- package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.json +30 -14
- package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +167 -0
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +40 -31
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +1049 -0
- package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.json +464 -0
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +1147 -0
- package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.json +488 -0
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +2 -110
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +94 -0
- 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 +35 -146
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +76 -20
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +26 -34
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +12 -12
- 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/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/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 +4 -4
- 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 +9 -9
- 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/Distribution.sol +12 -15
- package/contracts/components/IDistributionComponent.sol +0 -2
- package/contracts/components/IPoolComponent.sol +5 -1
- package/contracts/components/Pool.sol +35 -26
- package/contracts/components/Product.sol +33 -41
- package/contracts/instance/BundleManager.sol +129 -0
- package/contracts/instance/Cloneable.sol +46 -0
- package/contracts/instance/IInstance.sol +30 -7
- package/contracts/instance/IInstanceService.sol +3 -1
- package/contracts/instance/Instance.sol +26 -15
- package/contracts/instance/InstanceReader.sol +26 -1
- package/contracts/instance/InstanceService.sol +90 -16
- package/contracts/instance/InstanceServiceManager.sol +6 -5
- package/contracts/instance/ObjectManager.sol +95 -0
- package/contracts/instance/base/ComponentServiceBase.sol +96 -1
- package/contracts/instance/module/IBundle.sol +1 -0
- package/contracts/instance/module/ISetup.sol +3 -0
- package/contracts/instance/service/DistributionService.sol +12 -20
- package/contracts/instance/service/DistributionServiceManager.sol +6 -5
- package/contracts/instance/service/IPoolService.sol +16 -2
- package/contracts/instance/service/IProductService.sol +6 -3
- package/contracts/instance/service/PoolService.sol +287 -0
- package/contracts/instance/service/PoolServiceManager.sol +54 -0
- package/contracts/instance/service/ProductService.sol +570 -0
- package/contracts/instance/service/ProductServiceManager.sol +54 -0
- package/contracts/registry/IRegistry.sol +5 -18
- package/contracts/registry/IRegistryService.sol +28 -11
- package/contracts/registry/Registry.sol +4 -45
- package/contracts/registry/RegistryService.sol +30 -71
- package/contracts/shared/NftOwnable.sol +2 -4
- package/contracts/shared/Service.sol +1 -0
- package/contracts/types/NftIdSet.sol +26 -24
- package/contracts/types/RoleId.sol +2 -0
- package/package.json +1 -1
@@ -7,14 +7,16 @@ import {DistributorType} from "../types/DistributorType.sol";
|
|
7
7
|
import {Fee, FeeLib} from "../types/Fee.sol";
|
8
8
|
import {Key32} from "../types/Key32.sol";
|
9
9
|
import {NftId} from "../types/NftId.sol";
|
10
|
-
import {ObjectType, DISTRIBUTOR, DISTRIBUTION, INSTANCE, PRODUCT, POLICY, POOL, TREASURY} from "../types/ObjectType.sol";
|
10
|
+
import {ObjectType, DISTRIBUTOR, DISTRIBUTION, INSTANCE, PRODUCT, POLICY, POOL, TREASURY, BUNDLE} from "../types/ObjectType.sol";
|
11
11
|
import {ReferralId, ReferralStatus, ReferralLib, REFERRAL_OK, REFERRAL_ERROR_UNKNOWN, REFERRAL_ERROR_EXPIRED, REFERRAL_ERROR_EXHAUSTED} from "../types/Referral.sol";
|
12
12
|
import {Registerable} from "../shared/Registerable.sol";
|
13
13
|
import {RiskId} from "../types/RiskId.sol";
|
14
14
|
import {UFixed, MathLib, UFixedLib} from "../types/UFixed.sol";
|
15
15
|
import {Version} from "../types/Version.sol";
|
16
|
+
import {StateId} from "../types/StateId.sol";
|
16
17
|
|
17
18
|
import {IRegistry} from "../registry/IRegistry.sol";
|
19
|
+
import {IBundle} from "../instance/module/IBundle.sol";
|
18
20
|
import {IDistribution} from "../instance/module/IDistribution.sol";
|
19
21
|
import {IInstance} from "./IInstance.sol";
|
20
22
|
import {IKeyValueStore} from "../instance/base/IKeyValueStore.sol";
|
@@ -80,6 +82,14 @@ contract InstanceReader {
|
|
80
82
|
}
|
81
83
|
}
|
82
84
|
|
85
|
+
function getPolicyState(NftId policyNftId)
|
86
|
+
public
|
87
|
+
view
|
88
|
+
returns (StateId state)
|
89
|
+
{
|
90
|
+
return _instance.getState(toPolicyKey(policyNftId));
|
91
|
+
}
|
92
|
+
|
83
93
|
function getRiskInfo(RiskId riskId)
|
84
94
|
public
|
85
95
|
view
|
@@ -114,6 +124,17 @@ contract InstanceReader {
|
|
114
124
|
return abi.decode(data, (ITreasury.TreasuryInfo));
|
115
125
|
}
|
116
126
|
}
|
127
|
+
|
128
|
+
function getBundleInfo(NftId bundleNftId)
|
129
|
+
public
|
130
|
+
view
|
131
|
+
returns (IBundle.BundleInfo memory info)
|
132
|
+
{
|
133
|
+
bytes memory data = _store.getData(toBundleKey(bundleNftId));
|
134
|
+
if (data.length > 0) {
|
135
|
+
return abi.decode(data, (IBundle.BundleInfo));
|
136
|
+
}
|
137
|
+
}
|
117
138
|
|
118
139
|
function getDistributorTypeInfo(DistributorType distributorType)
|
119
140
|
public
|
@@ -259,6 +280,10 @@ contract InstanceReader {
|
|
259
280
|
return distributionNftId.toKey32(DISTRIBUTION());
|
260
281
|
}
|
261
282
|
|
283
|
+
function toBundleKey(NftId poolNftId) public pure returns (Key32) {
|
284
|
+
return poolNftId.toKey32(BUNDLE());
|
285
|
+
}
|
286
|
+
|
262
287
|
function toPoolKey(NftId poolNftId) public pure returns (Key32) {
|
263
288
|
return poolNftId.toKey32(POOL());
|
264
289
|
}
|
@@ -8,6 +8,7 @@ import {InstanceAccessManager} from "./InstanceAccessManager.sol";
|
|
8
8
|
import {Instance} from "./Instance.sol";
|
9
9
|
import {IInstanceService} from "./IInstanceService.sol";
|
10
10
|
import {InstanceReader} from "./InstanceReader.sol";
|
11
|
+
import {BundleManager} from "./BundleManager.sol";
|
11
12
|
import {IRegistry} from "../registry/IRegistry.sol";
|
12
13
|
import {Registry} from "../registry/Registry.sol";
|
13
14
|
import {RegistryService} from "../registry/RegistryService.sol";
|
@@ -15,8 +16,9 @@ import {Service} from "../../contracts/shared/Service.sol";
|
|
15
16
|
import {IService} from "../shared/IService.sol";
|
16
17
|
import {ContractDeployerLib} from "../shared/ContractDeployerLib.sol";
|
17
18
|
import {NftId, NftIdLib, zeroNftId} from "../../contracts/types/NftId.sol";
|
19
|
+
import {RoleId} from "../types/RoleId.sol";
|
18
20
|
import {VersionLib} from "../types/Version.sol";
|
19
|
-
import {ADMIN_ROLE, INSTANCE_SERVICE_ROLE, DISTRIBUTION_SERVICE_ROLE} from "../types/RoleId.sol";
|
21
|
+
import {ADMIN_ROLE, INSTANCE_SERVICE_ROLE, DISTRIBUTION_SERVICE_ROLE, POOL_SERVICE_ROLE, PRODUCT_SERVICE_ROLE} from "../types/RoleId.sol";
|
20
22
|
|
21
23
|
contract InstanceService is Service, IInstanceService {
|
22
24
|
|
@@ -24,6 +26,7 @@ contract InstanceService is Service, IInstanceService {
|
|
24
26
|
address internal _accessManagerMaster;
|
25
27
|
address internal _instanceMaster;
|
26
28
|
address internal _instanceReaderMaster;
|
29
|
+
address internal _instanceBundleManagerMaster;
|
27
30
|
|
28
31
|
// TODO update to real hash when instance is stable
|
29
32
|
bytes32 public constant INSTANCE_CREATION_CODE_HASH = bytes32(0);
|
@@ -34,8 +37,9 @@ contract InstanceService is Service, IInstanceService {
|
|
34
37
|
returns (
|
35
38
|
AccessManagerSimple clonedAccessManager,
|
36
39
|
Instance clonedInstance,
|
37
|
-
NftId
|
38
|
-
InstanceReader clonedInstanceReader
|
40
|
+
NftId clonedInstanceNftId,
|
41
|
+
InstanceReader clonedInstanceReader,
|
42
|
+
BundleManager clonedBundleManager
|
39
43
|
)
|
40
44
|
{
|
41
45
|
address instanceOwner = msg.sender;
|
@@ -44,32 +48,40 @@ contract InstanceService is Service, IInstanceService {
|
|
44
48
|
address registryServiceAddress = registry.getServiceAddress("RegistryService", VersionLib.toVersion(3, 0, 0).toMajorPart());
|
45
49
|
RegistryService registryService = RegistryService(registryServiceAddress);
|
46
50
|
|
51
|
+
// initially set the authority of the access managar to this (being the instance service).
|
52
|
+
// This will allow the instance service to bootstrap the authorizations of the instance
|
53
|
+
// and then transfer the ownership of the access manager to the instance owner once everything is setup
|
47
54
|
clonedAccessManager = AccessManagerSimple(Clones.clone(_accessManagerMaster));
|
48
|
-
// initial as this
|
49
55
|
clonedAccessManager.initialize(address(this));
|
50
56
|
|
51
57
|
clonedInstance = Instance(Clones.clone(_instanceMaster));
|
52
58
|
clonedInstance.initialize(address(clonedAccessManager), _registryAddress, registryNftId, msg.sender);
|
53
59
|
( IRegistry.ObjectInfo memory info, ) = registryService.registerInstance(clonedInstance);
|
54
|
-
|
60
|
+
clonedInstanceNftId = info.nftId;
|
55
61
|
|
56
62
|
clonedInstanceReader = InstanceReader(Clones.clone(address(_instanceReaderMaster)));
|
57
|
-
clonedInstanceReader.initialize(_registryAddress,
|
63
|
+
clonedInstanceReader.initialize(_registryAddress, clonedInstanceNftId);
|
64
|
+
clonedInstance.setInstanceReader(clonedInstanceReader);
|
58
65
|
|
59
|
-
|
66
|
+
clonedBundleManager = BundleManager(Clones.clone(_instanceBundleManagerMaster));
|
67
|
+
clonedBundleManager.initialize(address(clonedAccessManager), _registryAddress, clonedInstanceNftId);
|
68
|
+
clonedInstance.setBundleManager(clonedBundleManager);
|
60
69
|
|
61
|
-
|
70
|
+
// TODO amend setters with instance specific , policy manager ...
|
71
|
+
|
72
|
+
_grantInitialAuthorizations(clonedAccessManager, clonedInstance, clonedBundleManager);
|
62
73
|
|
63
|
-
// switch instance ownership to instance owner
|
74
|
+
// to complete setup switch instance ownership to the instance owner
|
75
|
+
// TODO: use a role less powerful than admin, maybe INSTANCE_ADMIN (does not exist yet)
|
64
76
|
clonedAccessManager.grantRole(ADMIN_ROLE().toInt(), instanceOwner, 0);
|
65
77
|
clonedAccessManager.revokeRole(ADMIN_ROLE().toInt(), address(this));
|
66
78
|
|
67
|
-
emit LogInstanceCloned(address(clonedAccessManager), address(clonedInstance), address(clonedInstanceReader),
|
79
|
+
emit LogInstanceCloned(address(clonedAccessManager), address(clonedInstance), address(clonedInstanceReader), clonedInstanceNftId);
|
68
80
|
}
|
69
81
|
|
70
|
-
function _grantInitialAuthorizations(AccessManagerSimple clonedAccessManager, Instance clonedInstance) internal {
|
82
|
+
function _grantInitialAuthorizations(AccessManagerSimple clonedAccessManager, Instance clonedInstance, BundleManager clonedBundleManager) internal {
|
83
|
+
// configure authorization for distribution service on instance
|
71
84
|
address distributionServiceAddress = _registry.getServiceAddress("DistributionService", VersionLib.toVersion(3, 0, 0).toMajorPart());
|
72
|
-
|
73
85
|
clonedAccessManager.grantRole(DISTRIBUTION_SERVICE_ROLE().toInt(), distributionServiceAddress, 0);
|
74
86
|
bytes4[] memory instanceDistributionServiceSelectors = new bytes4[](2);
|
75
87
|
instanceDistributionServiceSelectors[0] = clonedInstance.createDistributionSetup.selector;
|
@@ -78,6 +90,48 @@ contract InstanceService is Service, IInstanceService {
|
|
78
90
|
address(clonedInstance),
|
79
91
|
instanceDistributionServiceSelectors,
|
80
92
|
DISTRIBUTION_SERVICE_ROLE().toInt());
|
93
|
+
|
94
|
+
// configure authorization for pool service on instance
|
95
|
+
address poolServiceAddress = _registry.getServiceAddress("PoolService", VersionLib.toVersion(3, 0, 0).toMajorPart());
|
96
|
+
clonedAccessManager.grantRole(POOL_SERVICE_ROLE().toInt(), address(poolServiceAddress), 0);
|
97
|
+
bytes4[] memory instancePoolServiceSelectors = new bytes4[](4);
|
98
|
+
instancePoolServiceSelectors[0] = clonedInstance.createPoolSetup.selector;
|
99
|
+
instancePoolServiceSelectors[1] = clonedInstance.updatePoolSetup.selector;
|
100
|
+
instancePoolServiceSelectors[2] = clonedInstance.createBundle.selector;
|
101
|
+
instancePoolServiceSelectors[3] = clonedInstance.updateBundle.selector;
|
102
|
+
clonedAccessManager.setTargetFunctionRole(
|
103
|
+
address(clonedInstance),
|
104
|
+
instancePoolServiceSelectors,
|
105
|
+
POOL_SERVICE_ROLE().toInt());
|
106
|
+
|
107
|
+
// configure authorization for pool service on bundle manager
|
108
|
+
bytes4[] memory bundleManagerPoolServiceSelectors = new bytes4[](5);
|
109
|
+
bundleManagerPoolServiceSelectors[0] = clonedBundleManager.linkPolicy.selector;
|
110
|
+
bundleManagerPoolServiceSelectors[1] = clonedBundleManager.unlinkPolicy.selector;
|
111
|
+
bundleManagerPoolServiceSelectors[2] = clonedBundleManager.add.selector;
|
112
|
+
bundleManagerPoolServiceSelectors[3] = clonedBundleManager.lock.selector;
|
113
|
+
bundleManagerPoolServiceSelectors[4] = clonedBundleManager.unlock.selector;
|
114
|
+
clonedAccessManager.setTargetFunctionRole(
|
115
|
+
address(clonedBundleManager),
|
116
|
+
bundleManagerPoolServiceSelectors,
|
117
|
+
POOL_SERVICE_ROLE().toInt());
|
118
|
+
|
119
|
+
// configure authorization for product service on instance
|
120
|
+
address productServiceAddress = _registry.getServiceAddress("ProductService", VersionLib.toVersion(3, 0, 0).toMajorPart());
|
121
|
+
clonedAccessManager.grantRole(PRODUCT_SERVICE_ROLE().toInt(), address(productServiceAddress), 0);
|
122
|
+
bytes4[] memory instanceProductServiceSelectors = new bytes4[](9);
|
123
|
+
instanceProductServiceSelectors[0] = clonedInstance.createProductSetup.selector;
|
124
|
+
instanceProductServiceSelectors[1] = clonedInstance.updateProductSetup.selector;
|
125
|
+
instanceProductServiceSelectors[2] = clonedInstance.createRisk.selector;
|
126
|
+
instanceProductServiceSelectors[3] = clonedInstance.updateRisk.selector;
|
127
|
+
instanceProductServiceSelectors[4] = clonedInstance.updateRiskState.selector;
|
128
|
+
instanceProductServiceSelectors[5] = clonedInstance.createPolicy.selector;
|
129
|
+
instanceProductServiceSelectors[6] = clonedInstance.updatePolicy.selector;
|
130
|
+
instanceProductServiceSelectors[7] = clonedInstance.updatePolicyState.selector;
|
131
|
+
clonedAccessManager.setTargetFunctionRole(
|
132
|
+
address(clonedInstance),
|
133
|
+
instanceProductServiceSelectors,
|
134
|
+
PRODUCT_SERVICE_ROLE().toInt());
|
81
135
|
}
|
82
136
|
|
83
137
|
function setAccessManagerMaster(address accessManagerMaster) external {
|
@@ -101,6 +155,13 @@ contract InstanceService is Service, IInstanceService {
|
|
101
155
|
_instanceReaderMaster = instanceReaderMaster;
|
102
156
|
}
|
103
157
|
|
158
|
+
function setBundleManagerMaster(address bundleManagerMaster) external {
|
159
|
+
require(
|
160
|
+
_instanceBundleManagerMaster == address(0),
|
161
|
+
"ERROR:CRD-004:BUNDLE_MANAGER_MASTER_ALREADY_SET");
|
162
|
+
_instanceBundleManagerMaster = bundleManagerMaster;
|
163
|
+
}
|
164
|
+
|
104
165
|
function getInstanceReaderMaster() external view returns (address) {
|
105
166
|
return _instanceReaderMaster;
|
106
167
|
}
|
@@ -113,6 +174,10 @@ contract InstanceService is Service, IInstanceService {
|
|
113
174
|
return _accessManagerMaster;
|
114
175
|
}
|
115
176
|
|
177
|
+
function getBundleManagerMaster() external view returns (address) {
|
178
|
+
return _instanceBundleManagerMaster;
|
179
|
+
}
|
180
|
+
|
116
181
|
// From IService
|
117
182
|
function getName() public pure override(IService, Service) returns(string memory) {
|
118
183
|
return NAME;
|
@@ -144,15 +209,24 @@ contract InstanceService is Service, IInstanceService {
|
|
144
209
|
|
145
210
|
address initialOwner = address(0);
|
146
211
|
(_registryAddress, initialOwner) = abi.decode(data, (address, address));
|
147
|
-
|
148
|
-
|
212
|
+
// TODO while InstanceService is not deployed in InstanceServiceManager constructor
|
213
|
+
// owner is InstanceServiceManager deployer
|
214
|
+
_initializeService(_registryAddress, owner);
|
149
215
|
|
150
216
|
_registerInterface(type(IService).interfaceId);
|
151
217
|
_registerInterface(type(IInstanceService).interfaceId);
|
152
218
|
}
|
153
219
|
|
154
|
-
function
|
155
|
-
|
220
|
+
function hasRole(address account, RoleId role, NftId instanceNftId) external view returns (bool) {
|
221
|
+
IRegistry.ObjectInfo memory instanceObjectInfo = getRegistry().getObjectInfo(instanceNftId);
|
222
|
+
address instanceAddress = instanceObjectInfo.objectAddress;
|
223
|
+
Instance instance = Instance(instanceAddress);
|
224
|
+
AccessManagerSimple accessManager = AccessManagerSimple(instance.authority());
|
225
|
+
(bool isMember, uint32 executionDelay) = accessManager.hasRole(role.toInt(), account);
|
226
|
+
if (executionDelay > 0) {
|
227
|
+
return false;
|
228
|
+
}
|
229
|
+
return isMember;
|
156
230
|
}
|
157
231
|
}
|
158
232
|
|
@@ -31,14 +31,15 @@ contract InstanceServiceManager is ProxyManager {
|
|
31
31
|
Registry registry = Registry(registryAddress);
|
32
32
|
address registryServiceAddress = registry.getServiceAddress("RegistryService", VersionLib.toVersion(3, 0, 0).toMajorPart());
|
33
33
|
RegistryService registryService = RegistryService(registryServiceAddress);
|
34
|
-
|
35
|
-
registryService.registerService(_instanceService);
|
34
|
+
// TODO this must have a role or own nft to register service
|
35
|
+
//registryService.registerService(_instanceService);
|
36
36
|
// RegistryService registryService = _instanceService.getRegistryService();
|
37
37
|
|
38
|
+
// TODO no nft to link yet
|
38
39
|
// link ownership of instance service manager ot nft owner of instance service
|
39
|
-
_linkToNftOwnable(
|
40
|
-
|
41
|
-
|
40
|
+
//_linkToNftOwnable(
|
41
|
+
// address(registryAddress),
|
42
|
+
// address(_instanceService));
|
42
43
|
|
43
44
|
// implies that after this constructor call only upgrade functionality is available
|
44
45
|
_isDeployed = true;
|
@@ -0,0 +1,95 @@
|
|
1
|
+
// SPDX-License-Identifier: Apache-2.0
|
2
|
+
pragma solidity ^0.8.20;
|
3
|
+
|
4
|
+
import {Cloneable} from "./Cloneable.sol";
|
5
|
+
|
6
|
+
import {IInstance} from "./IInstance.sol";
|
7
|
+
import {INSTANCE} from "../types/ObjectType.sol";
|
8
|
+
import {InstanceReader} from "./InstanceReader.sol";
|
9
|
+
import {IRegistry} from "../registry/IRegistry.sol";
|
10
|
+
import {LibNftIdSet} from "../types/NftIdSet.sol";
|
11
|
+
import {NftId} from "../types/NftId.sol";
|
12
|
+
|
13
|
+
contract ObjectManager is
|
14
|
+
Cloneable
|
15
|
+
{
|
16
|
+
|
17
|
+
event LogObjectManagerInitialized(NftId instanceNftId, address instanceReader);
|
18
|
+
|
19
|
+
error ErrorObjectManagerNftIdInvalid(NftId instanceNftId);
|
20
|
+
error ErrorObjectManagerAlreadyAdded(NftId componentNftId, NftId objectNftId);
|
21
|
+
|
22
|
+
mapping(NftId compnentNftId => LibNftIdSet.Set objects) internal _activeObjects;
|
23
|
+
mapping(NftId compnentNftId => LibNftIdSet.Set objects) internal _allObjects;
|
24
|
+
InstanceReader internal _instanceReader;
|
25
|
+
|
26
|
+
constructor() Cloneable() {
|
27
|
+
_instanceReader = InstanceReader(address(0));
|
28
|
+
}
|
29
|
+
|
30
|
+
/// @dev call to initialize MUST be made in the same transaction as cloning of the contract
|
31
|
+
function initialize(
|
32
|
+
address authority,
|
33
|
+
address registry,
|
34
|
+
NftId instanceNftId
|
35
|
+
)
|
36
|
+
external
|
37
|
+
{
|
38
|
+
initialize(authority, registry);
|
39
|
+
|
40
|
+
// check/handle instance nft id/instance reader
|
41
|
+
IRegistry.ObjectInfo memory instanceInfo = _registry.getObjectInfo(instanceNftId);
|
42
|
+
if (instanceInfo.objectType != INSTANCE()) {
|
43
|
+
revert ErrorObjectManagerNftIdInvalid(instanceNftId);
|
44
|
+
}
|
45
|
+
|
46
|
+
IInstance instance = IInstance(instanceInfo.objectAddress);
|
47
|
+
_instanceReader = instance.getInstanceReader();
|
48
|
+
|
49
|
+
emit LogObjectManagerInitialized(instanceNftId, address(_instanceReader));
|
50
|
+
}
|
51
|
+
|
52
|
+
function getInstanceReader() external view returns (InstanceReader) {
|
53
|
+
return _instanceReader;
|
54
|
+
}
|
55
|
+
|
56
|
+
function _add(NftId componentNftId, NftId objectNftId) internal {
|
57
|
+
LibNftIdSet.Set storage allSet = _allObjects[componentNftId];
|
58
|
+
LibNftIdSet.Set storage activeSet = _activeObjects[componentNftId];
|
59
|
+
|
60
|
+
LibNftIdSet.add(allSet, objectNftId);
|
61
|
+
LibNftIdSet.add(activeSet, objectNftId);
|
62
|
+
}
|
63
|
+
|
64
|
+
function _activate(NftId componentNftId, NftId objectNftId) internal {
|
65
|
+
LibNftIdSet.add(_activeObjects[componentNftId], objectNftId);
|
66
|
+
}
|
67
|
+
|
68
|
+
function _deactivate(NftId componentNftId, NftId objectNftId) internal {
|
69
|
+
LibNftIdSet.remove(_activeObjects[componentNftId], objectNftId);
|
70
|
+
}
|
71
|
+
|
72
|
+
function _objects(NftId componentNftId) internal view returns (uint256) {
|
73
|
+
return LibNftIdSet.size(_allObjects[componentNftId]);
|
74
|
+
}
|
75
|
+
|
76
|
+
function _contains(NftId componentNftId, NftId objectNftId) internal view returns (bool) {
|
77
|
+
return LibNftIdSet.contains(_allObjects[componentNftId], objectNftId);
|
78
|
+
}
|
79
|
+
|
80
|
+
function _getObject(NftId componentNftId, uint256 idx) internal view returns (NftId) {
|
81
|
+
return LibNftIdSet.getElementAt(_allObjects[componentNftId], idx);
|
82
|
+
}
|
83
|
+
|
84
|
+
function _activeObjs(NftId componentNftId) internal view returns (uint256) {
|
85
|
+
return LibNftIdSet.size(_activeObjects[componentNftId]);
|
86
|
+
}
|
87
|
+
|
88
|
+
function _isActive(NftId componentNftId, NftId objectNftId) internal view returns (bool) {
|
89
|
+
return LibNftIdSet.contains(_activeObjects[componentNftId], objectNftId);
|
90
|
+
}
|
91
|
+
|
92
|
+
function _getActiveObject(NftId componentNftId, uint256 idx) internal view returns (NftId) {
|
93
|
+
return LibNftIdSet.getElementAt(_activeObjects[componentNftId], idx);
|
94
|
+
}
|
95
|
+
}
|
@@ -4,14 +4,109 @@ pragma solidity ^0.8.19;
|
|
4
4
|
import {IRegistry} from "../../registry/IRegistry.sol";
|
5
5
|
import {IRegistryService} from "../../registry/IRegistryService.sol";
|
6
6
|
import {IInstance} from "../../instance/IInstance.sol";
|
7
|
-
import {ObjectType, INSTANCE, PRODUCT, POOL} from "../../types/ObjectType.sol";
|
7
|
+
import {ObjectType, INSTANCE, PRODUCT, POOL, DISTRIBUTION, ORACLE} from "../../types/ObjectType.sol";
|
8
8
|
import {NftId, NftIdLib} from "../../types/NftId.sol";
|
9
|
+
import {RoleId, PRODUCT_OWNER_ROLE, POOL_OWNER_ROLE, DISTRIBUTION_OWNER_ROLE, ORACLE_OWNER_ROLE} from "../../types/RoleId.sol";
|
9
10
|
|
11
|
+
import {BaseComponent} from "../../components/BaseComponent.sol";
|
12
|
+
import {Product} from "../../components/Product.sol";
|
13
|
+
import {INftOwnable} from "../../shared/INftOwnable.sol";
|
10
14
|
import {Service} from "../../shared/Service.sol";
|
15
|
+
import {InstanceService} from "../InstanceService.sol";
|
11
16
|
import {Version, VersionPart, VersionLib} from "../../types/Version.sol";
|
12
17
|
|
13
18
|
abstract contract ComponentServiceBase is Service {
|
14
19
|
|
20
|
+
error ExpectedRoleMissing(RoleId expected, address caller);
|
21
|
+
error ComponentTypeInvalid(ObjectType componentType);
|
22
|
+
|
23
|
+
mapping (ObjectType => RoleId) internal _objectTypeToExpectedRole;
|
24
|
+
|
25
|
+
/// @dev modifier to check if caller has a role on the instance the component is registered in
|
26
|
+
modifier onlyComponentOwnerRole(address componentAddress) {
|
27
|
+
BaseComponent component = BaseComponent(componentAddress);
|
28
|
+
ObjectType objectType = _getObjectType(component);
|
29
|
+
RoleId expectedRole = _objectTypeToExpectedRole[objectType];
|
30
|
+
|
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
|
+
|
39
|
+
/// @dev modifier to check if caller is a registered service
|
40
|
+
modifier onlyService() {
|
41
|
+
address caller = msg.sender;
|
42
|
+
require(getRegistry().isRegisteredService(caller), "ERROR_NOT_SERVICE");
|
43
|
+
_;
|
44
|
+
}
|
45
|
+
|
46
|
+
function _initializeService(
|
47
|
+
address registry,
|
48
|
+
address initialOwner
|
49
|
+
)
|
50
|
+
internal
|
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();
|
58
|
+
}
|
59
|
+
|
60
|
+
function getInstanceService() public view returns (InstanceService) {
|
61
|
+
return InstanceService(getRegistry().getServiceAddress("InstanceService", getMajorVersion()));
|
62
|
+
}
|
63
|
+
|
64
|
+
function register(address componentAddress)
|
65
|
+
external
|
66
|
+
onlyComponentOwnerRole(componentAddress)
|
67
|
+
returns (NftId componentNftId)
|
68
|
+
{
|
69
|
+
address componentOwner = msg.sender;
|
70
|
+
BaseComponent component = BaseComponent(componentAddress);
|
71
|
+
ObjectType objectType = _getObjectType(component);
|
72
|
+
IRegistryService registryService = getRegistryService();
|
73
|
+
|
74
|
+
IRegistry.ObjectInfo memory objInfo;
|
75
|
+
bytes memory initialObjData;
|
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);
|
88
|
+
}
|
89
|
+
|
90
|
+
componentNftId = objInfo.nftId;
|
91
|
+
{
|
92
|
+
IInstance instance = _getInstance(objInfo);
|
93
|
+
_finalizeComponentRegistration(componentNftId, initialObjData, instance);
|
94
|
+
}
|
95
|
+
}
|
96
|
+
|
97
|
+
function _finalizeComponentRegistration(NftId componentNftId, bytes memory initialObjData, IInstance instance) internal virtual;
|
98
|
+
|
99
|
+
function _getObjectType(BaseComponent component) internal view returns (ObjectType) {
|
100
|
+
(IRegistry.ObjectInfo memory compInitialInfo, ) = component.getInitialInfo();
|
101
|
+
return compInitialInfo.objectType;
|
102
|
+
}
|
103
|
+
|
104
|
+
function _getInstance(IRegistry.ObjectInfo memory compObjInfo) internal view returns (IInstance) {
|
105
|
+
IRegistry registry = getRegistry();
|
106
|
+
IRegistry.ObjectInfo memory instanceInfo = registry.getObjectInfo(compObjInfo.parentNftId);
|
107
|
+
return IInstance(instanceInfo.objectAddress);
|
108
|
+
}
|
109
|
+
|
15
110
|
function _getAndVerifyComponentInfoAndInstance(
|
16
111
|
ObjectType objectType
|
17
112
|
)
|
@@ -13,6 +13,7 @@ interface IBundle {
|
|
13
13
|
uint256 capitalAmount; // net investment capital + net premiums - payouts
|
14
14
|
uint256 lockedAmount; // capital amount linked to collateralizaion of non-closed policies (<= balance)
|
15
15
|
uint256 balanceAmount; // total amount of funds: capitalAmount + fees (balance >= captial)
|
16
|
+
uint256 lifetime;
|
16
17
|
Timestamp expiredAt; // no new policies
|
17
18
|
Timestamp closedAt; // no open policies, locked amount = 0
|
18
19
|
}
|
@@ -20,6 +20,8 @@ interface ISetup {
|
|
20
20
|
Fee poolFee; // pool fee on net premium
|
21
21
|
Fee stakingFee; // pool fee on staked capital from investor
|
22
22
|
Fee performanceFee; // pool fee on profits from capital investors
|
23
|
+
bool isIntercepting; // intercepts nft transfers (for products)
|
24
|
+
address wallet;
|
23
25
|
}
|
24
26
|
|
25
27
|
struct DistributionSetupInfo {
|
@@ -38,6 +40,7 @@ interface ISetup {
|
|
38
40
|
Fee stakingFee; // pool fee on staked capital from investor
|
39
41
|
Fee performanceFee; // pool fee on profits from capital investors
|
40
42
|
bool isIntercepting; // intercepts nft transfers (for bundles)
|
43
|
+
bool isConfirmingApplication; // confirms applications before they are underwritten
|
41
44
|
address wallet;
|
42
45
|
}
|
43
46
|
}
|
@@ -10,6 +10,7 @@ import {ITreasury} from "../../instance/module/ITreasury.sol";
|
|
10
10
|
|
11
11
|
import {NftId, NftIdLib} from "../../types/NftId.sol";
|
12
12
|
import {Fee} from "../../types/Fee.sol";
|
13
|
+
import {DISTRIBUTION_OWNER_ROLE} from "../../types/RoleId.sol";
|
13
14
|
import {KEEP_STATE} from "../../types/StateId.sol";
|
14
15
|
import {DISTRIBUTION} from "../../types/ObjectType.sol";
|
15
16
|
import {Version, VersionLib} from "../../types/Version.sol";
|
@@ -22,6 +23,9 @@ import {Service} from "../../shared/Service.sol";
|
|
22
23
|
import {ComponentServiceBase} from "../base/ComponentServiceBase.sol";
|
23
24
|
import {IDistributionService} from "./IDistributionService.sol";
|
24
25
|
import {Distribution} from "../../components/Distribution.sol";
|
26
|
+
import {InstanceService} from "../InstanceService.sol";
|
27
|
+
import {Instance} from "../Instance.sol";
|
28
|
+
import {INftOwnable} from "../../shared/INftOwnable.sol";
|
25
29
|
|
26
30
|
string constant DISTRIBUTION_SERVICE_NAME = "DistributionService";
|
27
31
|
|
@@ -45,10 +49,9 @@ contract DistributionService is
|
|
45
49
|
{
|
46
50
|
address initialOwner = address(0);
|
47
51
|
(_registryAddress, initialOwner) = abi.decode(data, (address, address));
|
48
|
-
|
49
|
-
//
|
50
|
-
|
51
|
-
_initializeService(_registryAddress, initialOwner);
|
52
|
+
// TODO while DistributionService is not deployed in DistributionServiceManager constructor
|
53
|
+
// owner is DistributionServiceManager deployer
|
54
|
+
_initializeService(_registryAddress, owner);
|
52
55
|
|
53
56
|
_registerInterface(type(IService).interfaceId);
|
54
57
|
_registerInterface(type(IDistributionService).interfaceId);
|
@@ -59,23 +62,12 @@ contract DistributionService is
|
|
59
62
|
return NAME;
|
60
63
|
}
|
61
64
|
|
62
|
-
function
|
63
|
-
|
64
|
-
|
65
|
-
|
66
|
-
{
|
67
|
-
// TODO validate permission of componentOwner
|
68
|
-
Distribution distribution = Distribution(distributionComponentAddress);
|
69
|
-
IRegistryService registryService = getRegistryService();
|
70
|
-
(IRegistry.ObjectInfo memory distributionObjInfo, ) = registryService.registerDistribution(
|
71
|
-
distribution,
|
72
|
-
componentOwner
|
65
|
+
function _finalizeComponentRegistration(NftId componentNftId, bytes memory initialObjData, IInstance instance) internal override {
|
66
|
+
ISetup.DistributionSetupInfo memory initialSetup = abi.decode(
|
67
|
+
initialObjData,
|
68
|
+
(ISetup.DistributionSetupInfo)
|
73
69
|
);
|
74
|
-
|
75
|
-
|
76
|
-
ISetup.DistributionSetupInfo memory initialSetup = distribution.getInitialSetupInfo();
|
77
|
-
IInstance instance = distribution.getInstance();
|
78
|
-
instance.createDistributionSetup(distributionNftId, initialSetup);
|
70
|
+
instance.createDistributionSetup(componentNftId, initialSetup);
|
79
71
|
}
|
80
72
|
|
81
73
|
function setFees(
|
@@ -29,13 +29,14 @@ contract DistributionServiceManager is ProxyManager {
|
|
29
29
|
Registry registry = Registry(registryAddress);
|
30
30
|
address registryServiceAddress = registry.getServiceAddress("RegistryService", VersionLib.toVersion(3, 0, 0).toMajorPart());
|
31
31
|
RegistryService registryService = RegistryService(registryServiceAddress);
|
32
|
+
// TODO this must have a role or own nft to register service
|
33
|
+
//registryService.registerService(_distributionService);
|
32
34
|
|
33
|
-
|
34
|
-
|
35
|
+
// TODO no nft to link yet
|
35
36
|
// link ownership of instance service manager ot nft owner of instance service
|
36
|
-
_linkToNftOwnable(
|
37
|
-
|
38
|
-
|
37
|
+
//_linkToNftOwnable(
|
38
|
+
// address(registryAddress),
|
39
|
+
// address(_distributionService));
|
39
40
|
|
40
41
|
// implies that after this constructor call only upgrade functionality is available
|
41
42
|
_isDeployed = true;
|
@@ -3,9 +3,14 @@ pragma solidity ^0.8.19;
|
|
3
3
|
|
4
4
|
import {NftId} from "../../types/NftId.sol";
|
5
5
|
import {Fee} from "../../types/Fee.sol";
|
6
|
+
import {StateId} from "../../types/StateId.sol";
|
6
7
|
import {IService} from "../../shared/IService.sol";
|
8
|
+
import {IBundle} from "../module/IBundle.sol";
|
9
|
+
import {IInstance} from "../../instance/IInstance.sol";
|
7
10
|
|
8
11
|
interface IPoolService is IService {
|
12
|
+
error ErrorIPoolServiceInsufficientAllowance(address bundleOwner, address tokenHandlerAddress, uint256 amount);
|
13
|
+
|
9
14
|
function setFees(
|
10
15
|
Fee memory poolFee,
|
11
16
|
Fee memory stakingFee,
|
@@ -25,13 +30,22 @@ interface IPoolService is IService {
|
|
25
30
|
Fee memory fee
|
26
31
|
) external;
|
27
32
|
|
33
|
+
function updateBundle(NftId instanceNftId, NftId bundleNftId, IBundle.BundleInfo memory bundleInfo, StateId state) external;
|
34
|
+
|
35
|
+
function underwritePolicy(IInstance instanceNftId,
|
36
|
+
NftId policyNftId,
|
37
|
+
NftId bundleNftId,
|
38
|
+
uint256 collateralAmount,
|
39
|
+
uint256 netPremium
|
40
|
+
) external;
|
41
|
+
|
28
42
|
// function fundBundle(NftId bundleNftId, uint256 amount) external returns(uint256 netAmount);
|
29
43
|
|
30
44
|
// function defundBundle(NftId bundleNftId, uint256 amount) external returns(uint256 netAmount);
|
31
45
|
|
32
|
-
|
46
|
+
function lockBundle(NftId bundleNftId) external;
|
33
47
|
|
34
|
-
|
48
|
+
function unlockBundle(NftId bundleNftId) external;
|
35
49
|
|
36
50
|
// function closeBundle(NftId bundleNftId) external;
|
37
51
|
}
|
@@ -13,6 +13,9 @@ import {UFixed} from "../../types/UFixed.sol";
|
|
13
13
|
import {Fee} from "../../types/Fee.sol";
|
14
14
|
|
15
15
|
interface IProductService is IService {
|
16
|
+
|
17
|
+
error ErrorIProductServiceInsufficientAllowance(address customer, address tokenHandlerAddress, uint256 amount);
|
18
|
+
|
16
19
|
function setFees(
|
17
20
|
Fee memory productFee,
|
18
21
|
Fee memory processingFee
|
@@ -24,15 +27,15 @@ interface IProductService is IService {
|
|
24
27
|
) external;
|
25
28
|
|
26
29
|
|
27
|
-
function
|
30
|
+
function updateRisk(
|
28
31
|
RiskId riskId,
|
29
|
-
|
32
|
+
bytes memory data
|
30
33
|
) external;
|
31
34
|
|
32
35
|
|
33
36
|
function updateRiskState(
|
34
37
|
RiskId riskId,
|
35
|
-
StateId
|
38
|
+
StateId newState
|
36
39
|
) external;
|
37
40
|
|
38
41
|
|