@etherisc/gif-next 0.0.2-e1f23dc-329 → 0.0.2-e20063b-144
Sign up to get free protection for your applications and to get access to all the features.
- package/README.md +71 -14
- package/artifacts/contracts/components/Component.sol/Component.dbg.json +4 -0
- package/artifacts/contracts/components/Component.sol/Component.json +842 -0
- package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +1 -1
- package/artifacts/contracts/components/Distribution.sol/Distribution.json +946 -219
- package/artifacts/contracts/components/IComponent.sol/IComponent.dbg.json +4 -0
- package/artifacts/contracts/{instance/service/IComponentOwnerService.sol/IComponentOwnerService.json → components/IComponent.sol/IComponent.json} +303 -164
- package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.json +848 -31
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.json +864 -49
- package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.json +682 -9
- package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
- package/artifacts/contracts/components/Pool.sol/Pool.json +825 -231
- package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
- package/artifacts/contracts/components/Product.sol/Product.json +638 -190
- package/artifacts/contracts/instance/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.dbg.json +4 -0
- package/artifacts/contracts/instance/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.json +1206 -0
- package/artifacts/contracts/instance/BundleManager.sol/BundleManager.dbg.json +4 -0
- package/artifacts/contracts/instance/BundleManager.sol/BundleManager.json +778 -0
- package/artifacts/contracts/instance/Cloneable.sol/Cloneable.dbg.json +4 -0
- package/artifacts/contracts/instance/{AccessManagedSimple.sol/AccessManagedSimple.json → Cloneable.sol/Cloneable.json} +91 -2
- package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstance.sol/IInstance.json +1612 -656
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +321 -168
- package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
- package/artifacts/contracts/instance/Instance.sol/Instance.json +1002 -1278
- package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +593 -180
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +257 -261
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +501 -292
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +331 -98
- package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.dbg.json +4 -0
- package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.json +256 -0
- package/artifacts/contracts/instance/base/ComponentService.sol/ComponentService.dbg.json +4 -0
- package/artifacts/contracts/instance/base/{ComponentServiceBase.sol/ComponentServiceBase.json → ComponentService.sol/ComponentService.json} +247 -180
- 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 +71 -45
- 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 +4 -0
- package/artifacts/contracts/instance/service/ApplicationService.sol/ApplicationService.json +1060 -0
- package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.json +681 -0
- package/artifacts/contracts/instance/service/BundleService.sol/BundleService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/BundleService.sol/BundleService.json +1266 -0
- package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.json +725 -0
- package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.json +1040 -0
- package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.json +685 -0
- package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +1273 -215
- package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.json +428 -79
- package/artifacts/contracts/instance/service/IApplicationService.sol/IApplicationService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/IApplicationService.sol/IApplicationService.json +627 -0
- package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.json +686 -0
- package/artifacts/contracts/instance/service/IClaimService.sol/IClaimService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/IClaimService.sol/IClaimService.json +602 -0
- package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.json +804 -160
- package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.json +937 -0
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +437 -241
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +82 -371
- package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.json +1511 -0
- package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.json +741 -0
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +649 -338
- package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.json +305 -92
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +268 -522
- package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.json +295 -114
- 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 +244 -133
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +149 -230
- 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 +257 -235
- package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.dbg.json +4 -0
- package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.json +285 -0
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +200 -335
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +298 -145
- package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.dbg.json +4 -0
- package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.json +559 -0
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +141 -53
- 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/ERC165.sol/ERC165.json +41 -3
- package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
- package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.json +40 -29
- package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +4 -0
- package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.json +129 -0
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +21 -34
- package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +4 -0
- package/artifacts/contracts/{experiment/inheritance/IB.sol/IB.json → shared/IRegistryLinked.sol/IRegistryLinked.json} +18 -20
- package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
- package/artifacts/contracts/shared/IService.sol/IService.json +86 -172
- package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +1 -1
- package/artifacts/contracts/shared/IVersionable.sol/IVersionable.json +2 -152
- package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
- package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +120 -27
- package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +4 -0
- package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +248 -0
- package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +1 -1
- package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +294 -61
- package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
- package/artifacts/contracts/shared/Registerable.sol/Registerable.json +129 -51
- package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +4 -0
- package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +84 -0
- package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
- package/artifacts/contracts/shared/Service.sol/Service.json +191 -163
- 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/shared/Versionable.sol/Versionable.json +2 -152
- 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 +129 -51
- 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 +210 -214
- 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 +8 -190
- 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/Amount.sol/AmountLib.dbg.json +4 -0
- package/artifacts/contracts/types/Amount.sol/AmountLib.json +185 -0
- 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 +4 -0
- package/artifacts/contracts/types/ClaimId.sol/ClaimIdLib.json +179 -0
- 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 +40 -9
- 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 +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/ObjectType.sol/ObjectTypeLib.json +2 -2
- package/artifacts/contracts/types/PayoutId.sol/PayoutIdLib.dbg.json +4 -0
- package/artifacts/contracts/types/PayoutId.sol/PayoutIdLib.json +209 -0
- 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 +38 -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 +253 -0
- package/contracts/components/Distribution.sol +204 -79
- package/contracts/components/IComponent.sol +76 -0
- package/contracts/components/IDistributionComponent.sol +44 -17
- package/contracts/components/IPoolComponent.sol +88 -37
- package/contracts/components/IProductComponent.sol +10 -5
- package/contracts/components/Pool.sol +220 -160
- package/contracts/components/Product.sol +244 -157
- package/contracts/instance/AccessManagerUpgradeableInitializeable.sol +13 -0
- package/contracts/instance/BundleManager.sol +126 -0
- package/contracts/instance/Cloneable.sol +51 -0
- package/contracts/instance/IInstance.sol +67 -19
- package/contracts/instance/IInstanceService.sol +46 -8
- package/contracts/instance/Instance.sol +151 -284
- package/contracts/instance/InstanceAccessManager.sol +414 -175
- package/contracts/instance/InstanceReader.sol +38 -36
- package/contracts/instance/InstanceService.sol +402 -122
- package/contracts/instance/InstanceServiceManager.sol +6 -9
- package/contracts/instance/ObjectManager.sol +82 -0
- package/contracts/instance/base/ComponentService.sol +121 -0
- package/contracts/instance/base/KeyValueStore.sol +13 -5
- package/contracts/instance/base/Lifecycle.sol +23 -6
- package/contracts/instance/module/IAccess.sol +36 -20
- package/contracts/instance/module/IBundle.sol +8 -5
- package/contracts/instance/module/IComponents.sol +41 -0
- package/contracts/instance/module/IDistribution.sol +2 -0
- package/contracts/instance/module/IPolicy.sol +41 -9
- package/contracts/instance/module/ISetup.sol +9 -20
- package/contracts/instance/service/ApplicationService.sol +355 -0
- package/contracts/instance/service/ApplicationServiceManager.sol +35 -0
- package/contracts/instance/service/BundleService.sol +436 -0
- package/contracts/instance/service/BundleServiceManager.sol +51 -0
- package/contracts/instance/service/ClaimService.sol +239 -0
- package/contracts/instance/service/ClaimServiceManager.sol +35 -0
- package/contracts/instance/service/DistributionService.sol +374 -31
- package/contracts/instance/service/DistributionServiceManager.sol +7 -10
- package/contracts/instance/service/IApplicationService.sol +78 -0
- package/contracts/instance/service/IBundleService.sol +96 -0
- package/contracts/instance/service/IClaimService.sol +92 -0
- package/contracts/instance/service/IDistributionService.sol +87 -0
- package/contracts/instance/service/IPolicyService.sol +137 -0
- package/contracts/instance/service/IPoolService.sol +78 -20
- package/contracts/instance/service/IProductService.sol +3 -70
- package/contracts/instance/service/PolicyService.sol +541 -0
- package/contracts/instance/service/PolicyServiceManager.sol +54 -0
- package/contracts/instance/service/PoolService.sol +216 -114
- package/contracts/instance/service/PoolServiceManager.sol +6 -9
- package/contracts/instance/service/ProductService.sol +105 -459
- package/contracts/instance/service/ProductServiceManager.sol +2 -2
- package/contracts/registry/ChainNft.sol +9 -1
- package/contracts/registry/IRegistry.sol +39 -19
- package/contracts/registry/IRegistryService.sol +31 -13
- package/contracts/registry/ITransferInterceptor.sol +1 -0
- package/contracts/registry/Registry.sol +243 -224
- package/contracts/registry/RegistryAccessManager.sol +216 -0
- package/contracts/registry/RegistryService.sol +97 -173
- package/contracts/registry/RegistryServiceManager.sol +21 -39
- package/contracts/registry/ReleaseManager.sol +324 -0
- package/contracts/registry/TokenRegistry.sol +22 -17
- package/contracts/shared/ERC165.sol +14 -12
- package/contracts/shared/INftOwnable.sol +11 -10
- package/contracts/shared/IPolicyHolder.sol +26 -0
- package/contracts/shared/IRegisterable.sol +4 -6
- package/contracts/shared/IRegistryLinked.sol +12 -0
- package/contracts/shared/IService.sol +5 -4
- package/contracts/shared/IVersionable.sol +4 -47
- package/contracts/shared/NftOwnable.sol +66 -80
- package/contracts/shared/PolicyHolder.sol +81 -0
- package/contracts/shared/ProxyManager.sol +100 -25
- package/contracts/shared/Registerable.sol +16 -32
- package/contracts/shared/RegistryLinked.sol +48 -0
- package/contracts/shared/Service.sol +41 -24
- package/contracts/shared/TokenHandler.sol +11 -5
- package/contracts/shared/Versionable.sol +4 -92
- package/contracts/test/TestRegisterable.sol +1 -1
- package/contracts/test/TestService.sol +4 -3
- package/contracts/types/Amount.sol +65 -0
- package/contracts/types/Blocknumber.sol +1 -0
- package/contracts/types/ClaimId.sol +75 -0
- package/contracts/types/DistributorType.sol +2 -2
- package/contracts/types/Fee.sol +13 -5
- package/contracts/types/NftId.sol +8 -0
- package/contracts/types/NftIdSet.sol +26 -24
- package/contracts/types/ObjectType.sol +11 -6
- package/contracts/types/PayoutId.sol +82 -0
- package/contracts/types/Referral.sol +4 -0
- package/contracts/types/RoleId.sol +26 -19
- package/contracts/types/Seconds.sol +54 -0
- package/contracts/types/StateId.sol +7 -2
- package/contracts/types/Timestamp.sol +18 -13
- package/contracts/types/UFixed.sol +1 -0
- package/contracts/types/Version.sol +1 -0
- package/package.json +3 -3
- package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.dbg.json +0 -4
- package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.json +0 -327
- package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.dbg.json +0 -4
- package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.json +0 -280
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Cloner.dbg.json +0 -4
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Cloner.json +0 -66
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock1.dbg.json +0 -4
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock1.json +0 -24
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock2.dbg.json +0 -4
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock2.json +0 -42
- package/artifacts/contracts/experiment/errors/Require.sol/Require.dbg.json +0 -4
- package/artifacts/contracts/experiment/errors/Require.sol/Require.json +0 -105
- package/artifacts/contracts/experiment/errors/Revert.sol/Revert.dbg.json +0 -4
- package/artifacts/contracts/experiment/errors/Revert.sol/Revert.json +0 -105
- package/artifacts/contracts/experiment/inheritance/A.sol/A.dbg.json +0 -4
- package/artifacts/contracts/experiment/inheritance/A.sol/A.json +0 -128
- package/artifacts/contracts/experiment/inheritance/A.sol/AShared.dbg.json +0 -4
- package/artifacts/contracts/experiment/inheritance/A.sol/AShared.json +0 -42
- package/artifacts/contracts/experiment/inheritance/B.sol/B.dbg.json +0 -4
- package/artifacts/contracts/experiment/inheritance/B.sol/B.json +0 -76
- package/artifacts/contracts/experiment/inheritance/C.sol/C.dbg.json +0 -4
- package/artifacts/contracts/experiment/inheritance/C.sol/C.json +0 -89
- package/artifacts/contracts/experiment/inheritance/IA.sol/IA.dbg.json +0 -4
- package/artifacts/contracts/experiment/inheritance/IA.sol/IA.json +0 -128
- package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.dbg.json +0 -4
- package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.json +0 -37
- package/artifacts/contracts/experiment/inheritance/IB.sol/IB.dbg.json +0 -4
- package/artifacts/contracts/experiment/inheritance/IC.sol/IC.dbg.json +0 -4
- package/artifacts/contracts/experiment/inheritance/IC.sol/IC.json +0 -63
- package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.dbg.json +0 -4
- package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.json +0 -59
- package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.dbg.json +0 -4
- package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.json +0 -124
- package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.dbg.json +0 -4
- package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.json +0 -74
- package/artifacts/contracts/experiment/statemachine/SM.sol/SM.dbg.json +0 -4
- package/artifacts/contracts/experiment/statemachine/SM.sol/SM.json +0 -124
- package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.dbg.json +0 -4
- package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.json +0 -207
- package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.dbg.json +0 -4
- package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.json +0 -10
- package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.dbg.json +0 -4
- package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.json +0 -10
- package/artifacts/contracts/instance/AccessManagedSimple.sol/AccessManagedSimple.dbg.json +0 -4
- package/artifacts/contracts/instance/AccessManagerSimple.sol/AccessManagerSimple.dbg.json +0 -4
- package/artifacts/contracts/instance/AccessManagerSimple.sol/AccessManagerSimple.json +0 -1132
- package/artifacts/contracts/instance/IAccessManagerSimple.sol/IAccessManagerSimple.dbg.json +0 -4
- package/artifacts/contracts/instance/IAccessManagerSimple.sol/IAccessManagerSimple.json +0 -1082
- package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.dbg.json +0 -4
- package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.dbg.json +0 -4
- package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.json +0 -113
- package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.dbg.json +0 -4
- package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.json +0 -827
- package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.dbg.json +0 -4
- package/artifacts/contracts/shared/RegisterableUpgradable.sol/RegisterableUpgradable.dbg.json +0 -4
- package/artifacts/contracts/shared/RegisterableUpgradable.sol/RegisterableUpgradable.json +0 -442
- package/contracts/components/BaseComponent.sol +0 -91
- package/contracts/components/IBaseComponent.sol +0 -25
- package/contracts/experiment/cloning/Cloner.sol +0 -47
- package/contracts/experiment/errors/Require.sol +0 -38
- package/contracts/experiment/errors/Revert.sol +0 -44
- package/contracts/experiment/inheritance/A.sol +0 -53
- package/contracts/experiment/inheritance/B.sol +0 -28
- package/contracts/experiment/inheritance/C.sol +0 -34
- package/contracts/experiment/inheritance/IA.sol +0 -13
- package/contracts/experiment/inheritance/IB.sol +0 -10
- package/contracts/experiment/inheritance/IC.sol +0 -12
- package/contracts/experiment/statemachine/Dummy.sol +0 -27
- package/contracts/experiment/statemachine/ISM.sol +0 -25
- package/contracts/experiment/statemachine/SM.sol +0 -57
- package/contracts/experiment/statemachine/SimpleStateMachine.sol +0 -31
- package/contracts/experiment/types/TypeA.sol +0 -47
- package/contracts/experiment/types/TypeB.sol +0 -29
- package/contracts/instance/AccessManagedSimple.sol +0 -115
- package/contracts/instance/AccessManagerSimple.sol +0 -692
- package/contracts/instance/IAccessManagerSimple.sol +0 -391
- package/contracts/instance/base/ComponentServiceBase.sol +0 -134
- package/contracts/instance/base/IInstanceBase.sol +0 -23
- package/contracts/instance/service/ComponentOwnerService.sol +0 -317
- package/contracts/instance/service/IComponentOwnerService.sol +0 -20
- package/contracts/shared/RegisterableUpgradable.sol +0 -16
@@ -2,40 +2,48 @@
|
|
2
2
|
pragma solidity ^0.8.19;
|
3
3
|
|
4
4
|
import {IRegistry} from "../../registry/IRegistry.sol";
|
5
|
-
import {IRegistryService} from "../../registry/IRegistryService.sol";
|
6
5
|
import {IInstance} from "../../instance/IInstance.sol";
|
6
|
+
import {InstanceAccessManager} from "../InstanceAccessManager.sol";
|
7
7
|
import {InstanceReader} from "../../instance/InstanceReader.sol";
|
8
8
|
import {ISetup} from "../../instance/module/ISetup.sol";
|
9
|
-
import {
|
9
|
+
import {IPolicy} from "../module/IPolicy.sol";
|
10
10
|
|
11
|
-
import {NftId, NftIdLib} from "../../types/NftId.sol";
|
12
|
-
import {Fee} from "../../types/Fee.sol";
|
13
|
-
import {DISTRIBUTION_OWNER_ROLE} from "../../types/RoleId.sol";
|
11
|
+
import {NftId, NftIdLib, zeroNftId} from "../../types/NftId.sol";
|
12
|
+
import {Fee, FeeLib} from "../../types/Fee.sol";
|
13
|
+
import {PRODUCT_SERVICE_ROLE, DISTRIBUTION_OWNER_ROLE} from "../../types/RoleId.sol";
|
14
14
|
import {KEEP_STATE} from "../../types/StateId.sol";
|
15
|
-
import {DISTRIBUTION} from "../../types/ObjectType.sol";
|
15
|
+
import {ObjectType, DISTRIBUTION, INSTANCE, DISTRIBUTION, DISTRIBUTOR} from "../../types/ObjectType.sol";
|
16
16
|
import {Version, VersionLib} from "../../types/Version.sol";
|
17
|
+
import {RoleId} from "../../types/RoleId.sol";
|
17
18
|
|
18
19
|
import {IVersionable} from "../../shared/IVersionable.sol";
|
19
20
|
import {Versionable} from "../../shared/Versionable.sol";
|
20
21
|
|
21
22
|
import {IService} from "../../shared/IService.sol";
|
22
23
|
import {Service} from "../../shared/Service.sol";
|
23
|
-
import {
|
24
|
-
import {IDistributionService} from "./IDistributionService.sol";
|
25
|
-
import {Distribution} from "../../components/Distribution.sol";
|
24
|
+
import {ComponentService} from "../base/ComponentService.sol";
|
26
25
|
import {InstanceService} from "../InstanceService.sol";
|
27
|
-
import {
|
28
|
-
import {
|
26
|
+
import {IComponent} from "../../components/IComponent.sol";
|
27
|
+
import {IDistributionComponent} from "../../components/IDistributionComponent.sol";
|
28
|
+
import {IDistributionService} from "./IDistributionService.sol";
|
29
|
+
|
30
|
+
import {UFixed, UFixedLib} from "../../types/UFixed.sol";
|
31
|
+
import {DistributorType, DistributorTypeLib} from "../../types/DistributorType.sol";
|
32
|
+
import {ReferralId, ReferralStatus, ReferralLib} from "../../types/Referral.sol";
|
33
|
+
import {Timestamp, TimestampLib, zeroTimestamp} from "../../types/Timestamp.sol";
|
34
|
+
import {Key32} from "../../types/Key32.sol";
|
35
|
+
import {IDistribution} from "../module/IDistribution.sol";
|
29
36
|
|
30
|
-
string constant DISTRIBUTION_SERVICE_NAME = "DistributionService";
|
31
37
|
|
32
38
|
contract DistributionService is
|
33
|
-
|
39
|
+
ComponentService,
|
34
40
|
IDistributionService
|
35
41
|
{
|
36
42
|
using NftIdLib for NftId;
|
37
|
-
|
38
|
-
|
43
|
+
using TimestampLib for Timestamp;
|
44
|
+
using UFixedLib for UFixed;
|
45
|
+
using FeeLib for Fee;
|
46
|
+
using ReferralLib for ReferralId;
|
39
47
|
|
40
48
|
address internal _registryAddress;
|
41
49
|
|
@@ -47,42 +55,377 @@ contract DistributionService is
|
|
47
55
|
initializer
|
48
56
|
virtual override
|
49
57
|
{
|
50
|
-
address initialOwner
|
51
|
-
|
58
|
+
address initialOwner;
|
59
|
+
address registryAddress;
|
60
|
+
(registryAddress, initialOwner) = abi.decode(data, (address, address));
|
52
61
|
// TODO while DistributionService is not deployed in DistributionServiceManager constructor
|
53
62
|
// owner is DistributionServiceManager deployer
|
54
|
-
|
63
|
+
initializeService(registryAddress, address(0), owner);
|
64
|
+
registerInterface(type(IDistributionService).interfaceId);
|
65
|
+
}
|
55
66
|
|
56
|
-
|
57
|
-
|
67
|
+
function getDomain() public pure override returns(ObjectType) {
|
68
|
+
return DISTRIBUTION();
|
58
69
|
}
|
59
70
|
|
71
|
+
function register(address distributionAddress)
|
72
|
+
external
|
73
|
+
returns(NftId distributionNftId)
|
74
|
+
{
|
75
|
+
(
|
76
|
+
IComponent component,
|
77
|
+
address owner,
|
78
|
+
IInstance instance,
|
79
|
+
NftId instanceNftId
|
80
|
+
) = _checkComponentForRegistration(
|
81
|
+
distributionAddress,
|
82
|
+
DISTRIBUTION(),
|
83
|
+
DISTRIBUTION_OWNER_ROLE());
|
60
84
|
|
61
|
-
|
62
|
-
|
63
|
-
|
85
|
+
IRegistry.ObjectInfo memory distributionInfo = getRegistryService().registerDistribution(component, owner);
|
86
|
+
IDistributionComponent distribution = IDistributionComponent(distributionAddress);
|
87
|
+
distribution.linkToRegisteredNftId();
|
88
|
+
distributionNftId = distributionInfo.nftId;
|
64
89
|
|
65
|
-
|
66
|
-
|
67
|
-
|
68
|
-
|
69
|
-
);
|
70
|
-
|
90
|
+
instance.createDistributionSetup(distributionNftId, distribution.getSetupInfo());
|
91
|
+
// TODO move to distribution?
|
92
|
+
bytes4[][] memory selectors = new bytes4[][](2);
|
93
|
+
selectors[0] = new bytes4[](1);
|
94
|
+
selectors[1] = new bytes4[](2);
|
95
|
+
|
96
|
+
selectors[0][0] = IDistributionComponent.setFees.selector;
|
97
|
+
selectors[1][0] = IDistributionComponent.processRenewal.selector;
|
98
|
+
|
99
|
+
RoleId[] memory roles = new RoleId[](2);
|
100
|
+
roles[0] = DISTRIBUTION_OWNER_ROLE();
|
101
|
+
roles[1] = PRODUCT_SERVICE_ROLE();
|
102
|
+
|
103
|
+
getInstanceService().createGifTarget(
|
104
|
+
instanceNftId,
|
105
|
+
distributionAddress,
|
106
|
+
distribution.getName(),
|
107
|
+
selectors,
|
108
|
+
roles);
|
71
109
|
}
|
72
110
|
|
73
111
|
function setFees(
|
112
|
+
Fee memory minDistributionOwnerFee,
|
74
113
|
Fee memory distributionFee
|
75
114
|
)
|
76
115
|
external
|
77
116
|
override
|
78
117
|
{
|
79
|
-
(
|
118
|
+
if (minDistributionOwnerFee.fractionalFee > distributionFee.fractionalFee) {
|
119
|
+
revert ErrorIDistributionServiceMinFeeTooHigh(minDistributionOwnerFee.fractionalFee.toInt(), distributionFee.fractionalFee.toInt());
|
120
|
+
}
|
121
|
+
|
122
|
+
(NftId distributionNftId, IRegistry.ObjectInfo memory info , IInstance instance) = _getAndVerifyComponentInfoAndInstance(DISTRIBUTION());
|
80
123
|
InstanceReader instanceReader = instance.getInstanceReader();
|
81
|
-
NftId distributionNftId = info.nftId;
|
82
124
|
|
83
125
|
ISetup.DistributionSetupInfo memory distSetupInfo = instanceReader.getDistributionSetupInfo(distributionNftId);
|
126
|
+
distSetupInfo.minDistributionOwnerFee = minDistributionOwnerFee;
|
84
127
|
distSetupInfo.distributionFee = distributionFee;
|
85
128
|
|
86
129
|
instance.updateDistributionSetup(distributionNftId, distSetupInfo, KEEP_STATE());
|
87
130
|
}
|
131
|
+
|
132
|
+
function createDistributorType(
|
133
|
+
string memory name,
|
134
|
+
UFixed minDiscountPercentage,
|
135
|
+
UFixed maxDiscountPercentage,
|
136
|
+
UFixed commissionPercentage,
|
137
|
+
uint32 maxReferralCount,
|
138
|
+
uint32 maxReferralLifetime,
|
139
|
+
bool allowSelfReferrals,
|
140
|
+
bool allowRenewals,
|
141
|
+
bytes memory data
|
142
|
+
)
|
143
|
+
external
|
144
|
+
returns (DistributorType distributorType)
|
145
|
+
{
|
146
|
+
(NftId distributionNftId, IInstance instance) = _getAndVerifyCallingDistribution();
|
147
|
+
|
148
|
+
{
|
149
|
+
ISetup.DistributionSetupInfo memory setupInfo = instance.getInstanceReader().getDistributionSetupInfo(distributionNftId);
|
150
|
+
UFixed variableFeesPartsTotal = setupInfo.minDistributionOwnerFee.fractionalFee.add(commissionPercentage);
|
151
|
+
UFixed maxDiscountPercentageLimit = setupInfo.distributionFee.fractionalFee.sub(variableFeesPartsTotal);
|
152
|
+
if (maxDiscountPercentage.gt(maxDiscountPercentageLimit)) {
|
153
|
+
revert ErrorIDistributionServiceMaxDiscountTooHigh(maxDiscountPercentage.toInt(), maxDiscountPercentageLimit.toInt());
|
154
|
+
}
|
155
|
+
}
|
156
|
+
|
157
|
+
distributorType = DistributorTypeLib.toDistributorType(distributionNftId, name);
|
158
|
+
IDistribution.DistributorTypeInfo memory info = IDistribution.DistributorTypeInfo(
|
159
|
+
name,
|
160
|
+
minDiscountPercentage,
|
161
|
+
maxDiscountPercentage,
|
162
|
+
commissionPercentage,
|
163
|
+
maxReferralCount,
|
164
|
+
maxReferralLifetime,
|
165
|
+
allowSelfReferrals,
|
166
|
+
allowRenewals,
|
167
|
+
data);
|
168
|
+
|
169
|
+
instance.createDistributorType(distributorType, info);
|
170
|
+
}
|
171
|
+
|
172
|
+
function createDistributor(
|
173
|
+
address distributor,
|
174
|
+
DistributorType distributorType,
|
175
|
+
bytes memory data
|
176
|
+
) external returns (NftId distributorNftId)
|
177
|
+
{
|
178
|
+
(NftId distributionNftId, IInstance instance) = _getAndVerifyCallingDistribution();
|
179
|
+
|
180
|
+
distributorNftId = getRegistryService().registerDistributor(
|
181
|
+
IRegistry.ObjectInfo(
|
182
|
+
zeroNftId(),
|
183
|
+
distributionNftId,
|
184
|
+
DISTRIBUTOR(),
|
185
|
+
true, // intercepting property for bundles is defined on pool
|
186
|
+
address(0),
|
187
|
+
distributor,
|
188
|
+
""
|
189
|
+
));
|
190
|
+
|
191
|
+
IDistribution.DistributorInfo memory info = IDistribution.DistributorInfo(
|
192
|
+
distributorType,
|
193
|
+
true, // active
|
194
|
+
data,
|
195
|
+
0,
|
196
|
+
0);
|
197
|
+
|
198
|
+
instance.createDistributor(distributorNftId, info);
|
199
|
+
}
|
200
|
+
|
201
|
+
function updateDistributorType(
|
202
|
+
NftId distributorNftId,
|
203
|
+
DistributorType distributorType,
|
204
|
+
bytes memory data
|
205
|
+
) external virtual
|
206
|
+
{
|
207
|
+
(, IInstance instance) = _getAndVerifyCallingDistribution();
|
208
|
+
InstanceReader instanceReader = instance.getInstanceReader();
|
209
|
+
IDistribution.DistributorInfo memory distributorInfo = instanceReader.getDistributorInfo(distributorNftId);
|
210
|
+
distributorInfo.distributorType = distributorType;
|
211
|
+
distributorInfo.data = data;
|
212
|
+
instance.updateDistributor(distributorNftId, distributorInfo, KEEP_STATE());
|
213
|
+
}
|
214
|
+
|
215
|
+
|
216
|
+
function createReferral(
|
217
|
+
NftId distributorNftId,
|
218
|
+
string memory code,
|
219
|
+
UFixed discountPercentage,
|
220
|
+
uint32 maxReferrals,
|
221
|
+
Timestamp expiryAt,
|
222
|
+
bytes memory data
|
223
|
+
)
|
224
|
+
external
|
225
|
+
virtual
|
226
|
+
returns (ReferralId referralId)
|
227
|
+
{
|
228
|
+
(NftId distributionNftId, IInstance instance) = _getAndVerifyCallingDistribution();
|
229
|
+
|
230
|
+
if (bytes(code).length == 0) {
|
231
|
+
revert ErrorIDistributionServiceInvalidReferral(code);
|
232
|
+
}
|
233
|
+
if (expiryAt.eqz()) {
|
234
|
+
revert ErrorIDistributionServiceExpirationInvalid(expiryAt);
|
235
|
+
}
|
236
|
+
|
237
|
+
InstanceReader instanceReader = instance.getInstanceReader();
|
238
|
+
IDistribution.DistributorInfo memory distributorInfo = instanceReader.getDistributorInfo(distributorNftId);
|
239
|
+
DistributorType distributorType = distributorInfo.distributorType;
|
240
|
+
IDistribution.DistributorTypeInfo memory distributorTypeData = instanceReader.getDistributorTypeInfo(distributorType);
|
241
|
+
|
242
|
+
if (distributorTypeData.maxReferralCount < maxReferrals) {
|
243
|
+
revert ErrorIDistributionServiceMaxReferralsExceeded(distributorTypeData.maxReferralCount);
|
244
|
+
}
|
245
|
+
if (distributorTypeData.minDiscountPercentage > discountPercentage) {
|
246
|
+
revert ErrorIDistributionServiceDiscountTooLow(distributorTypeData.minDiscountPercentage.toInt(), discountPercentage.toInt());
|
247
|
+
}
|
248
|
+
if (distributorTypeData.maxDiscountPercentage < discountPercentage) {
|
249
|
+
revert ErrorIDistributionServiceDiscountTooHigh(distributorTypeData.maxDiscountPercentage.toInt(), discountPercentage.toInt());
|
250
|
+
}
|
251
|
+
if (expiryAt.toInt() - TimestampLib.blockTimestamp().toInt() > distributorTypeData.maxReferralLifetime) {
|
252
|
+
revert ErrorIDistributionServiceExpiryTooLong(distributorTypeData.maxReferralLifetime, expiryAt.toInt());
|
253
|
+
}
|
254
|
+
|
255
|
+
referralId = ReferralLib.toReferralId(distributionNftId, code);
|
256
|
+
IDistribution.ReferralInfo memory info = IDistribution.ReferralInfo(
|
257
|
+
distributorNftId,
|
258
|
+
code,
|
259
|
+
discountPercentage,
|
260
|
+
maxReferrals,
|
261
|
+
0, // used referrals
|
262
|
+
expiryAt,
|
263
|
+
data
|
264
|
+
);
|
265
|
+
|
266
|
+
instance.createReferral(referralId, info);
|
267
|
+
return referralId;
|
268
|
+
}
|
269
|
+
|
270
|
+
function processSale(
|
271
|
+
NftId distributionNftId,
|
272
|
+
ReferralId referralId,
|
273
|
+
IPolicy.Premium memory premium,
|
274
|
+
uint256 transferredDistributionFeeAmount
|
275
|
+
)
|
276
|
+
external
|
277
|
+
virtual
|
278
|
+
{
|
279
|
+
bool isReferral = ! referralId.eqz();
|
280
|
+
bool referralValid = referralIsValid(distributionNftId, referralId);
|
281
|
+
|
282
|
+
if (isReferral && ! referralValid) {
|
283
|
+
revert ErrorIDistributionServiceReferralInvalid(distributionNftId, referralId);
|
284
|
+
}
|
285
|
+
|
286
|
+
IInstance instance = _getInstanceForDistribution(distributionNftId);
|
287
|
+
InstanceReader reader = instance.getInstanceReader();
|
288
|
+
IDistribution.ReferralInfo memory referralInfo = reader.getReferralInfo(referralId);
|
289
|
+
IDistribution.DistributorInfo memory distributorInfo = reader.getDistributorInfo(referralInfo.distributorNftId);
|
290
|
+
ISetup.DistributionSetupInfo memory setupInfo = reader.getDistributionSetupInfo(distributionNftId);
|
291
|
+
|
292
|
+
uint256 distributionOwnerFee = premium.distributionOwnerFeeFixAmount + premium.distributionOwnerFeeVarAmount;
|
293
|
+
uint256 commissionAmount = premium.commissionAmount;
|
294
|
+
|
295
|
+
if (transferredDistributionFeeAmount != distributionOwnerFee + commissionAmount) {
|
296
|
+
revert ErrorIDistributionServiceInvalidFeeTransferred(transferredDistributionFeeAmount, distributionOwnerFee + commissionAmount);
|
297
|
+
}
|
298
|
+
|
299
|
+
|
300
|
+
if (distributionOwnerFee > 0) {
|
301
|
+
setupInfo.sumDistributionOwnerFees += distributionOwnerFee;
|
302
|
+
instance.updateDistributionSetup(distributionNftId, setupInfo, KEEP_STATE());
|
303
|
+
}
|
304
|
+
|
305
|
+
if (isReferral) {
|
306
|
+
referralInfo.usedReferrals += 1;
|
307
|
+
instance.updateReferral(referralId, referralInfo, KEEP_STATE());
|
308
|
+
|
309
|
+
if (commissionAmount > 0) {
|
310
|
+
distributorInfo.sumCommisions += commissionAmount;
|
311
|
+
distributorInfo.numPoliciesSold += 1;
|
312
|
+
instance.updateDistributor(referralInfo.distributorNftId, distributorInfo, KEEP_STATE());
|
313
|
+
}
|
314
|
+
}
|
315
|
+
}
|
316
|
+
|
317
|
+
function calculateFeeAmount(
|
318
|
+
NftId distributionNftId,
|
319
|
+
ReferralId referralId,
|
320
|
+
IPolicy.Premium memory premium
|
321
|
+
)
|
322
|
+
external
|
323
|
+
virtual
|
324
|
+
view
|
325
|
+
returns (IPolicy.Premium memory finalPremium)
|
326
|
+
{
|
327
|
+
IInstance instance = _getInstanceForDistribution(distributionNftId);
|
328
|
+
InstanceReader reader = instance.getInstanceReader();
|
329
|
+
|
330
|
+
// first calculate all fixed and variable fees for the distribution - this will defined the fullPremium
|
331
|
+
ISetup.DistributionSetupInfo memory setupInfo = reader.getDistributionSetupInfo(distributionNftId);
|
332
|
+
Fee memory distributionFee = setupInfo.distributionFee;
|
333
|
+
Fee memory minDistributionOwnerFee = setupInfo.minDistributionOwnerFee;
|
334
|
+
uint256 distributionFeeVarAmount = (UFixedLib.toUFixed(premium.netPremiumAmount) * distributionFee.fractionalFee).toInt();
|
335
|
+
premium.distributionFeeVarAmount = distributionFeeVarAmount;
|
336
|
+
premium.fullPremiumAmount += distributionFeeVarAmount;
|
337
|
+
|
338
|
+
// if the referral is not valid, then the distribution owner gets everything
|
339
|
+
if (! referralIsValid(distributionNftId, referralId)) {
|
340
|
+
premium.distributionOwnerFeeFixAmount = premium.distributionFeeFixAmount;
|
341
|
+
premium.distributionOwnerFeeVarAmount = premium.distributionFeeVarAmount;
|
342
|
+
premium.premiumAmount = premium.fullPremiumAmount;
|
343
|
+
return premium;
|
344
|
+
}
|
345
|
+
|
346
|
+
// if the referral is valid, the the commission and discount are calculated based in the full premium
|
347
|
+
// the remaing amount goes to the distribution owner
|
348
|
+
{
|
349
|
+
IDistribution.ReferralInfo memory referralInfo = reader.getReferralInfo(referralId);
|
350
|
+
IDistribution.DistributorInfo memory distributorInfo = reader.getDistributorInfo(referralInfo.distributorNftId);
|
351
|
+
IDistribution.DistributorTypeInfo memory distributorTypeInfo = reader.getDistributorTypeInfo(distributorInfo.distributorType);
|
352
|
+
|
353
|
+
uint256 commissionAmount = UFixedLib.toUFixed(premium.netPremiumAmount).mul(distributorTypeInfo.commissionPercentage).toInt();
|
354
|
+
premium.commissionAmount = commissionAmount;
|
355
|
+
premium.discountAmount = UFixedLib.toUFixed(premium.fullPremiumAmount).mul(referralInfo.discountPercentage).toInt();
|
356
|
+
premium.distributionOwnerFeeFixAmount = minDistributionOwnerFee.fixedFee;
|
357
|
+
premium.distributionOwnerFeeVarAmount = distributionFeeVarAmount - commissionAmount - premium.discountAmount;
|
358
|
+
premium.premiumAmount = premium.fullPremiumAmount - premium.discountAmount;
|
359
|
+
}
|
360
|
+
|
361
|
+
// sanity check to validate the fee calculation
|
362
|
+
if (premium.distributionOwnerFeeFixAmount < minDistributionOwnerFee.fixedFee) {
|
363
|
+
revert ErrorIDistributionServiceFeeCalculationMismatch(
|
364
|
+
premium.distributionFeeFixAmount,
|
365
|
+
premium.distributionFeeVarAmount,
|
366
|
+
premium.distributionOwnerFeeFixAmount,
|
367
|
+
premium.distributionOwnerFeeVarAmount,
|
368
|
+
premium.commissionAmount,
|
369
|
+
premium.discountAmount
|
370
|
+
);
|
371
|
+
}
|
372
|
+
if ((premium.distributionFeeVarAmount) != (premium.discountAmount + premium.distributionOwnerFeeVarAmount + premium.commissionAmount)) {
|
373
|
+
revert ErrorIDistributionServiceFeeCalculationMismatch(
|
374
|
+
premium.distributionFeeFixAmount,
|
375
|
+
premium.distributionFeeVarAmount,
|
376
|
+
premium.distributionOwnerFeeFixAmount,
|
377
|
+
premium.distributionOwnerFeeVarAmount,
|
378
|
+
premium.commissionAmount,
|
379
|
+
premium.discountAmount
|
380
|
+
);
|
381
|
+
}
|
382
|
+
|
383
|
+
return premium;
|
384
|
+
}
|
385
|
+
|
386
|
+
// TODO: zero should return false
|
387
|
+
function referralIsValid(NftId distributionNftId, ReferralId referralId) public view returns (bool isValid) {
|
388
|
+
IInstance instance = _getInstanceForDistribution(distributionNftId);
|
389
|
+
IDistribution.ReferralInfo memory info = instance.getInstanceReader().getReferralInfo(referralId);
|
390
|
+
|
391
|
+
if (info.distributorNftId.eqz()) {
|
392
|
+
return false;
|
393
|
+
}
|
394
|
+
|
395
|
+
isValid = info.expiryAt.eqz() || (info.expiryAt.gtz() && TimestampLib.blockTimestamp() <= info.expiryAt);
|
396
|
+
isValid = isValid && info.usedReferrals < info.maxReferrals;
|
397
|
+
}
|
398
|
+
|
399
|
+
function _getAndVerifyCallingDistribution()
|
400
|
+
internal
|
401
|
+
view
|
402
|
+
returns(
|
403
|
+
NftId distributionNftId,
|
404
|
+
IInstance instance
|
405
|
+
)
|
406
|
+
{
|
407
|
+
distributionNftId = getRegistry().getNftId(msg.sender);
|
408
|
+
if (distributionNftId.eqz()) {
|
409
|
+
revert ErrorDistributionServiceCallerNotRegistered(msg.sender);
|
410
|
+
}
|
411
|
+
|
412
|
+
IRegistry.ObjectInfo memory info = getRegistry().getObjectInfo(distributionNftId);
|
413
|
+
if(info.objectType != DISTRIBUTION()) {
|
414
|
+
revert ErrorIDistributionServiceCallerNotDistributor(msg.sender);
|
415
|
+
}
|
416
|
+
|
417
|
+
address instanceAddress = getRegistry().getObjectInfo(info.parentNftId).objectAddress;
|
418
|
+
instance = IInstance(instanceAddress);
|
419
|
+
}
|
420
|
+
|
421
|
+
|
422
|
+
function _getInstanceForDistribution(NftId distributionNftId)
|
423
|
+
internal
|
424
|
+
view
|
425
|
+
returns(IInstance instance)
|
426
|
+
{
|
427
|
+
NftId instanceNftId = getRegistry().getObjectInfo(distributionNftId).parentNftId;
|
428
|
+
address instanceAddress = getRegistry().getObjectInfo(instanceNftId).objectAddress;
|
429
|
+
return IInstance(instanceAddress);
|
430
|
+
}
|
88
431
|
}
|
@@ -6,7 +6,7 @@ import {ProxyManager} from "../../shared/ProxyManager.sol";
|
|
6
6
|
import {DistributionService} from "./DistributionService.sol";
|
7
7
|
import {Registry} from "../../registry/Registry.sol";
|
8
8
|
import {RegistryService} from "../../registry/RegistryService.sol";
|
9
|
-
import {
|
9
|
+
import {REGISTRY} from "../../types/ObjectType.sol";
|
10
10
|
|
11
11
|
contract DistributionServiceManager is ProxyManager {
|
12
12
|
|
@@ -16,7 +16,7 @@ contract DistributionServiceManager is ProxyManager {
|
|
16
16
|
constructor(
|
17
17
|
address registryAddress
|
18
18
|
)
|
19
|
-
ProxyManager()
|
19
|
+
ProxyManager(registryAddress)
|
20
20
|
{
|
21
21
|
DistributionService distSrv = new DistributionService();
|
22
22
|
bytes memory data = abi.encode(registryAddress, address(this));
|
@@ -25,11 +25,11 @@ contract DistributionServiceManager is ProxyManager {
|
|
25
25
|
data);
|
26
26
|
|
27
27
|
_distributionService = DistributionService(address(versionable));
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
//
|
28
|
+
|
29
|
+
// TODO `thi` must have a role or own nft to register service
|
30
|
+
//Registry registry = Registry(registryAddress);
|
31
|
+
//address registryServiceAddress = registry.getServiceAddress(REGISTRY(), _distributionService.getMajorVersion());
|
32
|
+
//RegistryService registryService = RegistryService(registryServiceAddress);
|
33
33
|
//registryService.registerService(_distributionService);
|
34
34
|
|
35
35
|
// TODO no nft to link yet
|
@@ -37,9 +37,6 @@ contract DistributionServiceManager is ProxyManager {
|
|
37
37
|
//_linkToNftOwnable(
|
38
38
|
// address(registryAddress),
|
39
39
|
// address(_distributionService));
|
40
|
-
|
41
|
-
// implies that after this constructor call only upgrade functionality is available
|
42
|
-
_isDeployed = true;
|
43
40
|
}
|
44
41
|
|
45
42
|
//--- view functions ----------------------------------------------------//
|
@@ -0,0 +1,78 @@
|
|
1
|
+
// SPDX-License-Identifier: Apache-2.0
|
2
|
+
pragma solidity ^0.8.19;
|
3
|
+
|
4
|
+
import {IPolicy} from "../module/IPolicy.sol";
|
5
|
+
import {IService} from "../../shared/IService.sol";
|
6
|
+
|
7
|
+
import {NftId} from "../../types/NftId.sol";
|
8
|
+
import {ObjectType} from "../../types/ObjectType.sol";
|
9
|
+
import {ReferralId} from "../../types/Referral.sol";
|
10
|
+
import {RiskId} from "../../types/RiskId.sol";
|
11
|
+
import {Seconds} from "../../types/Seconds.sol";
|
12
|
+
|
13
|
+
/// @dev gif service responsible for creating applications
|
14
|
+
/// only product components may call transaction functions
|
15
|
+
interface IApplicationService is IService {
|
16
|
+
|
17
|
+
error ErrorApplicationServiceNotProduct(NftId callerNftId, ObjectType callerType);
|
18
|
+
error ErrorApplicationServiceBundlePoolMismatch(NftId bundleNftId, NftId bundlePoolNftId, NftId poolNftId);
|
19
|
+
|
20
|
+
/// @dev creates a new application based on the specified attributes
|
21
|
+
/// may only be called by a product component
|
22
|
+
function create(
|
23
|
+
address applicationOwner,
|
24
|
+
RiskId riskId,
|
25
|
+
uint256 sumInsuredAmount,
|
26
|
+
Seconds lifetime,
|
27
|
+
NftId bundleNftId,
|
28
|
+
ReferralId referralId,
|
29
|
+
bytes memory applicationData
|
30
|
+
) external returns (NftId applicationNftId);
|
31
|
+
|
32
|
+
/// @dev updates application attributes
|
33
|
+
/// may only be called while the application is in applied state
|
34
|
+
/// may only be called by the referenced product related to applicationNftId
|
35
|
+
function adjust(
|
36
|
+
NftId applicationNftId,
|
37
|
+
RiskId riskId,
|
38
|
+
NftId bundleNftId,
|
39
|
+
ReferralId referralId,
|
40
|
+
uint256 sumInsuredAmount,
|
41
|
+
uint256 lifetime,
|
42
|
+
bytes memory applicationData
|
43
|
+
) external;
|
44
|
+
|
45
|
+
/// @dev creates a new application that extends the provided policy
|
46
|
+
/// lifetime will seamlessly extend referenced policy, for closed policies
|
47
|
+
/// lifetime will start at underwriting time
|
48
|
+
/// product will need to limit the time window for renewal as underwriting
|
49
|
+
/// will lock the collateral at underwriting time which might be earlier than activation time
|
50
|
+
/// policyNftId needs to refer to an underwritten (or active or closed) policy
|
51
|
+
/// may only be called by the referenced product related to policyNftId
|
52
|
+
function renew(
|
53
|
+
NftId policyNftId, // policy to be renewd (renewal inherits policy attributes)
|
54
|
+
NftId bundleNftId // will likely need a newer bundle for underwriting
|
55
|
+
) external returns (NftId applicationNftId);
|
56
|
+
|
57
|
+
/// @dev revokes the application represented by {policyNftId}
|
58
|
+
/// an application can only be revoked in applied state
|
59
|
+
/// only the application holder may revoke an application
|
60
|
+
function revoke(NftId policyNftId) external;
|
61
|
+
|
62
|
+
/// @dev calculates the premium amount for the specified attributes
|
63
|
+
/// also returns the various fee components involved with creating a policy
|
64
|
+
function calculatePremium(
|
65
|
+
NftId productNftId,
|
66
|
+
RiskId riskId,
|
67
|
+
uint256 sumInsuredAmount,
|
68
|
+
Seconds lifetime,
|
69
|
+
bytes memory applicationData,
|
70
|
+
NftId bundleNftId,
|
71
|
+
ReferralId referralId
|
72
|
+
)
|
73
|
+
external
|
74
|
+
view
|
75
|
+
returns (
|
76
|
+
IPolicy.Premium memory premium
|
77
|
+
);
|
78
|
+
}
|
@@ -0,0 +1,96 @@
|
|
1
|
+
// SPDX-License-Identifier: Apache-2.0
|
2
|
+
pragma solidity ^0.8.19;
|
3
|
+
|
4
|
+
import {Amount} from "../../types/Amount.sol";
|
5
|
+
import {NftId} from "../../types/NftId.sol";
|
6
|
+
import {Fee} from "../../types/Fee.sol";
|
7
|
+
import {IService} from "../../shared/IService.sol";
|
8
|
+
import {IBundle} from "../module/IBundle.sol";
|
9
|
+
import {IInstance} from "../../instance/IInstance.sol";
|
10
|
+
import {Seconds} from "../../types/Seconds.sol";
|
11
|
+
import {StateId} from "../../types/StateId.sol";
|
12
|
+
import {Timestamp} from "../../types/Timestamp.sol";
|
13
|
+
|
14
|
+
interface IBundleService is IService {
|
15
|
+
|
16
|
+
event LogBundleServiceBundleActivated(NftId bundleNftId);
|
17
|
+
event LogBundleServiceBundleLocked(NftId bundleNftId);
|
18
|
+
|
19
|
+
error ErrorBundleServiceInsufficientAllowance(address bundleOwner, address tokenHandlerAddress, uint256 amount);
|
20
|
+
error ErrorBundleServiceBundleNotOpen(NftId bundleNftId, StateId state, Timestamp expiredAt);
|
21
|
+
error ErrorBundleServiceCapacityInsufficient(NftId bundleNftId, uint capacityAmount, uint collateralAmount);
|
22
|
+
error ErrorBundleServiceBundleWithOpenPolicies(NftId bundleNftId, uint256 openPoliciesCount);
|
23
|
+
|
24
|
+
error ErrorBundleServiceBundleUnknown(NftId bundleNftId);
|
25
|
+
error ErrorBundleServiceBundlePoolMismatch(NftId expectedPoolNftId, NftId bundlePoolNftId);
|
26
|
+
|
27
|
+
/// @dev create a new bundle for the specified attributes
|
28
|
+
/// may only be called by pool service
|
29
|
+
function create(
|
30
|
+
IInstance instance, // instance relevant for bundle
|
31
|
+
NftId poolNftId, // the pool the bundle will be linked to
|
32
|
+
address owner, // initial bundle owner
|
33
|
+
Fee memory fee, // fees deducted from premium that go to bundle owner
|
34
|
+
Amount stakingAmount, // staking amount - staking fees result in initial bundle capital
|
35
|
+
Seconds lifetime, // initial duration for which new policies are covered
|
36
|
+
bytes calldata filter // optional use case specific criteria that define if a policy may be covered by this bundle
|
37
|
+
)
|
38
|
+
external
|
39
|
+
returns(NftId bundleNftId); // the nft id of the newly created bundle
|
40
|
+
|
41
|
+
/// @dev locks the specified bundle, locked bundles are not available to collateralize new policies
|
42
|
+
/// only active bundles may be locked
|
43
|
+
/// may only be called by registered and unlocked pool components
|
44
|
+
function lock(NftId bundleNftId) external;
|
45
|
+
|
46
|
+
/// @dev activates the specified bundle
|
47
|
+
/// only locked bundles may be unlocked
|
48
|
+
/// may only be called by registered and unlocked pool components
|
49
|
+
function unlock(NftId bundleNftId) external;
|
50
|
+
|
51
|
+
/// @dev closes the specified bundle
|
52
|
+
/// only open bundles (active or locked) may be closed
|
53
|
+
/// to close a bundle it may not have any non-closed polices attached to it
|
54
|
+
/// may only be called by registered and unlocked pool components
|
55
|
+
function close(
|
56
|
+
IInstance instance,
|
57
|
+
NftId bundleNftId
|
58
|
+
) external;
|
59
|
+
|
60
|
+
/// @dev set bundle fee to provided value
|
61
|
+
/// may only be called by registered and unlocked pool components
|
62
|
+
function setFee(
|
63
|
+
NftId bundleNftId,
|
64
|
+
Fee memory fee
|
65
|
+
) external;
|
66
|
+
|
67
|
+
|
68
|
+
/// @dev locks the specified collateral in the bundle
|
69
|
+
/// the locked collateral is added to the bundle locked capital
|
70
|
+
/// the bundles' fees are updated with the fees for this premium
|
71
|
+
/// the premium (minus bundle fee) is added to the bundle capital
|
72
|
+
/// may only be called by pool service
|
73
|
+
function lockCollateral(
|
74
|
+
IInstance instanceNftId,
|
75
|
+
NftId policyNftId,
|
76
|
+
NftId bundleNftId,
|
77
|
+
uint256 collateralAmount,
|
78
|
+
uint256 premium // premium amount after pool fee
|
79
|
+
) external;
|
80
|
+
|
81
|
+
|
82
|
+
/// @dev releases the specified collateral in the bundle
|
83
|
+
/// may only be called by pool service
|
84
|
+
function releaseCollateral(
|
85
|
+
IInstance instance,
|
86
|
+
NftId policyNftId,
|
87
|
+
NftId bundleNftId,
|
88
|
+
uint256 collateralAmount
|
89
|
+
) external;
|
90
|
+
|
91
|
+
function increaseBalance(IInstance instance, NftId bundleNftId, uint256 amount) external;
|
92
|
+
|
93
|
+
// function stake(NftId bundleNftId, uint256 amount) external returns(uint256 netAmount);
|
94
|
+
|
95
|
+
// function unstake(NftId bundleNftId, uint256 amount) external returns(uint256 netAmount);
|
96
|
+
}
|