@etherisc/gif-next 0.0.2-f29e479-370 → 0.0.2-f30e0eb-805
Sign up to get free protection for your applications and to get access to all the features.
- package/artifacts/contracts/components/Component.sol/Component.dbg.json +1 -1
- package/artifacts/contracts/components/Component.sol/Component.json +68 -89
- package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +1 -1
- package/artifacts/contracts/components/Distribution.sol/Distribution.json +113 -140
- package/artifacts/contracts/components/IComponent.sol/IComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IComponent.sol/IComponent.json +65 -73
- package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.json +91 -122
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.json +256 -189
- package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.json +69 -145
- package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
- package/artifacts/contracts/components/Pool.sol/Pool.json +279 -245
- package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
- package/artifacts/contracts/components/Product.sol/Product.json +73 -162
- 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 +1 -1
- package/artifacts/contracts/instance/BundleManager.sol/BundleManager.json +64 -50
- package/artifacts/contracts/instance/Cloneable.sol/Cloneable.dbg.json +1 -1
- package/artifacts/contracts/instance/Cloneable.sol/Cloneable.json +5 -0
- package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstance.sol/IInstance.json +171 -308
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +98 -40
- package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
- package/artifacts/contracts/instance/Instance.sol/Instance.json +260 -379
- package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +448 -121
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +120 -227
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +148 -161
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +31 -23
- package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.dbg.json +1 -1
- package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.json +8 -13
- package/artifacts/contracts/instance/base/ComponentService.sol/ComponentService.dbg.json +1 -1
- package/artifacts/contracts/instance/base/ComponentService.sol/ComponentService.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/KeyValueStore.sol/KeyValueStore.json +40 -10
- package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json +1 -1
- package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.json +36 -11
- package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IAccess.sol/IAccess.json +54 -71
- package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IComponents.sol/IComponents.dbg.json +4 -0
- package/artifacts/contracts/instance/module/IComponents.sol/IComponents.json +10 -0
- 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/ApplicationService.sol/ApplicationService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/ApplicationService.sol/ApplicationService.json +161 -62
- package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.json +33 -25
- package/artifacts/contracts/instance/service/BundleService.sol/BundleService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/BundleService.sol/BundleService.json +137 -140
- package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.json +12 -12
- package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.json +3 -3
- package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.json +2 -2
- package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +505 -91
- package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.json +78 -42
- package/artifacts/contracts/instance/service/IApplicationService.sol/IApplicationService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IApplicationService.sol/IApplicationService.json +110 -27
- package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.json +93 -96
- package/artifacts/contracts/instance/service/IClaimService.sol/IClaimService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.json +350 -8
- package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.json +21 -64
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +81 -0
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.json +58 -157
- package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.json +19 -47
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +114 -17
- package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.json +17 -9
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +7 -7
- package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.json +4 -4
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +15 -2
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +19 -0
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
- package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.json +18 -0
- package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
- package/artifacts/contracts/registry/Registry.sol/Registry.json +31 -12
- package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.json +2 -2
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +5 -5
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +3 -3
- package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.dbg.json +1 -1
- package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.json +7 -7
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +2 -2
- 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/IPolicyHolder.sol/IPolicyHolder.dbg.json +1 -1
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
- package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.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/PolicyHolder.sol/PolicyHolder.dbg.json +1 -1
- package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.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 +3 -3
- package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +1 -1
- package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +2 -2
- package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
- package/artifacts/contracts/shared/Service.sol/Service.json +1 -1
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +2 -2
- package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
- package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +2 -2
- 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/TestFee.sol/TestFee.json +2 -2
- package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json +1 -1
- package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +3 -3
- package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +1 -1
- package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.json +6 -6
- package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +1 -1
- package/artifacts/contracts/test/TestService.sol/TestService.json +3 -3
- 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 +2 -2
- 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/Blocknumber.sol/BlocknumberLib.json +2 -2
- package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/ClaimId.sol/ClaimIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.dbg.json +1 -1
- package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.json +2 -2
- package/artifacts/contracts/types/Fee.sol/FeeLib.dbg.json +1 -1
- package/artifacts/contracts/types/Fee.sol/FeeLib.json +2 -2
- package/artifacts/contracts/types/Key32.sol/Key32Lib.dbg.json +1 -1
- package/artifacts/contracts/types/Key32.sol/Key32Lib.json +2 -2
- package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/NftId.sol/NftIdLib.json +17 -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/NumberId.sol/NumberIdLib.dbg.json +1 -1
- 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/PayoutId.sol/PayoutIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/Referral.sol/ReferralLib.dbg.json +1 -1
- package/artifacts/contracts/types/Referral.sol/ReferralLib.json +23 -4
- package/artifacts/contracts/types/RiskId.sol/RiskIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/RiskId.sol/RiskIdLib.json +2 -2
- 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/Seconds.sol/SecondsLib.dbg.json +4 -0
- package/artifacts/contracts/types/Seconds.sol/SecondsLib.json +124 -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/Timestamp.sol/TimestampLib.json +25 -7
- package/artifacts/contracts/types/UFixed.sol/MathLib.dbg.json +1 -1
- package/artifacts/contracts/types/UFixed.sol/MathLib.json +2 -2
- package/artifacts/contracts/types/UFixed.sol/UFixedLib.dbg.json +1 -1
- package/artifacts/contracts/types/UFixed.sol/UFixedLib.json +2 -2
- package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +1 -1
- package/artifacts/contracts/types/Version.sol/VersionLib.json +2 -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/Component.sol +95 -85
- package/contracts/components/Distribution.sol +12 -19
- package/contracts/components/IComponent.sol +37 -17
- package/contracts/components/IDistributionComponent.sol +1 -22
- package/contracts/components/IPoolComponent.sol +73 -47
- package/contracts/components/IProductComponent.sol +3 -2
- package/contracts/components/Pool.sol +171 -126
- package/contracts/components/Product.sol +26 -18
- package/contracts/instance/AccessManagerUpgradeableInitializeable.sol +13 -0
- package/contracts/instance/BundleManager.sol +7 -5
- package/contracts/instance/Cloneable.sol +7 -2
- package/contracts/instance/IInstance.sol +16 -10
- package/contracts/instance/IInstanceService.sol +18 -5
- package/contracts/instance/Instance.sol +45 -9
- package/contracts/instance/InstanceAccessManager.sol +382 -157
- package/contracts/instance/InstanceReader.sol +7 -10
- package/contracts/instance/InstanceService.sol +174 -155
- package/contracts/instance/ObjectManager.sol +6 -8
- package/contracts/instance/base/ComponentService.sol +5 -5
- package/contracts/instance/base/KeyValueStore.sol +5 -2
- package/contracts/instance/base/Lifecycle.sol +11 -2
- package/contracts/instance/module/IAccess.sol +20 -13
- package/contracts/instance/module/IBundle.sol +2 -1
- package/contracts/instance/module/IComponents.sol +35 -0
- package/contracts/instance/module/IDistribution.sol +2 -1
- package/contracts/instance/module/IPolicy.sol +26 -1
- package/contracts/instance/module/ISetup.sol +7 -22
- package/contracts/instance/service/ApplicationService.sol +123 -41
- package/contracts/instance/service/BundleService.sol +76 -38
- package/contracts/instance/service/DistributionService.sol +139 -47
- package/contracts/instance/service/IApplicationService.sol +7 -7
- package/contracts/instance/service/IBundleService.sol +19 -11
- package/contracts/instance/service/IDistributionService.sol +19 -4
- package/contracts/instance/service/IPolicyService.sol +3 -20
- package/contracts/instance/service/IPoolService.sol +17 -2
- package/contracts/instance/service/PolicyService.sol +59 -132
- package/contracts/instance/service/PoolService.sol +128 -17
- package/contracts/instance/service/ProductService.sol +10 -2
- package/contracts/registry/ChainNft.sol +8 -0
- package/contracts/registry/IRegistry.sol +2 -0
- package/contracts/registry/ITransferInterceptor.sol +1 -0
- package/contracts/registry/Registry.sol +23 -20
- package/contracts/registry/RegistryService.sol +5 -5
- package/contracts/shared/Registerable.sol +2 -2
- package/contracts/shared/TokenHandler.sol +11 -5
- package/contracts/types/Blocknumber.sol +1 -0
- package/contracts/types/Fee.sol +1 -0
- package/contracts/types/NftId.sol +8 -0
- package/contracts/types/ObjectType.sol +1 -0
- package/contracts/types/Referral.sol +4 -0
- package/contracts/types/RoleId.sol +13 -6
- package/contracts/types/Seconds.sol +54 -0
- package/contracts/types/StateId.sol +1 -0
- package/contracts/types/Timestamp.sol +13 -13
- package/contracts/types/UFixed.sol +1 -0
- package/contracts/types/Version.sol +1 -0
- package/package.json +1 -1
@@ -42,8 +42,8 @@
|
|
42
42
|
"type": "function"
|
43
43
|
}
|
44
44
|
],
|
45
|
-
"bytecode": "
|
46
|
-
"deployedBytecode": "
|
45
|
+
"bytecode": "0x60fb610039600b82828239805160001a60731461002c57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe7300000000000000000000000000000000000000003014608060405260043610603d5760003560e01c80638e4ad86c146042578063ac43d834146067575b600080fd5b6050604d3660046085565b90565b60405160ff90911681526020015b60405180910390f35b60786072366004609d565b60ff1690565b604051908152602001605e565b600060208284031215609657600080fd5b5035919050565b60006020828403121560ae57600080fd5b813560ff8116811460be57600080fd5b939250505056fea2646970667358221220cdee50fe6c9714f8463d3a3d707ceac1b02f5c17b070c998ecfbac805f95cace64736f6c63430008140033",
|
46
|
+
"deployedBytecode": "0x7300000000000000000000000000000000000000003014608060405260043610603d5760003560e01c80638e4ad86c146042578063ac43d834146067575b600080fd5b6050604d3660046085565b90565b60405160ff90911681526020015b60405180910390f35b60786072366004609d565b60ff1690565b604051908152602001605e565b600060208284031215609657600080fd5b5035919050565b60006020828403121560ae57600080fd5b813560ff8116811460be57600080fd5b939250505056fea2646970667358221220cdee50fe6c9714f8463d3a3d707ceac1b02f5c17b070c998ecfbac805f95cace64736f6c63430008140033",
|
47
47
|
"linkReferences": {},
|
48
48
|
"deployedLinkReferences": {}
|
49
49
|
}
|
@@ -6,6 +6,7 @@ import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IER
|
|
6
6
|
import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";
|
7
7
|
|
8
8
|
import {IComponent} from "./IComponent.sol";
|
9
|
+
import {IComponents} from "../instance/module/IComponents.sol";
|
9
10
|
import {IProductService} from "../instance/service/IProductService.sol";
|
10
11
|
import {IInstanceService} from "../instance/IInstanceService.sol";
|
11
12
|
import {IInstance} from "../instance/IInstance.sol";
|
@@ -29,21 +30,23 @@ abstract contract Component is
|
|
29
30
|
AccessManagedUpgradeable
|
30
31
|
{
|
31
32
|
// keccak256(abi.encode(uint256(keccak256("gif-next.contracts.component.Component.sol")) - 1)) & ~bytes32(uint256(0xff));
|
32
|
-
bytes32 public constant
|
33
|
+
bytes32 public constant COMPONENT_LOCATION_V1 = 0xffe8d4462baed26a47154f4b8f6db497d2f772496965791d25bd456e342b7f00;
|
33
34
|
|
34
35
|
struct ComponentStorage {
|
35
|
-
IInstance _instance; // instance for this component
|
36
|
-
InstanceReader _instanceReader; // instance reader for this component
|
37
36
|
string _name; // unique (per instance) component name
|
38
37
|
IERC20Metadata _token; // token for this component
|
38
|
+
IInstance _instance; // instance for this component
|
39
39
|
address _wallet; // wallet for this component (default = component contract itself)
|
40
|
+
InstanceReader _instanceReader; // instance reader for this component
|
40
41
|
bool _isNftInterceptor; // declares if component is involved in nft transfers
|
41
|
-
IInstanceService _instanceService; // instance service for this component
|
42
|
-
|
43
42
|
NftId _productNftId; // only relevant for components that are linked to a aproduct
|
44
|
-
IProductService _productService; // product service for component, might not be relevant for some component types (eg oracles)
|
45
43
|
}
|
46
44
|
|
45
|
+
function _getComponentStorage() private pure returns (ComponentStorage storage $) {
|
46
|
+
assembly {
|
47
|
+
$.slot := COMPONENT_LOCATION_V1
|
48
|
+
}
|
49
|
+
}
|
47
50
|
|
48
51
|
modifier onlyChainNft() {
|
49
52
|
if(msg.sender != getRegistry().getChainNftAddress()) {
|
@@ -52,20 +55,6 @@ abstract contract Component is
|
|
52
55
|
_;
|
53
56
|
}
|
54
57
|
|
55
|
-
|
56
|
-
modifier onlyProductService() {
|
57
|
-
if(msg.sender != address(_getComponentStorage()._productService)) {
|
58
|
-
revert ErrorComponentNotProductService(msg.sender);
|
59
|
-
}
|
60
|
-
_;
|
61
|
-
}
|
62
|
-
|
63
|
-
function _getComponentStorage() private pure returns (ComponentStorage storage $) {
|
64
|
-
assembly {
|
65
|
-
$.slot := CONTRACT_LOCATION_V1
|
66
|
-
}
|
67
|
-
}
|
68
|
-
|
69
58
|
function initializeComponent(
|
70
59
|
address registry,
|
71
60
|
NftId instanceNftId,
|
@@ -74,77 +63,44 @@ abstract contract Component is
|
|
74
63
|
ObjectType componentType,
|
75
64
|
bool isInterceptor,
|
76
65
|
address initialOwner,
|
77
|
-
bytes memory data
|
66
|
+
bytes memory registryData // writeonly data that will saved in the object info record of the registry
|
78
67
|
)
|
79
68
|
public
|
80
69
|
virtual
|
81
70
|
onlyInitializing()
|
82
71
|
{
|
83
|
-
|
84
|
-
initializeRegisterable(registry, instanceNftId, componentType, isInterceptor, initialOwner, data);
|
85
|
-
|
86
|
-
// set unique name of component
|
87
|
-
$._name = name;
|
88
|
-
$._isNftInterceptor = isInterceptor;
|
72
|
+
initializeRegisterable(registry, instanceNftId, componentType, isInterceptor, initialOwner, registryData);
|
89
73
|
|
90
74
|
// set and check linked instance
|
91
|
-
|
92
|
-
$._instance = IInstance(
|
75
|
+
ComponentStorage storage $ = _getComponentStorage();
|
76
|
+
$._instance = IInstance(
|
77
|
+
getRegistry().getObjectInfo(instanceNftId).objectAddress);
|
78
|
+
|
93
79
|
if(!$._instance.supportsInterface(type(IInstance).interfaceId)) {
|
94
|
-
revert ErrorComponentNotInstance(instanceNftId
|
80
|
+
revert ErrorComponentNotInstance(instanceNftId);
|
95
81
|
}
|
96
82
|
|
97
83
|
// initialize AccessManagedUpgradeable
|
98
84
|
__AccessManaged_init($._instance.authority());
|
99
85
|
|
100
|
-
// set
|
101
|
-
|
102
|
-
$.
|
86
|
+
// set component state
|
87
|
+
$._name = name;
|
88
|
+
$._isNftInterceptor = isInterceptor;
|
103
89
|
$._instanceReader = $._instance.getInstanceReader();
|
104
|
-
$._productService = IProductService(getRegistry().getServiceAddress(PRODUCT(), gifVersion));
|
105
|
-
|
106
|
-
// set wallet and token
|
107
90
|
$._wallet = address(this);
|
108
91
|
$._token = IERC20Metadata(token);
|
109
92
|
|
110
93
|
registerInterface(type(IComponent).interfaceId);
|
111
94
|
}
|
112
95
|
|
113
|
-
/// @dev callback function for nft transfers. may only be called by chain nft contract.
|
114
|
-
/// default implementation is empty. overriding functions MUST add onlyChainNft modifier
|
115
|
-
function nftTransferFrom(address from, address to, uint256 tokenId)
|
116
|
-
external
|
117
|
-
virtual override
|
118
|
-
onlyChainNft()
|
119
|
-
{ }
|
120
|
-
|
121
96
|
function lock() external onlyOwner override {
|
122
|
-
|
97
|
+
IInstanceService(_getServiceAddress(INSTANCE())).setComponentLocked(true);
|
123
98
|
}
|
124
99
|
|
125
100
|
function unlock() external onlyOwner override {
|
126
|
-
|
101
|
+
IInstanceService(_getServiceAddress(INSTANCE())).setComponentLocked(false);
|
127
102
|
}
|
128
103
|
|
129
|
-
// only product service may set product nft id during registration of product setup
|
130
|
-
function setProductNftId(NftId productNftId)
|
131
|
-
external
|
132
|
-
override
|
133
|
-
onlyProductService()
|
134
|
-
{
|
135
|
-
ComponentStorage storage $ = _getComponentStorage();
|
136
|
-
|
137
|
-
if($._productNftId.gtz()) {
|
138
|
-
revert ErrorComponentProductNftAlreadySet();
|
139
|
-
}
|
140
|
-
|
141
|
-
$._productNftId = productNftId;
|
142
|
-
}
|
143
|
-
|
144
|
-
/// @dev Sets the wallet address for the component.
|
145
|
-
/// if the current wallet has tokens, these will be transferred.
|
146
|
-
/// if the new wallet address is externally owned, an approval from the
|
147
|
-
/// owner of the external wallet for the component to move all tokens must exist.
|
148
104
|
function setWallet(address newWallet)
|
149
105
|
external
|
150
106
|
override
|
@@ -159,8 +115,9 @@ abstract contract Component is
|
|
159
115
|
if (newWallet == address(0)) {
|
160
116
|
revert ErrorComponentWalletAddressZero();
|
161
117
|
}
|
118
|
+
|
162
119
|
if (newWallet == currentWallet) {
|
163
|
-
revert ErrorComponentWalletAddressIsSameAsCurrent(
|
120
|
+
revert ErrorComponentWalletAddressIsSameAsCurrent();
|
164
121
|
}
|
165
122
|
|
166
123
|
if (currentBalance > 0) {
|
@@ -177,7 +134,7 @@ abstract contract Component is
|
|
177
134
|
|
178
135
|
// effects
|
179
136
|
$._wallet = newWallet;
|
180
|
-
emit LogComponentWalletAddressChanged(newWallet);
|
137
|
+
emit LogComponentWalletAddressChanged(currentWallet, newWallet);
|
181
138
|
|
182
139
|
// interactions
|
183
140
|
if (currentBalance > 0) {
|
@@ -192,11 +149,44 @@ abstract contract Component is
|
|
192
149
|
}
|
193
150
|
}
|
194
151
|
|
195
|
-
function
|
196
|
-
|
197
|
-
view
|
152
|
+
function setProductNftId(NftId productNftId)
|
153
|
+
external
|
198
154
|
override
|
199
|
-
|
155
|
+
{
|
156
|
+
ComponentStorage storage $ = _getComponentStorage();
|
157
|
+
|
158
|
+
// verify caller is product service
|
159
|
+
if(msg.sender != _getServiceAddress(PRODUCT())) {
|
160
|
+
revert ErrorComponentNotProductService(msg.sender);
|
161
|
+
}
|
162
|
+
|
163
|
+
// verify component is not yet linked to a product
|
164
|
+
if($._productNftId.gtz()) {
|
165
|
+
revert ErrorComponentProductNftAlreadySet();
|
166
|
+
}
|
167
|
+
|
168
|
+
$._productNftId = productNftId;
|
169
|
+
}
|
170
|
+
|
171
|
+
function nftMint(address to, uint256 tokenId)
|
172
|
+
external
|
173
|
+
virtual
|
174
|
+
onlyChainNft
|
175
|
+
{}
|
176
|
+
|
177
|
+
/// @dev callback function for nft transfers
|
178
|
+
/// may only be called by chain nft contract.
|
179
|
+
/// do not override this function to implement business logic for handling transfers
|
180
|
+
/// override internal function _nftTransferFrom instead
|
181
|
+
function nftTransferFrom(address from, address to, uint256 tokenId)
|
182
|
+
external
|
183
|
+
virtual
|
184
|
+
onlyChainNft
|
185
|
+
{
|
186
|
+
_nftTransferFrom(from, to, tokenId);
|
187
|
+
}
|
188
|
+
|
189
|
+
function getWallet() public view override returns (address walletAddress)
|
200
190
|
{
|
201
191
|
return _getComponentStorage()._wallet;
|
202
192
|
}
|
@@ -213,15 +203,6 @@ abstract contract Component is
|
|
213
203
|
return _getComponentStorage()._instance;
|
214
204
|
}
|
215
205
|
|
216
|
-
function getInstanceReader() public view returns (InstanceReader reader) {
|
217
|
-
return _getComponentStorage()._instanceReader;
|
218
|
-
}
|
219
|
-
|
220
|
-
function getServiceAddress(ObjectType domain) public view returns (address service) {
|
221
|
-
VersionPart majorVersion = getInstance().getMajorVersion();
|
222
|
-
return getRegistry().getServiceAddress(domain, majorVersion);
|
223
|
-
}
|
224
|
-
|
225
206
|
function getName() public view override returns(string memory name) {
|
226
207
|
return _getComponentStorage()._name;
|
227
208
|
}
|
@@ -230,12 +211,41 @@ abstract contract Component is
|
|
230
211
|
return _getComponentStorage()._productNftId;
|
231
212
|
}
|
232
213
|
|
233
|
-
function
|
234
|
-
|
214
|
+
function getComponentInfo() public view returns (IComponents.ComponentInfo memory info) {
|
215
|
+
info = _getInstanceReader().getComponentInfo(getNftId());
|
216
|
+
|
217
|
+
// fallback to initial info (wallet is always != address(0))
|
218
|
+
if(info.wallet == address(0)) {
|
219
|
+
info = _getInitialInfo();
|
220
|
+
}
|
235
221
|
}
|
236
222
|
|
237
|
-
|
238
|
-
|
223
|
+
/// @dev defines initial component specification
|
224
|
+
/// overwrite this function according to your use case
|
225
|
+
function _getInitialInfo()
|
226
|
+
internal
|
227
|
+
view
|
228
|
+
virtual
|
229
|
+
returns (IComponents.ComponentInfo memory info)
|
230
|
+
{ }
|
231
|
+
|
232
|
+
|
233
|
+
/// @dev internal function for nft transfers.
|
234
|
+
/// handling logic that deals with nft transfers need to overwrite this function
|
235
|
+
function _nftTransferFrom(address from, address to, uint256 tokenId)
|
236
|
+
internal
|
237
|
+
virtual
|
238
|
+
{ }
|
239
|
+
|
240
|
+
/// @dev returns reader for linked instance
|
241
|
+
function _getInstanceReader() internal view returns (InstanceReader reader) {
|
242
|
+
return _getComponentStorage()._instanceReader;
|
239
243
|
}
|
240
244
|
|
241
|
-
|
245
|
+
/// @dev returns the service address for the specified domain
|
246
|
+
/// gets address via lookup from registry using the major version form the linked instance
|
247
|
+
function _getServiceAddress(ObjectType domain) internal view returns (address service) {
|
248
|
+
VersionPart majorVersion = _getComponentStorage()._instance.getMajorVersion();
|
249
|
+
return getRegistry().getServiceAddress(domain, majorVersion);
|
250
|
+
}
|
251
|
+
}
|
@@ -30,6 +30,7 @@ abstract contract Distribution is
|
|
30
30
|
bytes32 public constant DISTRIBUTION_STORAGE_LOCATION_V1 = 0xaab7c5ea03d290056d6c060e0833d3ebcbe647f7694616a2ec52738a64b2f900;
|
31
31
|
|
32
32
|
struct DistributionStorage {
|
33
|
+
Fee _minDistributionOwnerFee;
|
33
34
|
Fee _distributionFee;
|
34
35
|
TokenHandler _tokenHandler;
|
35
36
|
IDistributionService _distributionService;
|
@@ -41,18 +42,20 @@ abstract contract Distribution is
|
|
41
42
|
NftId instanceNftId,
|
42
43
|
string memory name,
|
43
44
|
address token,
|
45
|
+
Fee memory minDistributionOwnerFee,
|
44
46
|
Fee memory distributionFee,
|
45
47
|
address initialOwner,
|
46
|
-
bytes memory data
|
48
|
+
bytes memory registryData // writeonly data that will saved in the object info record of the registry
|
47
49
|
)
|
48
50
|
public
|
49
51
|
virtual
|
50
52
|
onlyInitializing()
|
51
53
|
{
|
52
|
-
initializeComponent(registry, instanceNftId, name, token, DISTRIBUTION(), true, initialOwner,
|
54
|
+
initializeComponent(registry, instanceNftId, name, token, DISTRIBUTION(), true, initialOwner, registryData);
|
53
55
|
|
54
56
|
DistributionStorage storage $ = _getDistributionStorage();
|
55
57
|
// TODO add validation
|
58
|
+
$._minDistributionOwnerFee = minDistributionOwnerFee;
|
56
59
|
$._distributionFee = distributionFee;
|
57
60
|
$._tokenHandler = new TokenHandler(token);
|
58
61
|
$._distributionService = getInstance().getDistributionService();
|
@@ -61,6 +64,7 @@ abstract contract Distribution is
|
|
61
64
|
}
|
62
65
|
|
63
66
|
function setFees(
|
67
|
+
Fee memory minDistributionOwnerFee,
|
64
68
|
Fee memory distributionFee
|
65
69
|
)
|
66
70
|
external
|
@@ -68,7 +72,7 @@ abstract contract Distribution is
|
|
68
72
|
onlyOwner
|
69
73
|
restricted()
|
70
74
|
{
|
71
|
-
_getDistributionStorage()._distributionService.setFees(distributionFee);
|
75
|
+
_getDistributionStorage()._distributionService.setFees(minDistributionOwnerFee, distributionFee);
|
72
76
|
}
|
73
77
|
|
74
78
|
function getDistributionFee() external view returns (Fee memory distributionFee) {
|
@@ -190,7 +194,7 @@ abstract contract Distribution is
|
|
190
194
|
)
|
191
195
|
{
|
192
196
|
ReferralId referralId = getReferralId(referralCode);
|
193
|
-
return
|
197
|
+
return _getInstanceReader().getDiscountPercentage(referralId);
|
194
198
|
}
|
195
199
|
|
196
200
|
|
@@ -219,19 +223,6 @@ abstract contract Distribution is
|
|
219
223
|
return 0 * netPremiumAmount;
|
220
224
|
}
|
221
225
|
|
222
|
-
function processSale(
|
223
|
-
ReferralId referralId,
|
224
|
-
uint256 premiumAmount
|
225
|
-
)
|
226
|
-
external
|
227
|
-
onlyOwner
|
228
|
-
restricted()
|
229
|
-
virtual override
|
230
|
-
{
|
231
|
-
DistributionStorage storage $ = _getDistributionStorage();
|
232
|
-
$._distributionService.processSale(referralId, premiumAmount);
|
233
|
-
}
|
234
|
-
|
235
226
|
function processRenewal(
|
236
227
|
ReferralId referralId,
|
237
228
|
uint256 feeAmount
|
@@ -259,13 +250,15 @@ abstract contract Distribution is
|
|
259
250
|
return ISetup.DistributionSetupInfo(
|
260
251
|
zeroNftId(),
|
261
252
|
$._tokenHandler,
|
253
|
+
$._minDistributionOwnerFee,
|
262
254
|
$._distributionFee,
|
263
|
-
address(this)
|
255
|
+
address(this),
|
256
|
+
0
|
264
257
|
);
|
265
258
|
}
|
266
259
|
|
267
260
|
|
268
|
-
function
|
261
|
+
function _nftTransferFrom(address from, address to, uint256 tokenId) internal virtual override {
|
269
262
|
// keep track of distributor nft owner
|
270
263
|
emit LogDistributorUpdated(to, msg.sender);
|
271
264
|
DistributionStorage storage $ = _getDistributionStorage();
|
@@ -3,6 +3,7 @@ pragma solidity ^0.8.20;
|
|
3
3
|
|
4
4
|
import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
|
5
5
|
|
6
|
+
import {IComponents} from "../instance/module/IComponents.sol";
|
6
7
|
import {IInstance} from "../instance/IInstance.sol";
|
7
8
|
import {IInstanceService} from "../instance/IInstanceService.sol";
|
8
9
|
import {IProductService} from "../instance/service/IProductService.sol";
|
@@ -11,44 +12,63 @@ import {ITransferInterceptor} from "../registry/ITransferInterceptor.sol";
|
|
11
12
|
import {NftId} from "../types/NftId.sol";
|
12
13
|
import {ObjectType} from "../types/ObjectType.sol";
|
13
14
|
|
15
|
+
/// @dev component base class
|
16
|
+
/// component examples are product, distribution, pool and oracle
|
14
17
|
interface IComponent is
|
15
18
|
IRegisterable,
|
16
19
|
ITransferInterceptor
|
17
20
|
{
|
18
|
-
|
19
21
|
error ErrorComponentNotChainNft(address caller);
|
20
22
|
error ErrorComponentNotProductService(address caller);
|
21
|
-
error ErrorComponentNotInstance(NftId instanceNftId
|
23
|
+
error ErrorComponentNotInstance(NftId instanceNftId);
|
22
24
|
error ErrorComponentProductNftAlreadySet();
|
25
|
+
|
23
26
|
error ErrorComponentWalletAddressZero();
|
24
|
-
error ErrorComponentWalletAddressIsSameAsCurrent(
|
27
|
+
error ErrorComponentWalletAddressIsSameAsCurrent();
|
25
28
|
error ErrorComponentWalletAllowanceTooSmall(address oldWallet, address newWallet, uint256 allowance, uint256 balance);
|
26
|
-
error ErrorComponentUnauthorized(address caller, uint64 requiredRoleIdNum);
|
27
29
|
|
28
|
-
event LogComponentWalletAddressChanged(address newWallet);
|
30
|
+
event LogComponentWalletAddressChanged(address oldWallet, address newWallet);
|
29
31
|
event LogComponentWalletTokensTransferred(address from, address to, uint256 amount);
|
30
32
|
|
31
|
-
|
32
|
-
|
33
|
+
/// @dev locks component to disable functions that may change state related to this component, the only exception is function "unlock"
|
34
|
+
/// only component owner (nft holder) is authorizes to call this function
|
33
35
|
function lock() external;
|
34
|
-
function unlock() external;
|
35
36
|
|
36
|
-
|
37
|
+
/// @dev unlocks component to (re-)enable functions that may change state related to this component
|
38
|
+
/// only component owner (nft holder) is authorizes to call this function
|
39
|
+
function unlock() external;
|
37
40
|
|
41
|
+
/// @dev sets the wallet address for the component
|
42
|
+
/// if the current wallet has tokens, these will be transferred
|
43
|
+
/// if the new wallet address is externally owned, an approval from the
|
44
|
+
/// owner of the external wallet for the component to move all tokens must exist
|
38
45
|
function setWallet(address walletAddress) external;
|
39
|
-
function getWallet() external view returns (address walletAddress);
|
40
46
|
|
41
|
-
|
47
|
+
/// @dev only product service may set product nft id during registration of product setup
|
48
|
+
function setProductNftId(NftId productNftId) external;
|
49
|
+
|
50
|
+
/// @dev returns the name of this component
|
51
|
+
/// to successfully register the component with an instance the name MUST be unique in the linked instance
|
52
|
+
function getName() external view returns (string memory name);
|
53
|
+
|
54
|
+
/// @dev defines which ERC20 token is used by this component
|
55
|
+
function getToken() external view returns (IERC20Metadata token);
|
42
56
|
|
57
|
+
/// @dev defines the instance to which this component is linked to
|
43
58
|
function getInstance() external view returns (IInstance instance);
|
44
59
|
|
45
|
-
/// @dev
|
46
|
-
///
|
47
|
-
function
|
60
|
+
/// @dev defines the wallet address used to hold the ERC20 tokens related to this component
|
61
|
+
/// the default address is the component token address
|
62
|
+
function getWallet() external view returns (address walletAddress);
|
48
63
|
|
49
|
-
|
64
|
+
/// @dev defines the product to which this component is linked to
|
65
|
+
/// this is only relevant for pool and distribution components
|
50
66
|
function getProductNftId() external view returns (NftId productNftId);
|
51
67
|
|
52
|
-
function
|
53
|
-
|
68
|
+
function isNftInterceptor() external view returns(bool isInterceptor);
|
69
|
+
|
70
|
+
/// @dev returns component infos for this pool
|
71
|
+
/// when registered with an instance the info is obtained from the data stored in the instance
|
72
|
+
/// when not registered the function returns the info from the component contract
|
73
|
+
function getComponentInfo() external view returns (IComponents.ComponentInfo memory info);
|
54
74
|
}
|
@@ -17,6 +17,7 @@ interface IDistributionComponent is IComponent {
|
|
17
17
|
function getSetupInfo() external view returns (ISetup.DistributionSetupInfo memory setupInfo);
|
18
18
|
|
19
19
|
function setFees(
|
20
|
+
Fee memory minDistributionOwnerFee,
|
20
21
|
Fee memory distributionFee
|
21
22
|
) external;
|
22
23
|
|
@@ -44,33 +45,11 @@ interface IDistributionComponent is IComponent {
|
|
44
45
|
bytes memory data
|
45
46
|
) external;
|
46
47
|
|
47
|
-
/**
|
48
|
-
* @dev lets distributors create referral codes.
|
49
|
-
* referral codes need to be unique
|
50
|
-
* distributor is identified via msg.sender.
|
51
|
-
*/
|
52
|
-
function createReferral(
|
53
|
-
NftId distributorNftId,
|
54
|
-
string memory code,
|
55
|
-
UFixed discountPercentage,
|
56
|
-
uint32 maxReferrals,
|
57
|
-
Timestamp expiryAt,
|
58
|
-
bytes memory data
|
59
|
-
) external returns (ReferralId referralId);
|
60
|
-
|
61
48
|
function calculateRenewalFeeAmount(
|
62
49
|
ReferralId referralId,
|
63
50
|
uint256 netPremiumAmount
|
64
51
|
) external view returns (uint256 feeAmount);
|
65
52
|
|
66
|
-
/// @dev callback from product service when selling a policy for a specific referralId
|
67
|
-
/// the used referral id and the collected fee are provided as parameters
|
68
|
-
/// the component implementation can then process this information accordingly
|
69
|
-
function processSale(
|
70
|
-
ReferralId referralId,
|
71
|
-
uint256 feeAmount
|
72
|
-
) external;
|
73
|
-
|
74
53
|
/// @dev callback from product service when a policy is renews for a specific referralId
|
75
54
|
function processRenewal(
|
76
55
|
ReferralId referralId,
|