@etherisc/gif-next 0.0.2-f634e5c-828 → 0.0.2-f677999-878
Sign up to get free protection for your applications and to get access to all the features.
- package/artifacts/contracts/accounting/AccountingService.sol/AccountingService.dbg.json +4 -0
- package/artifacts/contracts/accounting/AccountingService.sol/AccountingService.json +1007 -0
- package/artifacts/contracts/accounting/AccountingServiceManager.sol/AccountingServiceManager.dbg.json +4 -0
- package/artifacts/contracts/accounting/AccountingServiceManager.sol/AccountingServiceManager.json +744 -0
- package/artifacts/contracts/accounting/IAccountingService.sol/IAccountingService.dbg.json +4 -0
- package/artifacts/contracts/accounting/IAccountingService.sol/IAccountingService.json +791 -0
- package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.dbg.json +1 -1
- package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.json +148 -62
- package/artifacts/contracts/authorization/AccessAdmin.sol/IAccessManagedChecker.dbg.json +1 -1
- package/artifacts/contracts/authorization/AccessManagerCloneable.sol/AccessManagerCloneable.dbg.json +1 -1
- package/artifacts/contracts/authorization/AccessManagerCloneable.sol/AccessManagerCloneable.json +233 -5
- package/artifacts/contracts/authorization/Authorization.sol/Authorization.dbg.json +1 -1
- package/artifacts/contracts/authorization/Authorization.sol/Authorization.json +149 -21
- package/artifacts/contracts/authorization/IAccess.sol/IAccess.dbg.json +1 -1
- package/artifacts/contracts/authorization/IAccessAdmin.sol/IAccessAdmin.dbg.json +1 -1
- package/artifacts/contracts/authorization/IAccessAdmin.sol/IAccessAdmin.json +82 -12
- package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.dbg.json +1 -1
- package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.json +68 -13
- package/artifacts/contracts/authorization/IServiceAuthorization.sol/IServiceAuthorization.dbg.json +1 -1
- package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.dbg.json +1 -1
- package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.json +2 -2
- package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.dbg.json +1 -1
- package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.json +79 -67
- package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.dbg.json +1 -1
- package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.json +152 -33
- package/artifacts/contracts/distribution/Distribution.sol/Distribution.dbg.json +1 -1
- package/artifacts/contracts/distribution/Distribution.sol/Distribution.json +51 -39
- package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.dbg.json +1 -1
- package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.json +231 -186
- package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
- package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.json +57 -51
- package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
- package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.json +38 -26
- package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.dbg.json +1 -1
- package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.json +119 -73
- package/artifacts/contracts/examples/fire/DamageLevel.sol/DamageLevelLib.dbg.json +1 -1
- package/artifacts/contracts/examples/fire/FirePool.sol/FirePool.dbg.json +1 -1
- package/artifacts/contracts/examples/fire/FirePool.sol/FirePool.json +102 -42
- package/artifacts/contracts/examples/fire/FirePoolAuthorization.sol/FirePoolAuthorization.dbg.json +1 -1
- package/artifacts/contracts/examples/fire/FirePoolAuthorization.sol/FirePoolAuthorization.json +127 -40
- package/artifacts/contracts/examples/fire/FireProduct.sol/FireProduct.dbg.json +1 -1
- package/artifacts/contracts/examples/fire/FireProduct.sol/FireProduct.json +257 -190
- package/artifacts/contracts/examples/fire/FireProductAuthorization.sol/FireProductAuthorization.dbg.json +1 -1
- package/artifacts/contracts/examples/fire/FireProductAuthorization.sol/FireProductAuthorization.json +152 -33
- package/artifacts/contracts/examples/fire/FireUSD.sol/FireUSD.dbg.json +1 -1
- package/artifacts/contracts/examples/unpermissioned/SimpleDistribution.sol/SimpleDistribution.dbg.json +1 -1
- package/artifacts/contracts/examples/unpermissioned/SimpleDistribution.sol/SimpleDistribution.json +150 -56
- package/artifacts/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol/SimpleDistributionAuthorization.dbg.json +4 -0
- package/artifacts/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol/SimpleDistributionAuthorization.json +589 -0
- package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.dbg.json +1 -1
- package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.json +95 -63
- package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.dbg.json +1 -1
- package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.json +111 -48
- package/artifacts/contracts/examples/unpermissioned/SimplePoolAuthorization.sol/SimplePoolAuthorization.dbg.json +4 -0
- package/artifacts/contracts/examples/unpermissioned/SimplePoolAuthorization.sol/SimplePoolAuthorization.json +589 -0
- package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.dbg.json +1 -1
- package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.json +315 -150
- package/artifacts/contracts/examples/unpermissioned/SimpleProductAuthorization.sol/SimpleProductAuthorization.dbg.json +4 -0
- package/artifacts/contracts/examples/unpermissioned/SimpleProductAuthorization.sol/SimpleProductAuthorization.json +589 -0
- package/artifacts/contracts/instance/BundleSet.sol/BundleSet.dbg.json +1 -1
- package/artifacts/contracts/instance/BundleSet.sol/BundleSet.json +88 -45
- package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstance.sol/IInstance.json +54 -21
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +53 -3
- package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
- package/artifacts/contracts/instance/Instance.sol/Instance.json +80 -40
- package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.json +344 -99
- package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.json +127 -40
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +351 -198
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +65 -58
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +20 -22
- package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.json +422 -352
- package/artifacts/contracts/instance/RiskSet.sol/RiskSet.dbg.json +1 -1
- package/artifacts/contracts/instance/RiskSet.sol/RiskSet.json +96 -53
- package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.dbg.json +1 -1
- package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.json +2 -2
- package/artifacts/contracts/instance/base/Cloneable.sol/Cloneable.dbg.json +1 -1
- package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.dbg.json +1 -1
- package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.json +2 -2
- package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.dbg.json +1 -1
- package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.json +2 -2
- package/artifacts/contracts/instance/base/ObjectSet.sol/ObjectSet.dbg.json +1 -1
- package/artifacts/contracts/instance/base/ObjectSet.sol/ObjectSet.json +16 -5
- package/artifacts/contracts/instance/base/ObjectSetHelperLib.sol/ObjectSetHelperLib.dbg.json +4 -0
- package/artifacts/contracts/instance/base/ObjectSetHelperLib.sol/ObjectSetHelperLib.json +168 -0
- package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IComponents.sol/IComponents.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +1 -1
- package/artifacts/contracts/mock/Dip.sol/Dip.dbg.json +1 -1
- package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.dbg.json +1 -1
- package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.json +68 -56
- package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.dbg.json +1 -1
- package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.json +126 -35
- package/artifacts/contracts/oracle/IOracle.sol/IOracle.dbg.json +1 -1
- package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.dbg.json +1 -1
- package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.json +38 -26
- package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.dbg.json +1 -1
- package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.json +27 -3
- package/artifacts/contracts/oracle/Oracle.sol/Oracle.dbg.json +1 -1
- package/artifacts/contracts/oracle/Oracle.sol/Oracle.json +52 -40
- package/artifacts/contracts/oracle/OracleService.sol/OracleService.dbg.json +1 -1
- package/artifacts/contracts/oracle/OracleService.sol/OracleService.json +75 -68
- package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.dbg.json +1 -1
- package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.json +25 -27
- package/artifacts/contracts/pool/BasicPool.sol/BasicPool.dbg.json +1 -1
- package/artifacts/contracts/pool/BasicPool.sol/BasicPool.json +51 -39
- package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.dbg.json +1 -1
- package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.json +127 -40
- package/artifacts/contracts/pool/BundleService.sol/BundleService.dbg.json +1 -1
- package/artifacts/contracts/pool/BundleService.sol/BundleService.json +102 -201
- package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.dbg.json +1 -1
- package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.json +33 -55
- package/artifacts/contracts/pool/IBundleService.sol/IBundleService.dbg.json +1 -1
- package/artifacts/contracts/pool/IBundleService.sol/IBundleService.json +38 -80
- package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
- package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.json +38 -26
- package/artifacts/contracts/pool/IPoolService.sol/IPoolService.dbg.json +1 -1
- package/artifacts/contracts/pool/IPoolService.sol/IPoolService.json +120 -175
- package/artifacts/contracts/pool/Pool.sol/Pool.dbg.json +1 -1
- package/artifacts/contracts/pool/Pool.sol/Pool.json +51 -39
- package/artifacts/contracts/pool/PoolLib.sol/PoolLib.dbg.json +4 -0
- package/artifacts/contracts/pool/PoolLib.sol/PoolLib.json +456 -0
- package/artifacts/contracts/pool/PoolService.sol/PoolService.dbg.json +1 -1
- package/artifacts/contracts/pool/PoolService.sol/PoolService.json +236 -281
- package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
- package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.json +61 -47
- package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.dbg.json +1 -1
- package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.json +57 -50
- package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +1 -1
- package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.json +16 -18
- package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.dbg.json +1 -1
- package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.json +157 -130
- package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.dbg.json +1 -1
- package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.json +152 -33
- package/artifacts/contracts/product/ClaimService.sol/ClaimService.dbg.json +1 -1
- package/artifacts/contracts/product/ClaimService.sol/ClaimService.json +244 -187
- package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +1 -1
- package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.json +55 -65
- package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.dbg.json +1 -1
- package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.json +27 -3
- package/artifacts/contracts/product/IClaimService.sol/IClaimService.dbg.json +1 -1
- package/artifacts/contracts/product/IClaimService.sol/IClaimService.json +142 -20
- package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.dbg.json +1 -1
- package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.json +105 -68
- package/artifacts/contracts/product/IPricingService.sol/IPricingService.dbg.json +1 -1
- package/artifacts/contracts/product/IPricingService.sol/IPricingService.json +27 -3
- package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.dbg.json +1 -1
- package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.json +144 -117
- package/artifacts/contracts/product/IRiskService.sol/IRiskService.dbg.json +1 -1
- package/artifacts/contracts/product/IRiskService.sol/IRiskService.json +37 -7
- package/artifacts/contracts/product/PolicyService.sol/PolicyService.dbg.json +1 -1
- package/artifacts/contracts/product/PolicyService.sol/PolicyService.json +193 -173
- package/artifacts/contracts/product/PolicyServiceLib.sol/PolicyServiceLib.dbg.json +4 -0
- package/artifacts/contracts/product/PolicyServiceLib.sol/PolicyServiceLib.json +293 -0
- package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +1 -1
- package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.json +45 -47
- package/artifacts/contracts/product/PricingService.sol/PricingService.dbg.json +1 -1
- package/artifacts/contracts/product/PricingService.sol/PricingService.json +85 -78
- package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.dbg.json +1 -1
- package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.json +31 -33
- package/artifacts/contracts/product/Product.sol/Product.dbg.json +1 -1
- package/artifacts/contracts/product/Product.sol/Product.json +157 -130
- package/artifacts/contracts/product/RiskService.sol/RiskService.dbg.json +1 -1
- package/artifacts/contracts/product/RiskService.sol/RiskService.json +102 -81
- package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.dbg.json +1 -1
- package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.json +33 -19
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +26 -2
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +31 -7
- package/artifacts/contracts/registry/IRelease.sol/IRelease.dbg.json +4 -0
- package/artifacts/contracts/registry/IRelease.sol/IRelease.json +24 -0
- package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
- package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
- package/artifacts/contracts/registry/Registry.sol/Registry.json +64 -40
- package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.json +250 -221
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +51 -44
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +11 -13
- package/artifacts/contracts/registry/ReleaseAdmin.sol/ReleaseAdmin.dbg.json +4 -0
- package/artifacts/contracts/registry/ReleaseAdmin.sol/ReleaseAdmin.json +1849 -0
- package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.dbg.json +1 -1
- package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.json +2 -2
- package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.json +315 -49
- package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.dbg.json +1 -1
- package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.json +6 -6
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +4 -4
- package/artifacts/contracts/shared/Component.sol/Component.dbg.json +1 -1
- package/artifacts/contracts/shared/Component.sol/Component.json +51 -39
- package/artifacts/contracts/shared/ComponentService.sol/ComponentService.dbg.json +1 -1
- package/artifacts/contracts/shared/ComponentService.sol/ComponentService.json +105 -442
- package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.dbg.json +1 -1
- package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.json +40 -70
- package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.dbg.json +1 -1
- package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.json +27 -16
- package/artifacts/contracts/shared/ContractLib.sol/ContractLib.dbg.json +1 -1
- package/artifacts/contracts/shared/ContractLib.sol/ContractLib.json +57 -4
- package/artifacts/contracts/shared/ContractLib.sol/IInstanceAdminHelper.dbg.json +1 -1
- package/artifacts/contracts/shared/ContractLib.sol/ITargetHelper.dbg.json +1 -1
- package/artifacts/contracts/shared/ContractLib.sol/ITokenRegistryHelper.dbg.json +4 -0
- package/artifacts/contracts/shared/ContractLib.sol/ITokenRegistryHelper.json +40 -0
- package/artifacts/contracts/shared/IComponent.sol/IComponent.dbg.json +1 -1
- package/artifacts/contracts/shared/IComponent.sol/IComponent.json +38 -26
- package/artifacts/contracts/shared/IComponentService.sol/IComponentService.dbg.json +1 -1
- package/artifacts/contracts/shared/IComponentService.sol/IComponentService.json +27 -291
- package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.dbg.json +1 -1
- package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.json +38 -26
- package/artifacts/contracts/shared/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
- package/artifacts/contracts/shared/ILifecycle.sol/ILifecycle.dbg.json +1 -1
- package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
- package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +1 -1
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +120 -1
- package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +1 -1
- package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
- package/artifacts/contracts/shared/IService.sol/IService.json +27 -3
- package/artifacts/contracts/shared/InitializableERC165.sol/InitializableERC165.dbg.json +1 -1
- package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.dbg.json +1 -1
- package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.json +51 -39
- package/artifacts/contracts/shared/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
- package/artifacts/contracts/shared/Lifecycle.sol/Lifecycle.dbg.json +1 -1
- package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.dbg.json +1 -1
- package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.json +2 -2
- package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
- package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +2 -2
- package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +1 -1
- package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +2 -2
- package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
- package/artifacts/contracts/shared/Registerable.sol/Registerable.json +118 -62
- package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +1 -1
- package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +2 -2
- package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
- package/artifacts/contracts/shared/Service.sol/Service.json +27 -16
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +63 -162
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandlerBase.dbg.json +1 -1
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandlerBase.json +118 -29
- package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.dbg.json +1 -1
- package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.json +32 -32
- package/artifacts/contracts/staking/IStaking.sol/IStaking.dbg.json +1 -1
- package/artifacts/contracts/staking/IStaking.sol/IStaking.json +38 -26
- package/artifacts/contracts/staking/IStakingService.sol/IStakingService.dbg.json +1 -1
- package/artifacts/contracts/staking/IStakingService.sol/IStakingService.json +56 -3
- package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.dbg.json +1 -1
- package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.json +32 -32
- package/artifacts/contracts/staking/Staking.sol/Staking.dbg.json +1 -1
- package/artifacts/contracts/staking/Staking.sol/Staking.json +90 -57
- package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.json +2 -2
- package/artifacts/contracts/staking/StakingManager.sol/StakingManager.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingManager.sol/StakingManager.json +27 -19
- package/artifacts/contracts/staking/StakingReader.sol/StakingReader.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingReader.sol/StakingReader.json +4 -4
- package/artifacts/contracts/staking/StakingService.sol/StakingService.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingService.sol/StakingService.json +87 -51
- package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.json +18 -20
- package/artifacts/contracts/staking/StakingStore.sol/StakingStore.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingStore.sol/StakingStore.json +128 -128
- package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.dbg.json +1 -1
- package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.json +22 -22
- package/artifacts/contracts/type/AddressSet.sol/LibAddressSet.dbg.json +1 -1
- package/artifacts/contracts/type/Amount.sol/AmountLib.dbg.json +1 -1
- package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
- package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.dbg.json +1 -1
- package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.json +2 -2
- package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.dbg.json +1 -1
- package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.json +2 -2
- package/artifacts/contracts/type/Fee.sol/FeeLib.dbg.json +1 -1
- package/artifacts/contracts/type/Key32.sol/Key32Lib.dbg.json +1 -1
- package/artifacts/contracts/type/Key32.sol/Key32Lib.json +2 -2
- package/artifacts/contracts/type/Key32Set.sol/LibKey32Set.dbg.json +1 -1
- package/artifacts/contracts/type/Key32Set.sol/LibKey32Set.json +2 -2
- package/artifacts/contracts/type/NftId.sol/NftIdLib.dbg.json +1 -1
- package/artifacts/contracts/type/NftId.sol/NftIdLib.json +2 -2
- package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
- package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.json +2 -2
- package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
- package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.json +2 -2
- package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.dbg.json +1 -1
- package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.json +2 -2
- package/artifacts/contracts/type/Referral.sol/ReferralLib.dbg.json +1 -1
- package/artifacts/contracts/type/Referral.sol/ReferralLib.json +2 -2
- package/artifacts/contracts/type/RequestId.sol/RequestIdLib.dbg.json +1 -1
- package/artifacts/contracts/type/RequestId.sol/RequestIdLib.json +2 -2
- package/artifacts/contracts/type/RiskId.sol/RiskIdLib.dbg.json +1 -1
- package/artifacts/contracts/type/RiskId.sol/RiskIdLib.json +30 -6
- package/artifacts/contracts/type/RoleId.sol/RoleIdLib.dbg.json +1 -1
- package/artifacts/contracts/type/RoleId.sol/RoleIdLib.json +79 -15
- package/artifacts/contracts/type/Seconds.sol/SecondsLib.dbg.json +1 -1
- package/artifacts/contracts/type/Selector.sol/SelectorLib.dbg.json +1 -1
- package/artifacts/contracts/type/Selector.sol/SelectorLib.json +21 -2
- package/artifacts/contracts/type/Selector.sol/SelectorSetLib.dbg.json +1 -1
- package/artifacts/contracts/type/Selector.sol/SelectorSetLib.json +2 -2
- package/artifacts/contracts/type/StateId.sol/StateIdLib.dbg.json +1 -1
- package/artifacts/contracts/type/String.sol/StrLib.dbg.json +1 -1
- package/artifacts/contracts/type/Timestamp.sol/TimestampLib.dbg.json +1 -1
- package/artifacts/contracts/type/Timestamp.sol/TimestampLib.json +2 -2
- package/artifacts/contracts/type/UFixed.sol/UFixedLib.dbg.json +1 -1
- package/artifacts/contracts/type/Version.sol/VersionLib.dbg.json +1 -1
- package/artifacts/contracts/type/Version.sol/VersionLib.json +2 -21
- package/artifacts/contracts/type/Version.sol/VersionPartLib.dbg.json +1 -1
- package/artifacts/contracts/type/Version.sol/VersionPartLib.json +47 -2
- package/artifacts/contracts/upgradeability/IVersionable.sol/IVersionable.dbg.json +1 -1
- package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.dbg.json +1 -1
- package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.json +2 -2
- package/artifacts/contracts/upgradeability/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
- package/artifacts/contracts/upgradeability/Versionable.sol/Versionable.dbg.json +1 -1
- package/contracts/accounting/AccountingService.sol +262 -0
- package/contracts/accounting/AccountingServiceManager.sol +38 -0
- package/contracts/accounting/IAccountingService.sol +45 -0
- package/contracts/authorization/AccessAdmin.sol +156 -82
- package/contracts/authorization/AccessManagerCloneable.sol +136 -3
- package/contracts/authorization/Authorization.sol +277 -229
- package/contracts/authorization/IAccessAdmin.sol +13 -7
- package/contracts/authorization/IAuthorization.sol +15 -1
- package/contracts/distribution/BasicDistribution.sol +11 -9
- package/contracts/distribution/BasicDistributionAuthorization.sol +21 -8
- package/contracts/distribution/Distribution.sol +37 -32
- package/contracts/distribution/DistributionService.sol +59 -33
- package/contracts/distribution/DistributionServiceManager.sol +1 -1
- package/contracts/distribution/IDistributionService.sol +16 -13
- package/contracts/examples/fire/FirePool.sol +6 -2
- package/contracts/examples/fire/FirePoolAuthorization.sol +2 -1
- package/contracts/examples/fire/FireProduct.sol +9 -3
- package/contracts/examples/fire/FireProductAuthorization.sol +2 -1
- package/contracts/examples/unpermissioned/SimpleDistribution.sol +29 -9
- package/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol +28 -0
- package/contracts/examples/unpermissioned/SimplePool.sol +7 -9
- package/contracts/examples/unpermissioned/SimplePoolAuthorization.sol +28 -0
- package/contracts/examples/unpermissioned/SimpleProduct.sol +36 -4
- package/contracts/examples/unpermissioned/SimpleProductAuthorization.sol +28 -0
- package/contracts/instance/BundleSet.sol +4 -4
- package/contracts/instance/IInstance.sol +6 -7
- package/contracts/instance/IInstanceService.sol +2 -0
- package/contracts/instance/Instance.sol +19 -11
- package/contracts/instance/InstanceAdmin.sol +213 -64
- package/contracts/instance/InstanceAuthorizationV3.sol +18 -23
- package/contracts/instance/InstanceReader.sol +91 -35
- package/contracts/instance/InstanceService.sol +43 -31
- package/contracts/instance/InstanceServiceManager.sol +1 -1
- package/contracts/instance/InstanceStore.sol +13 -2
- package/contracts/instance/RiskSet.sol +11 -12
- package/contracts/instance/base/ObjectLifecycle.sol +4 -2
- package/contracts/instance/base/ObjectSet.sol +7 -8
- package/contracts/instance/base/ObjectSetHelperLib.sol +30 -0
- package/contracts/instance/module/IComponents.sol +3 -2
- package/contracts/instance/module/IDistribution.sol +5 -2
- package/contracts/instance/module/IRisk.sol +2 -0
- package/contracts/oracle/BasicOracleAuthorization.sol +3 -12
- package/contracts/oracle/Oracle.sol +1 -1
- package/contracts/oracle/OracleService.sol +16 -15
- package/contracts/oracle/OracleServiceManager.sol +1 -1
- package/contracts/pool/BasicPoolAuthorization.sol +21 -13
- package/contracts/pool/BundleService.sol +35 -63
- package/contracts/pool/BundleServiceManager.sol +1 -1
- package/contracts/pool/IBundleService.sol +13 -20
- package/contracts/pool/IPoolService.sol +50 -38
- package/contracts/pool/Pool.sol +9 -9
- package/contracts/pool/PoolLib.sol +216 -0
- package/contracts/pool/PoolService.sol +307 -162
- package/contracts/pool/PoolServiceManager.sol +1 -1
- package/contracts/product/ApplicationService.sol +3 -3
- package/contracts/product/ApplicationServiceManager.sol +1 -1
- package/contracts/product/BasicProduct.sol +2 -0
- package/contracts/product/BasicProductAuthorization.sol +24 -10
- package/contracts/product/ClaimService.sol +157 -139
- package/contracts/product/ClaimServiceManager.sol +1 -1
- package/contracts/product/IClaimService.sol +14 -2
- package/contracts/product/IPolicyService.sol +11 -6
- package/contracts/product/IProductComponent.sol +4 -1
- package/contracts/product/IRiskService.sol +5 -8
- package/contracts/product/PolicyService.sol +95 -146
- package/contracts/product/PolicyServiceLib.sol +65 -0
- package/contracts/product/PolicyServiceManager.sol +1 -1
- package/contracts/product/PricingService.sol +23 -19
- package/contracts/product/PricingServiceManager.sol +3 -3
- package/contracts/product/Product.sol +55 -13
- package/contracts/product/RiskService.sol +66 -29
- package/contracts/product/RiskServiceManager.sol +1 -1
- package/contracts/registry/IRegistry.sol +8 -15
- package/contracts/registry/IRelease.sol +26 -0
- package/contracts/registry/Registry.sol +7 -2
- package/contracts/registry/RegistryAdmin.sol +129 -226
- package/contracts/registry/RegistryService.sol +3 -3
- package/contracts/registry/RegistryServiceManager.sol +1 -1
- package/contracts/registry/ReleaseAdmin.sol +245 -0
- package/contracts/registry/ReleaseLifecycle.sol +2 -0
- package/contracts/registry/ReleaseRegistry.sol +124 -99
- package/contracts/registry/ServiceAuthorizationV3.sol +85 -14
- package/contracts/registry/TokenRegistry.sol +6 -8
- package/contracts/shared/Component.sol +32 -27
- package/contracts/shared/ComponentService.sol +89 -266
- package/contracts/shared/ComponentServiceManager.sol +1 -1
- package/contracts/shared/ComponentVerifyingService.sol +1 -1
- package/contracts/shared/ContractLib.sol +32 -3
- package/contracts/shared/IComponent.sol +3 -9
- package/contracts/shared/IComponentService.sol +1 -23
- package/contracts/shared/IRegisterable.sol +15 -4
- package/contracts/shared/IService.sol +3 -5
- package/contracts/shared/InstanceLinkedComponent.sol +3 -3
- package/contracts/shared/NftOwnable.sol +4 -4
- package/contracts/shared/PolicyHolder.sol +1 -1
- package/contracts/shared/Registerable.sol +45 -19
- package/contracts/shared/RegistryLinked.sol +1 -1
- package/contracts/shared/Service.sol +8 -27
- package/contracts/shared/TokenHandler.sol +40 -88
- package/contracts/staking/IStaking.sol +0 -8
- package/contracts/staking/IStakingService.sol +8 -0
- package/contracts/staking/StakeManagerLib.sol +1 -1
- package/contracts/staking/Staking.sol +34 -13
- package/contracts/staking/StakingReader.sol +1 -1
- package/contracts/staking/StakingService.sol +32 -42
- package/contracts/staking/StakingServiceManager.sol +5 -4
- package/contracts/type/ObjectType.sol +46 -21
- package/contracts/type/RiskId.sol +9 -3
- package/contracts/type/RoleId.sol +24 -4
- package/contracts/type/Selector.sol +5 -0
- package/contracts/type/Timestamp.sol +0 -5
- package/contracts/type/Version.sol +15 -5
- package/contracts/upgradeability/ProxyManager.sol +1 -1
- package/package.json +2 -2
- package/artifacts/contracts/authorization/ReleaseAccessManager.sol/ReleaseAccessManager.dbg.json +0 -4
- package/artifacts/contracts/authorization/ReleaseAccessManager.sol/ReleaseAccessManager.json +0 -1196
- package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +0 -4
- package/artifacts/contracts/instance/module/IAccess.sol/IAccess.json +0 -129
- package/contracts/authorization/ReleaseAccessManager.sol +0 -38
- package/contracts/instance/module/IAccess.sol +0 -46
@@ -53,7 +53,10 @@ interface IProductComponent is
|
|
53
53
|
) external view returns (Amount netPremiumAmount);
|
54
54
|
|
55
55
|
|
56
|
-
/// @dev returns initial
|
56
|
+
/// @dev returns initial product specific infos
|
57
57
|
function getInitialProductInfo() external view returns (IComponents.ProductInfo memory info);
|
58
|
+
|
59
|
+
/// @dev returns initial fee infos
|
60
|
+
function getInitialFeeInfo() external view returns (IComponents.FeeInfo memory info);
|
58
61
|
|
59
62
|
}
|
@@ -1,23 +1,20 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
2
|
pragma solidity ^0.8.20;
|
3
3
|
|
4
|
-
import {IRisk} from "../instance/module/IRisk.sol";
|
5
4
|
import {IService} from "../shared/IService.sol";
|
6
5
|
|
7
|
-
import {NftId} from "../type/NftId.sol";
|
8
|
-
import {ReferralId} from "../type/Referral.sol";
|
9
6
|
import {RiskId} from "../type/RiskId.sol";
|
10
7
|
import {StateId} from "../type/StateId.sol";
|
11
|
-
import {Timestamp} from "../type/Timestamp.sol";
|
12
|
-
import {UFixed} from "../type/UFixed.sol";
|
13
|
-
import {Fee} from "../type/Fee.sol";
|
14
8
|
|
15
9
|
interface IRiskService is IService {
|
16
10
|
|
11
|
+
/// @dev Create a new risk with the given id and provided data.
|
12
|
+
/// The key of the risk derived from the risk id in comination with the product NftId.
|
13
|
+
/// Risk data is stored in the instance store.
|
17
14
|
function createRisk(
|
18
|
-
|
15
|
+
bytes32 id,
|
19
16
|
bytes memory data
|
20
|
-
) external;
|
17
|
+
) external returns (RiskId riskId);
|
21
18
|
|
22
19
|
|
23
20
|
function updateRisk(
|
@@ -3,6 +3,7 @@ pragma solidity ^0.8.20;
|
|
3
3
|
|
4
4
|
import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
|
5
5
|
|
6
|
+
import {IAccountingService} from "../accounting/IAccountingService.sol";
|
6
7
|
import {IComponentService} from "../shared/IComponentService.sol";
|
7
8
|
import {IComponents} from "../instance/module/IComponents.sol";
|
8
9
|
import {IDistributionService} from "../distribution/IDistributionService.sol";
|
@@ -20,7 +21,8 @@ import {Amount} from "../type/Amount.sol";
|
|
20
21
|
import {APPLIED, COLLATERALIZED, KEEP_STATE, CLOSED, DECLINED, PAID} from "../type/StateId.sol";
|
21
22
|
import {ContractLib} from "../shared/ContractLib.sol";
|
22
23
|
import {NftId} from "../type/NftId.sol";
|
23
|
-
import {ObjectType, COMPONENT, DISTRIBUTION, PRODUCT, POOL, POLICY, PRICE} from "../type/ObjectType.sol";
|
24
|
+
import {ObjectType, ACCOUNTING, COMPONENT, DISTRIBUTION, PRODUCT, POOL, POLICY, PRICE} from "../type/ObjectType.sol";
|
25
|
+
import {PolicyServiceLib} from "./PolicyServiceLib.sol";
|
24
26
|
import {ReferralId} from "../type/Referral.sol";
|
25
27
|
import {RiskId} from "../type/RiskId.sol";
|
26
28
|
import {Service} from "../shared/Service.sol";
|
@@ -34,6 +36,7 @@ contract PolicyService is
|
|
34
36
|
Service,
|
35
37
|
IPolicyService
|
36
38
|
{
|
39
|
+
IAccountingService private _accountingService;
|
37
40
|
IComponentService internal _componentService;
|
38
41
|
IDistributionService internal _distributionService;
|
39
42
|
IPoolService internal _poolService;
|
@@ -48,13 +51,14 @@ contract PolicyService is
|
|
48
51
|
initializer
|
49
52
|
{
|
50
53
|
(
|
51
|
-
address
|
52
|
-
address
|
54
|
+
address authority,
|
55
|
+
address registry
|
53
56
|
) = abi.decode(data, (address, address));
|
54
57
|
|
55
|
-
|
58
|
+
__Service_init(authority, registry, owner);
|
56
59
|
|
57
60
|
VersionPart majorVersion = getVersion().toMajorPart();
|
61
|
+
_accountingService = IAccountingService(getRegistry().getServiceAddress(ACCOUNTING(), majorVersion));
|
58
62
|
_componentService = IComponentService(getRegistry().getServiceAddress(COMPONENT(), majorVersion));
|
59
63
|
_poolService = IPoolService(getRegistry().getServiceAddress(POOL(), majorVersion));
|
60
64
|
_distributionService = IDistributionService(getRegistry().getServiceAddress(DISTRIBUTION(), majorVersion));
|
@@ -116,14 +120,14 @@ contract PolicyService is
|
|
116
120
|
// actual collateralizaion
|
117
121
|
_poolService.lockCollateral(
|
118
122
|
instance,
|
119
|
-
address(instanceReader.
|
123
|
+
address(instanceReader.getToken(productNftId)),
|
120
124
|
productNftId,
|
121
125
|
applicationNftId,
|
122
126
|
applicationInfo.bundleNftId,
|
123
127
|
applicationInfo.sumInsuredAmount);
|
124
128
|
|
125
129
|
// optional activation of policy
|
126
|
-
if(activateAt
|
130
|
+
if(activateAt.gtz()) {
|
127
131
|
applicationInfo = _activate(applicationNftId, applicationInfo, activateAt);
|
128
132
|
}
|
129
133
|
|
@@ -162,7 +166,7 @@ contract PolicyService is
|
|
162
166
|
}
|
163
167
|
|
164
168
|
// link policy to risk and bundle
|
165
|
-
NftId poolNftId = getRegistry().
|
169
|
+
NftId poolNftId = getRegistry().getParentNftId(bundleNftId);
|
166
170
|
instance.getRiskSet().linkPolicy(productNftId, riskId, applicationNftId);
|
167
171
|
instance.getBundleSet().linkPolicy(poolNftId, bundleNftId, applicationNftId);
|
168
172
|
|
@@ -204,12 +208,18 @@ contract PolicyService is
|
|
204
208
|
|
205
209
|
// check funds and allowance of policy holder
|
206
210
|
IPolicy.PremiumInfo memory premium = instanceReader.getPremiumInfo(policyNftId);
|
207
|
-
|
208
|
-
|
209
|
-
|
210
|
-
|
211
|
-
|
212
|
-
|
211
|
+
instanceReader.getTokenHandler(
|
212
|
+
productNftId).checkBalanceAndAllowance(
|
213
|
+
getRegistry().ownerOf(policyNftId),
|
214
|
+
premium.premiumAmount,
|
215
|
+
false);
|
216
|
+
|
217
|
+
// )
|
218
|
+
// _checkPremiumBalanceAndAllowance(
|
219
|
+
// tokenHandler.TOKEN(),
|
220
|
+
// address(tokenHandler),
|
221
|
+
// getRegistry().ownerOf(policyNftId),
|
222
|
+
// premium.premiumAmount);
|
213
223
|
|
214
224
|
// effects
|
215
225
|
_processSale(
|
@@ -232,7 +242,7 @@ contract PolicyService is
|
|
232
242
|
emit LogPolicyServicePolicyPremiumCollected(policyNftId, premium.premiumAmount);
|
233
243
|
|
234
244
|
// interactions
|
235
|
-
|
245
|
+
_transferPremiumAmounts(instanceReader, policyNftId, policyInfo.productNftId, premium);
|
236
246
|
}
|
237
247
|
|
238
248
|
|
@@ -260,6 +270,45 @@ contract PolicyService is
|
|
260
270
|
_policyHolderPolicyActivated(policyNftId, activateAt);
|
261
271
|
}
|
262
272
|
|
273
|
+
/// @inheritdoc IPolicyService
|
274
|
+
function adjustActivation(
|
275
|
+
NftId policyNftId,
|
276
|
+
Timestamp newActivateAt
|
277
|
+
)
|
278
|
+
external
|
279
|
+
virtual
|
280
|
+
nonReentrant()
|
281
|
+
{
|
282
|
+
// checks
|
283
|
+
(
|
284
|
+
IInstance instance,,
|
285
|
+
IPolicy.PolicyInfo memory policyInfo
|
286
|
+
) = _getAndVerifyCallerForPolicy(policyNftId);
|
287
|
+
|
288
|
+
if (policyInfo.activatedAt.eqz()) {
|
289
|
+
revert ErrorPolicyServicePolicyNotActivated(policyNftId);
|
290
|
+
}
|
291
|
+
|
292
|
+
if (newActivateAt < TimestampLib.blockTimestamp()) {
|
293
|
+
revert ErrorPolicyServicePolicyActivationTooEarly(policyNftId, TimestampLib.blockTimestamp(), newActivateAt);
|
294
|
+
}
|
295
|
+
|
296
|
+
if (newActivateAt > policyInfo.expiredAt) {
|
297
|
+
revert ErrorPolicyServicePolicyActivationTooLate(policyNftId, policyInfo.expiredAt, newActivateAt);
|
298
|
+
}
|
299
|
+
|
300
|
+
// effects
|
301
|
+
policyInfo.activatedAt = newActivateAt;
|
302
|
+
instance.getInstanceStore().updatePolicy(policyNftId, policyInfo, KEEP_STATE());
|
303
|
+
|
304
|
+
// log policy activation before interactions with policy holder
|
305
|
+
emit LogPolicyServicePolicyActivatedUpdated(policyNftId, newActivateAt);
|
306
|
+
|
307
|
+
// interactions
|
308
|
+
// callback to policy holder if applicable
|
309
|
+
_policyHolderPolicyActivated(policyNftId, newActivateAt);
|
310
|
+
}
|
311
|
+
|
263
312
|
|
264
313
|
/// @inheritdoc IPolicyService
|
265
314
|
function expire(
|
@@ -330,7 +379,7 @@ contract PolicyService is
|
|
330
379
|
InstanceReader instanceReader = instance.getInstanceReader();
|
331
380
|
|
332
381
|
// check policy is in a closeable state
|
333
|
-
if (!policyIsCloseable(instanceReader, policyNftId)) {
|
382
|
+
if (!PolicyServiceLib.policyIsCloseable(instanceReader, policyNftId)) {
|
334
383
|
revert ErrorPolicyServicePolicyNotCloseable(policyNftId);
|
335
384
|
}
|
336
385
|
|
@@ -346,7 +395,6 @@ contract PolicyService is
|
|
346
395
|
// release (remaining) collateral that was blocked by policy
|
347
396
|
_poolService.releaseCollateral(
|
348
397
|
instance,
|
349
|
-
address(instanceReader.getComponentInfo(productNftId).token),
|
350
398
|
policyNftId,
|
351
399
|
policyInfo);
|
352
400
|
|
@@ -357,40 +405,13 @@ contract PolicyService is
|
|
357
405
|
instance.getInstanceStore().updatePolicy(policyNftId, policyInfo, CLOSED());
|
358
406
|
|
359
407
|
// unlink policy from risk and bundle
|
360
|
-
NftId poolNftId = getRegistry().
|
408
|
+
NftId poolNftId = getRegistry().getParentNftId(bundleNftId);
|
361
409
|
instance.getRiskSet().unlinkPolicy(productNftId, riskId, policyNftId);
|
362
410
|
instance.getBundleSet().unlinkPolicy(poolNftId, bundleNftId, policyNftId);
|
363
411
|
|
364
412
|
emit LogPolicyServicePolicyClosed(policyNftId);
|
365
413
|
}
|
366
414
|
|
367
|
-
|
368
|
-
function policyIsCloseable(InstanceReader instanceReader, NftId policyNftId)
|
369
|
-
public
|
370
|
-
view
|
371
|
-
returns (bool isCloseable)
|
372
|
-
{
|
373
|
-
// policy already closed
|
374
|
-
if (instanceReader.getPolicyState(policyNftId) == CLOSED()) {
|
375
|
-
return false;
|
376
|
-
}
|
377
|
-
|
378
|
-
IPolicy.PolicyInfo memory info = instanceReader.getPolicyInfo(policyNftId);
|
379
|
-
|
380
|
-
if (info.productNftId.eqz()) { return false; } // not closeable: policy does not exist (or does not belong to this instance)
|
381
|
-
if (info.activatedAt.eqz()) { return false; } // not closeable: not yet activated
|
382
|
-
if (info.openClaimsCount > 0) { return false; } // not closeable: has open claims
|
383
|
-
|
384
|
-
// closeable: if sum of claims matches sum insured a policy may be closed prior to the expiry date
|
385
|
-
if (info.claimAmount == info.sumInsuredAmount) { return true; }
|
386
|
-
|
387
|
-
// not closeable: not yet expired
|
388
|
-
if (TimestampLib.blockTimestamp() < info.expiredAt) { return false; }
|
389
|
-
|
390
|
-
// all conditions to close the policy are met
|
391
|
-
return true;
|
392
|
-
}
|
393
|
-
|
394
415
|
/// @dev shared functionality for expire() and policyExpire().
|
395
416
|
function _expire(
|
396
417
|
IInstance instance,
|
@@ -399,67 +420,31 @@ contract PolicyService is
|
|
399
420
|
Timestamp expireAt
|
400
421
|
)
|
401
422
|
internal
|
402
|
-
returns (Timestamp
|
423
|
+
returns (Timestamp)
|
403
424
|
{
|
404
|
-
|
405
|
-
|
406
|
-
|
407
|
-
|
408
|
-
|
409
|
-
}
|
410
|
-
|
411
|
-
// set return value to provided timestamp
|
412
|
-
expiredAt = expireAt;
|
413
|
-
|
414
|
-
// update expiredAt to current block timestamp if not set
|
415
|
-
if (expiredAt.eqz()) {
|
416
|
-
expiredAt = TimestampLib.blockTimestamp();
|
417
|
-
}
|
418
|
-
|
419
|
-
// check expiredAt represents a valid expiry time
|
420
|
-
if (expiredAt >= policyInfo.expiredAt) {
|
421
|
-
revert ErrorPolicyServicePolicyExpirationTooLate(policyNftId, policyInfo.expiredAt, expireAt);
|
422
|
-
}
|
423
|
-
|
424
|
-
if (expiredAt < TimestampLib.blockTimestamp()) {
|
425
|
-
revert ErrorPolicyServicePolicyExpirationTooEarly(policyNftId, TimestampLib.blockTimestamp(), expireAt);
|
426
|
-
}
|
425
|
+
PolicyServiceLib.checkExpiration(
|
426
|
+
expireAt,
|
427
|
+
policyNftId,
|
428
|
+
instance.getInstanceReader().getPolicyState(policyNftId),
|
429
|
+
policyInfo);
|
427
430
|
|
428
431
|
// effects
|
429
432
|
// update policyInfo with new expiredAt timestamp
|
430
|
-
|
431
|
-
|
433
|
+
if (expireAt.gtz()) {
|
434
|
+
policyInfo.expiredAt = expireAt;
|
435
|
+
} else {
|
436
|
+
policyInfo.expiredAt = TimestampLib.blockTimestamp();
|
437
|
+
}
|
432
438
|
instance.getInstanceStore().updatePolicy(policyNftId, policyInfo, KEEP_STATE());
|
433
439
|
|
434
|
-
emit LogPolicyServicePolicyExpirationUpdated(policyNftId,
|
440
|
+
emit LogPolicyServicePolicyExpirationUpdated(policyNftId, policyInfo.expiredAt);
|
435
441
|
|
436
442
|
// interactions
|
437
443
|
// callback to policy holder if applicable
|
438
|
-
_policyHolderPolicyExpired(policyNftId, expiredAt);
|
444
|
+
_policyHolderPolicyExpired(policyNftId, policyInfo.expiredAt);
|
445
|
+
return policyInfo.expiredAt;
|
439
446
|
}
|
440
447
|
|
441
|
-
// TODO cleanup
|
442
|
-
// /// @dev Calculates the premium and updates all counters in the other services.
|
443
|
-
// /// Only book keeping, no token transfers.
|
444
|
-
// function _processPremium(
|
445
|
-
// IInstance instance,
|
446
|
-
// NftId applicationNftId,
|
447
|
-
// IPolicy.PolicyInfo memory applicationInfo,
|
448
|
-
// IPolicy.PremiumInfo memory premium
|
449
|
-
// )
|
450
|
-
// internal
|
451
|
-
// virtual
|
452
|
-
// {
|
453
|
-
// // update the counters
|
454
|
-
// _processSale(
|
455
|
-
// instanceReader,
|
456
|
-
// instance.getInstanceStore(),
|
457
|
-
// productNftId,
|
458
|
-
// applicationInfo.bundleNftId,
|
459
|
-
// applicationInfo.referralId,
|
460
|
-
// premium);
|
461
|
-
// }
|
462
|
-
|
463
448
|
|
464
449
|
function _activate(
|
465
450
|
NftId policyNftId,
|
@@ -504,7 +489,7 @@ contract PolicyService is
|
|
504
489
|
productNftId);
|
505
490
|
|
506
491
|
// update product fees, distribution and pool fees
|
507
|
-
|
492
|
+
_accountingService.increaseProductFees(
|
508
493
|
instanceStore,
|
509
494
|
productNftId,
|
510
495
|
premium.productFeeVarAmount + premium.productFeeFixAmount);
|
@@ -525,7 +510,7 @@ contract PolicyService is
|
|
525
510
|
|
526
511
|
|
527
512
|
/// @dev transfer the premium to the wallets the premium is distributed to
|
528
|
-
function
|
513
|
+
function _transferPremiumAmounts(
|
529
514
|
InstanceReader instanceReader,
|
530
515
|
NftId policyNftId,
|
531
516
|
NftId productNftId,
|
@@ -534,7 +519,6 @@ contract PolicyService is
|
|
534
519
|
internal
|
535
520
|
virtual
|
536
521
|
{
|
537
|
-
TokenHandler tokenHandler = _getTokenHandler(instanceReader, productNftId);
|
538
522
|
address policyHolder = getRegistry().ownerOf(policyNftId);
|
539
523
|
|
540
524
|
(
|
@@ -546,14 +530,19 @@ contract PolicyService is
|
|
546
530
|
instanceReader,
|
547
531
|
productNftId);
|
548
532
|
|
549
|
-
|
550
|
-
|
551
|
-
|
552
|
-
|
553
|
-
|
554
|
-
|
555
|
-
|
556
|
-
|
533
|
+
// step 1: collect premium amount from policy holder
|
534
|
+
TokenHandler tokenHandler = instanceReader.getTokenHandler(productNftId);
|
535
|
+
tokenHandler.pullToken(policyHolder, premium.premiumAmount);
|
536
|
+
|
537
|
+
// step 2: push distribution fee to distribution wallet
|
538
|
+
if (premium.distributionFeeAndCommissionAmount.gtz()) {
|
539
|
+
tokenHandler.pushToken(distributionWallet, premium.distributionFeeAndCommissionAmount);
|
540
|
+
}
|
541
|
+
|
542
|
+
// step 3: push pool fee, bundle fee and pool premium to pool wallet
|
543
|
+
if (premium.poolPremiumAndFeeAmount.gtz()) {
|
544
|
+
tokenHandler.pushToken(poolWallet, premium.poolPremiumAndFeeAmount);
|
545
|
+
}
|
557
546
|
}
|
558
547
|
|
559
548
|
|
@@ -573,31 +562,6 @@ contract PolicyService is
|
|
573
562
|
}
|
574
563
|
|
575
564
|
|
576
|
-
/// @dev checks the balance and allowance of the policy holder
|
577
|
-
function _checkPremiumBalanceAndAllowance(
|
578
|
-
IERC20Metadata token,
|
579
|
-
address tokenHandlerAddress,
|
580
|
-
address policyHolder,
|
581
|
-
Amount premiumAmount
|
582
|
-
)
|
583
|
-
internal
|
584
|
-
virtual
|
585
|
-
view
|
586
|
-
{
|
587
|
-
uint256 premium = premiumAmount.toInt();
|
588
|
-
uint256 balance = token.balanceOf(policyHolder);
|
589
|
-
uint256 allowance = token.allowance(policyHolder, tokenHandlerAddress);
|
590
|
-
|
591
|
-
if (balance < premium) {
|
592
|
-
revert ErrorPolicyServiceBalanceInsufficient(policyHolder, premium, balance);
|
593
|
-
}
|
594
|
-
|
595
|
-
if (allowance < premium) {
|
596
|
-
revert ErrorPolicyServiceAllowanceInsufficient(policyHolder, tokenHandlerAddress, premium, allowance);
|
597
|
-
}
|
598
|
-
}
|
599
|
-
|
600
|
-
|
601
565
|
function _policyHolderPolicyActivated(
|
602
566
|
NftId policyNftId,
|
603
567
|
Timestamp activateAt
|
@@ -656,21 +620,6 @@ contract PolicyService is
|
|
656
620
|
}
|
657
621
|
|
658
622
|
|
659
|
-
function _getTokenHandler(
|
660
|
-
InstanceReader instanceReader,
|
661
|
-
NftId productNftId
|
662
|
-
)
|
663
|
-
internal
|
664
|
-
virtual
|
665
|
-
view
|
666
|
-
returns (
|
667
|
-
TokenHandler tokenHandler
|
668
|
-
)
|
669
|
-
{
|
670
|
-
tokenHandler = instanceReader.getComponentInfo(productNftId).tokenHandler;
|
671
|
-
}
|
672
|
-
|
673
|
-
|
674
623
|
function _getDistributionNftAndWallets(
|
675
624
|
InstanceReader instanceReader,
|
676
625
|
NftId productNftId
|
@@ -714,7 +663,7 @@ contract PolicyService is
|
|
714
663
|
PRODUCT(), // caller must be product
|
715
664
|
true); // only active caller
|
716
665
|
|
717
|
-
productNftId = productInfo.nftId;
|
666
|
+
productNftId = productInfo.nftId; // calling product nft id
|
718
667
|
instance = IInstance(instanceAddress);
|
719
668
|
policyInfo = instance.getInstanceReader().getPolicyInfo(policyNftId);
|
720
669
|
|
@@ -0,0 +1,65 @@
|
|
1
|
+
// SPDX-License-Identifier: Apache-2.0
|
2
|
+
pragma solidity ^0.8.20;
|
3
|
+
|
4
|
+
import {InstanceReader} from "../instance/InstanceReader.sol";
|
5
|
+
import {IPolicy} from "../instance/module/IPolicy.sol";
|
6
|
+
import {IPolicyService} from "../product/IPolicyService.sol";
|
7
|
+
import {NftId} from "../type/NftId.sol";
|
8
|
+
import {StateId, CLOSED, COLLATERALIZED} from "../type/StateId.sol";
|
9
|
+
import {Timestamp, TimestampLib} from "../type/Timestamp.sol";
|
10
|
+
|
11
|
+
library PolicyServiceLib {
|
12
|
+
|
13
|
+
function checkExpiration(
|
14
|
+
Timestamp newExpiredAt,
|
15
|
+
NftId policyNftId,
|
16
|
+
StateId policyState,
|
17
|
+
IPolicy.PolicyInfo memory policyInfo
|
18
|
+
)
|
19
|
+
external
|
20
|
+
view
|
21
|
+
{
|
22
|
+
if (policyState != COLLATERALIZED()) {
|
23
|
+
revert IPolicyService.ErrorPolicyServicePolicyNotActive(policyNftId, policyState);
|
24
|
+
}
|
25
|
+
if (TimestampLib.blockTimestamp() < policyInfo.activatedAt) {
|
26
|
+
revert IPolicyService.ErrorPolicyServicePolicyNotActive(policyNftId, policyState);
|
27
|
+
}
|
28
|
+
|
29
|
+
// check expiredAt represents a valid expiry time
|
30
|
+
if (newExpiredAt >= policyInfo.expiredAt) {
|
31
|
+
revert IPolicyService.ErrorPolicyServicePolicyExpirationTooLate(policyNftId, policyInfo.expiredAt, newExpiredAt);
|
32
|
+
}
|
33
|
+
|
34
|
+
if (newExpiredAt.gtz() && newExpiredAt < TimestampLib.blockTimestamp()) {
|
35
|
+
revert IPolicyService.ErrorPolicyServicePolicyExpirationTooEarly(policyNftId, TimestampLib.blockTimestamp(), newExpiredAt);
|
36
|
+
}
|
37
|
+
}
|
38
|
+
|
39
|
+
function policyIsCloseable(InstanceReader instanceReader, NftId policyNftId)
|
40
|
+
external
|
41
|
+
view
|
42
|
+
returns (bool isCloseable)
|
43
|
+
{
|
44
|
+
// policy already closed
|
45
|
+
if (instanceReader.getPolicyState(policyNftId) == CLOSED()) {
|
46
|
+
return false;
|
47
|
+
}
|
48
|
+
|
49
|
+
IPolicy.PolicyInfo memory info = instanceReader.getPolicyInfo(policyNftId);
|
50
|
+
|
51
|
+
if (info.productNftId.eqz()) { return false; } // not closeable: policy does not exist (or does not belong to this instance)
|
52
|
+
if (info.activatedAt.eqz()) { return false; } // not closeable: not yet activated
|
53
|
+
if (info.openClaimsCount > 0) { return false; } // not closeable: has open claims
|
54
|
+
|
55
|
+
// closeable: if sum of claims matches sum insured a policy may be closed prior to the expiry date
|
56
|
+
if (info.claimAmount == info.sumInsuredAmount) { return true; }
|
57
|
+
|
58
|
+
// not closeable: not yet expired
|
59
|
+
if (TimestampLib.blockTimestamp() < info.expiredAt) { return false; }
|
60
|
+
|
61
|
+
// all conditions to close the policy are met
|
62
|
+
return true;
|
63
|
+
}
|
64
|
+
|
65
|
+
}
|
@@ -17,7 +17,7 @@ contract PolicyServiceManager is ProxyManager {
|
|
17
17
|
)
|
18
18
|
{
|
19
19
|
PolicyService svc = new PolicyService{salt: salt}();
|
20
|
-
bytes memory data = abi.encode(
|
20
|
+
bytes memory data = abi.encode(authority, registry);
|
21
21
|
IVersionable versionable = initialize(
|
22
22
|
registry,
|
23
23
|
address(svc),
|
@@ -42,14 +42,15 @@ contract PricingService is
|
|
42
42
|
initializer()
|
43
43
|
{
|
44
44
|
(
|
45
|
-
address
|
46
|
-
address
|
45
|
+
address authority,
|
46
|
+
address registry
|
47
47
|
) = abi.decode(data, (address, address));
|
48
48
|
|
49
|
-
|
50
|
-
_registerInterface(type(IPricingService).interfaceId);
|
49
|
+
__Service_init(authority, registry, owner);
|
51
50
|
|
52
51
|
_distributionService = IDistributionService(_getServiceAddress(DISTRIBUTION()));
|
52
|
+
|
53
|
+
_registerInterface(type(IPricingService).interfaceId);
|
53
54
|
}
|
54
55
|
|
55
56
|
/// @dev calculates the premium amount for the specified attributes
|
@@ -98,6 +99,7 @@ contract PricingService is
|
|
98
99
|
{
|
99
100
|
// get configurations for all involed objects
|
100
101
|
IComponents.ProductInfo memory productInfo = reader.getProductInfo(productNftId);
|
102
|
+
IComponents.FeeInfo memory feeInfo = reader.getFeeInfo(productNftId);
|
101
103
|
|
102
104
|
IBundle.BundleInfo memory bundleInfo = reader.getBundleInfo(bundleNftId);
|
103
105
|
if(bundleInfo.poolNftId != productInfo.poolNftId) {
|
@@ -107,21 +109,22 @@ contract PricingService is
|
|
107
109
|
// calculate fixed fees for product, pool, bundle
|
108
110
|
premium = _getFixedFeeAmounts(
|
109
111
|
netPremiumAmount,
|
110
|
-
|
112
|
+
feeInfo,
|
111
113
|
bundleInfo
|
112
114
|
);
|
113
115
|
|
114
116
|
// calculate variable fees for product, pool, bundle
|
115
117
|
premium = _calculateVariableFeeAmounts(
|
116
118
|
premium,
|
117
|
-
|
119
|
+
feeInfo,
|
118
120
|
bundleInfo
|
119
121
|
);
|
120
122
|
|
121
123
|
// calculate distribution fee and (if applicable) commission
|
122
124
|
premium = _calculateDistributionOwnerFeeAmount(
|
123
125
|
premium,
|
124
|
-
|
126
|
+
feeInfo,
|
127
|
+
productInfo.distributionNftId,
|
125
128
|
referralId,
|
126
129
|
reader
|
127
130
|
);
|
@@ -137,7 +140,7 @@ contract PricingService is
|
|
137
140
|
revert ErrorPricingServiceTargetWalletAmountsMismatch();
|
138
141
|
}
|
139
142
|
|
140
|
-
if (premium.distributionOwnerFeeFixAmount.toInt() <
|
143
|
+
if (premium.distributionOwnerFeeFixAmount.toInt() < feeInfo.minDistributionOwnerFee.fixedFee) {
|
141
144
|
revert ErrorPricingServiceFeeCalculationMismatch(
|
142
145
|
premium.distributionFeeFixAmount,
|
143
146
|
premium.distributionFeeVarAmount,
|
@@ -164,7 +167,7 @@ contract PricingService is
|
|
164
167
|
// internal functions
|
165
168
|
function _getFixedFeeAmounts(
|
166
169
|
Amount netPremiumAmount,
|
167
|
-
IComponents.
|
170
|
+
IComponents.FeeInfo memory feeInfo,
|
168
171
|
IBundle.BundleInfo memory bundleInfo
|
169
172
|
)
|
170
173
|
internal
|
@@ -177,11 +180,11 @@ contract PricingService is
|
|
177
180
|
premium.netPremiumAmount = netPremiumAmount;
|
178
181
|
premium.fullPremiumAmount = netPremiumAmount;
|
179
182
|
|
180
|
-
Amount t = AmountLib.toAmount(
|
183
|
+
Amount t = AmountLib.toAmount(feeInfo.productFee.fixedFee);
|
181
184
|
premium.productFeeFixAmount = t;
|
182
185
|
premium.fullPremiumAmount = premium.fullPremiumAmount + t;
|
183
186
|
|
184
|
-
t = AmountLib.toAmount(
|
187
|
+
t = AmountLib.toAmount(feeInfo.poolFee.fixedFee);
|
185
188
|
premium.poolFeeFixAmount = t;
|
186
189
|
premium.fullPremiumAmount = premium.fullPremiumAmount + t;
|
187
190
|
|
@@ -189,14 +192,14 @@ contract PricingService is
|
|
189
192
|
premium.bundleFeeFixAmount = t;
|
190
193
|
premium.fullPremiumAmount = premium.fullPremiumAmount + t;
|
191
194
|
|
192
|
-
t = AmountLib.toAmount(
|
195
|
+
t = AmountLib.toAmount(feeInfo.distributionFee.fixedFee);
|
193
196
|
premium.distributionFeeFixAmount = t;
|
194
197
|
premium.fullPremiumAmount = premium.fullPremiumAmount + t;
|
195
198
|
}
|
196
199
|
|
197
200
|
function _calculateVariableFeeAmounts(
|
198
201
|
IPolicy.PremiumInfo memory premium,
|
199
|
-
IComponents.
|
202
|
+
IComponents.FeeInfo memory feeInfo,
|
200
203
|
IBundle.BundleInfo memory bundleInfo
|
201
204
|
)
|
202
205
|
internal
|
@@ -207,11 +210,11 @@ contract PricingService is
|
|
207
210
|
{
|
208
211
|
Amount netPremiumAmount = premium.netPremiumAmount;
|
209
212
|
|
210
|
-
Amount t = netPremiumAmount.multiplyWith(
|
213
|
+
Amount t = netPremiumAmount.multiplyWith(feeInfo.productFee.fractionalFee);
|
211
214
|
premium.productFeeVarAmount = t;
|
212
215
|
premium.fullPremiumAmount = premium.fullPremiumAmount + t;
|
213
216
|
|
214
|
-
t = netPremiumAmount.multiplyWith(
|
217
|
+
t = netPremiumAmount.multiplyWith(feeInfo.poolFee.fractionalFee);
|
215
218
|
premium.poolFeeVarAmount = t;
|
216
219
|
premium.fullPremiumAmount = premium.fullPremiumAmount + t;
|
217
220
|
|
@@ -219,7 +222,7 @@ contract PricingService is
|
|
219
222
|
premium.bundleFeeVarAmount = t;
|
220
223
|
premium.fullPremiumAmount = premium.fullPremiumAmount + t;
|
221
224
|
|
222
|
-
t = netPremiumAmount.multiplyWith(
|
225
|
+
t = netPremiumAmount.multiplyWith(feeInfo.distributionFee.fractionalFee);
|
223
226
|
premium.distributionFeeVarAmount = t;
|
224
227
|
premium.fullPremiumAmount = premium.fullPremiumAmount + t;
|
225
228
|
|
@@ -228,7 +231,8 @@ contract PricingService is
|
|
228
231
|
|
229
232
|
function _calculateDistributionOwnerFeeAmount(
|
230
233
|
IPolicy.PremiumInfo memory premium,
|
231
|
-
IComponents.
|
234
|
+
IComponents.FeeInfo memory feeInfo,
|
235
|
+
NftId distributionNftId,
|
232
236
|
// ISetup.DistributionSetupInfo memory distInfo,
|
233
237
|
ReferralId referralId,
|
234
238
|
InstanceReader reader
|
@@ -239,14 +243,14 @@ contract PricingService is
|
|
239
243
|
{
|
240
244
|
|
241
245
|
// if the referral is not valid, then the distribution owner gets everything
|
242
|
-
if (
|
246
|
+
if (distributionNftId.eqz() || ! _distributionService.referralIsValid(distributionNftId, referralId)) {
|
243
247
|
premium.distributionOwnerFeeFixAmount = premium.distributionFeeFixAmount;
|
244
248
|
premium.distributionOwnerFeeVarAmount = premium.distributionFeeVarAmount;
|
245
249
|
premium.premiumAmount = premium.fullPremiumAmount;
|
246
250
|
return premium;
|
247
251
|
}
|
248
252
|
|
249
|
-
Fee memory minDistributionOwnerFee =
|
253
|
+
Fee memory minDistributionOwnerFee = feeInfo.minDistributionOwnerFee;
|
250
254
|
|
251
255
|
// if the referral is valid, the the commission and discount are calculated based in the full premium
|
252
256
|
// the remaing amount goes to the distribution owner
|