@etherisc/gif-next 0.0.2-f634e5c-828 → 0.0.2-f689687-279
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 +77 -65
- 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 +117 -110
- package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
- package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.json +46 -48
- 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 +27 -3
- 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 +259 -184
- 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 +104 -54
- 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 +288 -147
- 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 +331 -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 +294 -196
- 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 +403 -353
- 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 +27 -50
- 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 +27 -3
- package/artifacts/contracts/product/PolicyService.sol/PolicyService.dbg.json +1 -1
- package/artifacts/contracts/product/PolicyService.sol/PolicyService.json +105 -137
- package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +1 -1
- package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.json +40 -38
- 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 +76 -77
- package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.dbg.json +1 -1
- package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.json +25 -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 +23 -4
- 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 +4 -4
- package/contracts/distribution/BasicDistributionAuthorization.sol +21 -8
- package/contracts/distribution/Distribution.sol +27 -24
- package/contracts/distribution/DistributionService.sol +18 -15
- package/contracts/distribution/DistributionServiceManager.sol +1 -1
- package/contracts/examples/fire/FirePool.sol +6 -2
- package/contracts/examples/fire/FirePoolAuthorization.sol +2 -1
- package/contracts/examples/fire/FireProduct.sol +8 -1
- package/contracts/examples/fire/FireProductAuthorization.sol +2 -1
- package/contracts/examples/unpermissioned/SimpleDistribution.sol +6 -14
- 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 +25 -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 +216 -62
- package/contracts/instance/InstanceAuthorizationV3.sol +18 -23
- package/contracts/instance/InstanceReader.sol +79 -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/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 +3 -2
- package/contracts/product/IProductComponent.sol +4 -1
- package/contracts/product/PolicyService.sol +74 -82
- 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 +36 -0
- package/contracts/product/RiskService.sol +61 -23
- 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 +5 -0
- 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 +1 -1
- 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
@@ -1,12 +1,14 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
2
|
pragma solidity ^0.8.20;
|
3
3
|
|
4
|
+
import {IAccountingService} from "../accounting/IAccountingService.sol";
|
4
5
|
import {IBundle} from "../instance/module/IBundle.sol";
|
5
6
|
import {IBundleService} from "./IBundleService.sol";
|
6
7
|
import {IComponents} from "../instance/module/IComponents.sol";
|
7
8
|
import {IComponentService} from "../shared/IComponentService.sol";
|
8
9
|
import {IInstance} from "../instance/IInstance.sol";
|
9
10
|
import {IPolicy} from "../instance/module/IPolicy.sol";
|
11
|
+
import {IPolicyHolder} from "../shared/IPolicyHolder.sol";
|
10
12
|
import {IPoolComponent} from "../pool/IPoolComponent.sol";
|
11
13
|
import {IPoolService} from "./IPoolService.sol";
|
12
14
|
import {IProductComponent} from "../product/IProductComponent.sol";
|
@@ -16,22 +18,25 @@ import {IStaking} from "../staking/IStaking.sol";
|
|
16
18
|
import {Amount, AmountLib} from "../type/Amount.sol";
|
17
19
|
import {ClaimId} from "../type/ClaimId.sol";
|
18
20
|
import {ContractLib} from "../shared/ContractLib.sol";
|
19
|
-
import {Fee, FeeLib} from "../type/Fee.sol";
|
20
|
-
import {NftId} from "../type/NftId.sol";
|
21
|
-
import {ObjectType, POOL, BUNDLE, PRODUCT, POLICY, COMPONENT} from "../type/ObjectType.sol";
|
22
|
-
import {Fee, FeeLib} from "../type/Fee.sol";
|
23
|
-
import {KEEP_STATE} from "../type/StateId.sol";
|
24
|
-
import {UFixed} from "../type/UFixed.sol";
|
25
|
-
import {Service} from "../shared/Service.sol";
|
26
21
|
import {InstanceReader} from "../instance/InstanceReader.sol";
|
27
22
|
import {InstanceStore} from "../instance/InstanceStore.sol";
|
23
|
+
import {KEEP_STATE} from "../type/StateId.sol";
|
24
|
+
import {NftId} from "../type/NftId.sol";
|
25
|
+
import {ObjectType, ACCOUNTING, POOL, BUNDLE, PRODUCT, POLICY, COMPONENT} from "../type/ObjectType.sol";
|
26
|
+
import {PayoutId} from "../type/PayoutId.sol";
|
27
|
+
import {PoolLib} from "./PoolLib.sol";
|
28
|
+
import {Service} from "../shared/Service.sol";
|
29
|
+
import {TokenHandler} from "../shared/TokenHandler.sol";
|
30
|
+
import {UFixed} from "../type/UFixed.sol";
|
28
31
|
|
29
32
|
string constant POOL_SERVICE_NAME = "PoolService";
|
30
33
|
|
34
|
+
|
31
35
|
contract PoolService is
|
32
36
|
Service,
|
33
37
|
IPoolService
|
34
38
|
{
|
39
|
+
IAccountingService private _accountingService;
|
35
40
|
IBundleService internal _bundleService;
|
36
41
|
IComponentService internal _componentService;
|
37
42
|
IStaking private _staking;
|
@@ -45,12 +50,13 @@ contract PoolService is
|
|
45
50
|
initializer()
|
46
51
|
{
|
47
52
|
(
|
48
|
-
address
|
49
|
-
address
|
53
|
+
address authority,
|
54
|
+
address registry
|
50
55
|
) = abi.decode(data, (address, address));
|
51
56
|
|
52
|
-
|
57
|
+
__Service_init(authority, registry, owner);
|
53
58
|
|
59
|
+
_accountingService = IAccountingService(_getServiceAddress(ACCOUNTING()));
|
54
60
|
_bundleService = IBundleService(_getServiceAddress(BUNDLE()));
|
55
61
|
_componentService = IComponentService(_getServiceAddress(COMPONENT()));
|
56
62
|
_staking = IStaking(getRegistry().getStakingAddress());
|
@@ -89,7 +95,7 @@ contract PoolService is
|
|
89
95
|
// releasing collateral in bundle
|
90
96
|
(Amount unstakedAmount, Amount feeAmount) = _bundleService.close(instance, bundleNftId);
|
91
97
|
|
92
|
-
|
98
|
+
_accountingService.decreasePoolBalance(
|
93
99
|
instance.getInstanceStore(),
|
94
100
|
poolNftId,
|
95
101
|
unstakedAmount + feeAmount,
|
@@ -99,8 +105,7 @@ contract PoolService is
|
|
99
105
|
|
100
106
|
if ((unstakedAmount + feeAmount).gtz()){
|
101
107
|
IComponents.ComponentInfo memory poolComponentInfo = instance.getInstanceReader().getComponentInfo(poolNftId);
|
102
|
-
poolComponentInfo.tokenHandler.
|
103
|
-
poolComponentInfo.tokenHandler.getWallet(),
|
108
|
+
poolComponentInfo.tokenHandler.pushToken(
|
104
109
|
getRegistry().ownerOf(bundleNftId),
|
105
110
|
unstakedAmount + feeAmount);
|
106
111
|
}
|
@@ -120,7 +125,7 @@ contract PoolService is
|
|
120
125
|
|
121
126
|
(NftId poolNftId, IInstance instance) = _getAndVerifyActivePool();
|
122
127
|
InstanceReader instanceReader = instance.getInstanceReader();
|
123
|
-
NftId productNftId = getRegistry().
|
128
|
+
NftId productNftId = getRegistry().getParentNftId(poolNftId);
|
124
129
|
|
125
130
|
// check policy matches with calling pool
|
126
131
|
IPolicy.PolicyInfo memory policyInfo = instanceReader.getPolicyInfo(policyNftId);
|
@@ -141,23 +146,47 @@ contract PoolService is
|
|
141
146
|
}
|
142
147
|
|
143
148
|
|
149
|
+
// function _checkAndGetPoolInfo(NftId bundleNftId)
|
150
|
+
// internal
|
151
|
+
// view
|
152
|
+
// returns (
|
153
|
+
// InstanceReader instanceReader,
|
154
|
+
// InstanceStore instanceStore,
|
155
|
+
// NftId instanceNftId,
|
156
|
+
// NftId poolNftId,
|
157
|
+
// IComponents.PoolInfo memory poolInfo
|
158
|
+
// )
|
159
|
+
// {
|
160
|
+
// _checkNftType(bundleNftId, BUNDLE());
|
161
|
+
|
162
|
+
// (NftId poolNftId, IInstance instance) = _getAndVerifyActivePool();
|
163
|
+
// instanceReader = instance.getInstanceReader();
|
164
|
+
// instanceStore = instance.getInstanceStore();
|
165
|
+
// instanceNftId = instance.getNftId();
|
166
|
+
// poolInfo = instanceReader.getPoolInfo(poolNftId);
|
167
|
+
|
168
|
+
// if (getRegistry().getParentNftId(bundleNftId) != poolNftId) {
|
169
|
+
// revert ErrorPoolServiceBundlePoolMismatch(bundleNftId, poolNftId);
|
170
|
+
// }
|
171
|
+
// }
|
172
|
+
|
173
|
+
|
144
174
|
/// @inheritdoc IPoolService
|
145
175
|
function stake(NftId bundleNftId, Amount amount)
|
146
176
|
external
|
147
177
|
virtual
|
148
178
|
// TODO: restricted() (once #462 is done)
|
149
|
-
returns(
|
179
|
+
returns(
|
180
|
+
Amount netAmount
|
181
|
+
)
|
150
182
|
{
|
151
|
-
|
152
|
-
|
153
|
-
|
154
|
-
|
155
|
-
|
156
|
-
|
157
|
-
|
158
|
-
if (bundleInfo.poolNftId != poolNftId) {
|
159
|
-
revert ErrorPoolServiceBundlePoolMismatch(bundleNftId, poolNftId);
|
160
|
-
}
|
183
|
+
(
|
184
|
+
InstanceReader instanceReader,
|
185
|
+
InstanceStore instanceStore,
|
186
|
+
NftId instanceNftId,
|
187
|
+
NftId poolNftId,
|
188
|
+
IComponents.PoolInfo memory poolInfo
|
189
|
+
) = PoolLib.checkAndGetPoolInfo(getRegistry(), msg.sender, bundleNftId);
|
161
190
|
|
162
191
|
{
|
163
192
|
Amount currentPoolBalance = instanceReader.getBalanceAmount(poolNftId);
|
@@ -167,37 +196,33 @@ contract PoolService is
|
|
167
196
|
}
|
168
197
|
|
169
198
|
// calculate fees
|
170
|
-
IRegistry registry = getRegistry();
|
171
199
|
Amount feeAmount;
|
172
|
-
|
173
|
-
|
174
|
-
|
175
|
-
|
176
|
-
(
|
177
|
-
|
178
|
-
|
179
|
-
)
|
180
|
-
stakingFee,
|
181
|
-
amount);
|
182
|
-
}
|
200
|
+
(
|
201
|
+
feeAmount,
|
202
|
+
netAmount
|
203
|
+
) = PoolLib.calculateStakingAmounts(
|
204
|
+
getRegistry(),
|
205
|
+
instanceReader,
|
206
|
+
poolNftId,
|
207
|
+
amount);
|
183
208
|
|
184
209
|
// do all the book keeping
|
185
|
-
|
186
|
-
|
210
|
+
_accountingService.increasePoolBalance(
|
211
|
+
instanceStore,
|
187
212
|
poolNftId,
|
188
213
|
netAmount,
|
189
214
|
feeAmount);
|
190
215
|
|
191
|
-
_bundleService.stake(
|
216
|
+
_bundleService.stake(instanceReader, instanceStore, bundleNftId, netAmount);
|
192
217
|
|
193
|
-
emit LogPoolServiceBundleStaked(
|
218
|
+
emit LogPoolServiceBundleStaked(instanceNftId, poolNftId, bundleNftId, amount, netAmount);
|
194
219
|
|
195
220
|
// only collect staking amount when pool is not externally managed
|
196
221
|
if (!poolInfo.isExternallyManaged) {
|
197
222
|
|
198
223
|
// collect tokens from bundle owner
|
199
224
|
address bundleOwner = getRegistry().ownerOf(bundleNftId);
|
200
|
-
|
225
|
+
_pullStakingAmount(
|
201
226
|
instanceReader,
|
202
227
|
poolNftId,
|
203
228
|
bundleOwner,
|
@@ -213,19 +238,15 @@ contract PoolService is
|
|
213
238
|
// TODO: restricted() (once #462 is done)
|
214
239
|
returns(Amount netAmount)
|
215
240
|
{
|
216
|
-
|
217
|
-
|
218
|
-
|
219
|
-
|
220
|
-
|
221
|
-
|
222
|
-
|
223
|
-
if (bundleInfo.poolNftId != poolNftId) {
|
224
|
-
revert ErrorPoolServiceBundlePoolMismatch(bundleNftId, poolNftId);
|
225
|
-
}
|
241
|
+
(
|
242
|
+
InstanceReader instanceReader,
|
243
|
+
InstanceStore instanceStore,
|
244
|
+
NftId instanceNftId,
|
245
|
+
NftId poolNftId,
|
246
|
+
) = PoolLib.checkAndGetPoolInfo(getRegistry(), msg.sender, bundleNftId);
|
226
247
|
|
227
248
|
// call bundle service for bookkeeping and additional checks
|
228
|
-
Amount unstakedAmount = _bundleService.unstake(
|
249
|
+
Amount unstakedAmount = _bundleService.unstake(instanceStore, bundleNftId, amount);
|
229
250
|
|
230
251
|
// Important: from now on work only with unstakedAmount as it is the only reliable amount.
|
231
252
|
// if amount was max, this was set to the available amount
|
@@ -234,21 +255,21 @@ contract PoolService is
|
|
234
255
|
netAmount = unstakedAmount;
|
235
256
|
|
236
257
|
// update pool bookkeeping - performance fees stay in the pool, but as fees
|
237
|
-
|
258
|
+
_accountingService.decreasePoolBalance(
|
238
259
|
instanceStore,
|
239
260
|
poolNftId,
|
240
261
|
unstakedAmount,
|
241
262
|
AmountLib.zero());
|
242
263
|
|
243
264
|
|
244
|
-
emit LogPoolServiceBundleUnstaked(
|
265
|
+
emit LogPoolServiceBundleUnstaked(instanceNftId, poolNftId, bundleNftId, unstakedAmount, netAmount);
|
245
266
|
|
246
267
|
// only distribute staking amount when pool is not externally managed
|
247
268
|
if (!instanceReader.getPoolInfo(poolNftId).isExternallyManaged) {
|
248
269
|
|
249
270
|
// transfer amount to bundle owner
|
250
271
|
address bundleOwner = getRegistry().ownerOf(bundleNftId);
|
251
|
-
|
272
|
+
_pushUnstakingAmount(
|
252
273
|
instanceReader,
|
253
274
|
poolNftId,
|
254
275
|
bundleOwner,
|
@@ -276,7 +297,7 @@ contract PoolService is
|
|
276
297
|
address poolOwner = getRegistry().ownerOf(poolNftId);
|
277
298
|
emit LogPoolServiceWalletFunded(poolNftId, poolOwner, amount);
|
278
299
|
|
279
|
-
|
300
|
+
_pullStakingAmount(
|
280
301
|
reader,
|
281
302
|
poolNftId,
|
282
303
|
poolOwner,
|
@@ -303,7 +324,7 @@ contract PoolService is
|
|
303
324
|
address poolOwner = getRegistry().ownerOf(poolNftId);
|
304
325
|
emit LogPoolServiceWalletDefunded(poolNftId, poolOwner, amount);
|
305
326
|
|
306
|
-
|
327
|
+
_pushUnstakingAmount(
|
307
328
|
reader,
|
308
329
|
poolNftId,
|
309
330
|
poolOwner,
|
@@ -322,7 +343,7 @@ contract PoolService is
|
|
322
343
|
_checkNftType(bundleNftId, BUNDLE());
|
323
344
|
|
324
345
|
IRegistry registry = getRegistry();
|
325
|
-
NftId poolNftId = registry.
|
346
|
+
NftId poolNftId = registry.getParentNftId(bundleNftId);
|
326
347
|
(, address instanceAddress) = ContractLib.getInfoAndInstance(registry, poolNftId, true);
|
327
348
|
IInstance instance = IInstance(instanceAddress);
|
328
349
|
|
@@ -331,13 +352,13 @@ contract PoolService is
|
|
331
352
|
Amount bundleNetAmount = premium.netPremiumAmount;
|
332
353
|
|
333
354
|
InstanceStore instanceStore = instance.getInstanceStore();
|
334
|
-
|
355
|
+
_accountingService.increasePoolBalance(
|
335
356
|
instanceStore,
|
336
357
|
poolNftId,
|
337
358
|
bundleNetAmount + bundleFeeAmount,
|
338
359
|
poolFeeAmount);
|
339
360
|
|
340
|
-
|
361
|
+
_accountingService.increaseBundleBalanceForPool(
|
341
362
|
instanceStore,
|
342
363
|
bundleNftId,
|
343
364
|
bundleNetAmount,
|
@@ -372,7 +393,7 @@ contract PoolService is
|
|
372
393
|
totalCollateralAmount,
|
373
394
|
localCollateralAmount,
|
374
395
|
poolIsVerifyingApplications
|
375
|
-
) = calculateRequiredCollateral(
|
396
|
+
) = PoolLib.calculateRequiredCollateral(
|
376
397
|
instance.getInstanceReader(),
|
377
398
|
productNftId,
|
378
399
|
sumInsuredAmount);
|
@@ -407,45 +428,155 @@ contract PoolService is
|
|
407
428
|
}
|
408
429
|
|
409
430
|
function processPayout(
|
410
|
-
|
411
|
-
|
431
|
+
InstanceReader instanceReader,
|
432
|
+
InstanceStore instanceStore,
|
433
|
+
NftId productNftId,
|
412
434
|
NftId policyNftId,
|
413
|
-
|
414
|
-
|
435
|
+
NftId bundleNftId,
|
436
|
+
PayoutId payoutId,
|
437
|
+
Amount payoutAmount,
|
438
|
+
address payoutBeneficiary
|
415
439
|
)
|
416
440
|
external
|
417
441
|
virtual
|
418
442
|
restricted()
|
419
443
|
{
|
444
|
+
// checks
|
420
445
|
_checkNftType(policyNftId, POLICY());
|
421
446
|
|
422
|
-
|
423
|
-
NftId poolNftId = getRegistry().
|
424
|
-
InstanceStore instanceStore = instance.getInstanceStore();
|
447
|
+
// effects
|
448
|
+
NftId poolNftId = getRegistry().getParentNftId(bundleNftId);
|
425
449
|
|
426
|
-
|
450
|
+
_accountingService.decreasePoolBalance(
|
427
451
|
instanceStore,
|
428
452
|
poolNftId,
|
429
453
|
payoutAmount,
|
430
454
|
AmountLib.zero());
|
431
455
|
|
432
|
-
|
456
|
+
_accountingService.decreaseBundleBalanceForPool(
|
433
457
|
instanceStore,
|
434
458
|
bundleNftId,
|
435
459
|
payoutAmount,
|
436
460
|
AmountLib.zero());
|
437
461
|
|
438
462
|
_bundleService.releaseCollateral(
|
439
|
-
|
463
|
+
instanceStore,
|
440
464
|
policyNftId,
|
441
|
-
|
465
|
+
bundleNftId,
|
442
466
|
payoutAmount);
|
443
467
|
|
444
468
|
// update value locked with staking service
|
469
|
+
TokenHandler poolTokenHandler = TokenHandler(
|
470
|
+
instanceReader.getTokenHandler(
|
471
|
+
poolNftId));
|
472
|
+
|
445
473
|
_staking.decreaseTotalValueLocked(
|
446
|
-
|
447
|
-
|
474
|
+
instanceReader.getInstanceNftId(),
|
475
|
+
address(poolTokenHandler.TOKEN()),
|
448
476
|
payoutAmount);
|
477
|
+
|
478
|
+
// interactions
|
479
|
+
_transferTokenAndNotifyPolicyHolder(
|
480
|
+
instanceReader,
|
481
|
+
poolTokenHandler,
|
482
|
+
productNftId,
|
483
|
+
policyNftId,
|
484
|
+
payoutId,
|
485
|
+
payoutAmount,
|
486
|
+
payoutBeneficiary);
|
487
|
+
}
|
488
|
+
|
489
|
+
function _transferTokenAndNotifyPolicyHolder(
|
490
|
+
InstanceReader instanceReader,
|
491
|
+
TokenHandler poolTokenHandler,
|
492
|
+
NftId productNftId,
|
493
|
+
NftId policyNftId,
|
494
|
+
PayoutId payoutId,
|
495
|
+
Amount payoutAmount,
|
496
|
+
address payoutBeneficiary
|
497
|
+
)
|
498
|
+
internal
|
499
|
+
{
|
500
|
+
(
|
501
|
+
Amount netPayoutAmount,
|
502
|
+
Amount processingFeeAmount,
|
503
|
+
address beneficiary
|
504
|
+
) = PoolLib.calculatePayoutAmounts(
|
505
|
+
getRegistry(),
|
506
|
+
instanceReader,
|
507
|
+
productNftId,
|
508
|
+
policyNftId,
|
509
|
+
payoutAmount,
|
510
|
+
payoutBeneficiary);
|
511
|
+
|
512
|
+
// 1st token tx to payout to beneficiary
|
513
|
+
poolTokenHandler.pushToken(
|
514
|
+
beneficiary,
|
515
|
+
netPayoutAmount);
|
516
|
+
|
517
|
+
// 2nd token tx to transfer processing fees to product wallet
|
518
|
+
// if processingFeeAmount > 0
|
519
|
+
if (processingFeeAmount.gtz()) {
|
520
|
+
poolTokenHandler.pushToken(
|
521
|
+
instanceReader.getWallet(productNftId),
|
522
|
+
processingFeeAmount);
|
523
|
+
}
|
524
|
+
|
525
|
+
// callback to policy holder if applicable
|
526
|
+
_policyHolderPayoutExecuted(
|
527
|
+
policyNftId,
|
528
|
+
payoutId,
|
529
|
+
beneficiary,
|
530
|
+
netPayoutAmount);
|
531
|
+
}
|
532
|
+
|
533
|
+
|
534
|
+
/// @inheritdoc IPoolService
|
535
|
+
function withdrawBundleFees(
|
536
|
+
NftId bundleNftId,
|
537
|
+
Amount amount
|
538
|
+
)
|
539
|
+
public
|
540
|
+
virtual
|
541
|
+
restricted()
|
542
|
+
returns (Amount withdrawnAmount)
|
543
|
+
{
|
544
|
+
// checks
|
545
|
+
_checkNftType(bundleNftId, BUNDLE());
|
546
|
+
|
547
|
+
(NftId poolNftId, IInstance instance) = _getAndVerifyActivePool();
|
548
|
+
InstanceReader reader = instance.getInstanceReader();
|
549
|
+
|
550
|
+
// determine withdrawn amount
|
551
|
+
withdrawnAmount = amount;
|
552
|
+
if (withdrawnAmount.gte(AmountLib.max())) {
|
553
|
+
withdrawnAmount = reader.getFeeAmount(bundleNftId);
|
554
|
+
} else {
|
555
|
+
if (withdrawnAmount > reader.getFeeAmount(bundleNftId)) {
|
556
|
+
revert ErrorPoolServiceFeesWithdrawAmountExceedsLimit(withdrawnAmount, reader.getFeeAmount(bundleNftId));
|
557
|
+
}
|
558
|
+
}
|
559
|
+
|
560
|
+
// effects
|
561
|
+
// decrease fee counters by withdrawnAmount
|
562
|
+
{
|
563
|
+
InstanceStore store = instance.getInstanceStore();
|
564
|
+
// decrease fee amount of the bundle
|
565
|
+
_accountingService.decreaseBundleBalanceForPool(store, bundleNftId, AmountLib.zero(), withdrawnAmount);
|
566
|
+
// decrease pool balance
|
567
|
+
_accountingService.decreasePoolBalance(store, poolNftId, withdrawnAmount, AmountLib.zero());
|
568
|
+
}
|
569
|
+
|
570
|
+
// interactions
|
571
|
+
// transfer amount to bundle owner
|
572
|
+
{
|
573
|
+
address bundleOwner = getRegistry().ownerOf(bundleNftId);
|
574
|
+
TokenHandler tokenHandler = reader.getTokenHandler(poolNftId);
|
575
|
+
address token = address(tokenHandler.TOKEN());
|
576
|
+
emit LogPoolServiceFeesWithdrawn(bundleNftId, bundleOwner, token, withdrawnAmount);
|
577
|
+
|
578
|
+
tokenHandler.pushToken(bundleOwner, withdrawnAmount);
|
579
|
+
}
|
449
580
|
}
|
450
581
|
|
451
582
|
|
@@ -453,7 +584,6 @@ contract PoolService is
|
|
453
584
|
/// may only be called by the policy service for unlocked pool components
|
454
585
|
function releaseCollateral(
|
455
586
|
IInstance instance,
|
456
|
-
address token,
|
457
587
|
NftId policyNftId,
|
458
588
|
IPolicy.PolicyInfo memory policyInfo
|
459
589
|
)
|
@@ -466,93 +596,97 @@ contract PoolService is
|
|
466
596
|
Amount remainingCollateralAmount = policyInfo.sumInsuredAmount - policyInfo.claimAmount;
|
467
597
|
|
468
598
|
_bundleService.releaseCollateral(
|
469
|
-
instance,
|
599
|
+
instance.getInstanceStore(),
|
470
600
|
policyNftId,
|
471
601
|
policyInfo.bundleNftId,
|
472
602
|
remainingCollateralAmount);
|
473
603
|
|
474
604
|
// update value locked with staking service
|
605
|
+
InstanceReader instanceReader = instance.getInstanceReader();
|
475
606
|
_staking.decreaseTotalValueLocked(
|
476
|
-
|
477
|
-
|
607
|
+
instanceReader.getInstanceNftId(),
|
608
|
+
address(instanceReader.getToken(policyInfo.productNftId)),
|
478
609
|
remainingCollateralAmount);
|
479
610
|
}
|
480
611
|
|
481
612
|
|
482
|
-
function calculateRequiredCollateral(
|
483
|
-
|
484
|
-
|
485
|
-
|
486
|
-
)
|
487
|
-
|
488
|
-
|
489
|
-
|
490
|
-
|
491
|
-
|
492
|
-
|
493
|
-
|
494
|
-
|
495
|
-
{
|
496
|
-
|
497
|
-
|
498
|
-
|
499
|
-
|
500
|
-
|
501
|
-
|
502
|
-
|
503
|
-
|
504
|
-
|
505
|
-
|
506
|
-
|
507
|
-
|
508
|
-
|
509
|
-
|
510
|
-
|
511
|
-
|
512
|
-
|
513
|
-
|
514
|
-
|
515
|
-
|
516
|
-
|
517
|
-
|
518
|
-
|
519
|
-
|
520
|
-
|
521
|
-
|
522
|
-
|
523
|
-
|
524
|
-
|
525
|
-
|
526
|
-
|
527
|
-
|
528
|
-
|
529
|
-
|
530
|
-
|
531
|
-
|
532
|
-
|
533
|
-
|
534
|
-
|
535
|
-
|
536
|
-
|
613
|
+
// function calculateRequiredCollateral(
|
614
|
+
// InstanceReader instanceReader,
|
615
|
+
// NftId productNftId,
|
616
|
+
// Amount sumInsuredAmount
|
617
|
+
// )
|
618
|
+
// public
|
619
|
+
// view
|
620
|
+
// returns(
|
621
|
+
// NftId poolNftId,
|
622
|
+
// Amount totalCollateralAmount,
|
623
|
+
// Amount localCollateralAmount,
|
624
|
+
// bool poolIsVerifyingApplications
|
625
|
+
// )
|
626
|
+
// {
|
627
|
+
// return CollateralLib.calculateRequiredCollateral(
|
628
|
+
// instanceReader,
|
629
|
+
// productNftId,
|
630
|
+
// sumInsuredAmount);
|
631
|
+
// }
|
632
|
+
|
633
|
+
// _checkNftType(productNftId, PRODUCT());
|
634
|
+
|
635
|
+
// poolNftId = instanceReader.getProductInfo(productNftId).poolNftId;
|
636
|
+
// IComponents.PoolInfo memory poolInfo = instanceReader.getPoolInfo(poolNftId);
|
637
|
+
// poolIsVerifyingApplications = poolInfo.isVerifyingApplications;
|
638
|
+
|
639
|
+
// (
|
640
|
+
// totalCollateralAmount,
|
641
|
+
// localCollateralAmount
|
642
|
+
// ) = calculateRequiredCollateral(
|
643
|
+
// poolInfo.collateralizationLevel,
|
644
|
+
// poolInfo.retentionLevel,
|
645
|
+
// sumInsuredAmount);
|
646
|
+
// }
|
647
|
+
|
648
|
+
|
649
|
+
// function calculateRequiredCollateral(
|
650
|
+
// UFixed collateralizationLevel,
|
651
|
+
// UFixed retentionLevel,
|
652
|
+
// Amount sumInsuredAmount
|
653
|
+
// )
|
654
|
+
// public
|
655
|
+
// pure
|
656
|
+
// returns(
|
657
|
+
// Amount totalCollateralAmount,
|
658
|
+
// Amount localCollateralAmount
|
659
|
+
// )
|
660
|
+
// {
|
661
|
+
// // collateralization is applied to sum insured
|
662
|
+
// UFixed totalUFixed = collateralizationLevel * sumInsuredAmount.toUFixed();
|
663
|
+
// totalCollateralAmount = AmountLib.toAmount(totalUFixed.toInt());
|
664
|
+
|
665
|
+
// // retention level defines how much capital is required locally
|
666
|
+
// localCollateralAmount = AmountLib.toAmount(
|
667
|
+
// (retentionLevel * totalUFixed).toInt());
|
668
|
+
// }
|
669
|
+
|
670
|
+
|
671
|
+
|
672
|
+
|
673
|
+
function _policyHolderPayoutExecuted(
|
674
|
+
NftId policyNftId,
|
675
|
+
PayoutId payoutId,
|
676
|
+
address beneficiary,
|
677
|
+
Amount payoutAmount
|
537
678
|
)
|
538
679
|
internal
|
539
|
-
pure
|
540
|
-
returns (Amount stakingNetAmount)
|
541
680
|
{
|
542
|
-
|
543
|
-
|
544
|
-
|
545
|
-
if (FeeLib.gtz(stakingFee)) {
|
546
|
-
(Amount feeAmount, Amount netAmount) = FeeLib.calculateFee(stakingFee, stakingAmount);
|
547
|
-
stakingNetAmount = netAmount;
|
548
|
-
|
549
|
-
// TODO update fee balance for pool
|
681
|
+
IPolicyHolder policyHolder = PoolLib.getPolicyHolder(getRegistry(), policyNftId);
|
682
|
+
if(address(policyHolder) != address(0)) {
|
683
|
+
policyHolder.payoutExecuted(policyNftId, payoutId, payoutAmount, beneficiary);
|
550
684
|
}
|
551
685
|
}
|
552
686
|
|
553
687
|
|
554
|
-
/// @dev
|
555
|
-
function
|
688
|
+
/// @dev Transfers the specified amount from the "from account" to the pool's wallet
|
689
|
+
function _pullStakingAmount(
|
556
690
|
InstanceReader reader,
|
557
691
|
NftId poolNftId,
|
558
692
|
address from,
|
@@ -561,13 +695,13 @@ contract PoolService is
|
|
561
695
|
internal
|
562
696
|
{
|
563
697
|
IComponents.ComponentInfo memory info = reader.getComponentInfo(poolNftId);
|
564
|
-
info.tokenHandler.
|
698
|
+
info.tokenHandler.pullToken(
|
565
699
|
from,
|
566
700
|
amount);
|
567
701
|
}
|
568
702
|
|
569
|
-
/// @dev
|
570
|
-
function
|
703
|
+
/// @dev Transfers the specified amount from the pool's wallet to the "to account"
|
704
|
+
function _pushUnstakingAmount(
|
571
705
|
InstanceReader reader,
|
572
706
|
NftId poolNftId,
|
573
707
|
address to,
|
@@ -576,8 +710,7 @@ contract PoolService is
|
|
576
710
|
internal
|
577
711
|
{
|
578
712
|
IComponents.ComponentInfo memory info = reader.getComponentInfo(poolNftId);
|
579
|
-
info.tokenHandler.
|
580
|
-
info.tokenHandler.getWallet(),
|
713
|
+
info.tokenHandler.pushToken(
|
581
714
|
to,
|
582
715
|
amount);
|
583
716
|
}
|
@@ -592,19 +725,31 @@ contract PoolService is
|
|
592
725
|
IInstance instance
|
593
726
|
)
|
594
727
|
{
|
595
|
-
(
|
596
|
-
IRegistry.ObjectInfo memory info,
|
597
|
-
address instanceAddress
|
598
|
-
) = ContractLib.getAndVerifyComponent(
|
599
|
-
getRegistry(),
|
600
|
-
msg.sender,
|
601
|
-
POOL(),
|
602
|
-
true); // only active pools
|
603
|
-
|
604
|
-
poolNftId = info.nftId;
|
605
|
-
instance = IInstance(instanceAddress);
|
728
|
+
return PoolLib.getAndVerifyActivePool(getRegistry(), msg.sender);
|
606
729
|
}
|
607
730
|
|
731
|
+
// function _getAndVerifyActivePool()
|
732
|
+
// internal
|
733
|
+
// virtual
|
734
|
+
// view
|
735
|
+
// returns (
|
736
|
+
// NftId poolNftId,
|
737
|
+
// IInstance instance
|
738
|
+
// )
|
739
|
+
// {
|
740
|
+
// (
|
741
|
+
// IRegistry.ObjectInfo memory info,
|
742
|
+
// address instanceAddress
|
743
|
+
// ) = ContractLib.getAndVerifyComponent(
|
744
|
+
// getRegistry(),
|
745
|
+
// msg.sender,
|
746
|
+
// POOL(),
|
747
|
+
// true); // only active pools
|
748
|
+
|
749
|
+
// poolNftId = info.nftId;
|
750
|
+
// instance = IInstance(instanceAddress);
|
751
|
+
// }
|
752
|
+
|
608
753
|
|
609
754
|
function _getDomain() internal pure override returns(ObjectType) {
|
610
755
|
return POOL();
|