@etherisc/gif-next 0.0.2-dc7e4cb-141 → 0.0.2-de0a1d3-009
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 +58 -11
- package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.dbg.json +1 -1
- package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +4 -0
- package/artifacts/contracts/components/Distribution.sol/Distribution.json +405 -0
- package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +4 -0
- package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.json +340 -0
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.json +131 -0
- package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.json +109 -18
- package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
- package/artifacts/contracts/components/Pool.sol/Pool.json +194 -3
- package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
- package/artifacts/contracts/components/Product.sol/Product.json +160 -21
- 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/Dummy.sol/LifeCycleModule.json +2 -2
- 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/SM.sol/SM.json +2 -2
- package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.dbg.json +1 -1
- package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.json +2 -2
- 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/IInstance.sol/IInstance.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstance.sol/IInstance.json +709 -678
- package/artifacts/contracts/instance/IInstanceLinked.sol/IInstanceLinked.dbg.json +1 -1
- package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
- package/artifacts/contracts/instance/Instance.sol/Instance.json +916 -717
- package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.dbg.json +4 -0
- package/artifacts/contracts/instance/{InstanceBase.sol/InstanceBase.json → base/ComponentServiceBase.sol/ComponentServiceBase.json} +102 -28
- package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.dbg.json +4 -0
- package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.json +113 -0
- package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.dbg.json +4 -0
- package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.json +560 -0
- package/artifacts/contracts/instance/base/ILifecycle.sol/ILifecycle.dbg.json +4 -0
- package/artifacts/contracts/instance/{module/lifecycle/ILifecycle.sol/ILifecycleModule.json → base/ILifecycle.sol/ILifecycle.json} +10 -77
- package/artifacts/contracts/instance/base/IService.sol/IService.dbg.json +4 -0
- package/artifacts/contracts/instance/{service → base}/IService.sol/IService.json +58 -17
- package/artifacts/contracts/instance/base/InstanceBase.sol/InstanceBase.dbg.json +4 -0
- package/artifacts/contracts/instance/base/InstanceBase.sol/InstanceBase.json +463 -0
- package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.dbg.json +4 -0
- package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.json +710 -0
- package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json +4 -0
- package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.json +169 -0
- package/artifacts/contracts/instance/base/ModuleBase.sol/ModuleBase.dbg.json +4 -0
- package/artifacts/contracts/instance/{module/compensation/ICompensation.sol/ICompensation.json → base/ModuleBase.sol/ModuleBase.json} +2 -2
- package/artifacts/contracts/instance/base/ServiceBase.sol/ServiceBase.dbg.json +4 -0
- package/artifacts/contracts/instance/{service → base}/ServiceBase.sol/ServiceBase.json +88 -1
- package/artifacts/contracts/instance/module/access/Access.sol/AccessModule.dbg.json +1 -1
- package/artifacts/contracts/instance/module/access/IAccess.sol/IAccess.dbg.json +1 -1
- package/artifacts/contracts/instance/module/access/IAccess.sol/IAccessModule.dbg.json +1 -1
- package/artifacts/contracts/instance/module/bundle/BundleModule.sol/BundleModule.dbg.json +1 -1
- package/artifacts/contracts/instance/module/bundle/BundleModule.sol/BundleModule.json +71 -50
- package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundle.dbg.json +1 -1
- package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundleModule.dbg.json +1 -1
- package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundleModule.json +71 -50
- package/artifacts/contracts/instance/module/component/ComponentModule.sol/ComponentModule.dbg.json +1 -1
- package/artifacts/contracts/instance/module/component/ComponentModule.sol/ComponentModule.json +22 -93
- package/artifacts/contracts/instance/module/component/IComponent.sol/IComponent.dbg.json +1 -1
- package/artifacts/contracts/instance/module/component/IComponent.sol/IComponentModule.dbg.json +1 -1
- package/artifacts/contracts/instance/module/component/IComponent.sol/IComponentModule.json +22 -93
- package/artifacts/contracts/instance/module/distribution/DistributionModule.sol/DistributionModule.dbg.json +4 -0
- package/artifacts/contracts/instance/module/distribution/DistributionModule.sol/DistributionModule.json +10 -0
- package/artifacts/contracts/instance/module/distribution/IDistribution.sol/IDistribution.dbg.json +4 -0
- package/artifacts/contracts/instance/module/{compensation/ICompensation.sol/ICompensationModule.json → distribution/IDistribution.sol/IDistribution.json} +2 -2
- package/artifacts/contracts/instance/module/distribution/IDistribution.sol/IDistributionModule.dbg.json +4 -0
- package/artifacts/contracts/instance/module/distribution/IDistribution.sol/IDistributionModule.json +10 -0
- package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicy.dbg.json +1 -1
- package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicyModule.dbg.json +1 -1
- package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicyModule.json +61 -38
- package/artifacts/contracts/instance/module/policy/PolicyModule.sol/PolicyModule.dbg.json +1 -1
- package/artifacts/contracts/instance/module/policy/PolicyModule.sol/PolicyModule.json +61 -38
- package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPool.dbg.json +1 -1
- package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPoolModule.dbg.json +1 -1
- package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPoolModule.json +0 -5
- package/artifacts/contracts/instance/module/pool/PoolModule.sol/PoolModule.dbg.json +1 -1
- package/artifacts/contracts/instance/module/pool/PoolModule.sol/PoolModule.json +0 -5
- package/artifacts/contracts/instance/module/risk/IRisk.sol/IRisk.dbg.json +1 -1
- package/artifacts/contracts/instance/module/risk/IRisk.sol/IRiskModule.dbg.json +1 -1
- package/artifacts/contracts/instance/module/risk/IRisk.sol/IRiskModule.json +104 -1
- package/artifacts/contracts/instance/module/risk/RiskModule.sol/RiskModule.dbg.json +1 -1
- package/artifacts/contracts/instance/module/risk/RiskModule.sol/RiskModule.json +126 -5
- package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasury.dbg.json +1 -1
- package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasuryModule.dbg.json +1 -1
- package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasuryModule.json +209 -231
- package/artifacts/contracts/instance/module/treasury/TokenHandler.sol/TokenHandler.dbg.json +1 -1
- package/artifacts/contracts/instance/module/treasury/TokenHandler.sol/TokenHandler.json +2 -2
- package/artifacts/contracts/instance/module/treasury/TreasuryModule.sol/TreasuryModule.dbg.json +1 -1
- package/artifacts/contracts/instance/module/treasury/TreasuryModule.sol/TreasuryModule.json +209 -231
- package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.json +145 -18
- package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +507 -0
- package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.json +57 -16
- package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/{ComponentServiceBase.sol/ComponentServiceBase.json → IDistributionService.sol/IDistributionService.json} +91 -25
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +122 -17
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +210 -16
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +171 -12
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +303 -31
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
- package/artifacts/contracts/registry/IChainNft.sol/IChainNft.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistryLinked.sol/IRegistryLinked.dbg.json +1 -1
- package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
- package/artifacts/contracts/registry/Registry.sol/Registry.json +2 -2
- package/artifacts/contracts/registry/RegistryUpgradeable.sol/RegistryUpgradeable.dbg.json +4 -0
- package/artifacts/contracts/registry/RegistryUpgradeable.sol/RegistryUpgradeable.json +724 -0
- package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +1 -1
- package/artifacts/contracts/shared/IOwnable.sol/IOwnable.dbg.json +1 -1
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
- package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +1 -1
- package/artifacts/contracts/shared/IVersionable.sol/IVersionable.json +53 -12
- package/artifacts/contracts/shared/Proxy.sol/ProxyDeployer.dbg.json +4 -0
- package/artifacts/contracts/shared/Proxy.sol/ProxyDeployer.json +248 -0
- package/artifacts/contracts/shared/Proxy.sol/ProxyWithProxyAdminGetter.dbg.json +4 -0
- package/artifacts/contracts/shared/Proxy.sol/ProxyWithProxyAdminGetter.json +129 -0
- package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
- package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +1 -1
- package/artifacts/contracts/shared/Versionable.sol/Versionable.json +87 -0
- package/artifacts/contracts/shared/VersionableUpgradeable.sol/VersionableUpgradeable.dbg.json +4 -0
- package/artifacts/contracts/shared/VersionableUpgradeable.sol/VersionableUpgradeable.json +228 -0
- package/artifacts/contracts/test/TestDistribution.sol/TestDistribution.dbg.json +4 -0
- package/artifacts/contracts/test/TestDistribution.sol/TestDistribution.json +405 -0
- package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json +1 -1
- package/artifacts/contracts/test/TestFee.sol/TestFee.json +2 -2
- package/artifacts/contracts/test/TestPool.sol/TestPool.dbg.json +1 -1
- package/artifacts/contracts/test/TestPool.sol/TestPool.json +194 -3
- package/artifacts/contracts/test/TestProduct.sol/TestProduct.dbg.json +1 -1
- package/artifacts/contracts/test/TestProduct.sol/TestProduct.json +209 -27
- 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 +38 -4
- package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +1 -1
- package/artifacts/contracts/test/TestService.sol/TestService.json +95 -8
- 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/TestVersion.sol/TestVersion.json +2 -2
- package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json +1 -1
- package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.json +95 -8
- 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/Fee.sol/FeeLib.dbg.json +1 -1
- package/artifacts/contracts/types/Fee.sol/FeeLib.json +50 -11
- package/artifacts/contracts/types/Key32.sol/Key32Lib.dbg.json +4 -0
- package/artifacts/contracts/types/Key32.sol/Key32Lib.json +111 -0
- package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/NftId.sol/NftIdLib.json +65 -4
- package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
- package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.json +2 -2
- package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
- package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.json +2 -2
- package/artifacts/contracts/types/ReferralId.sol/ReferralIdLib.dbg.json +4 -0
- package/artifacts/contracts/types/ReferralId.sol/ReferralIdLib.json +99 -0
- package/artifacts/contracts/types/RiskId.sol/RiskIdLib.dbg.json +4 -0
- package/artifacts/contracts/types/RiskId.sol/RiskIdLib.json +86 -0
- package/artifacts/contracts/types/RoleId.sol/RoleIdLib.dbg.json +4 -0
- package/artifacts/contracts/types/RoleId.sol/RoleIdLib.json +30 -0
- package/artifacts/contracts/types/StateId.sol/StateIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/StateId.sol/StateIdLib.json +2 -2
- package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json +1 -1
- package/artifacts/contracts/types/UFixed.sol/UFixedMathLib.dbg.json +1 -1
- package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +1 -1
- package/artifacts/contracts/types/Version.sol/VersionLib.json +40 -2
- package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +1 -1
- package/artifacts/contracts/types/Version.sol/VersionPartLib.json +2 -2
- package/contracts/components/BaseComponent.sol +7 -2
- package/contracts/components/Distribution.sol +132 -0
- package/contracts/components/IDistributionComponent.sol +47 -0
- package/contracts/components/IPoolComponent.sol +14 -0
- package/contracts/components/IProductComponent.sol +24 -5
- package/contracts/components/Pool.sol +64 -3
- package/contracts/components/Product.sol +123 -13
- package/contracts/instance/IInstance.sol +14 -14
- package/contracts/instance/Instance.sol +20 -12
- package/contracts/instance/{service → base}/ComponentServiceBase.sol +1 -0
- package/contracts/instance/base/IInstanceBase.sol +22 -0
- package/contracts/instance/base/IKeyValueStore.sol +50 -0
- package/contracts/instance/base/ILifecycle.sol +30 -0
- package/contracts/instance/{InstanceBase.sol → base/InstanceBase.sol} +33 -13
- package/contracts/instance/base/KeyValueStore.sol +161 -0
- package/contracts/instance/{module/lifecycle/LifecycleModule.sol → base/Lifecycle.sol} +50 -39
- package/contracts/instance/base/ModuleBase.sol +57 -0
- package/contracts/instance/{service → base}/ServiceBase.sol +0 -2
- package/contracts/instance/module/access/Access.sol +6 -6
- package/contracts/instance/module/bundle/BundleModule.sol +24 -118
- package/contracts/instance/module/bundle/IBundle.sol +9 -9
- package/contracts/instance/module/component/ComponentModule.sol +27 -60
- package/contracts/instance/module/component/IComponent.sol +5 -30
- package/contracts/instance/module/distribution/DistributionModule.sol +17 -0
- package/contracts/instance/module/distribution/IDistribution.sol +10 -0
- package/contracts/instance/module/policy/IPolicy.sol +12 -9
- package/contracts/instance/module/policy/PolicyModule.sol +33 -26
- package/contracts/instance/module/pool/IPoolModule.sol +0 -1
- package/contracts/instance/module/pool/PoolModule.sol +12 -9
- package/contracts/instance/module/risk/IRisk.sol +18 -2
- package/contracts/instance/module/risk/RiskModule.sol +56 -2
- package/contracts/instance/module/treasury/ITreasury.sol +29 -50
- package/contracts/instance/module/treasury/TreasuryModule.sol +71 -85
- package/contracts/instance/service/ComponentOwnerService.sol +30 -44
- package/contracts/instance/service/DistributionService.sol +59 -0
- package/contracts/instance/service/IComponentOwnerService.sol +1 -1
- package/contracts/instance/service/IDistributionService.sol +12 -0
- package/contracts/instance/service/IPoolService.sol +8 -1
- package/contracts/instance/service/IProductService.sol +56 -7
- package/contracts/instance/service/PoolService.sol +31 -5
- package/contracts/instance/service/ProductService.sol +231 -77
- package/contracts/registry/Registry.sol +4 -4
- package/contracts/registry/RegistryUpgradeable.sol +473 -0
- package/contracts/shared/IVersionable.sol +17 -4
- package/contracts/shared/Proxy.sol +94 -0
- package/contracts/shared/Versionable.sol +13 -3
- package/contracts/shared/VersionableUpgradeable.sol +133 -0
- package/contracts/test/TestDistribution.sol +21 -0
- package/contracts/test/TestPool.sol +5 -2
- package/contracts/test/TestProduct.sol +35 -7
- package/contracts/test/TestRoleId.sol +2 -2
- package/contracts/test/TestService.sol +1 -1
- package/contracts/types/Fee.sol +8 -3
- package/contracts/types/Key32.sol +45 -0
- package/contracts/types/NftId.sol +16 -1
- package/contracts/types/ObjectType.sol +24 -8
- package/contracts/types/ReferralId.sol +48 -0
- package/contracts/types/RiskId.sol +43 -0
- package/contracts/types/RoleId.sol +12 -10
- package/contracts/types/StateId.sol +7 -1
- package/contracts/types/Version.sol +8 -0
- package/package.json +1 -1
- package/artifacts/contracts/instance/IServiceLinked.sol/IServiceLinked.dbg.json +0 -4
- package/artifacts/contracts/instance/IServiceLinked.sol/IServiceLinked.json +0 -50
- package/artifacts/contracts/instance/InstanceBase.sol/InstanceBase.dbg.json +0 -4
- package/artifacts/contracts/instance/module/compensation/CompensationModule.sol/CompensationModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/compensation/CompensationModule.sol/CompensationModule.json +0 -10
- package/artifacts/contracts/instance/module/compensation/ICompensation.sol/ICompensation.dbg.json +0 -4
- package/artifacts/contracts/instance/module/compensation/ICompensation.sol/ICompensationModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/lifecycle/ILifecycle.sol/ILifecycle.dbg.json +0 -4
- package/artifacts/contracts/instance/module/lifecycle/ILifecycle.sol/ILifecycle.json +0 -134
- package/artifacts/contracts/instance/module/lifecycle/ILifecycle.sol/ILifecycleModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/lifecycle/LifecycleModule.sol/LifecycleModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/lifecycle/LifecycleModule.sol/LifecycleModule.json +0 -221
- package/artifacts/contracts/instance/service/ComponentServiceBase.sol/ComponentServiceBase.dbg.json +0 -4
- package/artifacts/contracts/instance/service/IService.sol/IService.dbg.json +0 -4
- package/artifacts/contracts/instance/service/ServiceBase.sol/ServiceBase.dbg.json +0 -4
- package/contracts/instance/IServiceLinked.sol +0 -12
- package/contracts/instance/module/compensation/CompensationModule.sol +0 -8
- package/contracts/instance/module/compensation/ICompensation.sol +0 -10
- package/contracts/instance/module/lifecycle/ILifecycle.sol +0 -47
- /package/contracts/instance/{service → base}/IService.sol +0 -0
@@ -2,31 +2,21 @@
|
|
2
2
|
pragma solidity ^0.8.19;
|
3
3
|
|
4
4
|
import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
|
5
|
+
import {IKeyValueStore} from "../../base/IKeyValueStore.sol";
|
6
|
+
import {IComponentModule} from "./IComponent.sol";
|
5
7
|
|
6
|
-
import {
|
7
|
-
import {
|
8
|
+
import {NftId} from "../../../types/NftId.sol";
|
9
|
+
import {ObjectType, COMPONENT} from "../../../types/ObjectType.sol";
|
10
|
+
import {StateId} from "../../../types/StateId.sol";
|
11
|
+
import {ModuleBase} from "../../base/ModuleBase.sol";
|
8
12
|
|
9
|
-
|
10
|
-
|
11
|
-
import {IComponentOwnerService} from "../../service/IComponentOwnerService.sol";
|
12
|
-
import {ObjectType, PRODUCT, ORACLE, POOL} from "../../../types/ObjectType.sol";
|
13
|
-
import {StateId, ACTIVE, PAUSED} from "../../../types/StateId.sol";
|
14
|
-
import {NftId, NftIdLib, zeroNftId} from "../../../types/NftId.sol";
|
15
|
-
import {Fee} from "../../../types/Fee.sol";
|
16
|
-
|
17
|
-
abstract contract ComponentModule is
|
13
|
+
abstract contract ComponentModule is
|
14
|
+
ModuleBase,
|
18
15
|
IComponentModule
|
19
16
|
{
|
20
|
-
using NftIdLib for NftId;
|
21
17
|
|
22
|
-
mapping(NftId nftId => ComponentInfo info) private _componentInfo;
|
23
18
|
NftId[] private _nftIds;
|
24
19
|
|
25
|
-
mapping(ObjectType cType => bytes32 role) private _componentOwnerRole;
|
26
|
-
|
27
|
-
// TODO maybe move this to Instance contract as internal variable?
|
28
|
-
LifecycleModule private _lifecycleModule;
|
29
|
-
|
30
20
|
modifier onlyComponentOwnerService() {
|
31
21
|
require(
|
32
22
|
msg.sender == address(this.getComponentOwnerService()),
|
@@ -35,49 +25,32 @@ abstract contract ComponentModule is
|
|
35
25
|
_;
|
36
26
|
}
|
37
27
|
|
38
|
-
|
39
|
-
|
40
|
-
_lifecycleModule = LifecycleModule(componentAddress);
|
28
|
+
function initializeComponentModule(IKeyValueStore keyValueStore) internal {
|
29
|
+
_initialize(keyValueStore);
|
41
30
|
}
|
42
31
|
|
43
32
|
function registerComponent(
|
44
33
|
NftId nftId,
|
45
|
-
|
46
|
-
|
47
|
-
)
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
token
|
54
|
-
);
|
55
|
-
|
34
|
+
IERC20Metadata token,
|
35
|
+
address wallet
|
36
|
+
)
|
37
|
+
external
|
38
|
+
onlyComponentOwnerService
|
39
|
+
override
|
40
|
+
{
|
41
|
+
ComponentInfo memory info = ComponentInfo(token, wallet);
|
56
42
|
_nftIds.push(nftId);
|
57
|
-
|
58
|
-
// TODO add logging
|
43
|
+
_create(COMPONENT(), nftId, abi.encode(info));
|
59
44
|
}
|
60
45
|
|
61
|
-
function
|
62
|
-
ComponentInfo memory info
|
63
|
-
|
64
|
-
|
65
|
-
require(
|
66
|
-
nftId.gtz() && _componentInfo[nftId].nftId.eq(nftId),
|
67
|
-
"ERROR:CMP-006:COMPONENT_UNKNOWN"
|
68
|
-
);
|
46
|
+
function getComponentToken(NftId nftId) external view override returns(IERC20Metadata token) {
|
47
|
+
ComponentInfo memory info = abi.decode(_getData(COMPONENT(), nftId), (ComponentInfo));
|
48
|
+
return info.token;
|
49
|
+
}
|
69
50
|
|
70
|
-
|
71
|
-
|
72
|
-
|
73
|
-
ObjectType objectType = this.getRegistry().getObjectInfo(nftId).objectType;
|
74
|
-
_lifecycleModule.checkAndLogTransition(
|
75
|
-
nftId,
|
76
|
-
objectType,
|
77
|
-
_componentInfo[nftId].state,
|
78
|
-
info.state
|
79
|
-
);
|
80
|
-
_componentInfo[nftId] = info;
|
51
|
+
function getComponentWallet(NftId nftId) external view override returns (address wallet) {
|
52
|
+
ComponentInfo memory info = abi.decode(_getData(COMPONENT(), nftId), (ComponentInfo));
|
53
|
+
return info.wallet;
|
81
54
|
}
|
82
55
|
|
83
56
|
function getComponentCount()
|
@@ -94,10 +67,4 @@ abstract contract ComponentModule is
|
|
94
67
|
) external view override returns (NftId componentNftId) {
|
95
68
|
return _nftIds[idx];
|
96
69
|
}
|
97
|
-
|
98
|
-
function getComponentInfo(
|
99
|
-
NftId nftId
|
100
|
-
) external view override returns (ComponentInfo memory) {
|
101
|
-
return _componentInfo[nftId];
|
102
|
-
}
|
103
|
-
}
|
70
|
+
}
|
@@ -2,52 +2,27 @@
|
|
2
2
|
pragma solidity ^0.8.19;
|
3
3
|
|
4
4
|
import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
|
5
|
+
import {IComponentOwnerService} from "../../service/IComponentOwnerService.sol";
|
5
6
|
|
6
|
-
|
7
|
-
import {IRegistry} from "../../../registry/IRegistry.sol";
|
8
|
-
import {IInstance} from "../../IInstance.sol";
|
9
7
|
import {StateId} from "../../../types/StateId.sol";
|
10
8
|
import {NftId} from "../../../types/NftId.sol";
|
11
|
-
import {ObjectType} from "../../../types/ObjectType.sol";
|
12
|
-
import {RoleId} from "../../../types/RoleId.sol";
|
13
|
-
import {Fee} from "../../../types/Fee.sol";
|
14
|
-
import {UFixed} from "../../../types/UFixed.sol";
|
15
|
-
|
16
|
-
import {IComponentOwnerService} from "../../service/IComponentOwnerService.sol";
|
17
|
-
// import {IComponentBase} from "../../../components/IComponentBase.sol";
|
18
9
|
|
19
10
|
interface IComponent {
|
20
|
-
// component dynamic info (static info kept in registry)
|
21
11
|
struct ComponentInfo {
|
22
|
-
NftId nftId;
|
23
|
-
StateId state;
|
24
12
|
IERC20Metadata token;
|
13
|
+
address wallet;
|
25
14
|
}
|
26
15
|
}
|
27
16
|
|
28
17
|
interface IComponentModule is IComponent {
|
29
|
-
function getRegistry() external view returns (IRegistry registry);
|
30
18
|
|
31
|
-
function registerComponent(
|
32
|
-
|
33
|
-
|
34
|
-
IERC20Metadata token
|
35
|
-
) external;
|
36
|
-
|
37
|
-
function setComponentInfo(
|
38
|
-
ComponentInfo memory info
|
39
|
-
) external returns (NftId componentNftId);
|
40
|
-
|
41
|
-
function getComponentInfo(
|
42
|
-
NftId nftId
|
43
|
-
) external view returns (ComponentInfo memory info);
|
19
|
+
function registerComponent(NftId nftId, IERC20Metadata token, address wallet) external;
|
20
|
+
function getComponentToken(NftId nftId) external view returns (IERC20Metadata token);
|
21
|
+
function getComponentWallet(NftId nftId) external view returns (address wallet);
|
44
22
|
|
45
23
|
function getComponentCount() external view returns (uint256 numberOfCompnents);
|
46
|
-
|
47
24
|
function getComponentId(uint256 idx) external view returns (NftId nftId);
|
48
25
|
|
49
26
|
// repeat service linked signaturea to avoid linearization issues
|
50
27
|
function getComponentOwnerService() external view returns(IComponentOwnerService);
|
51
|
-
|
52
|
-
function hasRole(RoleId role, address member) external view returns (bool);
|
53
28
|
}
|
@@ -0,0 +1,17 @@
|
|
1
|
+
// SPDX-License-Identifier: Apache-2.0
|
2
|
+
pragma solidity ^0.8.19;
|
3
|
+
|
4
|
+
import {IDistributionModule} from "./IDistribution.sol";
|
5
|
+
import {IKeyValueStore} from "../../base/IKeyValueStore.sol";
|
6
|
+
import {ModuleBase} from "../../base/ModuleBase.sol";
|
7
|
+
|
8
|
+
contract DistributionModule is
|
9
|
+
ModuleBase,
|
10
|
+
IDistributionModule
|
11
|
+
{
|
12
|
+
|
13
|
+
function initializeDistributionModule(IKeyValueStore keyValueStore) internal {
|
14
|
+
_initialize(keyValueStore);
|
15
|
+
}
|
16
|
+
|
17
|
+
}
|
@@ -5,42 +5,45 @@ import {IRegistry} from "../../../registry/IRegistry.sol";
|
|
5
5
|
import {IInstance} from "../../IInstance.sol";
|
6
6
|
import {IProductService} from "../../service/IProductService.sol";
|
7
7
|
import {NftId} from "../../../types/NftId.sol";
|
8
|
+
import {ReferralId} from "../../../types/ReferralId.sol";
|
9
|
+
import {RiskId} from "../../../types/RiskId.sol";
|
8
10
|
import {StateId} from "../../../types/StateId.sol";
|
9
11
|
import {Timestamp} from "../../../types/Timestamp.sol";
|
10
|
-
import {Blocknumber} from "../../../types/Blocknumber.sol";
|
11
12
|
|
12
13
|
// TODO check if there is value to introuce IContract and let IPolicy derive from IContract
|
13
14
|
interface IPolicy {
|
14
15
|
struct PolicyInfo {
|
15
|
-
NftId nftId;
|
16
16
|
NftId productNftId;
|
17
17
|
NftId bundleNftId;
|
18
|
+
ReferralId referralId;
|
18
19
|
address beneficiary;
|
19
|
-
|
20
|
+
RiskId riskId;
|
20
21
|
uint256 sumInsuredAmount;
|
21
22
|
uint256 premiumAmount;
|
22
23
|
uint256 premiumPaidAmount;
|
23
24
|
uint256 lifetime;
|
24
|
-
bytes
|
25
|
-
|
25
|
+
bytes applicationData;
|
26
|
+
bytes policyData;
|
26
27
|
Timestamp activatedAt; // time of underwriting
|
27
28
|
Timestamp expiredAt; // no new claims (activatedAt + lifetime)
|
28
29
|
Timestamp closedAt; // no locked capital
|
29
|
-
Blocknumber updatedIn; // write log entries in a way to support backtracking of all state changes
|
30
30
|
}
|
31
31
|
}
|
32
32
|
|
33
33
|
interface IPolicyModule is IPolicy {
|
34
|
-
function
|
35
|
-
NftId productNftId,
|
34
|
+
function createPolicyInfo(
|
36
35
|
NftId policyNftId,
|
36
|
+
NftId productNftId,
|
37
|
+
ReferralId referralId,
|
38
|
+
RiskId riskId,
|
37
39
|
uint256 sumInsuredAmount,
|
38
40
|
uint256 premiumAmount,
|
39
41
|
uint256 lifetime,
|
40
42
|
NftId bundleNftId
|
41
43
|
) external;
|
42
44
|
|
43
|
-
function setPolicyInfo(PolicyInfo memory
|
45
|
+
function setPolicyInfo(NftId policyNftId, PolicyInfo memory info) external;
|
46
|
+
function updatePolicyState(NftId nftId, StateId state) external;
|
44
47
|
|
45
48
|
// function underwrite(NftId nftId) external;
|
46
49
|
|
@@ -3,23 +3,22 @@ pragma solidity ^0.8.19;
|
|
3
3
|
|
4
4
|
import {IRegistry} from "../../../registry/IRegistry.sol";
|
5
5
|
|
6
|
-
import {LifecycleModule} from "../../module/lifecycle/LifecycleModule.sol";
|
7
6
|
import {IProductService} from "../../service/IProductService.sol";
|
8
7
|
import {IPolicy, IPolicyModule} from "./IPolicy.sol";
|
9
8
|
import {ObjectType, POLICY} from "../../../types/ObjectType.sol";
|
10
|
-
import {APPLIED, ACTIVE, UNDERWRITTEN} from "../../../types/StateId.sol";
|
11
9
|
import {NftId, NftIdLib} from "../../../types/NftId.sol";
|
10
|
+
import {ReferralId} from "../../../types/ReferralId.sol";
|
11
|
+
import {RiskId} from "../../../types/RiskId.sol";
|
12
|
+
import {StateId} from "../../../types/StateId.sol";
|
12
13
|
import {Timestamp, blockTimestamp, zeroTimestamp} from "../../../types/Timestamp.sol";
|
13
|
-
import {Blocknumber, blockNumber} from "../../../types/Blocknumber.sol";
|
14
14
|
|
15
|
-
import {
|
15
|
+
import {IKeyValueStore} from "../../base/IKeyValueStore.sol";
|
16
|
+
import {ModuleBase} from "../../base/ModuleBase.sol";
|
16
17
|
|
17
|
-
abstract contract PolicyModule is
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
LifecycleModule private _lifecycleModule;
|
18
|
+
abstract contract PolicyModule is
|
19
|
+
ModuleBase,
|
20
|
+
IPolicyModule
|
21
|
+
{
|
23
22
|
|
24
23
|
// TODO find a better place to avoid dupliation
|
25
24
|
modifier onlyProductService2() {
|
@@ -30,13 +29,15 @@ abstract contract PolicyModule is IPolicyModule {
|
|
30
29
|
_;
|
31
30
|
}
|
32
31
|
|
33
|
-
|
34
|
-
|
32
|
+
function initializePolicyModule(IKeyValueStore keyValueStore) internal {
|
33
|
+
_initialize(keyValueStore);
|
35
34
|
}
|
36
35
|
|
37
|
-
function
|
38
|
-
NftId productNftId,
|
36
|
+
function createPolicyInfo(
|
39
37
|
NftId policyNftId,
|
38
|
+
NftId productNftId,
|
39
|
+
ReferralId referralId,
|
40
|
+
RiskId riskId,
|
40
41
|
uint256 sumInsuredAmount,
|
41
42
|
uint256 premiumAmount,
|
42
43
|
uint256 lifetime,
|
@@ -46,39 +47,45 @@ abstract contract PolicyModule is IPolicyModule {
|
|
46
47
|
onlyProductService2
|
47
48
|
override
|
48
49
|
{
|
49
|
-
|
50
|
-
policyNftId,
|
50
|
+
PolicyInfo memory info = PolicyInfo(
|
51
51
|
productNftId,
|
52
52
|
bundleNftId,
|
53
|
+
referralId,
|
53
54
|
address(0), // beneficiary = policy nft holder
|
54
|
-
|
55
|
+
riskId,
|
55
56
|
sumInsuredAmount,
|
56
57
|
premiumAmount,
|
57
58
|
0, // premium paid amount
|
58
59
|
lifetime,
|
59
|
-
"", //
|
60
|
-
|
60
|
+
"", // applicationData
|
61
|
+
"", // policyData
|
61
62
|
zeroTimestamp(), // activatedAt
|
62
63
|
zeroTimestamp(), // expiredAt
|
63
|
-
zeroTimestamp()
|
64
|
-
blockNumber() // updatedIn
|
64
|
+
zeroTimestamp() // closedAt
|
65
65
|
);
|
66
66
|
|
67
|
-
|
67
|
+
_create(POLICY(), policyNftId, abi.encode(info));
|
68
68
|
}
|
69
69
|
|
70
|
-
function setPolicyInfo(PolicyInfo memory
|
70
|
+
function setPolicyInfo(NftId policyNftId, PolicyInfo memory info)
|
71
71
|
external
|
72
72
|
override
|
73
73
|
onlyProductService2
|
74
74
|
{
|
75
|
-
|
75
|
+
_updateData(POLICY(), policyNftId, abi.encode(info));
|
76
|
+
}
|
77
|
+
|
78
|
+
function updatePolicyState(NftId bundleNftId, StateId state)
|
79
|
+
external
|
80
|
+
override
|
81
|
+
onlyProductService2
|
82
|
+
{
|
83
|
+
_updateState(POLICY(), bundleNftId, state);
|
76
84
|
}
|
77
85
|
|
78
86
|
function getPolicyInfo(
|
79
87
|
NftId nftId
|
80
88
|
) external view returns (PolicyInfo memory info) {
|
81
|
-
return
|
89
|
+
return abi.decode(_getData(POLICY(), nftId), (PolicyInfo));
|
82
90
|
}
|
83
|
-
|
84
91
|
}
|
@@ -8,18 +8,22 @@ import {IPolicy, IPolicyModule} from "../../module/policy/IPolicy.sol";
|
|
8
8
|
import {ITreasuryModule} from "../../module/treasury/ITreasury.sol";
|
9
9
|
|
10
10
|
import {NftId} from "../../../types/NftId.sol";
|
11
|
+
import {POOL} from "../../../types/ObjectType.sol";
|
11
12
|
import {LibNftIdSet} from "../../../types/NftIdSet.sol";
|
12
13
|
import {StateId, APPLIED} from "../../../types/StateId.sol";
|
13
14
|
import {UFixed} from "../../../types/UFixed.sol";
|
14
15
|
|
16
|
+
import {IKeyValueStore} from "../../base/IKeyValueStore.sol";
|
15
17
|
import {IPoolModule} from "./IPoolModule.sol";
|
18
|
+
import {ModuleBase} from "../../base/ModuleBase.sol";
|
16
19
|
|
17
20
|
abstract contract PoolModule is
|
21
|
+
ModuleBase,
|
18
22
|
IPoolModule
|
19
23
|
{
|
20
24
|
using LibNftIdSet for LibNftIdSet.Set;
|
21
25
|
|
22
|
-
mapping(NftId poolNftId => PoolInfo info) private _poolInfo;
|
26
|
+
// mapping(NftId poolNftId => PoolInfo info) private _poolInfo;
|
23
27
|
mapping(NftId poolNftId => LibNftIdSet.Set bundles) private _bundlesForPool;
|
24
28
|
|
25
29
|
modifier poolServiceCallingPool() {
|
@@ -30,6 +34,10 @@ abstract contract PoolModule is
|
|
30
34
|
_;
|
31
35
|
}
|
32
36
|
|
37
|
+
function initializePoolModule(IKeyValueStore keyValueStore) internal {
|
38
|
+
_initialize(keyValueStore);
|
39
|
+
}
|
40
|
+
|
33
41
|
function registerPool(
|
34
42
|
NftId nftId,
|
35
43
|
bool isVerifying,
|
@@ -38,17 +46,12 @@ abstract contract PoolModule is
|
|
38
46
|
public
|
39
47
|
override
|
40
48
|
{
|
41
|
-
|
42
|
-
_poolInfo[nftId].nftId.eqz(),
|
43
|
-
"ERROR:PL-010:ALREADY_CREATED");
|
44
|
-
|
45
|
-
_poolInfo[nftId] = PoolInfo(
|
46
|
-
nftId,
|
49
|
+
PoolInfo memory info = PoolInfo(
|
47
50
|
isVerifying,
|
48
51
|
collateralizationRate
|
49
52
|
);
|
50
53
|
|
51
|
-
|
54
|
+
_create(POOL(), nftId, abi.encode(info));
|
52
55
|
}
|
53
56
|
|
54
57
|
function addBundleToPool(
|
@@ -71,7 +74,7 @@ abstract contract PoolModule is
|
|
71
74
|
function getPoolInfo(
|
72
75
|
NftId nftId
|
73
76
|
) external view override returns (PoolInfo memory info) {
|
74
|
-
|
77
|
+
return abi.decode(_getData(POOL(), nftId), (PoolInfo));
|
75
78
|
}
|
76
79
|
|
77
80
|
|
@@ -1,10 +1,26 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
2
|
pragma solidity ^0.8.19;
|
3
3
|
|
4
|
-
|
4
|
+
import {NftId} from "../../../types/NftId.sol";
|
5
|
+
import {RiskId} from "../../../types/RiskId.sol";
|
6
|
+
import {StateId} from "../../../types/StateId.sol";
|
5
7
|
|
8
|
+
interface IRisk {
|
9
|
+
struct RiskInfo {
|
10
|
+
NftId productNftId;
|
11
|
+
bytes data;
|
12
|
+
}
|
6
13
|
}
|
7
14
|
|
8
15
|
interface IRiskModule is IRisk {
|
9
|
-
|
16
|
+
function createRisk(
|
17
|
+
RiskId riskId,
|
18
|
+
NftId productNftId,
|
19
|
+
bytes memory data
|
20
|
+
) external;
|
21
|
+
|
22
|
+
function setRiskInfo(RiskId riskId, RiskInfo memory info) external;
|
23
|
+
function updateRiskState(RiskId riskId, StateId state) external;
|
24
|
+
|
25
|
+
function getRiskInfo(RiskId riskId) external view returns (RiskInfo memory info);
|
10
26
|
}
|
@@ -1,8 +1,62 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
2
|
pragma solidity ^0.8.19;
|
3
3
|
|
4
|
+
import {NftId} from "../../../types/NftId.sol";
|
5
|
+
import {RISK} from "../../../types/ObjectType.sol";
|
6
|
+
import {RiskId} from "../../../types/RiskId.sol";
|
7
|
+
import {StateId} from "../../../types/StateId.sol";
|
8
|
+
|
9
|
+
import {IKeyValueStore} from "../../base/IKeyValueStore.sol";
|
4
10
|
import {IRiskModule} from "./IRisk.sol";
|
11
|
+
import {ModuleBase} from "../../base/ModuleBase.sol";
|
12
|
+
|
13
|
+
contract RiskModule is
|
14
|
+
ModuleBase,
|
15
|
+
IRiskModule
|
16
|
+
{
|
17
|
+
function initializeRiskModule(IKeyValueStore keyValueStore) internal {
|
18
|
+
_initialize(keyValueStore);
|
19
|
+
}
|
20
|
+
|
21
|
+
function createRisk(
|
22
|
+
RiskId riskId,
|
23
|
+
NftId productNftId,
|
24
|
+
bytes memory data
|
25
|
+
) external override {
|
26
|
+
RiskInfo memory info = RiskInfo(
|
27
|
+
productNftId,
|
28
|
+
data
|
29
|
+
);
|
30
|
+
|
31
|
+
_create(RISK(), riskId.toKey32(), abi.encode(info));
|
32
|
+
}
|
33
|
+
|
34
|
+
function setRiskInfo(
|
35
|
+
RiskId riskId,
|
36
|
+
RiskInfo memory info
|
37
|
+
)
|
38
|
+
external
|
39
|
+
override
|
40
|
+
{
|
41
|
+
|
42
|
+
}
|
43
|
+
|
44
|
+
function updateRiskState(
|
45
|
+
RiskId riskId,
|
46
|
+
StateId state
|
47
|
+
)
|
48
|
+
external
|
49
|
+
override
|
50
|
+
{
|
51
|
+
|
52
|
+
}
|
53
|
+
|
54
|
+
function getRiskInfo(RiskId riskId)
|
55
|
+
external
|
56
|
+
view
|
57
|
+
override
|
58
|
+
returns (RiskInfo memory info)
|
59
|
+
{
|
5
60
|
|
6
|
-
|
7
|
-
|
61
|
+
}
|
8
62
|
}
|
@@ -2,6 +2,9 @@
|
|
2
2
|
pragma solidity ^0.8.19;
|
3
3
|
|
4
4
|
import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
|
5
|
+
import {IDistributionComponent} from "../../../components/IDistributionComponent.sol";
|
6
|
+
import {IPoolComponent} from "../../../components/IPoolComponent.sol";
|
7
|
+
import {IProductComponent} from "../../../components/IProductComponent.sol";
|
5
8
|
|
6
9
|
import {NftId} from "../../../types/NftId.sol";
|
7
10
|
import {UFixed} from "../../../types/UFixed.sol";
|
@@ -13,73 +16,49 @@ interface ITreasury {
|
|
13
16
|
// TODO add events
|
14
17
|
// TODO add errors
|
15
18
|
|
16
|
-
|
17
|
-
|
18
|
-
NftId distributorNftId;
|
19
|
+
// treasury info is linked to product nft id
|
20
|
+
struct TreasuryInfo {
|
19
21
|
NftId poolNftId;
|
22
|
+
NftId distributionNftId;
|
20
23
|
IERC20Metadata token;
|
21
|
-
|
22
|
-
Fee
|
23
|
-
Fee
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
NftId distributorNftId;
|
28
|
-
address wallet;
|
29
|
-
Fee commissionFee;
|
30
|
-
}
|
31
|
-
|
32
|
-
struct PoolSetup {
|
33
|
-
NftId poolNftId;
|
34
|
-
address wallet;
|
35
|
-
Fee stakingFee;
|
36
|
-
Fee performanceFee;
|
24
|
+
Fee productFee; // product fee on net premium
|
25
|
+
Fee processingFee; // product fee on payout amounts
|
26
|
+
Fee poolFee; // pool fee on net premium
|
27
|
+
Fee stakingFee; // pool fee on staked capital from investor
|
28
|
+
Fee performanceFee; // pool fee on profits from capital investors
|
29
|
+
Fee distributionFee; // default distribution fee (no referral id)
|
37
30
|
}
|
38
31
|
}
|
39
32
|
|
40
33
|
interface ITreasuryModule is ITreasury {
|
41
34
|
|
42
|
-
function
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
IERC20Metadata token,
|
47
|
-
address wallet,
|
48
|
-
Fee memory policyFee,
|
49
|
-
Fee memory processingFee
|
35
|
+
function registerProductSetup(
|
36
|
+
IProductComponent product,
|
37
|
+
IPoolComponent pool,
|
38
|
+
IDistributionComponent distribution
|
50
39
|
) external;
|
51
40
|
|
52
|
-
function
|
41
|
+
function setTreasuryInfo(
|
53
42
|
NftId productNftId,
|
54
|
-
|
55
|
-
Fee memory processingFee
|
43
|
+
TreasuryInfo memory info
|
56
44
|
) external;
|
57
45
|
|
58
|
-
function
|
59
|
-
NftId
|
60
|
-
|
61
|
-
Fee memory stakingFee,
|
62
|
-
Fee memory performanceFee
|
63
|
-
) external;
|
46
|
+
function hasTreasuryInfo(
|
47
|
+
NftId productNftId
|
48
|
+
) external view returns (bool hasInfo);
|
64
49
|
|
65
|
-
function
|
66
|
-
NftId
|
67
|
-
|
68
|
-
|
69
|
-
|
50
|
+
function getTreasuryInfo(
|
51
|
+
NftId productNftId
|
52
|
+
) external view returns (TreasuryInfo memory info);
|
53
|
+
|
54
|
+
function getProductNftId(
|
55
|
+
NftId componentNftId
|
56
|
+
) external view returns (NftId productNftId);
|
70
57
|
|
71
58
|
function getTokenHandler(
|
72
59
|
NftId componentNftId
|
73
60
|
) external view returns (TokenHandler tokenHandler);
|
74
61
|
|
75
|
-
function getProductSetup(
|
76
|
-
NftId productNftId
|
77
|
-
) external view returns (ProductSetup memory setup);
|
78
|
-
|
79
|
-
function getPoolSetup(
|
80
|
-
NftId poolNftId
|
81
|
-
) external view returns (PoolSetup memory setup);
|
82
|
-
|
83
62
|
function calculateFeeAmount(
|
84
63
|
uint256 amount,
|
85
64
|
Fee memory fee
|
@@ -90,7 +69,7 @@ interface ITreasuryModule is ITreasury {
|
|
90
69
|
uint256 fixedFee
|
91
70
|
) external pure returns (Fee memory fee);
|
92
71
|
|
93
|
-
function getZeroFee() external
|
72
|
+
function getZeroFee() external view returns (Fee memory fee);
|
94
73
|
|
95
74
|
function getUFixed(
|
96
75
|
uint256 a
|