@etherisc/gif-next 0.0.2-f62dcdf-553 → 0.0.2-f634e5c-828
Sign up to get free protection for your applications and to get access to all the features.
- package/README.md +27 -6
- package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.dbg.json +1 -1
- package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.json +2 -2
- package/artifacts/contracts/authorization/AccessAdmin.sol/IAccessManagedChecker.dbg.json +4 -0
- package/artifacts/contracts/authorization/AccessAdmin.sol/IAccessManagedChecker.json +24 -0
- package/artifacts/contracts/authorization/AccessManagerCloneable.sol/AccessManagerCloneable.dbg.json +1 -1
- package/artifacts/contracts/authorization/Authorization.sol/Authorization.dbg.json +1 -1
- package/artifacts/contracts/authorization/Authorization.sol/Authorization.json +2 -2
- 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/IAuthorization.sol/IAuthorization.dbg.json +1 -1
- package/artifacts/contracts/authorization/IServiceAuthorization.sol/IServiceAuthorization.dbg.json +1 -1
- package/artifacts/contracts/authorization/ReleaseAccessManager.sol/ReleaseAccessManager.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 +55 -147
- package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.dbg.json +1 -1
- package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.json +2 -2
- package/artifacts/contracts/distribution/Distribution.sol/Distribution.dbg.json +1 -1
- package/artifacts/contracts/distribution/Distribution.sol/Distribution.json +8 -52
- package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.dbg.json +1 -1
- package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.json +121 -82
- package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
- package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.json +72 -48
- package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
- package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.json +11 -37
- package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.dbg.json +1 -1
- package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.json +23 -0
- 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 +37 -160
- package/artifacts/contracts/examples/fire/FirePoolAuthorization.sol/FirePoolAuthorization.dbg.json +1 -1
- package/artifacts/contracts/examples/fire/FirePoolAuthorization.sol/FirePoolAuthorization.json +49 -17
- package/artifacts/contracts/examples/fire/FireProduct.sol/FireProduct.dbg.json +1 -1
- package/artifacts/contracts/examples/fire/FireProduct.sol/FireProduct.json +93 -200
- package/artifacts/contracts/examples/fire/FireProductAuthorization.sol/FireProductAuthorization.dbg.json +1 -1
- package/artifacts/contracts/examples/fire/FireProductAuthorization.sol/FireProductAuthorization.json +2 -2
- 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 +79 -121
- package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.dbg.json +1 -1
- package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.json +33 -101
- package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.dbg.json +1 -1
- package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.json +155 -155
- package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.dbg.json +1 -1
- package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.json +391 -219
- package/artifacts/contracts/instance/BundleSet.sol/BundleSet.dbg.json +1 -1
- package/artifacts/contracts/instance/BundleSet.sol/BundleSet.json +147 -42
- package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstance.sol/IInstance.json +64 -18
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +24 -17
- package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
- package/artifacts/contracts/instance/Instance.sol/Instance.json +96 -29
- package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.json +103 -72
- package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.json +40 -27
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +302 -74
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +71 -48
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +46 -22
- package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.json +59 -69
- package/artifacts/contracts/instance/RiskSet.sol/RiskSet.dbg.json +4 -0
- package/artifacts/contracts/instance/RiskSet.sol/RiskSet.json +810 -0
- 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 +2 -2
- package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +1 -1
- 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 +22 -114
- package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.dbg.json +1 -1
- package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.json +2 -2
- 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 +11 -37
- package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.dbg.json +1 -1
- package/artifacts/contracts/oracle/Oracle.sol/Oracle.dbg.json +1 -1
- package/artifacts/contracts/oracle/Oracle.sol/Oracle.json +8 -52
- package/artifacts/contracts/oracle/OracleService.sol/OracleService.dbg.json +1 -1
- package/artifacts/contracts/oracle/OracleService.sol/OracleService.json +84 -60
- package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.dbg.json +1 -1
- package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.json +66 -22
- package/artifacts/contracts/pool/BasicPool.sol/BasicPool.dbg.json +1 -1
- package/artifacts/contracts/pool/BasicPool.sol/BasicPool.json +8 -67
- package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.dbg.json +1 -1
- package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.json +49 -17
- package/artifacts/contracts/pool/BundleService.sol/BundleService.dbg.json +1 -1
- package/artifacts/contracts/pool/BundleService.sol/BundleService.json +101 -206
- package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.dbg.json +1 -1
- package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.json +58 -70
- package/artifacts/contracts/pool/IBundleService.sol/IBundleService.dbg.json +1 -1
- package/artifacts/contracts/pool/IBundleService.sol/IBundleService.json +19 -57
- package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
- package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.json +11 -76
- package/artifacts/contracts/pool/IPoolService.sol/IPoolService.dbg.json +1 -1
- package/artifacts/contracts/pool/IPoolService.sol/IPoolService.json +77 -75
- package/artifacts/contracts/pool/Pool.sol/Pool.dbg.json +1 -1
- package/artifacts/contracts/pool/Pool.sol/Pool.json +8 -91
- package/artifacts/contracts/pool/PoolService.sol/PoolService.dbg.json +1 -1
- package/artifacts/contracts/pool/PoolService.sol/PoolService.json +154 -160
- package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
- package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.json +61 -33
- package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.dbg.json +1 -1
- package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.json +58 -23
- package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +1 -1
- package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.json +42 -22
- package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.dbg.json +1 -1
- package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.json +13 -52
- package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.dbg.json +1 -1
- package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.json +2 -2
- package/artifacts/contracts/product/ClaimService.sol/ClaimService.dbg.json +1 -1
- package/artifacts/contracts/product/ClaimService.sol/ClaimService.json +74 -66
- package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +1 -1
- package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.json +67 -47
- package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.dbg.json +1 -1
- package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.json +34 -7
- package/artifacts/contracts/product/IClaimService.sol/IClaimService.dbg.json +1 -1
- package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.dbg.json +1 -1
- package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.json +38 -19
- package/artifacts/contracts/product/IPricingService.sol/IPricingService.dbg.json +1 -1
- package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.dbg.json +1 -1
- package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.json +16 -37
- package/artifacts/contracts/product/IRiskService.sol/IRiskService.dbg.json +1 -1
- package/artifacts/contracts/product/PolicyService.sol/PolicyService.dbg.json +1 -1
- package/artifacts/contracts/product/PolicyService.sol/PolicyService.json +132 -121
- package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +1 -1
- package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.json +70 -42
- package/artifacts/contracts/product/PricingService.sol/PricingService.dbg.json +1 -1
- package/artifacts/contracts/product/PricingService.sol/PricingService.json +50 -34
- package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.dbg.json +1 -1
- package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.json +56 -32
- package/artifacts/contracts/product/Product.sol/Product.dbg.json +1 -1
- package/artifacts/contracts/product/Product.sol/Product.json +13 -52
- package/artifacts/contracts/product/RiskService.sol/RiskService.dbg.json +1 -1
- package/artifacts/contracts/product/RiskService.sol/RiskService.json +34 -18
- package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.dbg.json +1 -1
- package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.json +40 -16
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +2 -2
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +24 -0
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
- package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
- package/artifacts/contracts/registry/Registry.sol/Registry.json +62 -38
- package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.json +107 -94
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +32 -16
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +39 -15
- 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 +12 -12
- 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 +2 -2
- package/artifacts/contracts/shared/Component.sol/Component.dbg.json +1 -1
- package/artifacts/contracts/shared/Component.sol/Component.json +8 -38
- package/artifacts/contracts/shared/ComponentService.sol/ComponentService.dbg.json +1 -1
- package/artifacts/contracts/shared/ComponentService.sol/ComponentService.json +256 -116
- package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.dbg.json +1 -1
- package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.json +78 -42
- package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.dbg.json +1 -1
- package/artifacts/contracts/shared/ContractLib.sol/ContractLib.dbg.json +1 -1
- package/artifacts/contracts/shared/ContractLib.sol/ContractLib.json +402 -6
- package/artifacts/contracts/shared/ContractLib.sol/IInstanceAdminHelper.dbg.json +4 -0
- package/artifacts/contracts/shared/ContractLib.sol/IInstanceAdminHelper.json +24 -0
- package/artifacts/contracts/shared/ContractLib.sol/ITargetHelper.dbg.json +4 -0
- package/artifacts/contracts/shared/ContractLib.sol/ITargetHelper.json +30 -0
- package/artifacts/contracts/shared/IComponent.sol/IComponent.dbg.json +1 -1
- package/artifacts/contracts/shared/IComponent.sol/IComponent.json +11 -23
- package/artifacts/contracts/shared/IComponentService.sol/IComponentService.dbg.json +1 -1
- package/artifacts/contracts/shared/IComponentService.sol/IComponentService.json +146 -14
- package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.dbg.json +1 -1
- package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.json +11 -37
- 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/IRegistryLinked.sol/IRegistryLinked.dbg.json +1 -1
- package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
- 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 +8 -52
- 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 +2 -2
- 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/TokenHandler.sol/TokenHandler.dbg.json +1 -1
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +388 -35
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandlerBase.dbg.json +4 -0
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandlerBase.json +395 -0
- package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.dbg.json +1 -1
- package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.json +88 -24
- package/artifacts/contracts/staking/IStaking.sol/IStaking.dbg.json +1 -1
- package/artifacts/contracts/staking/IStaking.sol/IStaking.json +29 -59
- package/artifacts/contracts/staking/IStakingService.sol/IStakingService.dbg.json +1 -1
- package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.dbg.json +1 -1
- package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.json +3 -3
- package/artifacts/contracts/staking/Staking.sol/Staking.dbg.json +1 -1
- package/artifacts/contracts/staking/Staking.sol/Staking.json +80 -152
- 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 +50 -46
- package/artifacts/contracts/staking/StakingReader.sol/StakingReader.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingReader.sol/StakingReader.json +2 -2
- package/artifacts/contracts/staking/StakingService.sol/StakingService.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingService.sol/StakingService.json +36 -20
- package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.json +43 -19
- package/artifacts/contracts/staking/StakingStore.sol/StakingStore.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingStore.sol/StakingStore.json +13 -13
- package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.dbg.json +1 -1
- package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.json +3 -3
- 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/Amount.sol/AmountLib.json +3 -3
- 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/Fee.sol/FeeLib.json +3 -3
- 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 +4 -0
- package/artifacts/contracts/type/Key32Set.sol/LibKey32Set.json +33 -0
- package/artifacts/contracts/type/NftId.sol/NftIdLib.dbg.json +1 -1
- package/artifacts/contracts/type/NftId.sol/NftIdLib.json +23 -4
- 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 +43 -5
- package/artifacts/contracts/type/RoleId.sol/RoleIdLib.dbg.json +1 -1
- package/artifacts/contracts/type/RoleId.sol/RoleIdLib.json +2 -2
- 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/SelectorSetLib.dbg.json +1 -1
- 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/UFixed.sol/UFixedLib.dbg.json +1 -1
- package/artifacts/contracts/type/UFixed.sol/UFixedLib.json +3 -3
- package/artifacts/contracts/type/Version.sol/VersionLib.dbg.json +1 -1
- package/artifacts/contracts/type/Version.sol/VersionPartLib.dbg.json +1 -1
- 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 +18 -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/authorization/AccessAdmin.sol +21 -2
- package/contracts/authorization/ReleaseAccessManager.sol +1 -1
- package/contracts/distribution/BasicDistribution.sol +2 -2
- package/contracts/distribution/BasicDistributionAuthorization.sol +1 -1
- package/contracts/distribution/Distribution.sol +5 -6
- package/contracts/distribution/DistributionService.sol +18 -19
- package/contracts/distribution/IDistributionService.sol +5 -6
- package/contracts/examples/fire/FirePool.sol +16 -3
- package/contracts/examples/fire/FireProduct.sol +24 -8
- package/contracts/examples/unpermissioned/SimpleDistribution.sol +15 -0
- package/contracts/examples/unpermissioned/SimplePool.sol +34 -2
- package/contracts/examples/unpermissioned/SimpleProduct.sol +15 -21
- package/contracts/instance/BundleSet.sol +38 -34
- package/contracts/instance/IInstance.sol +7 -2
- package/contracts/instance/IInstanceService.sol +7 -9
- package/contracts/instance/Instance.sol +16 -9
- package/contracts/instance/InstanceAdmin.sol +41 -30
- package/contracts/instance/InstanceAuthorizationV3.sol +33 -9
- package/contracts/instance/InstanceReader.sol +88 -2
- package/contracts/instance/InstanceService.sol +39 -58
- package/contracts/instance/RiskSet.sol +119 -0
- package/contracts/instance/base/ObjectCounter.sol +1 -2
- package/contracts/instance/base/ObjectSet.sol +24 -25
- package/contracts/instance/module/IComponents.sol +1 -2
- package/contracts/instance/module/IPolicy.sol +2 -1
- package/contracts/instance/module/IRisk.sol +1 -0
- package/contracts/oracle/OracleService.sol +87 -69
- package/contracts/pool/BasicPool.sol +24 -3
- package/contracts/pool/BasicPoolAuthorization.sol +12 -1
- package/contracts/pool/BundleService.sol +14 -84
- package/contracts/pool/IBundleService.sol +2 -23
- package/contracts/pool/IPoolComponent.sol +1 -7
- package/contracts/pool/IPoolService.sol +12 -26
- package/contracts/pool/Pool.sol +112 -102
- package/contracts/pool/PoolService.sol +156 -88
- package/contracts/product/ApplicationService.sol +12 -12
- package/contracts/product/BasicProduct.sol +7 -11
- package/contracts/product/ClaimService.sol +3 -1
- package/contracts/product/IApplicationService.sol +5 -2
- package/contracts/product/IPolicyService.sol +17 -7
- package/contracts/product/PolicyService.sol +237 -195
- package/contracts/product/Product.sol +12 -40
- package/contracts/product/RiskService.sol +14 -3
- package/contracts/registry/ChainNft.sol +4 -2
- package/contracts/registry/IRegistry.sol +2 -0
- package/contracts/registry/Registry.sol +9 -1
- package/contracts/registry/RegistryAdmin.sol +15 -12
- package/contracts/registry/ReleaseRegistry.sol +5 -20
- package/contracts/registry/ServiceAuthorizationV3.sol +13 -31
- package/contracts/shared/Component.sol +43 -86
- package/contracts/shared/ComponentService.sol +160 -36
- package/contracts/shared/ComponentVerifyingService.sol +15 -13
- package/contracts/shared/ContractLib.sol +196 -10
- package/contracts/shared/IComponent.sol +5 -12
- package/contracts/shared/IComponentService.sol +19 -5
- package/contracts/shared/IInstanceLinkedComponent.sol +0 -11
- package/contracts/shared/InstanceLinkedComponent.sol +1 -17
- package/contracts/shared/Registerable.sol +0 -2
- package/contracts/shared/RegistryLinked.sol +6 -12
- package/contracts/shared/TokenHandler.sol +316 -66
- package/contracts/shared/TokenHandlerDeployerLib.sol +10 -2
- package/contracts/staking/IStaking.sol +9 -4
- package/contracts/staking/Staking.sol +29 -21
- package/contracts/staking/StakingService.sol +41 -8
- package/contracts/type/Key32.sol +2 -2
- package/contracts/type/Key32Set.sol +62 -0
- package/contracts/type/NftId.sol +6 -0
- package/contracts/type/ObjectType.sol +2 -0
- package/contracts/type/RiskId.sol +18 -6
- package/contracts/type/UFixed.sol +9 -119
- package/package.json +3 -3
- package/artifacts/contracts/type/UFixed.sol/MathLib.dbg.json +0 -4
- package/artifacts/contracts/type/UFixed.sol/MathLib.json +0 -16
@@ -7,28 +7,29 @@ import {IComponents} from "../instance/module/IComponents.sol";
|
|
7
7
|
import {IComponentService} from "../shared/IComponentService.sol";
|
8
8
|
import {IInstance} from "../instance/IInstance.sol";
|
9
9
|
import {IPolicy} from "../instance/module/IPolicy.sol";
|
10
|
-
import {
|
10
|
+
import {IPoolComponent} from "../pool/IPoolComponent.sol";
|
11
11
|
import {IPoolService} from "./IPoolService.sol";
|
12
|
+
import {IProductComponent} from "../product/IProductComponent.sol";
|
12
13
|
import {IRegistry} from "../registry/IRegistry.sol";
|
13
14
|
import {IStaking} from "../staking/IStaking.sol";
|
14
15
|
|
15
16
|
import {Amount, AmountLib} from "../type/Amount.sol";
|
16
17
|
import {ClaimId} from "../type/ClaimId.sol";
|
18
|
+
import {ContractLib} from "../shared/ContractLib.sol";
|
17
19
|
import {Fee, FeeLib} from "../type/Fee.sol";
|
18
20
|
import {NftId} from "../type/NftId.sol";
|
19
21
|
import {ObjectType, POOL, BUNDLE, PRODUCT, POLICY, COMPONENT} from "../type/ObjectType.sol";
|
20
22
|
import {Fee, FeeLib} from "../type/Fee.sol";
|
21
23
|
import {KEEP_STATE} from "../type/StateId.sol";
|
22
|
-
import {Seconds} from "../type/Seconds.sol";
|
23
24
|
import {UFixed} from "../type/UFixed.sol";
|
24
|
-
import {
|
25
|
+
import {Service} from "../shared/Service.sol";
|
25
26
|
import {InstanceReader} from "../instance/InstanceReader.sol";
|
26
27
|
import {InstanceStore} from "../instance/InstanceStore.sol";
|
27
28
|
|
28
29
|
string constant POOL_SERVICE_NAME = "PoolService";
|
29
30
|
|
30
31
|
contract PoolService is
|
31
|
-
|
32
|
+
Service,
|
32
33
|
IPoolService
|
33
34
|
{
|
34
35
|
IBundleService internal _bundleService;
|
@@ -63,7 +64,7 @@ contract PoolService is
|
|
63
64
|
external
|
64
65
|
virtual
|
65
66
|
{
|
66
|
-
(NftId poolNftId
|
67
|
+
(NftId poolNftId, IInstance instance) = _getAndVerifyActivePool();
|
67
68
|
InstanceReader instanceReader = instance.getInstanceReader();
|
68
69
|
IComponents.PoolInfo memory poolInfo = instanceReader.getPoolInfo(poolNftId);
|
69
70
|
|
@@ -75,40 +76,13 @@ contract PoolService is
|
|
75
76
|
}
|
76
77
|
|
77
78
|
|
78
|
-
/// @inheritdoc IPoolService
|
79
|
-
function createBundle(
|
80
|
-
address bundleOwner, // initial bundle owner
|
81
|
-
Fee memory fee, // fees deducted from premium that go to bundle owner
|
82
|
-
Seconds lifetime, // initial duration for which new policies are covered
|
83
|
-
bytes calldata filter // optional use case specific criteria that define if a policy may be covered by this bundle
|
84
|
-
)
|
85
|
-
external
|
86
|
-
virtual
|
87
|
-
returns(NftId bundleNftId)
|
88
|
-
{
|
89
|
-
(NftId poolNftId,, IInstance instance) = _getAndVerifyActiveComponent(POOL());
|
90
|
-
|
91
|
-
// create the empty bundle
|
92
|
-
bundleNftId = _bundleService.create(
|
93
|
-
instance,
|
94
|
-
poolNftId,
|
95
|
-
bundleOwner,
|
96
|
-
fee,
|
97
|
-
AmountLib.zero(),
|
98
|
-
lifetime,
|
99
|
-
filter);
|
100
|
-
|
101
|
-
emit LogPoolServiceBundleCreated(instance.getNftId(), poolNftId, bundleNftId);
|
102
|
-
}
|
103
|
-
|
104
|
-
|
105
79
|
function closeBundle(NftId bundleNftId)
|
106
80
|
external
|
107
81
|
virtual
|
108
82
|
{
|
109
83
|
_checkNftType(bundleNftId, BUNDLE());
|
110
84
|
|
111
|
-
(NftId poolNftId
|
85
|
+
(NftId poolNftId, IInstance instance) = _getAndVerifyActivePool();
|
112
86
|
|
113
87
|
// TODO get performance fee for pool (#477)
|
114
88
|
|
@@ -126,7 +100,7 @@ contract PoolService is
|
|
126
100
|
if ((unstakedAmount + feeAmount).gtz()){
|
127
101
|
IComponents.ComponentInfo memory poolComponentInfo = instance.getInstanceReader().getComponentInfo(poolNftId);
|
128
102
|
poolComponentInfo.tokenHandler.distributeTokens(
|
129
|
-
poolComponentInfo.
|
103
|
+
poolComponentInfo.tokenHandler.getWallet(),
|
130
104
|
getRegistry().ownerOf(bundleNftId),
|
131
105
|
unstakedAmount + feeAmount);
|
132
106
|
}
|
@@ -144,9 +118,9 @@ contract PoolService is
|
|
144
118
|
{
|
145
119
|
_checkNftType(policyNftId, POLICY());
|
146
120
|
|
147
|
-
(NftId poolNftId
|
121
|
+
(NftId poolNftId, IInstance instance) = _getAndVerifyActivePool();
|
148
122
|
InstanceReader instanceReader = instance.getInstanceReader();
|
149
|
-
NftId productNftId =
|
123
|
+
NftId productNftId = getRegistry().getObjectInfo(poolNftId).parentNftId;
|
150
124
|
|
151
125
|
// check policy matches with calling pool
|
152
126
|
IPolicy.PolicyInfo memory policyInfo = instanceReader.getPolicyInfo(policyNftId);
|
@@ -176,7 +150,7 @@ contract PoolService is
|
|
176
150
|
{
|
177
151
|
_checkNftType(bundleNftId, BUNDLE());
|
178
152
|
|
179
|
-
(NftId poolNftId
|
153
|
+
(NftId poolNftId, IInstance instance) = _getAndVerifyActivePool();
|
180
154
|
InstanceReader instanceReader = instance.getInstanceReader();
|
181
155
|
IBundle.BundleInfo memory bundleInfo = instanceReader.getBundleInfo(bundleNftId);
|
182
156
|
IComponents.PoolInfo memory poolInfo = instanceReader.getPoolInfo(poolNftId);
|
@@ -207,7 +181,7 @@ contract PoolService is
|
|
207
181
|
amount);
|
208
182
|
}
|
209
183
|
|
210
|
-
// do all the
|
184
|
+
// do all the book keeping
|
211
185
|
_componentService.increasePoolBalance(
|
212
186
|
instance.getInstanceStore(),
|
213
187
|
poolNftId,
|
@@ -216,18 +190,22 @@ contract PoolService is
|
|
216
190
|
|
217
191
|
_bundleService.stake(instance, bundleNftId, netAmount);
|
218
192
|
|
219
|
-
// collect tokens from bundle owner
|
220
|
-
address bundleOwner = registry.ownerOf(bundleNftId);
|
221
193
|
emit LogPoolServiceBundleStaked(instance.getNftId(), poolNftId, bundleNftId, amount, netAmount);
|
222
194
|
|
223
|
-
//
|
224
|
-
|
225
|
-
|
226
|
-
|
227
|
-
bundleOwner
|
228
|
-
|
195
|
+
// only collect staking amount when pool is not externally managed
|
196
|
+
if (!poolInfo.isExternallyManaged) {
|
197
|
+
|
198
|
+
// collect tokens from bundle owner
|
199
|
+
address bundleOwner = getRegistry().ownerOf(bundleNftId);
|
200
|
+
_collectStakingAmount(
|
201
|
+
instanceReader,
|
202
|
+
poolNftId,
|
203
|
+
bundleOwner,
|
204
|
+
amount);
|
205
|
+
}
|
229
206
|
}
|
230
207
|
|
208
|
+
|
231
209
|
/// @inheritdoc IPoolService
|
232
210
|
function unstake(NftId bundleNftId, Amount amount)
|
233
211
|
external
|
@@ -237,11 +215,11 @@ contract PoolService is
|
|
237
215
|
{
|
238
216
|
_checkNftType(bundleNftId, BUNDLE());
|
239
217
|
|
240
|
-
(NftId poolNftId
|
218
|
+
(NftId poolNftId, IInstance instance) = _getAndVerifyActivePool();
|
241
219
|
InstanceReader instanceReader = instance.getInstanceReader();
|
242
220
|
InstanceStore instanceStore = instance.getInstanceStore();
|
243
221
|
IBundle.BundleInfo memory bundleInfo = instanceReader.getBundleInfo(bundleNftId);
|
244
|
-
|
222
|
+
|
245
223
|
if (bundleInfo.poolNftId != poolNftId) {
|
246
224
|
revert ErrorPoolServiceBundlePoolMismatch(bundleNftId, poolNftId);
|
247
225
|
}
|
@@ -253,6 +231,7 @@ contract PoolService is
|
|
253
231
|
// if amount was max, this was set to the available amount
|
254
232
|
|
255
233
|
// TODO: handle performance fees (issue #477)
|
234
|
+
netAmount = unstakedAmount;
|
256
235
|
|
257
236
|
// update pool bookkeeping - performance fees stay in the pool, but as fees
|
258
237
|
_componentService.decreasePoolBalance(
|
@@ -261,42 +240,77 @@ contract PoolService is
|
|
261
240
|
unstakedAmount,
|
262
241
|
AmountLib.zero());
|
263
242
|
|
264
|
-
IComponents.ComponentInfo memory poolComponentInfo = instanceReader.getComponentInfo(poolNftId);
|
265
243
|
|
266
|
-
|
267
|
-
address owner = getRegistry().ownerOf(bundleNftId);
|
268
|
-
emit LogPoolServiceBundleUnstaked(instance.getNftId(), poolNftId, bundleNftId, unstakedAmount);
|
269
|
-
poolComponentInfo.tokenHandler.distributeTokens(
|
270
|
-
poolComponentInfo.wallet,
|
271
|
-
owner,
|
272
|
-
unstakedAmount);
|
244
|
+
emit LogPoolServiceBundleUnstaked(instance.getNftId(), poolNftId, bundleNftId, unstakedAmount, netAmount);
|
273
245
|
|
274
|
-
|
246
|
+
// only distribute staking amount when pool is not externally managed
|
247
|
+
if (!instanceReader.getPoolInfo(poolNftId).isExternallyManaged) {
|
248
|
+
|
249
|
+
// transfer amount to bundle owner
|
250
|
+
address bundleOwner = getRegistry().ownerOf(bundleNftId);
|
251
|
+
_distributeUnstakingAmount(
|
252
|
+
instanceReader,
|
253
|
+
poolNftId,
|
254
|
+
bundleOwner,
|
255
|
+
netAmount);
|
256
|
+
}
|
275
257
|
}
|
276
258
|
|
277
259
|
|
278
|
-
function fundPoolWallet(
|
260
|
+
function fundPoolWallet(Amount amount)
|
279
261
|
external
|
280
262
|
virtual
|
281
|
-
restricted()
|
263
|
+
// restricted()
|
282
264
|
{
|
283
|
-
|
284
|
-
|
285
|
-
|
265
|
+
(
|
266
|
+
NftId poolNftId,
|
267
|
+
IInstance instance
|
268
|
+
) = _getAndVerifyActivePool();
|
269
|
+
|
270
|
+
// check that pool is externally managed
|
271
|
+
InstanceReader reader = instance.getInstanceReader();
|
272
|
+
if (!reader.getPoolInfo(poolNftId).isExternallyManaged) {
|
273
|
+
revert ErrorPoolServicePoolNotExternallyManaged(poolNftId);
|
274
|
+
}
|
275
|
+
|
276
|
+
address poolOwner = getRegistry().ownerOf(poolNftId);
|
277
|
+
emit LogPoolServiceWalletFunded(poolNftId, poolOwner, amount);
|
278
|
+
|
279
|
+
_collectStakingAmount(
|
280
|
+
reader,
|
281
|
+
poolNftId,
|
282
|
+
poolOwner,
|
283
|
+
amount);
|
286
284
|
}
|
287
285
|
|
288
286
|
|
289
|
-
function defundPoolWallet(
|
287
|
+
function defundPoolWallet(Amount amount)
|
290
288
|
external
|
291
289
|
virtual
|
292
|
-
restricted()
|
290
|
+
// restricted()
|
293
291
|
{
|
294
|
-
|
292
|
+
(
|
293
|
+
NftId poolNftId,
|
294
|
+
IInstance instance
|
295
|
+
) = _getAndVerifyActivePool();
|
296
|
+
|
297
|
+
// check that pool is externally managed
|
298
|
+
InstanceReader reader = instance.getInstanceReader();
|
299
|
+
if (!reader.getPoolInfo(poolNftId).isExternallyManaged) {
|
300
|
+
revert ErrorPoolServicePoolNotExternallyManaged(poolNftId);
|
301
|
+
}
|
302
|
+
|
303
|
+
address poolOwner = getRegistry().ownerOf(poolNftId);
|
304
|
+
emit LogPoolServiceWalletDefunded(poolNftId, poolOwner, amount);
|
295
305
|
|
296
|
-
|
297
|
-
|
306
|
+
_distributeUnstakingAmount(
|
307
|
+
reader,
|
308
|
+
poolNftId,
|
309
|
+
poolOwner,
|
310
|
+
amount);
|
298
311
|
}
|
299
312
|
|
313
|
+
|
300
314
|
function processSale(
|
301
315
|
NftId bundleNftId,
|
302
316
|
IPolicy.PremiumInfo memory premium
|
@@ -308,9 +322,9 @@ contract PoolService is
|
|
308
322
|
_checkNftType(bundleNftId, BUNDLE());
|
309
323
|
|
310
324
|
IRegistry registry = getRegistry();
|
311
|
-
|
312
|
-
|
313
|
-
IInstance instance =
|
325
|
+
NftId poolNftId = registry.getObjectInfo(bundleNftId).parentNftId;
|
326
|
+
(, address instanceAddress) = ContractLib.getInfoAndInstance(registry, poolNftId, true);
|
327
|
+
IInstance instance = IInstance(instanceAddress);
|
314
328
|
|
315
329
|
Amount poolFeeAmount = premium.poolFeeFixAmount + premium.poolFeeVarAmount;
|
316
330
|
Amount bundleFeeAmount = premium.bundleFeeFixAmount + premium.bundleFeeVarAmount;
|
@@ -319,13 +333,13 @@ contract PoolService is
|
|
319
333
|
InstanceStore instanceStore = instance.getInstanceStore();
|
320
334
|
_componentService.increasePoolBalance(
|
321
335
|
instanceStore,
|
322
|
-
|
336
|
+
poolNftId,
|
323
337
|
bundleNetAmount + bundleFeeAmount,
|
324
338
|
poolFeeAmount);
|
325
339
|
|
326
340
|
_componentService.increaseBundleBalance(
|
327
341
|
instanceStore,
|
328
|
-
|
342
|
+
bundleNftId,
|
329
343
|
bundleNetAmount,
|
330
344
|
bundleFeeAmount);
|
331
345
|
}
|
@@ -351,9 +365,13 @@ contract PoolService is
|
|
351
365
|
_checkNftType(applicationNftId, POLICY());
|
352
366
|
_checkNftType(bundleNftId, BUNDLE());
|
353
367
|
|
368
|
+
NftId poolNftId;
|
369
|
+
bool poolIsVerifyingApplications;
|
354
370
|
(
|
371
|
+
poolNftId,
|
355
372
|
totalCollateralAmount,
|
356
|
-
localCollateralAmount
|
373
|
+
localCollateralAmount,
|
374
|
+
poolIsVerifyingApplications
|
357
375
|
) = calculateRequiredCollateral(
|
358
376
|
instance.getInstanceReader(),
|
359
377
|
productNftId,
|
@@ -371,6 +389,21 @@ contract PoolService is
|
|
371
389
|
instance.getNftId(),
|
372
390
|
token,
|
373
391
|
totalCollateralAmount);
|
392
|
+
|
393
|
+
// pool callback when required
|
394
|
+
if (poolIsVerifyingApplications) {
|
395
|
+
IPoolComponent pool = IPoolComponent(
|
396
|
+
getRegistry().getObjectAddress(poolNftId));
|
397
|
+
|
398
|
+
pool.verifyApplication(
|
399
|
+
applicationNftId,
|
400
|
+
bundleNftId,
|
401
|
+
totalCollateralAmount);
|
402
|
+
|
403
|
+
// TODO add logging
|
404
|
+
}
|
405
|
+
|
406
|
+
// TODO add logging
|
374
407
|
}
|
375
408
|
|
376
409
|
function processPayout(
|
@@ -438,10 +471,6 @@ contract PoolService is
|
|
438
471
|
policyInfo.bundleNftId,
|
439
472
|
remainingCollateralAmount);
|
440
473
|
|
441
|
-
_bundleService.unlinkPolicy(
|
442
|
-
instance,
|
443
|
-
policyNftId);
|
444
|
-
|
445
474
|
// update value locked with staking service
|
446
475
|
_staking.decreaseTotalValueLocked(
|
447
476
|
instance.getNftId(),
|
@@ -458,14 +487,17 @@ contract PoolService is
|
|
458
487
|
public
|
459
488
|
view
|
460
489
|
returns(
|
490
|
+
NftId poolNftId,
|
461
491
|
Amount totalCollateralAmount,
|
462
|
-
Amount localCollateralAmount
|
492
|
+
Amount localCollateralAmount,
|
493
|
+
bool poolIsVerifyingApplications
|
463
494
|
)
|
464
495
|
{
|
465
496
|
_checkNftType(productNftId, PRODUCT());
|
466
497
|
|
467
|
-
|
498
|
+
poolNftId = instanceReader.getProductInfo(productNftId).poolNftId;
|
468
499
|
IComponents.PoolInfo memory poolInfo = instanceReader.getPoolInfo(poolNftId);
|
500
|
+
poolIsVerifyingApplications = poolInfo.isVerifyingApplications;
|
469
501
|
|
470
502
|
(
|
471
503
|
totalCollateralAmount,
|
@@ -519,25 +551,61 @@ contract PoolService is
|
|
519
551
|
}
|
520
552
|
|
521
553
|
|
522
|
-
/// @dev transfers the specified amount from the
|
554
|
+
/// @dev transfers the specified amount from the "from account" to the pool's wallet
|
523
555
|
function _collectStakingAmount(
|
524
|
-
InstanceReader
|
556
|
+
InstanceReader reader,
|
525
557
|
NftId poolNftId,
|
526
|
-
address
|
558
|
+
address from,
|
527
559
|
Amount amount
|
528
560
|
)
|
529
561
|
internal
|
530
562
|
{
|
563
|
+
IComponents.ComponentInfo memory info = reader.getComponentInfo(poolNftId);
|
564
|
+
info.tokenHandler.collectTokens(
|
565
|
+
from,
|
566
|
+
amount);
|
567
|
+
}
|
531
568
|
|
532
|
-
|
533
|
-
|
534
|
-
|
535
|
-
|
536
|
-
|
537
|
-
|
569
|
+
/// @dev distributes the specified amount from the pool's wallet to the "to account"
|
570
|
+
function _distributeUnstakingAmount(
|
571
|
+
InstanceReader reader,
|
572
|
+
NftId poolNftId,
|
573
|
+
address to,
|
574
|
+
Amount amount
|
575
|
+
)
|
576
|
+
internal
|
577
|
+
{
|
578
|
+
IComponents.ComponentInfo memory info = reader.getComponentInfo(poolNftId);
|
579
|
+
info.tokenHandler.distributeTokens(
|
580
|
+
info.tokenHandler.getWallet(),
|
581
|
+
to,
|
538
582
|
amount);
|
539
583
|
}
|
540
584
|
|
585
|
+
|
586
|
+
function _getAndVerifyActivePool()
|
587
|
+
internal
|
588
|
+
virtual
|
589
|
+
view
|
590
|
+
returns (
|
591
|
+
NftId poolNftId,
|
592
|
+
IInstance instance
|
593
|
+
)
|
594
|
+
{
|
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);
|
606
|
+
}
|
607
|
+
|
608
|
+
|
541
609
|
function _getDomain() internal pure override returns(ObjectType) {
|
542
610
|
return POOL();
|
543
611
|
}
|
@@ -55,10 +55,10 @@ contract ApplicationService is
|
|
55
55
|
}
|
56
56
|
|
57
57
|
|
58
|
-
function
|
58
|
+
function _checkLinkedApplicationParameters(
|
59
59
|
InstanceReader instanceReader,
|
60
60
|
NftId productNftId,
|
61
|
-
RiskId
|
61
|
+
RiskId riskId,
|
62
62
|
ReferralId referralId,
|
63
63
|
NftId bundleNftId
|
64
64
|
)
|
@@ -66,18 +66,18 @@ contract ApplicationService is
|
|
66
66
|
virtual
|
67
67
|
view
|
68
68
|
{
|
69
|
-
|
69
|
+
// check risk with product
|
70
|
+
(bool exists, bool active) = instanceReader.getRiskSet().checkRisk(productNftId, riskId);
|
71
|
+
if (!exists) { revert ErrorApplicationServiceRiskUnknown(riskId, productNftId); }
|
72
|
+
if (!active) { revert ErrorApplicationServiceRiskPaused(riskId, productNftId); }
|
70
73
|
|
71
|
-
//
|
74
|
+
// check bundle with pool
|
75
|
+
NftId poolNftId = instanceReader.getProductInfo(productNftId).poolNftId;
|
76
|
+
(exists, active) = instanceReader.getBundleSet().checkBundle(poolNftId, bundleNftId);
|
77
|
+
if (!exists) { revert ErrorApplicationServiceBundleUnknown(bundleNftId, poolNftId); }
|
78
|
+
if (!active) { revert ErrorApplicationServiceBundleLocked(bundleNftId, poolNftId); }
|
72
79
|
|
73
80
|
// TODO check referral with distribution
|
74
|
-
|
75
|
-
// check bundle with pool
|
76
|
-
NftId productPoolNftId = productInfo.poolNftId;
|
77
|
-
NftId bundlePoolNftId = instanceReader.getBundleInfo(bundleNftId).poolNftId;
|
78
|
-
if(bundlePoolNftId != productPoolNftId) {
|
79
|
-
revert ErrorApplicationServiceBundlePoolMismatch(bundleNftId, productPoolNftId, bundlePoolNftId);
|
80
|
-
}
|
81
81
|
}
|
82
82
|
|
83
83
|
|
@@ -143,7 +143,7 @@ contract ApplicationService is
|
|
143
143
|
|
144
144
|
// check if provided references are valid and linked to calling product contract
|
145
145
|
InstanceReader instanceReader = instance.getInstanceReader();
|
146
|
-
|
146
|
+
_checkLinkedApplicationParameters(
|
147
147
|
instanceReader,
|
148
148
|
productNftId,
|
149
149
|
riskId,
|
@@ -3,6 +3,7 @@ pragma solidity ^0.8.20;
|
|
3
3
|
|
4
4
|
import {Fee} from "../type/Fee.sol";
|
5
5
|
import {IAuthorization} from "../authorization/IAuthorization.sol";
|
6
|
+
import {IComponents} from "../instance/module/IComponents.sol";
|
6
7
|
import {NftId} from "../type/NftId.sol";
|
7
8
|
import {Product} from "../product/Product.sol";
|
8
9
|
|
@@ -25,13 +26,11 @@ abstract contract BasicProduct is
|
|
25
26
|
function _initializeBasicProduct(
|
26
27
|
address registry,
|
27
28
|
NftId instanceNftId,
|
28
|
-
IAuthorization authorization,
|
29
|
-
address initialOwner,
|
30
29
|
string memory name,
|
31
30
|
address token,
|
32
|
-
|
33
|
-
|
34
|
-
|
31
|
+
IComponents.ProductInfo memory productInfo,
|
32
|
+
IAuthorization authorization,
|
33
|
+
address initialOwner
|
35
34
|
)
|
36
35
|
internal
|
37
36
|
virtual
|
@@ -40,14 +39,11 @@ abstract contract BasicProduct is
|
|
40
39
|
_initializeProduct(
|
41
40
|
registry,
|
42
41
|
instanceNftId,
|
43
|
-
authorization,
|
44
|
-
initialOwner,
|
45
42
|
name,
|
46
43
|
token,
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
numberOfOracles,
|
44
|
+
productInfo,
|
45
|
+
authorization,
|
46
|
+
initialOwner,
|
51
47
|
""); // component data
|
52
48
|
}
|
53
49
|
}
|
@@ -388,7 +388,9 @@ contract ClaimService is
|
|
388
388
|
{
|
389
389
|
NftId poolNftId = getRegistry().getObjectInfo(policyInfo.bundleNftId).parentNftId;
|
390
390
|
IComponents.ComponentInfo memory poolInfo = instanceReader.getComponentInfo(poolNftId);
|
391
|
-
poolInfo.tokenHandler.
|
391
|
+
poolInfo.tokenHandler.pushToken(
|
392
|
+
beneficiary,
|
393
|
+
netPayoutAmount);
|
392
394
|
|
393
395
|
// TODO add 2nd token tx if processingFeeAmount > 0
|
394
396
|
}
|
@@ -15,8 +15,11 @@ import {Seconds} from "../type/Seconds.sol";
|
|
15
15
|
/// only product components may call transaction functions
|
16
16
|
interface IApplicationService is IService {
|
17
17
|
|
18
|
-
|
19
|
-
error
|
18
|
+
// _checkLinkedApplicationParameters
|
19
|
+
error ErrorApplicationServiceRiskUnknown(RiskId riskId, NftId productNftId);
|
20
|
+
error ErrorApplicationServiceRiskPaused(RiskId riskId, NftId productNftId);
|
21
|
+
error ErrorApplicationServiceBundleUnknown(NftId bundleNftId, NftId poolNftId);
|
22
|
+
error ErrorApplicationServiceBundleLocked(NftId bundleNftId, NftId poolNftId);
|
20
23
|
|
21
24
|
/// @dev creates a new application based on the specified attributes
|
22
25
|
/// may only be called by a product component
|
@@ -5,6 +5,7 @@ import {IService} from "../shared/IService.sol";
|
|
5
5
|
|
6
6
|
import {Amount} from "../type/Amount.sol";
|
7
7
|
import {IInstance} from "../instance/IInstance.sol";
|
8
|
+
import {InstanceReader} from "../instance/InstanceReader.sol";
|
8
9
|
import {NftId} from "../type/NftId.sol";
|
9
10
|
import {StateId} from "../type/StateId.sol";
|
10
11
|
import {Timestamp} from "../type/Timestamp.sol";
|
@@ -28,8 +29,9 @@ interface IPolicyService is IService {
|
|
28
29
|
|
29
30
|
error ErrorPolicyServiceInsufficientAllowance(address customer, address tokenHandlerAddress, uint256 amount);
|
30
31
|
error ErrorPolicyServicePremiumAlreadyPaid(NftId policyNftId);
|
31
|
-
|
32
|
-
error
|
32
|
+
|
33
|
+
error ErrorPolicyServicePolicyNotCloseable(NftId policyNftId);
|
34
|
+
|
33
35
|
error ErrorPolicyServicePolicyNotActive(NftId policyNftId, StateId state);
|
34
36
|
error ErrorPolicyServicePremiumNotPaid(NftId policyNftId, Amount premiumAmount);
|
35
37
|
error ErrorPolicyServiceOpenClaims(NftId policyNftId, uint16 openClaimsCount);
|
@@ -49,7 +51,9 @@ interface IPolicyService is IService {
|
|
49
51
|
function createPolicy(
|
50
52
|
NftId applicationNftId,
|
51
53
|
Timestamp activateAt
|
52
|
-
)
|
54
|
+
)
|
55
|
+
external
|
56
|
+
returns (Amount premiumAmount);
|
53
57
|
|
54
58
|
/// @dev declines an application represented by {policyNftId}
|
55
59
|
/// an application can only be declined in applied state
|
@@ -63,18 +67,24 @@ interface IPolicyService is IService {
|
|
63
67
|
/// to activate a policy it needs to be in underwritten state
|
64
68
|
function activate(NftId policyNftId, Timestamp activateAt) external;
|
65
69
|
|
66
|
-
/// @dev
|
70
|
+
/// @dev Expires the specified policy and sets the expiry date in the policy metadata.
|
71
|
+
/// Function consumers are products.
|
72
|
+
/// If expiry date is set to 0, then the earliest possible expiry date (current blocktime) is set
|
67
73
|
/// to expire a policy it must be in active state, policies may be expired even when the predefined expiry date is still in the future
|
68
74
|
/// a policy can only be closed when it has been expired. in addition, it must not have any open claims
|
69
75
|
/// this function can only be called by a product. the policy needs to match with the calling product
|
70
76
|
/// @return expiredAt the effective expiry date
|
71
77
|
function expire(NftId policyNftId, Timestamp expireAt) external returns (Timestamp expiredAt);
|
72
78
|
|
73
|
-
|
74
|
-
|
75
|
-
/// @dev closes the specified policy and sets the closed data in the policy metadata
|
79
|
+
/// @dev Closes the specified policy and sets the closed data in the policy metadata
|
76
80
|
/// a policy can only be closed when it has been expired. in addition, it must not have any open claims
|
77
81
|
/// this function can only be called by a product. the policy needs to match with the calling product
|
78
82
|
function close(NftId policyNftId) external;
|
79
83
|
|
84
|
+
/// @dev Expires the specified policy and sets the expiry date in the policy metadata.
|
85
|
+
/// Function consumers is claim service.
|
86
|
+
function expirePolicy(IInstance instance, NftId policyNftId, Timestamp expireAt) external returns (Timestamp expiredAt);
|
87
|
+
|
88
|
+
/// @dev Returns true iff policy is closeable
|
89
|
+
function policyIsCloseable(InstanceReader instanceReader, NftId policyNftId) external view returns (bool isCloseable);
|
80
90
|
}
|