@etherisc/gif-next 0.0.2-ecbd488-936 → 0.0.2-edc084c-558
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 +941 -230
- package/artifacts/contracts/components/IComponent.sol/IComponent.dbg.json +4 -0
- package/artifacts/contracts/{shared/RegisterableUpgradable.sol/RegisterableUpgradable.json → components/IComponent.sol/IComponent.json} +295 -132
- 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 +1833 -480
- 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 +943 -1206
- 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 +148 -247
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +509 -261
- 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 +1039 -0
- package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.json +673 -0
- package/artifacts/contracts/instance/service/BundleService.sol/BundleService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/BundleService.sol/BundleService.json +1231 -0
- package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.json +721 -0
- package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.json +817 -0
- package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.json +641 -0
- package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +1341 -259
- package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.json +440 -79
- package/artifacts/contracts/instance/service/IApplicationService.sol/IApplicationService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/IApplicationService.sol/IApplicationService.json +622 -0
- package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.json +659 -0
- package/artifacts/contracts/instance/service/IClaimService.sol/IClaimService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/{IComponentOwnerService.sol/IComponentOwnerService.json → IClaimService.sol/IClaimService.json} +217 -208
- 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 +606 -0
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +437 -154
- 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 +1092 -0
- package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.json +697 -0
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +649 -251
- 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 +270 -476
- package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.json +304 -99
- 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 +261 -131
- 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 +275 -226
- 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 -141
- 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 +161 -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 +100 -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 +100 -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 +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 +253 -0
- package/contracts/components/Distribution.sol +200 -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 +221 -160
- package/contracts/components/Product.sol +125 -116
- package/contracts/instance/AccessManagerUpgradeableInitializeable.sol +13 -0
- package/contracts/instance/BundleManager.sol +127 -0
- package/contracts/instance/Cloneable.sol +51 -0
- package/contracts/instance/IInstance.sol +61 -11
- package/contracts/instance/IInstanceService.sol +47 -5
- package/contracts/instance/Instance.sol +144 -260
- package/contracts/instance/InstanceAccessManager.sol +414 -175
- package/contracts/instance/InstanceReader.sol +19 -34
- package/contracts/instance/InstanceService.sol +417 -117
- 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 +11 -2
- 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 +30 -3
- package/contracts/instance/module/ISetup.sol +9 -20
- package/contracts/instance/service/ApplicationService.sol +350 -0
- package/contracts/instance/service/ApplicationServiceManager.sol +35 -0
- package/contracts/instance/service/BundleService.sol +431 -0
- package/contracts/instance/service/BundleServiceManager.sol +51 -0
- package/contracts/instance/service/ClaimService.sol +151 -0
- package/contracts/instance/service/ClaimServiceManager.sol +35 -0
- package/contracts/instance/service/DistributionService.sol +378 -31
- package/contracts/instance/service/DistributionServiceManager.sol +7 -10
- package/contracts/instance/service/IApplicationService.sol +82 -0
- package/contracts/instance/service/IBundleService.sol +93 -0
- package/contracts/instance/service/IClaimService.sol +61 -0
- package/contracts/instance/service/IDistributionService.sol +87 -0
- package/contracts/instance/service/IPolicyService.sol +72 -0
- package/contracts/instance/service/IPoolService.sol +79 -17
- package/contracts/instance/service/IProductService.sol +3 -70
- package/contracts/instance/service/PolicyService.sol +362 -0
- package/contracts/instance/service/PolicyServiceManager.sol +54 -0
- package/contracts/instance/service/PoolService.sol +217 -108
- package/contracts/instance/service/PoolServiceManager.sol +6 -9
- package/contracts/instance/service/ProductService.sol +107 -440
- package/contracts/instance/service/ProductServiceManager.sol +2 -2
- package/contracts/registry/ChainNft.sol +9 -1
- package/contracts/registry/IRegistry.sol +41 -19
- package/contracts/registry/IRegistryService.sol +31 -13
- package/contracts/registry/ITransferInterceptor.sol +1 -0
- package/contracts/registry/Registry.sol +245 -222
- 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 +60 -0
- package/contracts/types/Blocknumber.sol +1 -0
- package/contracts/types/ClaimId.sol +52 -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 +10 -5
- package/contracts/types/PayoutId.sol +54 -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 +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 +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/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 -124
- 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
@@ -4,6 +4,7 @@ pragma solidity ^0.8.19;
|
|
4
4
|
import {IRegistry} from "../../registry/IRegistry.sol";
|
5
5
|
import {IProductComponent} from "../../components/IProductComponent.sol";
|
6
6
|
import {Product} from "../../components/Product.sol";
|
7
|
+
import {IComponent} from "../../components/IComponent.sol";
|
7
8
|
import {IPoolComponent} from "../../components/IPoolComponent.sol";
|
8
9
|
import {IDistributionComponent} from "../../components/IDistributionComponent.sol";
|
9
10
|
import {IInstance} from "../IInstance.sol";
|
@@ -22,7 +23,7 @@ import {Versionable} from "../../shared/Versionable.sol";
|
|
22
23
|
import {Timestamp, zeroTimestamp} from "../../types/Timestamp.sol";
|
23
24
|
import {UFixed, UFixedLib} from "../../types/UFixed.sol";
|
24
25
|
import {Blocknumber, blockNumber} from "../../types/Blocknumber.sol";
|
25
|
-
import {ObjectType,
|
26
|
+
import {ObjectType, PRODUCT, POOL, POLICY} from "../../types/ObjectType.sol";
|
26
27
|
import {APPLIED, UNDERWRITTEN, ACTIVE, KEEP_STATE} from "../../types/StateId.sol";
|
27
28
|
import {NftId, NftIdLib, zeroNftId} from "../../types/NftId.sol";
|
28
29
|
import {Fee, FeeLib} from "../../types/Fee.sol";
|
@@ -30,22 +31,20 @@ import {ReferralId} from "../../types/Referral.sol";
|
|
30
31
|
import {RiskId} from "../../types/RiskId.sol";
|
31
32
|
import {StateId} from "../../types/StateId.sol";
|
32
33
|
import {Version, VersionLib} from "../../types/Version.sol";
|
34
|
+
import {RoleId, PRODUCT_OWNER_ROLE} from "../../types/RoleId.sol";
|
33
35
|
|
34
36
|
import {IService} from "../../shared/IService.sol";
|
35
37
|
import {Service} from "../../shared/Service.sol";
|
36
|
-
import {
|
38
|
+
import {ComponentService} from "../base/ComponentService.sol";
|
37
39
|
import {IProductService} from "./IProductService.sol";
|
38
40
|
import {InstanceReader} from "../InstanceReader.sol";
|
39
|
-
|
40
|
-
string constant PRODUCT_SERVICE_NAME = "ProductService";
|
41
|
+
import {IPoolService} from "./PoolService.sol";
|
41
42
|
|
42
43
|
// TODO or name this ProtectionService to have Product be something more generic (loan, savings account, ...)
|
43
|
-
contract ProductService is
|
44
|
+
contract ProductService is ComponentService, IProductService {
|
44
45
|
using NftIdLib for NftId;
|
45
46
|
|
46
|
-
|
47
|
-
|
48
|
-
address internal _registryAddress;
|
47
|
+
IPoolService internal _poolService;
|
49
48
|
|
50
49
|
event LogProductServiceSender(address sender);
|
51
50
|
|
@@ -57,26 +56,97 @@ contract ProductService is ComponentServiceBase, IProductService {
|
|
57
56
|
initializer
|
58
57
|
virtual override
|
59
58
|
{
|
60
|
-
address
|
61
|
-
|
59
|
+
address registryAddress;
|
60
|
+
address initialOwner;
|
61
|
+
(registryAddress, initialOwner) = abi.decode(data, (address, address));
|
62
|
+
|
63
|
+
initializeService(registryAddress, address(0), owner);
|
62
64
|
|
63
|
-
|
65
|
+
_poolService = IPoolService(getRegistry().getServiceAddress(POOL(), getVersion().toMajorPart()));
|
64
66
|
|
65
|
-
|
66
|
-
_registerInterface(type(IProductService).interfaceId);
|
67
|
+
registerInterface(type(IProductService).interfaceId);
|
67
68
|
}
|
68
69
|
|
69
70
|
|
70
|
-
function
|
71
|
-
|
71
|
+
function register(address productAddress)
|
72
|
+
external
|
73
|
+
returns(NftId productNftId)
|
74
|
+
{
|
75
|
+
(
|
76
|
+
IComponent component,
|
77
|
+
address owner,
|
78
|
+
IInstance instance,
|
79
|
+
NftId instanceNftId
|
80
|
+
) = _checkComponentForRegistration(
|
81
|
+
productAddress,
|
82
|
+
PRODUCT(),
|
83
|
+
PRODUCT_OWNER_ROLE());
|
84
|
+
|
85
|
+
IProductComponent product = IProductComponent(productAddress);
|
86
|
+
IRegistry.ObjectInfo memory productInfo = getRegistryService().registerProduct(product, owner);
|
87
|
+
productNftId = productInfo.nftId;
|
88
|
+
_createProductSetup(
|
89
|
+
instance,
|
90
|
+
product,
|
91
|
+
productNftId);
|
92
|
+
}
|
93
|
+
|
94
|
+
|
95
|
+
function _createProductSetup(
|
96
|
+
IInstance instance,
|
97
|
+
IProductComponent product,
|
98
|
+
NftId productNftId
|
99
|
+
)
|
100
|
+
internal
|
101
|
+
returns (string memory name)
|
102
|
+
{
|
103
|
+
// wire distribution and pool components to product component
|
104
|
+
ISetup.ProductSetupInfo memory setup = product.getSetupInfo();
|
105
|
+
IComponent distribution = IComponent(getRegistry().getObjectInfo(setup.distributionNftId).objectAddress);
|
106
|
+
IComponent pool = IComponent(getRegistry().getObjectInfo(setup.poolNftId).objectAddress);
|
107
|
+
|
108
|
+
distribution.setProductNftId(productNftId);
|
109
|
+
pool.setProductNftId(productNftId);
|
110
|
+
product.setProductNftId(productNftId);
|
111
|
+
product.linkToRegisteredNftId();
|
112
|
+
|
113
|
+
// create product setup in instance
|
114
|
+
instance.createProductSetup(productNftId, product.getSetupInfo());
|
115
|
+
|
116
|
+
bytes4[][] memory selectors = new bytes4[][](1);
|
117
|
+
selectors[0] = new bytes4[](1);
|
118
|
+
selectors[0][0] = IProductComponent.setFees.selector;
|
119
|
+
|
120
|
+
RoleId[] memory roles = new RoleId[](1);
|
121
|
+
roles[0] = PRODUCT_OWNER_ROLE();
|
122
|
+
|
123
|
+
// create target for instane access manager
|
124
|
+
getInstanceService().createGifTarget(
|
125
|
+
getRegistry().getNftId(address(instance)),
|
126
|
+
address(product),
|
127
|
+
product.getName(),
|
128
|
+
selectors,
|
129
|
+
roles);
|
130
|
+
}
|
131
|
+
|
132
|
+
function getDomain() public pure override returns(ObjectType) {
|
133
|
+
return PRODUCT();
|
72
134
|
}
|
73
135
|
|
74
|
-
|
75
|
-
|
76
|
-
|
77
|
-
|
136
|
+
|
137
|
+
function _decodeAndVerifyProductData(bytes memory data)
|
138
|
+
internal
|
139
|
+
returns(string memory name, ISetup.ProductSetupInfo memory setup)
|
140
|
+
{
|
141
|
+
(name, setup) = abi.decode(
|
142
|
+
data,
|
143
|
+
(string, ISetup.ProductSetupInfo)
|
78
144
|
);
|
79
|
-
|
145
|
+
|
146
|
+
// TODO add checks
|
147
|
+
// if(wallet == address(0)) {
|
148
|
+
// revert WalletIsZero();
|
149
|
+
// }
|
80
150
|
}
|
81
151
|
|
82
152
|
function setFees(
|
@@ -84,27 +154,30 @@ contract ProductService is ComponentServiceBase, IProductService {
|
|
84
154
|
Fee memory processingFee
|
85
155
|
)
|
86
156
|
external
|
87
|
-
override
|
88
157
|
{
|
89
|
-
|
158
|
+
// TODO check args
|
159
|
+
|
160
|
+
(NftId productNftId, IRegistry.ObjectInfo memory productInfo, IInstance instance) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
|
90
161
|
InstanceReader instanceReader = instance.getInstanceReader();
|
91
|
-
NftId productNftId = productInfo.nftId;
|
92
162
|
|
93
163
|
ISetup.ProductSetupInfo memory productSetupInfo = instanceReader.getProductSetupInfo(productNftId);
|
164
|
+
|
94
165
|
productSetupInfo.productFee = productFee;
|
95
166
|
productSetupInfo.processingFee = processingFee;
|
96
167
|
|
97
168
|
instance.updateProductSetup(productNftId, productSetupInfo, KEEP_STATE());
|
98
169
|
}
|
99
170
|
|
100
|
-
// FIXME: this
|
101
171
|
function createRisk(
|
102
172
|
RiskId riskId,
|
103
173
|
bytes memory data
|
104
|
-
)
|
105
|
-
|
106
|
-
|
174
|
+
)
|
175
|
+
external
|
176
|
+
override
|
177
|
+
{
|
178
|
+
(NftId productNftId, IRegistry.ObjectInfo memory productInfo, IInstance instance) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
|
107
179
|
IRisk.RiskInfo memory riskInfo = IRisk.RiskInfo(productNftId, data);
|
180
|
+
|
108
181
|
instance.createRisk(
|
109
182
|
riskId,
|
110
183
|
riskInfo
|
@@ -114,9 +187,12 @@ contract ProductService is ComponentServiceBase, IProductService {
|
|
114
187
|
function updateRisk(
|
115
188
|
RiskId riskId,
|
116
189
|
bytes memory data
|
117
|
-
)
|
118
|
-
|
190
|
+
)
|
191
|
+
external
|
192
|
+
{
|
193
|
+
(,, IInstance instance) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
|
119
194
|
InstanceReader instanceReader = instance.getInstanceReader();
|
195
|
+
|
120
196
|
IRisk.RiskInfo memory riskInfo = instanceReader.getRiskInfo(riskId);
|
121
197
|
riskInfo.data = data;
|
122
198
|
instance.updateRisk(riskId, riskInfo, KEEP_STATE());
|
@@ -125,419 +201,10 @@ contract ProductService is ComponentServiceBase, IProductService {
|
|
125
201
|
function updateRiskState(
|
126
202
|
RiskId riskId,
|
127
203
|
StateId state
|
128
|
-
) external {
|
129
|
-
(, IInstance instance) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
|
130
|
-
instance.updateRiskState(riskId, state);
|
131
|
-
}
|
132
|
-
|
133
|
-
function _getAndVerifyInstanceAndProduct() internal view returns (Product product) {
|
134
|
-
IRegistry.ObjectInfo memory productInfo;
|
135
|
-
(productInfo,) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
|
136
|
-
product = Product(productInfo.objectAddress);
|
137
|
-
}
|
138
|
-
|
139
|
-
function calculatePremium(
|
140
|
-
RiskId riskId,
|
141
|
-
uint256 sumInsuredAmount,
|
142
|
-
uint256 lifetime,
|
143
|
-
bytes memory applicationData,
|
144
|
-
NftId bundleNftId,
|
145
|
-
ReferralId referralId
|
146
|
-
)
|
147
|
-
public
|
148
|
-
view
|
149
|
-
override
|
150
|
-
returns (
|
151
|
-
uint256 premiumAmount,
|
152
|
-
uint256 productFeeAmount,
|
153
|
-
uint256 poolFeeAmount,
|
154
|
-
uint256 bundleFeeAmount,
|
155
|
-
uint256 distributionFeeAmount
|
156
|
-
)
|
157
|
-
{
|
158
|
-
Product product = _getAndVerifyInstanceAndProduct();
|
159
|
-
uint256 netPremiumAmount = product.calculateNetPremium(
|
160
|
-
sumInsuredAmount,
|
161
|
-
riskId,
|
162
|
-
lifetime,
|
163
|
-
applicationData
|
164
|
-
);
|
165
|
-
|
166
|
-
(
|
167
|
-
productFeeAmount,
|
168
|
-
poolFeeAmount,
|
169
|
-
bundleFeeAmount,
|
170
|
-
distributionFeeAmount
|
171
|
-
) = _calculateFeeAmounts(
|
172
|
-
netPremiumAmount,
|
173
|
-
product,
|
174
|
-
bundleNftId,
|
175
|
-
referralId
|
176
|
-
);
|
177
|
-
|
178
|
-
premiumAmount = netPremiumAmount + productFeeAmount;
|
179
|
-
premiumAmount += poolFeeAmount + bundleFeeAmount;
|
180
|
-
premiumAmount += distributionFeeAmount;
|
181
|
-
}
|
182
|
-
|
183
|
-
function _calculateFeeAmounts(
|
184
|
-
uint256 netPremiumAmount,
|
185
|
-
Product product,
|
186
|
-
NftId bundleNftId,
|
187
|
-
ReferralId referralId
|
188
|
-
)
|
189
|
-
internal
|
190
|
-
view
|
191
|
-
returns (
|
192
|
-
uint256 productFeeAmount,
|
193
|
-
uint256 poolFeeAmount,
|
194
|
-
uint256 bundleFeeAmount,
|
195
|
-
uint256 distributionFeeAmount
|
196
|
-
)
|
197
|
-
{
|
198
|
-
IInstance instance = product.getInstance();
|
199
|
-
// FIXME: this
|
200
|
-
// ITreasury.TreasuryInfo memory treasuryInfo = instance.getTreasuryInfo(product.getNftId());
|
201
|
-
// IBundle.BundleInfo memory bundleInfo = instance.getBundleInfo(bundleNftId);
|
202
|
-
// require(bundleInfo.poolNftId == treasuryInfo.poolNftId,"ERROR:PRS-035:BUNDLE_POOL_MISMATCH");
|
203
|
-
|
204
|
-
// (productFeeAmount,) = FeeLib.calculateFee(treasuryInfo.productFee, netPremiumAmount);
|
205
|
-
// (poolFeeAmount,) = FeeLib.calculateFee(treasuryInfo.poolFee, netPremiumAmount);
|
206
|
-
// (bundleFeeAmount,) = FeeLib.calculateFee(bundleInfo.fee, netPremiumAmount);
|
207
|
-
|
208
|
-
// IRegistry.ObjectInfo memory distributionInfo = getRegistry().getObjectInfo(treasuryInfo.distributionNftId);
|
209
|
-
// IDistributionComponent distribution = IDistributionComponent(distributionInfo.objectAddress);
|
210
|
-
// distributionFeeAmount = distribution.calculateFeeAmount(referralId, netPremiumAmount);
|
211
|
-
}
|
212
|
-
|
213
|
-
|
214
|
-
function createApplication(
|
215
|
-
address applicationOwner,
|
216
|
-
RiskId riskId,
|
217
|
-
uint256 sumInsuredAmount,
|
218
|
-
uint256 lifetime,
|
219
|
-
bytes memory applicationData,
|
220
|
-
NftId bundleNftId,
|
221
|
-
ReferralId referralId
|
222
|
-
) external override returns (NftId policyNftId) {
|
223
|
-
(IRegistry.ObjectInfo memory productInfo, IInstance instance) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
|
224
|
-
// TODO add validations (see create bundle in pool service)
|
225
|
-
|
226
|
-
policyNftId = getRegistryService().registerPolicy(
|
227
|
-
IRegistry.ObjectInfo(
|
228
|
-
zeroNftId(),
|
229
|
-
productInfo.nftId,
|
230
|
-
POLICY(),
|
231
|
-
false, // intercepting property for policies is defined on product
|
232
|
-
address(0),
|
233
|
-
applicationOwner,
|
234
|
-
""
|
235
|
-
)
|
236
|
-
);
|
237
|
-
|
238
|
-
(uint256 premiumAmount,,,,) = calculatePremium(
|
239
|
-
riskId,
|
240
|
-
sumInsuredAmount,
|
241
|
-
lifetime,
|
242
|
-
applicationData,
|
243
|
-
bundleNftId,
|
244
|
-
referralId
|
245
|
-
);
|
246
|
-
|
247
|
-
// FIXME: this
|
248
|
-
// instance.createPolicyInfo(
|
249
|
-
// policyNftId,
|
250
|
-
// productInfo.nftId,
|
251
|
-
// referralId,
|
252
|
-
// riskId,
|
253
|
-
// sumInsuredAmount,
|
254
|
-
// premiumAmount,
|
255
|
-
// lifetime,
|
256
|
-
// bundleNftId
|
257
|
-
// );
|
258
|
-
|
259
|
-
// TODO add logging
|
260
|
-
}
|
261
|
-
|
262
|
-
function _getAndVerifyUnderwritingSetup(
|
263
|
-
IInstance instance,
|
264
|
-
IPolicy.PolicyInfo memory policyInfo
|
265
|
-
)
|
266
|
-
internal
|
267
|
-
view
|
268
|
-
returns (
|
269
|
-
ITreasury.TreasuryInfo memory treasuryInfo,
|
270
|
-
NftId bundleNftId,
|
271
|
-
IBundle.BundleInfo memory bundleInfo,
|
272
|
-
uint256 collateralAmount
|
273
|
-
)
|
274
|
-
{
|
275
|
-
// FIXME: this
|
276
|
-
// check match between policy and bundle (via pool)
|
277
|
-
// treasuryInfo = instance.getTreasuryInfo(policyInfo.productNftId);
|
278
|
-
// bundleNftId = policyInfo.bundleNftId;
|
279
|
-
// bundleInfo = instance.getBundleInfo(bundleNftId);
|
280
|
-
// require(bundleInfo.poolNftId == treasuryInfo.poolNftId, "POLICY_BUNDLE_MISMATCH");
|
281
|
-
|
282
|
-
// // calculate required collateral
|
283
|
-
// NftId poolNftId = treasuryInfo.poolNftId;
|
284
|
-
// ISetup.PoolSetupInfo memory poolInfo = instance.getPoolInfo(poolNftId);
|
285
|
-
|
286
|
-
// // obtain remaining return values
|
287
|
-
// collateralAmount = calculateRequiredCollateral(poolInfo.collateralizationLevel, policyInfo.sumInsuredAmount);
|
288
|
-
}
|
289
|
-
|
290
|
-
function _lockCollateralInBundle(
|
291
|
-
IInstance instance,
|
292
|
-
NftId bundleNftId,
|
293
|
-
IBundle.BundleInfo memory bundleInfo,
|
294
|
-
NftId policyNftId,
|
295
|
-
uint256 collateralAmount
|
296
|
-
)
|
297
|
-
internal
|
298
|
-
returns (IBundle.BundleInfo memory)
|
299
|
-
{
|
300
|
-
bundleInfo.lockedAmount += collateralAmount;
|
301
|
-
// FIXME: this
|
302
|
-
// instance.collateralizePolicy(bundleNftId, policyNftId, collateralAmount);
|
303
|
-
return bundleInfo;
|
304
|
-
}
|
305
|
-
|
306
|
-
function _underwriteByPool(
|
307
|
-
ITreasury.TreasuryInfo memory treasuryInfo,
|
308
|
-
NftId policyNftId,
|
309
|
-
IPolicy.PolicyInfo memory policyInfo,
|
310
|
-
bytes memory bundleFilter,
|
311
|
-
uint256 collateralAmount
|
312
|
-
)
|
313
|
-
internal
|
314
|
-
{
|
315
|
-
address poolAddress = getRegistry().getObjectInfo(treasuryInfo.poolNftId).objectAddress;
|
316
|
-
IPoolComponent pool = IPoolComponent(poolAddress);
|
317
|
-
pool.underwrite(
|
318
|
-
policyNftId,
|
319
|
-
policyInfo.applicationData,
|
320
|
-
bundleFilter,
|
321
|
-
collateralAmount);
|
322
|
-
}
|
323
|
-
|
324
|
-
|
325
|
-
function revoke(
|
326
|
-
NftId policyNftId
|
327
204
|
)
|
328
205
|
external
|
329
|
-
override
|
330
|
-
{
|
331
|
-
require(false, "ERROR:PRS-234:NOT_YET_IMPLEMENTED");
|
332
|
-
}
|
333
|
-
|
334
|
-
|
335
|
-
function underwrite(
|
336
|
-
NftId policyNftId,
|
337
|
-
bool requirePremiumPayment,
|
338
|
-
Timestamp activateAt
|
339
|
-
)
|
340
|
-
external
|
341
|
-
override
|
342
|
-
{
|
343
|
-
// check caller is registered product
|
344
|
-
(
|
345
|
-
IRegistry.ObjectInfo memory productInfo,
|
346
|
-
IInstance instance
|
347
|
-
) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
|
348
|
-
|
349
|
-
// check match between policy and calling product
|
350
|
-
NftId productNftId = productInfo.nftId;
|
351
|
-
// FIXME: this
|
352
|
-
// IPolicy.PolicyInfo memory policyInfo = instance.getPolicyInfo(policyNftId);
|
353
|
-
// require(policyInfo.productNftId == productNftId, "POLICY_PRODUCT_MISMATCH");
|
354
|
-
// require(instance.getState(policyNftId.toKey32(POLICY())) == APPLIED(), "ERROR:PRS-021:STATE_NOT_APPLIED");
|
355
|
-
|
356
|
-
// ITreasury.TreasuryInfo memory treasuryInfo;
|
357
|
-
// NftId bundleNftId;
|
358
|
-
// IBundle.BundleInfo memory bundleInfo;
|
359
|
-
// uint256 collateralAmount;
|
360
|
-
|
361
|
-
// (
|
362
|
-
// treasuryInfo,
|
363
|
-
// bundleNftId,
|
364
|
-
// bundleInfo,
|
365
|
-
// collateralAmount
|
366
|
-
// ) = _getAndVerifyUnderwritingSetup(
|
367
|
-
// instance,
|
368
|
-
// policyInfo
|
369
|
-
// );
|
370
|
-
|
371
|
-
// // lock bundle collateral
|
372
|
-
// bundleInfo = _lockCollateralInBundle(
|
373
|
-
// instance,
|
374
|
-
// bundleNftId,
|
375
|
-
// bundleInfo,
|
376
|
-
// policyNftId,
|
377
|
-
// collateralAmount);
|
378
|
-
|
379
|
-
// // set policy state to underwritten
|
380
|
-
// instance.updatePolicyState(policyNftId, UNDERWRITTEN());
|
381
|
-
|
382
|
-
// // optional activation of policy
|
383
|
-
// if(activateAt > zeroTimestamp()) {
|
384
|
-
// policyInfo.activatedAt = activateAt;
|
385
|
-
// policyInfo.expiredAt = activateAt.addSeconds(policyInfo.lifetime);
|
386
|
-
|
387
|
-
// instance.updatePolicyState(policyNftId, ACTIVE());
|
388
|
-
// }
|
389
|
-
|
390
|
-
// // optional collection of premium
|
391
|
-
// if(requirePremiumPayment) {
|
392
|
-
// uint256 netPremiumAmount = _processPremiumByTreasury(
|
393
|
-
// instance,
|
394
|
-
// productInfo.nftId,
|
395
|
-
// treasuryInfo,
|
396
|
-
// policyNftId,
|
397
|
-
// policyInfo.premiumAmount);
|
398
|
-
|
399
|
-
// policyInfo.premiumPaidAmount += policyInfo.premiumAmount;
|
400
|
-
// bundleInfo.balanceAmount += netPremiumAmount;
|
401
|
-
// }
|
402
|
-
|
403
|
-
// instance.setPolicyInfo(policyNftId, policyInfo);
|
404
|
-
// instance.setBundleInfo(bundleNftId, bundleInfo);
|
405
|
-
|
406
|
-
// // involve pool if necessary
|
407
|
-
// {
|
408
|
-
// NftId poolNftId = treasuryInfo.poolNftId;
|
409
|
-
// ISetup.PoolSetupInfo memory poolInfo = instance.getPoolInfo(poolNftId);
|
410
|
-
|
411
|
-
// if(poolInfo.isVerifying) {
|
412
|
-
// _underwriteByPool(
|
413
|
-
// treasuryInfo,
|
414
|
-
// policyNftId,
|
415
|
-
// policyInfo,
|
416
|
-
// bundleInfo.filter,
|
417
|
-
// collateralAmount
|
418
|
-
// );
|
419
|
-
// }
|
420
|
-
// }
|
421
|
-
|
422
|
-
// TODO add logging
|
423
|
-
}
|
424
|
-
|
425
|
-
function calculateRequiredCollateral(UFixed collateralizationLevel, uint256 sumInsuredAmount) public pure override returns(uint256 collateralAmount) {
|
426
|
-
UFixed sumInsuredUFixed = UFixedLib.toUFixed(sumInsuredAmount);
|
427
|
-
UFixed collateralUFixed = collateralizationLevel * sumInsuredUFixed;
|
428
|
-
return collateralUFixed.toInt();
|
429
|
-
}
|
430
|
-
|
431
|
-
function collectPremium(NftId policyNftId, Timestamp activateAt) external override {
|
432
|
-
// check caller is registered product
|
433
|
-
(IRegistry.ObjectInfo memory productInfo, IInstance instance) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
|
434
|
-
|
435
|
-
// perform actual token transfers
|
436
|
-
// FIXME: this
|
437
|
-
// IPolicy.PolicyInfo memory policyInfo = instance.getPolicyInfo(policyNftId);
|
438
|
-
// ITreasury.TreasuryInfo memory treasuryInfo = instance.getTreasuryInfo(productInfo.nftId);
|
439
|
-
|
440
|
-
// uint256 premiumAmount = policyInfo.premiumAmount;
|
441
|
-
// _processPremiumByTreasury(instance, productInfo.nftId, treasuryInfo, policyNftId, premiumAmount);
|
442
|
-
|
443
|
-
// // policy level book keeping for premium paid
|
444
|
-
// policyInfo.premiumPaidAmount += premiumAmount;
|
445
|
-
|
446
|
-
// // optional activation of policy
|
447
|
-
// if(activateAt > zeroTimestamp()) {
|
448
|
-
// require(
|
449
|
-
// policyInfo.activatedAt.eqz(),
|
450
|
-
// "ERROR:PRS-030:ALREADY_ACTIVATED");
|
451
|
-
|
452
|
-
// policyInfo.activatedAt = activateAt;
|
453
|
-
// policyInfo.expiredAt = activateAt.addSeconds(policyInfo.lifetime);
|
454
|
-
|
455
|
-
// instance.updatePolicyState(policyNftId, ACTIVE());
|
456
|
-
// }
|
457
|
-
|
458
|
-
// instance.setPolicyInfo(policyNftId, policyInfo);
|
459
|
-
|
460
|
-
// TODO add logging
|
461
|
-
}
|
462
|
-
|
463
|
-
// FIXME: this
|
464
|
-
function activate(NftId policyNftId, Timestamp activateAt) external override {
|
465
|
-
// check caller is registered product
|
466
|
-
(, IInstance instance) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
|
467
|
-
|
468
|
-
// IPolicy.PolicyInfo memory policyInfo = instance.getPolicyInfo(policyNftId);
|
469
|
-
|
470
|
-
// require(
|
471
|
-
// policyInfo.activatedAt.eqz(),
|
472
|
-
// "ERROR:PRS-020:ALREADY_ACTIVATED");
|
473
|
-
|
474
|
-
// policyInfo.activatedAt = activateAt;
|
475
|
-
// policyInfo.expiredAt = activateAt.addSeconds(policyInfo.lifetime);
|
476
|
-
|
477
|
-
// instance.setPolicyInfo(policyNftId, policyInfo);
|
478
|
-
// instance.updatePolicyState(policyNftId, ACTIVE());
|
479
|
-
|
480
|
-
// TODO add logging
|
481
|
-
}
|
482
|
-
|
483
|
-
function close(
|
484
|
-
NftId policyNftId
|
485
|
-
) external override // solhint-disable-next-line no-empty-blocks
|
486
|
-
{
|
487
|
-
|
488
|
-
}
|
489
|
-
|
490
|
-
function _getPoolNftId(
|
491
|
-
IInstance instance,
|
492
|
-
NftId productNftId
|
493
|
-
)
|
494
|
-
internal
|
495
|
-
view
|
496
|
-
returns (NftId poolNftid)
|
497
|
-
{
|
498
|
-
// FIXME: this
|
499
|
-
// return instance.getTreasuryInfo(productNftId).poolNftId;
|
500
|
-
}
|
501
|
-
|
502
|
-
|
503
|
-
function _processPremiumByTreasury(
|
504
|
-
IInstance instance,
|
505
|
-
NftId productNftId,
|
506
|
-
ITreasury.TreasuryInfo memory treasuryInfo,
|
507
|
-
NftId policyNftId,
|
508
|
-
uint256 premiumAmount
|
509
|
-
)
|
510
|
-
internal
|
511
|
-
returns (uint256 netPremiumAmount)
|
512
206
|
{
|
513
|
-
|
514
|
-
|
515
|
-
// FIXME: this
|
516
|
-
// TokenHandler tokenHandler = instance.getTokenHandler(productNftId);
|
517
|
-
// address policyOwner = getRegistry().ownerOf(policyNftId);
|
518
|
-
// address poolWallet = instance.getComponentWallet(treasuryInfo.poolNftId);
|
519
|
-
// netPremiumAmount = premiumAmount;
|
520
|
-
// Fee memory productFee = treasuryInfo.productFee;
|
521
|
-
|
522
|
-
// if (FeeLib.feeIsZero(productFee)) {
|
523
|
-
// tokenHandler.transfer(
|
524
|
-
// policyOwner,
|
525
|
-
// poolWallet,
|
526
|
-
// premiumAmount
|
527
|
-
// );
|
528
|
-
// } else {
|
529
|
-
// (uint256 feeAmount, uint256 netAmount) = instance.calculateFeeAmount(
|
530
|
-
// premiumAmount,
|
531
|
-
// productFee
|
532
|
-
// );
|
533
|
-
|
534
|
-
// address productWallet = instance.getComponentWallet(productNftId);
|
535
|
-
// tokenHandler.transfer(policyOwner, productWallet, feeAmount);
|
536
|
-
// tokenHandler.transfer(policyOwner, poolWallet, netAmount);
|
537
|
-
// netPremiumAmount = netAmount;
|
538
|
-
// }
|
539
|
-
}
|
540
|
-
|
541
|
-
// TODO add logging
|
207
|
+
(,, IInstance instance) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
|
208
|
+
instance.updateRiskState(riskId, state);
|
542
209
|
}
|
543
210
|
}
|
@@ -16,7 +16,7 @@ contract ProductServiceManager is ProxyManager {
|
|
16
16
|
constructor(
|
17
17
|
address registryAddress
|
18
18
|
)
|
19
|
-
ProxyManager()
|
19
|
+
ProxyManager(registryAddress)
|
20
20
|
{
|
21
21
|
ProductService svc = new ProductService();
|
22
22
|
bytes memory data = abi.encode(registryAddress, address(this));
|
@@ -39,7 +39,7 @@ contract ProductServiceManager is ProxyManager {
|
|
39
39
|
// address(_productService));
|
40
40
|
|
41
41
|
// implies that after this constructor call only upgrade functionality is available
|
42
|
-
_isDeployed = true;
|
42
|
+
// _isDeployed = true;
|
43
43
|
}
|
44
44
|
|
45
45
|
//--- view functions ----------------------------------------------------//
|
@@ -59,7 +59,7 @@ contract ChainNft is ERC721Enumerable {
|
|
59
59
|
}
|
60
60
|
|
61
61
|
_chainIdMultiplier = 10 ** _chainIdDigits;
|
62
|
-
_idNext =
|
62
|
+
_idNext = 3;
|
63
63
|
}
|
64
64
|
|
65
65
|
/**
|
@@ -95,6 +95,10 @@ contract ChainNft is ERC721Enumerable {
|
|
95
95
|
|
96
96
|
_totalMinted++;
|
97
97
|
_safeMint(to, tokenId);
|
98
|
+
|
99
|
+
if(interceptor != address(0)) {
|
100
|
+
ITransferInterceptor(interceptor).nftMint(to, tokenId);
|
101
|
+
}
|
98
102
|
}
|
99
103
|
|
100
104
|
|
@@ -195,6 +199,10 @@ contract ChainNft is ERC721Enumerable {
|
|
195
199
|
_chainIdDigits;
|
196
200
|
}
|
197
201
|
|
202
|
+
function getNextTokenId() external view returns (uint256) {
|
203
|
+
return calculateTokenId(_idNext);
|
204
|
+
}
|
205
|
+
|
198
206
|
function _getNextTokenId() private returns (uint256 id) {
|
199
207
|
id = calculateTokenId(_idNext);
|
200
208
|
_idNext++;
|