@etherisc/gif-next 0.0.2-e9a637d-547 → 0.0.2-eadf4ad-211
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +6 -12
- package/artifacts/contracts/distribution/Distribution.sol/Distribution.dbg.json +4 -0
- package/artifacts/contracts/{components → distribution}/Distribution.sol/Distribution.json +61 -14
- package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.dbg.json +4 -0
- package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.json +1556 -0
- package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +4 -0
- package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.json +819 -0
- package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.dbg.json +4 -0
- package/artifacts/contracts/{components → distribution}/IDistributionComponent.sol/IDistributionComponent.json +45 -14
- package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.dbg.json +4 -0
- package/artifacts/contracts/{instance/service → distribution}/IDistributionService.sol/IDistributionService.json +24 -274
- package/artifacts/contracts/instance/BundleManager.sol/BundleManager.dbg.json +1 -1
- package/artifacts/contracts/instance/BundleManager.sol/BundleManager.json +6 -6
- package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstance.sol/IInstance.json +93 -13
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +5 -43
- package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
- package/artifacts/contracts/instance/Instance.sol/Instance.json +109 -29
- package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +6 -6
- package/artifacts/contracts/instance/InstanceAuthorizationsLib.sol/InstanceAuthorizationsLib.dbg.json +4 -0
- package/artifacts/contracts/instance/InstanceAuthorizationsLib.sol/InstanceAuthorizationsLib.json +124 -0
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +349 -64
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +49 -278
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +83 -133
- package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.json +427 -257
- package/artifacts/contracts/instance/base/Cloneable.sol/Cloneable.dbg.json +4 -0
- package/artifacts/contracts/instance/{Cloneable.sol → base/Cloneable.sol}/Cloneable.json +1 -1
- package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
- package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.json +49 -0
- package/artifacts/contracts/instance/base/ILifecycle.sol/ILifecycle.dbg.json +1 -1
- package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
- package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.json +61 -12
- package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json +1 -1
- package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.json +8 -8
- package/artifacts/contracts/instance/base/ObjectManager.sol/ObjectManager.dbg.json +4 -0
- package/artifacts/contracts/instance/{ObjectManager.sol → base/ObjectManager.sol}/ObjectManager.json +3 -3
- 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/instance/module/ISetup.sol/ISetup.dbg.json +1 -1
- package/artifacts/contracts/instance/module/ITreasury.sol/ITreasury.dbg.json +1 -1
- package/artifacts/contracts/pool/BundleService.sol/BundleService.dbg.json +4 -0
- package/artifacts/contracts/pool/BundleService.sol/BundleService.json +1288 -0
- package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.dbg.json +4 -0
- package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.json +735 -0
- package/artifacts/contracts/pool/IBundleService.sol/IBundleService.dbg.json +4 -0
- package/artifacts/contracts/{instance/service → pool}/IBundleService.sol/IBundleService.json +105 -29
- package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.dbg.json +4 -0
- package/artifacts/contracts/{components → pool}/IPoolComponent.sol/IPoolComponent.json +56 -25
- package/artifacts/contracts/pool/IPoolService.sol/IPoolService.dbg.json +4 -0
- package/artifacts/contracts/{instance/service → pool}/IPoolService.sol/IPoolService.json +272 -39
- package/artifacts/contracts/pool/Pool.sol/Pool.dbg.json +4 -0
- package/artifacts/contracts/{components → pool}/Pool.sol/Pool.json +56 -25
- package/artifacts/contracts/pool/PoolService.sol/PoolService.dbg.json +4 -0
- package/artifacts/contracts/pool/PoolService.sol/PoolService.json +1622 -0
- package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.dbg.json +4 -0
- package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.json +747 -0
- package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.dbg.json +4 -0
- package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.json +918 -0
- package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +4 -0
- package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.json +687 -0
- package/artifacts/contracts/product/ClaimService.sol/ClaimService.dbg.json +4 -0
- package/artifacts/contracts/product/ClaimService.sol/ClaimService.json +1386 -0
- package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +4 -0
- package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.json +787 -0
- package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.dbg.json +4 -0
- package/artifacts/contracts/{instance/service/IClaimService.sol/IClaimService.json → product/IApplicationService.sol/IApplicationService.json} +119 -101
- package/artifacts/contracts/product/IClaimService.sol/IClaimService.dbg.json +4 -0
- package/artifacts/contracts/product/IClaimService.sol/IClaimService.json +753 -0
- package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.dbg.json +4 -0
- package/artifacts/contracts/{instance/service → product}/IPolicyService.sol/IPolicyService.json +129 -84
- package/artifacts/contracts/product/IPricingService.sol/IPricingService.dbg.json +4 -0
- package/artifacts/contracts/{instance/service/IApplicationService.sol/IApplicationService.json → product/IPricingService.sol/IPricingService.json} +63 -175
- package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.dbg.json +4 -0
- package/artifacts/contracts/{components → product}/IProductComponent.sol/IProductComponent.json +53 -22
- package/artifacts/contracts/product/IProductService.sol/IProductService.dbg.json +4 -0
- package/artifacts/contracts/{instance/service → product}/IProductService.sol/IProductService.json +6 -14
- package/artifacts/contracts/product/PolicyService.sol/PolicyService.dbg.json +4 -0
- package/artifacts/contracts/product/PolicyService.sol/PolicyService.json +1281 -0
- package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +4 -0
- package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.json +779 -0
- package/artifacts/contracts/product/PricingService.sol/PricingService.dbg.json +4 -0
- package/artifacts/contracts/product/PricingService.sol/PricingService.json +1004 -0
- package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.dbg.json +4 -0
- package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.json +727 -0
- package/artifacts/contracts/product/Product.sol/Product.dbg.json +4 -0
- package/artifacts/contracts/{components → product}/Product.sol/Product.json +53 -22
- package/artifacts/contracts/product/ProductService.sol/ProductService.dbg.json +4 -0
- package/artifacts/contracts/product/ProductService.sol/ProductService.json +864 -0
- package/artifacts/contracts/product/ProductServiceManager.sol/ProductServiceManager.dbg.json +4 -0
- package/artifacts/contracts/product/ProductServiceManager.sol/ProductServiceManager.json +679 -0
- 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 +73 -13
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +154 -60
- 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 +97 -29
- package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.json +50 -97
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +174 -80
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +78 -47
- package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.dbg.json +1 -1
- package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.json +369 -82
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +14 -27
- package/artifacts/contracts/shared/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.dbg.json +4 -0
- package/artifacts/contracts/{instance → shared}/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.json +3 -3
- package/artifacts/contracts/shared/Component.sol/Component.dbg.json +4 -0
- package/artifacts/contracts/{components → shared}/Component.sol/Component.json +38 -7
- package/artifacts/contracts/shared/ComponentService.sol/ComponentService.dbg.json +4 -0
- package/artifacts/contracts/{instance/base → shared}/ComponentService.sol/ComponentService.json +38 -14
- package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +1 -1
- package/artifacts/contracts/shared/IComponent.sol/IComponent.dbg.json +4 -0
- package/artifacts/contracts/{components → shared}/IComponent.sol/IComponent.json +38 -7
- package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
- package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.json +0 -13
- package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +1 -1
- package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.json +69 -9
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +0 -13
- package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +1 -1
- package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.json +0 -13
- package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
- package/artifacts/contracts/shared/IService.sol/IService.json +5 -13
- package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +1 -1
- package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
- package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +8 -21
- package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +1 -1
- package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +80 -26
- package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +1 -1
- package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +49 -33
- package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
- package/artifacts/contracts/shared/Registerable.sol/Registerable.json +8 -21
- package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +1 -1
- package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +2 -15
- package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
- package/artifacts/contracts/shared/Service.sol/Service.json +5 -13
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +24 -6
- package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
- package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +2 -2
- package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +1 -1
- package/artifacts/contracts/staking/IStakingService.sol/IStakingService.dbg.json +4 -0
- package/artifacts/contracts/staking/IStakingService.sol/IStakingService.json +523 -0
- package/artifacts/contracts/staking/StakingService.sol/StakingService.dbg.json +4 -0
- package/artifacts/contracts/staking/StakingService.sol/StakingService.json +767 -0
- package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.dbg.json +4 -0
- package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.json +667 -0
- package/artifacts/contracts/type/AddressSet.sol/LibAddressSet.dbg.json +4 -0
- package/artifacts/contracts/{types → type}/AddressSet.sol/LibAddressSet.json +3 -3
- package/artifacts/contracts/type/Amount.sol/AmountLib.dbg.json +4 -0
- package/artifacts/contracts/type/Amount.sol/AmountLib.json +281 -0
- package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.dbg.json +4 -0
- package/artifacts/contracts/{types → type}/Blocknumber.sol/BlocknumberLib.json +3 -3
- package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.dbg.json +4 -0
- package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.json +179 -0
- package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.dbg.json +4 -0
- package/artifacts/contracts/{types → type}/DistributorType.sol/DistributorTypeLib.json +5 -5
- package/artifacts/contracts/type/Fee.sol/FeeLib.dbg.json +4 -0
- package/artifacts/contracts/type/Fee.sol/FeeLib.json +312 -0
- package/artifacts/contracts/type/Key32.sol/Key32Lib.dbg.json +4 -0
- package/artifacts/contracts/{types → type}/Key32.sol/Key32Lib.json +3 -3
- package/artifacts/contracts/type/NftId.sol/NftIdLib.dbg.json +4 -0
- package/artifacts/contracts/{types → type}/NftId.sol/NftIdLib.json +5 -5
- package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.dbg.json +4 -0
- package/artifacts/contracts/{types → type}/NftIdSet.sol/LibNftIdSet.json +3 -3
- package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.dbg.json +4 -0
- package/artifacts/contracts/{types → type}/ObjectType.sol/ObjectTypeLib.json +3 -3
- package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.dbg.json +4 -0
- package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.json +209 -0
- package/artifacts/contracts/type/Referral.sol/ReferralLib.dbg.json +4 -0
- package/artifacts/contracts/{types → type}/Referral.sol/ReferralLib.json +5 -5
- package/artifacts/contracts/type/RiskId.sol/RiskIdLib.dbg.json +4 -0
- package/artifacts/contracts/{types → type}/RiskId.sol/RiskIdLib.json +5 -5
- package/artifacts/contracts/type/RoleId.sol/RoleIdLib.dbg.json +4 -0
- package/artifacts/contracts/{types → type}/RoleId.sol/RoleIdLib.json +5 -5
- package/artifacts/contracts/type/Seconds.sol/SecondsLib.dbg.json +4 -0
- package/artifacts/contracts/{types → type}/Seconds.sol/SecondsLib.json +3 -3
- package/artifacts/contracts/type/StateId.sol/StateIdLib.dbg.json +4 -0
- package/artifacts/contracts/{types → type}/StateId.sol/StateIdLib.json +3 -3
- package/artifacts/contracts/type/Timestamp.sol/TimestampLib.dbg.json +4 -0
- package/artifacts/contracts/{types → type}/Timestamp.sol/TimestampLib.json +20 -7
- package/artifacts/contracts/type/UFixed.sol/MathLib.dbg.json +4 -0
- package/artifacts/contracts/{types → type}/UFixed.sol/MathLib.json +3 -3
- package/artifacts/contracts/type/UFixed.sol/UFixedLib.dbg.json +4 -0
- package/artifacts/contracts/{types → type}/UFixed.sol/UFixedLib.json +3 -3
- package/artifacts/contracts/type/Version.sol/VersionLib.dbg.json +4 -0
- package/artifacts/contracts/{types → type}/Version.sol/VersionLib.json +3 -3
- package/artifacts/contracts/type/Version.sol/VersionPartLib.dbg.json +4 -0
- package/artifacts/contracts/{types → type}/Version.sol/VersionPartLib.json +3 -3
- package/contracts/{components → distribution}/Distribution.sol +21 -16
- package/contracts/{instance/service → distribution}/DistributionService.sol +93 -179
- package/contracts/{instance/service → distribution}/DistributionServiceManager.sol +14 -11
- package/contracts/{components → distribution}/IDistributionComponent.sol +7 -7
- package/contracts/{instance/service → distribution}/IDistributionService.sol +18 -30
- package/contracts/instance/BundleManager.sol +8 -9
- package/contracts/instance/IInstance.sol +30 -13
- package/contracts/instance/IInstanceService.sol +6 -17
- package/contracts/instance/Instance.sol +76 -46
- package/contracts/instance/InstanceAccessManager.sol +8 -5
- package/contracts/instance/InstanceAuthorizationsLib.sol +308 -0
- package/contracts/instance/InstanceReader.sol +91 -16
- package/contracts/instance/InstanceService.sol +78 -307
- package/contracts/instance/InstanceServiceManager.sol +11 -21
- package/contracts/instance/InstanceStore.sol +57 -65
- package/contracts/instance/{Cloneable.sol → base/Cloneable.sol} +1 -1
- package/contracts/instance/base/IKeyValueStore.sol +14 -10
- package/contracts/instance/base/ILifecycle.sol +3 -3
- package/contracts/instance/base/KeyValueStore.sol +32 -43
- package/contracts/instance/base/Lifecycle.sol +17 -5
- package/contracts/instance/{ObjectManager.sol → base/ObjectManager.sol} +7 -7
- package/contracts/instance/module/IAccess.sol +2 -2
- package/contracts/instance/module/IBundle.sol +5 -5
- package/contracts/instance/module/IComponents.sol +8 -8
- package/contracts/instance/module/IDistribution.sol +7 -6
- package/contracts/instance/module/IPolicy.sol +22 -16
- package/contracts/instance/module/IRisk.sol +1 -1
- package/contracts/instance/module/ISetup.sol +4 -4
- package/contracts/instance/module/ITreasury.sol +2 -2
- package/contracts/{instance/service → pool}/BundleService.sol +108 -155
- package/contracts/pool/BundleServiceManager.sol +42 -0
- package/contracts/{instance/service → pool}/IBundleService.sol +43 -18
- package/contracts/{components → pool}/IPoolComponent.sol +14 -13
- package/contracts/{instance/service → pool}/IPoolService.sol +28 -13
- package/contracts/{components → pool}/Pool.sol +20 -21
- package/contracts/{instance/service → pool}/PoolService.sol +160 -59
- package/contracts/pool/PoolServiceManager.sol +42 -0
- package/contracts/product/ApplicationService.sol +187 -0
- package/contracts/{instance/service → product}/ApplicationServiceManager.sol +11 -8
- package/contracts/product/ClaimService.sol +443 -0
- package/contracts/{instance/service → product}/ClaimServiceManager.sol +11 -8
- package/contracts/{instance/service → product}/IApplicationService.sol +14 -34
- package/contracts/product/IClaimService.sol +93 -0
- package/contracts/{instance/service → product}/IPolicyService.sol +34 -26
- package/contracts/product/IPricingService.sol +37 -0
- package/contracts/{components → product}/IProductComponent.sol +11 -10
- package/contracts/{instance/service → product}/IProductService.sol +10 -10
- package/contracts/{instance/service → product}/PolicyService.sol +154 -138
- package/contracts/product/PolicyServiceManager.sol +42 -0
- package/contracts/product/PricingService.sol +276 -0
- package/contracts/product/PricingServiceManager.sol +42 -0
- package/contracts/{components → product}/Product.sol +160 -74
- package/contracts/{instance/service → product}/ProductService.sol +50 -47
- package/contracts/product/ProductServiceManager.sol +42 -0
- package/contracts/registry/IRegistry.sol +23 -16
- package/contracts/registry/IRegistryService.sol +26 -36
- package/contracts/registry/Registry.sol +43 -39
- package/contracts/registry/RegistryAccessManager.sol +39 -123
- package/contracts/registry/RegistryService.sol +32 -83
- package/contracts/registry/RegistryServiceManager.sol +21 -11
- package/contracts/registry/ReleaseManager.sol +247 -189
- package/contracts/registry/TokenRegistry.sol +2 -2
- package/contracts/{components → shared}/Component.sol +26 -8
- package/contracts/{instance/base → shared}/ComponentService.sol +60 -40
- package/contracts/{components → shared}/IComponent.sol +19 -5
- package/contracts/shared/INftOwnable.sol +1 -1
- package/contracts/shared/IPolicyHolder.sol +24 -10
- package/contracts/shared/IRegistryLinked.sol +0 -1
- package/contracts/shared/IService.sol +3 -1
- package/contracts/shared/IVersionable.sol +1 -1
- package/contracts/shared/NftOwnable.sol +1 -3
- package/contracts/shared/PolicyHolder.sol +31 -18
- package/contracts/shared/ProxyManager.sol +29 -3
- package/contracts/shared/Registerable.sol +12 -11
- package/contracts/shared/RegistryLinked.sol +0 -5
- package/contracts/shared/Service.sol +3 -3
- package/contracts/shared/TokenHandler.sol +4 -2
- package/contracts/shared/Versionable.sol +1 -1
- package/contracts/staking/IStakingService.sol +102 -0
- package/contracts/staking/StakingService.sol +169 -0
- package/contracts/staking/StakingServiceManager.sol +40 -0
- package/contracts/{types → type}/Amount.sol +49 -0
- package/contracts/{types → type}/ClaimId.sol +25 -2
- package/contracts/{types → type}/Fee.sol +7 -6
- package/contracts/{types → type}/NftIdSet.sol +1 -1
- package/contracts/{types → type}/ObjectType.sol +10 -5
- package/contracts/{types → type}/PayoutId.sol +33 -5
- package/contracts/{types → type}/RoleId.sol +50 -8
- package/contracts/{types → type}/StateId.sol +6 -2
- package/contracts/{types → type}/Timestamp.sol +5 -0
- package/package.json +1 -1
- package/artifacts/contracts/components/Component.sol/Component.dbg.json +0 -4
- package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +0 -4
- package/artifacts/contracts/components/IComponent.sol/IComponent.dbg.json +0 -4
- package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +0 -4
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +0 -4
- package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +0 -4
- package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +0 -4
- package/artifacts/contracts/components/Product.sol/Product.dbg.json +0 -4
- package/artifacts/contracts/instance/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.dbg.json +0 -4
- package/artifacts/contracts/instance/Cloneable.sol/Cloneable.dbg.json +0 -4
- package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.dbg.json +0 -4
- package/artifacts/contracts/instance/base/ComponentService.sol/ComponentService.dbg.json +0 -4
- package/artifacts/contracts/instance/service/ApplicationService.sol/ApplicationService.dbg.json +0 -4
- package/artifacts/contracts/instance/service/ApplicationService.sol/ApplicationService.json +0 -1039
- package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +0 -4
- package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.json +0 -673
- package/artifacts/contracts/instance/service/BundleService.sol/BundleService.dbg.json +0 -4
- package/artifacts/contracts/instance/service/BundleService.sol/BundleService.json +0 -1231
- package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.dbg.json +0 -4
- package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.json +0 -721
- package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.dbg.json +0 -4
- package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.json +0 -817
- package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +0 -4
- package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.json +0 -641
- package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +0 -4
- package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +0 -1798
- package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +0 -4
- package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.json +0 -805
- package/artifacts/contracts/instance/service/IApplicationService.sol/IApplicationService.dbg.json +0 -4
- package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.dbg.json +0 -4
- package/artifacts/contracts/instance/service/IClaimService.sol/IClaimService.dbg.json +0 -4
- package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +0 -4
- package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.dbg.json +0 -4
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +0 -4
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +0 -4
- package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.dbg.json +0 -4
- package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.json +0 -1092
- package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +0 -4
- package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.json +0 -697
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +0 -4
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +0 -1237
- package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.dbg.json +0 -4
- package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.json +0 -661
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +0 -4
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +0 -840
- package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.dbg.json +0 -4
- package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.json +0 -653
- package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.dbg.json +0 -4
- package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.json +0 -107
- package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json +0 -4
- package/artifacts/contracts/test/TestFee.sol/TestFee.json +0 -119
- package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json +0 -4
- package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +0 -383
- package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +0 -4
- package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.json +0 -116
- package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +0 -4
- package/artifacts/contracts/test/TestService.sol/TestService.json +0 -596
- package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json +0 -4
- package/artifacts/contracts/test/TestToken.sol/TestUsdc.json +0 -376
- package/artifacts/contracts/test/TestVersion.sol/TestVersion.dbg.json +0 -4
- package/artifacts/contracts/test/TestVersion.sol/TestVersion.json +0 -218
- package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json +0 -4
- package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.json +0 -104
- package/artifacts/contracts/test/Usdc.sol/USDC.dbg.json +0 -4
- package/artifacts/contracts/test/Usdc.sol/USDC.json +0 -376
- package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.dbg.json +0 -4
- package/artifacts/contracts/types/Amount.sol/AmountLib.dbg.json +0 -4
- package/artifacts/contracts/types/Amount.sol/AmountLib.json +0 -161
- package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +0 -4
- package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +0 -4
- package/artifacts/contracts/types/ChainId.sol/ChainIdLib.json +0 -10
- package/artifacts/contracts/types/ClaimId.sol/ClaimIdLib.dbg.json +0 -4
- package/artifacts/contracts/types/ClaimId.sol/ClaimIdLib.json +0 -100
- package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.dbg.json +0 -4
- package/artifacts/contracts/types/Fee.sol/FeeLib.dbg.json +0 -4
- package/artifacts/contracts/types/Fee.sol/FeeLib.json +0 -288
- package/artifacts/contracts/types/Key32.sol/Key32Lib.dbg.json +0 -4
- package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +0 -4
- package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.dbg.json +0 -4
- package/artifacts/contracts/types/NumberId.sol/NumberIdLib.dbg.json +0 -4
- package/artifacts/contracts/types/NumberId.sol/NumberIdLib.json +0 -100
- package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.dbg.json +0 -4
- package/artifacts/contracts/types/PayoutId.sol/PayoutIdLib.dbg.json +0 -4
- package/artifacts/contracts/types/PayoutId.sol/PayoutIdLib.json +0 -100
- package/artifacts/contracts/types/Referral.sol/ReferralLib.dbg.json +0 -4
- package/artifacts/contracts/types/RiskId.sol/RiskIdLib.dbg.json +0 -4
- package/artifacts/contracts/types/RoleId.sol/RoleIdLib.dbg.json +0 -4
- package/artifacts/contracts/types/Seconds.sol/SecondsLib.dbg.json +0 -4
- package/artifacts/contracts/types/StateId.sol/StateIdLib.dbg.json +0 -4
- package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json +0 -4
- package/artifacts/contracts/types/UFixed.sol/MathLib.dbg.json +0 -4
- package/artifacts/contracts/types/UFixed.sol/UFixedLib.dbg.json +0 -4
- package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +0 -4
- package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +0 -4
- package/contracts/instance/service/ApplicationService.sol +0 -351
- package/contracts/instance/service/BundleServiceManager.sol +0 -51
- package/contracts/instance/service/ClaimService.sol +0 -151
- package/contracts/instance/service/IClaimService.sol +0 -61
- package/contracts/instance/service/PolicyServiceManager.sol +0 -54
- package/contracts/instance/service/PoolServiceManager.sol +0 -51
- package/contracts/instance/service/ProductServiceManager.sol +0 -54
- package/contracts/shared/ContractDeployerLib.sol +0 -72
- package/contracts/test/TestFee.sol +0 -25
- package/contracts/test/TestRegisterable.sol +0 -18
- package/contracts/test/TestRoleId.sol +0 -14
- package/contracts/test/TestService.sol +0 -25
- package/contracts/test/TestToken.sol +0 -26
- package/contracts/test/TestVersion.sol +0 -44
- package/contracts/test/TestVersionable.sol +0 -17
- package/contracts/test/Usdc.sol +0 -26
- package/contracts/types/ChainId.sol +0 -38
- package/contracts/types/NumberId.sol +0 -52
- /package/contracts/{instance → shared}/AccessManagerUpgradeableInitializeable.sol +0 -0
- /package/contracts/{types → type}/AddressSet.sol +0 -0
- /package/contracts/{types → type}/Blocknumber.sol +0 -0
- /package/contracts/{types → type}/DistributorType.sol +0 -0
- /package/contracts/{types → type}/Key32.sol +0 -0
- /package/contracts/{types → type}/NftId.sol +0 -0
- /package/contracts/{types → type}/Referral.sol +0 -0
- /package/contracts/{types → type}/RiskId.sol +0 -0
- /package/contracts/{types → type}/Seconds.sol +0 -0
- /package/contracts/{types → type}/UFixed.sol +0 -0
- /package/contracts/{types → type}/Version.sol +0 -0
@@ -1,13 +1,14 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
2
|
pragma solidity ^0.8.20;
|
3
3
|
|
4
|
-
import {
|
5
|
-
import {
|
4
|
+
import {Amount} from "../type/Amount.sol";
|
5
|
+
import {Fee} from "../type/Fee.sol";
|
6
|
+
import {IComponent} from "../shared/IComponent.sol";
|
6
7
|
import {IComponents} from "../instance/module/IComponents.sol";
|
7
|
-
import {NftId} from "../
|
8
|
-
import {RoleId} from "../
|
9
|
-
import {Seconds} from "../
|
10
|
-
import {UFixed} from "../
|
8
|
+
import {NftId} from "../type/NftId.sol";
|
9
|
+
import {RoleId} from "../type/RoleId.sol";
|
10
|
+
import {Seconds} from "../type/Seconds.sol";
|
11
|
+
import {UFixed} from "../type/UFixed.sol";
|
11
12
|
|
12
13
|
/// @dev pool components hold and manage the collateral to cover active policies
|
13
14
|
/// pools come in different flavors
|
@@ -18,17 +19,17 @@ interface IPoolComponent is IComponent {
|
|
18
19
|
|
19
20
|
error ErrorPoolApplicationBundleMismatch(NftId applicationNftId);
|
20
21
|
|
21
|
-
event LogPoolVerifiedByPool(address pool, NftId applicationNftId,
|
22
|
+
event LogPoolVerifiedByPool(address pool, NftId applicationNftId, Amount collateralizationAmount);
|
22
23
|
|
23
24
|
/// @dev increases the staked tokens by the specified amount
|
24
25
|
/// only the bundle owner may stake tokens
|
25
26
|
/// bundle MUST be in active or locked state
|
26
|
-
function stake(NftId bundleNftId,
|
27
|
+
function stake(NftId bundleNftId, Amount amount) external;
|
27
28
|
|
28
29
|
/// @dev decreases the staked tokens by the specified amount
|
29
30
|
/// only the bundle owner may unstake tokens from the bundle
|
30
31
|
/// bundle MUST be in active, locked or closed state
|
31
|
-
function unstake(NftId bundleNftId,
|
32
|
+
function unstake(NftId bundleNftId, Amount amount) external;
|
32
33
|
|
33
34
|
/// @dev extends the bundle lifetime of the bundle by the specified time
|
34
35
|
/// only the bundle owner may extend the bundle's lifetime
|
@@ -37,7 +38,7 @@ interface IPoolComponent is IComponent {
|
|
37
38
|
|
38
39
|
/// @dev locks the specified bundle
|
39
40
|
/// a bundle to be locked MUST be in active state
|
40
|
-
/// locked bundles may not be used to
|
41
|
+
/// locked bundles may not be used to collateralize any new policy
|
41
42
|
function lockBundle(NftId bundleNftId) external;
|
42
43
|
|
43
44
|
/// @dev unlocks the specified bundle
|
@@ -61,7 +62,7 @@ interface IPoolComponent is IComponent {
|
|
61
62
|
|
62
63
|
/// @dev sets the maximum overall capital amound held by this pool
|
63
64
|
/// function may only be called by pool owner
|
64
|
-
function setMaxCapitalAmount(
|
65
|
+
function setMaxCapitalAmount(Amount maxCapitalAmount) external;
|
65
66
|
|
66
67
|
/// @dev sets the required role to create/own bundles
|
67
68
|
/// may only be called once after setting up a pool
|
@@ -88,7 +89,7 @@ interface IPoolComponent is IComponent {
|
|
88
89
|
bytes memory applicationData,
|
89
90
|
NftId bundleNftId,
|
90
91
|
bytes memory bundleFilter,
|
91
|
-
|
92
|
+
Amount collateralizationAmount
|
92
93
|
) external;
|
93
94
|
|
94
95
|
/// @dev returns true iff the application matches with the bundle
|
@@ -99,7 +100,7 @@ interface IPoolComponent is IComponent {
|
|
99
100
|
bytes memory applicationData,
|
100
101
|
NftId bundleNftId,
|
101
102
|
bytes memory bundleFilter,
|
102
|
-
|
103
|
+
Amount collateralizationAmount
|
103
104
|
)
|
104
105
|
external
|
105
106
|
view
|
@@ -1,20 +1,21 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
2
|
pragma solidity ^0.8.19;
|
3
3
|
|
4
|
-
import {Amount} from "
|
5
|
-
import {Fee} from "
|
6
|
-
import {NftId} from "
|
7
|
-
import {
|
8
|
-
import {
|
9
|
-
import {
|
10
|
-
import {
|
11
|
-
import {
|
12
|
-
import {
|
13
|
-
import {
|
4
|
+
import {Amount} from "../type/Amount.sol";
|
5
|
+
import {Fee} from "../type/Fee.sol";
|
6
|
+
import {NftId} from "../type/NftId.sol";
|
7
|
+
import {PayoutId} from "../type/PayoutId.sol";
|
8
|
+
import {IBundle} from "../instance/module/IBundle.sol";
|
9
|
+
import {IInstance} from "../instance/IInstance.sol";
|
10
|
+
import {IPolicy} from "../instance/module/IPolicy.sol";
|
11
|
+
import {IService} from "../shared/IService.sol";
|
12
|
+
import {RoleId} from "../type/RoleId.sol";
|
13
|
+
import {Seconds} from "../type/Seconds.sol";
|
14
|
+
import {StateId} from "../type/StateId.sol";
|
14
15
|
|
15
16
|
interface IPoolService is IService {
|
16
17
|
|
17
|
-
event LogPoolServiceMaxCapitalAmountUpdated(NftId poolNftId,
|
18
|
+
event LogPoolServiceMaxCapitalAmountUpdated(NftId poolNftId, Amount previousMaxCapitalAmount, Amount currentMaxCapitalAmount);
|
18
19
|
event LogPoolServiceBundleOwnerRoleSet(NftId poolNftId, RoleId bundleOwnerRole);
|
19
20
|
|
20
21
|
event LogPoolServiceBundleCreated(NftId instanceNftId, NftId poolNftId, NftId bundleNftId);
|
@@ -22,6 +23,7 @@ interface IPoolService is IService {
|
|
22
23
|
|
23
24
|
error ErrorPoolServiceBundleOwnerRoleAlreadySet(NftId poolNftId);
|
24
25
|
error ErrorPoolServiceBundlePoolMismatch(NftId bundlePoolNftId, NftId productPoolNftId);
|
26
|
+
error ErrorPoolServiceInvalidTransferAmount(Amount expectedAmount, Amount actualAmount);
|
25
27
|
|
26
28
|
/// @dev registers a new pool with the registry service
|
27
29
|
function register(address poolAddress) external returns(NftId);
|
@@ -31,7 +33,7 @@ interface IPoolService is IService {
|
|
31
33
|
function setBundleOwnerRole(RoleId bundleOwnerRole) external;
|
32
34
|
|
33
35
|
/// @dev sets the max capital amount for the calling pool
|
34
|
-
function setMaxCapitalAmount(
|
36
|
+
function setMaxCapitalAmount(Amount maxCapitalAmount) external;
|
35
37
|
|
36
38
|
/// @dev set pool sepecific fees
|
37
39
|
function setFees(
|
@@ -51,7 +53,7 @@ interface IPoolService is IService {
|
|
51
53
|
NftId productNftId,
|
52
54
|
NftId applicationNftId,
|
53
55
|
IPolicy.PolicyInfo memory applicationInfo,
|
54
|
-
|
56
|
+
Amount premiumAmount
|
55
57
|
) external;
|
56
58
|
|
57
59
|
|
@@ -64,6 +66,17 @@ interface IPoolService is IService {
|
|
64
66
|
) external;
|
65
67
|
|
66
68
|
|
69
|
+
/// @dev reduces the locked collateral in the bundle associated with the specified policy
|
70
|
+
/// every payout of a policy reduces the collateral by the payout amount
|
71
|
+
/// may only be called by the claim service for unlocked pool components
|
72
|
+
function reduceCollateral(
|
73
|
+
IInstance instance,
|
74
|
+
NftId policyNftId,
|
75
|
+
IPolicy.PolicyInfo memory policyInfo,
|
76
|
+
Amount payoutAmount
|
77
|
+
) external;
|
78
|
+
|
79
|
+
|
67
80
|
/// @dev create a new bundle for the provided parameters
|
68
81
|
/// staking fees will be deducted by the pool service from the staking amount
|
69
82
|
/// may only be called by registered and unlocked pool components
|
@@ -85,6 +98,8 @@ interface IPoolService is IService {
|
|
85
98
|
/// may only be called by registered and unlocked pool components
|
86
99
|
function closeBundle(NftId bundleNftId) external;
|
87
100
|
|
101
|
+
/// @dev processes the sale of a bundle and track the pool fee and bundle fee amounts
|
102
|
+
function processSale(NftId bundleNftId, IPolicy.Premium memory premium, Amount actualAmountTransferred) external;
|
88
103
|
|
89
104
|
/// @dev increase stakes for bundle
|
90
105
|
/// staking fees will be deducted by the pool service from the staking amount
|
@@ -1,20 +1,19 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
2
|
pragma solidity ^0.8.20;
|
3
3
|
|
4
|
-
import {Amount, AmountLib} from "../
|
5
|
-
import {Component} from "
|
6
|
-
import {Fee, FeeLib} from "../
|
7
|
-
import {IBundleService} from "
|
8
|
-
import {InstanceReader} from "../instance/InstanceReader.sol";
|
4
|
+
import {Amount, AmountLib} from "../type/Amount.sol";
|
5
|
+
import {Component} from "../shared/Component.sol";
|
6
|
+
import {Fee, FeeLib} from "../type/Fee.sol";
|
7
|
+
import {IBundleService} from "./IBundleService.sol";
|
9
8
|
import {IPoolComponent} from "./IPoolComponent.sol";
|
10
|
-
import {IPoolService} from "
|
9
|
+
import {IPoolService} from "./IPoolService.sol";
|
11
10
|
import {IComponents} from "../instance/module/IComponents.sol";
|
12
|
-
import {NftId, NftIdLib} from "../
|
13
|
-
import {POOL} from "../
|
14
|
-
import {RoleId, PUBLIC_ROLE} from "../
|
15
|
-
import {Seconds} from "../
|
11
|
+
import {NftId, NftIdLib} from "../type/NftId.sol";
|
12
|
+
import {BUNDLE, POOL} from "../type/ObjectType.sol";
|
13
|
+
import {RoleId, PUBLIC_ROLE} from "../type/RoleId.sol";
|
14
|
+
import {Seconds} from "../type/Seconds.sol";
|
16
15
|
import {TokenHandler} from "../shared/TokenHandler.sol";
|
17
|
-
import {UFixed, UFixedLib} from "../
|
16
|
+
import {UFixed, UFixedLib} from "../type/UFixed.sol";
|
18
17
|
|
19
18
|
abstract contract Pool is
|
20
19
|
Component,
|
@@ -61,8 +60,8 @@ abstract contract Pool is
|
|
61
60
|
initializeComponent(registry, instanceNftId, name, token, POOL(), isInterceptingNftTransfers, initialOwner, registryData);
|
62
61
|
|
63
62
|
PoolStorage storage $ = _getPoolStorage();
|
64
|
-
$._poolService =
|
65
|
-
$._bundleService =
|
63
|
+
$._poolService = IPoolService(_getServiceAddress(POOL()));
|
64
|
+
$._bundleService = IBundleService(_getServiceAddress(BUNDLE()));
|
66
65
|
|
67
66
|
registerInterface(type(IPoolComponent).interfaceId);
|
68
67
|
}
|
@@ -70,7 +69,7 @@ abstract contract Pool is
|
|
70
69
|
|
71
70
|
function stake(
|
72
71
|
NftId bundleNftId,
|
73
|
-
|
72
|
+
Amount amount
|
74
73
|
)
|
75
74
|
public
|
76
75
|
virtual
|
@@ -83,7 +82,7 @@ abstract contract Pool is
|
|
83
82
|
|
84
83
|
function unstake(
|
85
84
|
NftId bundleNftId,
|
86
|
-
|
85
|
+
Amount amount
|
87
86
|
)
|
88
87
|
public
|
89
88
|
virtual
|
@@ -150,7 +149,7 @@ abstract contract Pool is
|
|
150
149
|
}
|
151
150
|
|
152
151
|
|
153
|
-
function setMaxCapitalAmount(
|
152
|
+
function setMaxCapitalAmount(Amount maxCapitalAmount)
|
154
153
|
public
|
155
154
|
virtual
|
156
155
|
restricted()
|
@@ -190,7 +189,7 @@ abstract contract Pool is
|
|
190
189
|
bytes memory applicationData,
|
191
190
|
NftId bundleNftId,
|
192
191
|
bytes memory bundleFilter,
|
193
|
-
|
192
|
+
Amount collateralizationAmount
|
194
193
|
)
|
195
194
|
public
|
196
195
|
virtual
|
@@ -219,7 +218,7 @@ abstract contract Pool is
|
|
219
218
|
bytes memory applicationData,
|
220
219
|
NftId bundleNftId,
|
221
220
|
bytes memory bundleFilter,
|
222
|
-
|
221
|
+
Amount collateralizationAmount
|
223
222
|
)
|
224
223
|
public
|
225
224
|
view
|
@@ -280,9 +279,9 @@ abstract contract Pool is
|
|
280
279
|
IComponents.PoolInfo(
|
281
280
|
NftIdLib.zero(), // will be set when GIF registers the related product
|
282
281
|
PUBLIC_ROLE(), // bundleOwnerRole
|
283
|
-
|
284
|
-
|
285
|
-
|
282
|
+
AmountLib.max(), // maxCapitalAmount,
|
283
|
+
AmountLib.zero(), // initial balance amount
|
284
|
+
AmountLib.zero(), // initial fee amount
|
286
285
|
isNftInterceptor(), // isInterceptingBundleTransfers
|
287
286
|
false, // isExternallyManaged,
|
288
287
|
false, // isVerifyingApplications,
|
@@ -1,41 +1,41 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
2
|
pragma solidity ^0.8.19;
|
3
3
|
|
4
|
-
import {Pool} from "
|
5
|
-
import {IRegistry} from "
|
6
|
-
import {IInstance} from "
|
7
|
-
import {IBundle} from "
|
8
|
-
import {TokenHandler} from "
|
9
|
-
import {IComponents} from "../module/IComponents.sol";
|
10
|
-
import {IPolicy} from "../module/IPolicy.sol";
|
11
|
-
|
12
|
-
import {IVersionable} from "
|
13
|
-
import {Versionable} from "
|
14
|
-
import {INftOwnable} from "
|
15
|
-
|
16
|
-
import {Amount} from "
|
17
|
-
import {Fee, FeeLib} from "
|
18
|
-
import {NftId, NftIdLib, zeroNftId} from "
|
19
|
-
import {ObjectType, POOL, BUNDLE} from "
|
20
|
-
import {PUBLIC_ROLE, POOL_OWNER_ROLE, POLICY_SERVICE_ROLE, RoleId} from "
|
21
|
-
import {Fee, FeeLib} from "
|
22
|
-
import {Version, VersionLib} from "
|
23
|
-
import {KEEP_STATE, StateId} from "
|
24
|
-
import {Seconds} from "
|
25
|
-
import {TimestampLib, zeroTimestamp} from "
|
26
|
-
import {Version, VersionLib} from "
|
27
|
-
|
28
|
-
import {IService} from "
|
29
|
-
import {Service} from "
|
30
|
-
import {BundleManager} from "../BundleManager.sol";
|
31
|
-
import {ComponentService} from "../
|
4
|
+
import {Pool} from "./Pool.sol";
|
5
|
+
import {IRegistry} from "../registry/IRegistry.sol";
|
6
|
+
import {IInstance} from "../instance/IInstance.sol";
|
7
|
+
import {IBundle} from "../instance/module/IBundle.sol";
|
8
|
+
import {TokenHandler} from "../instance/module/ITreasury.sol";
|
9
|
+
import {IComponents} from "../instance/module/IComponents.sol";
|
10
|
+
import {IPolicy} from "../instance/module/IPolicy.sol";
|
11
|
+
|
12
|
+
import {IVersionable} from "../shared/IVersionable.sol";
|
13
|
+
import {Versionable} from "../shared/Versionable.sol";
|
14
|
+
import {INftOwnable} from "../shared/INftOwnable.sol";
|
15
|
+
|
16
|
+
import {Amount, AmountLib} from "../type/Amount.sol";
|
17
|
+
import {Fee, FeeLib} from "../type/Fee.sol";
|
18
|
+
import {NftId, NftIdLib, zeroNftId} from "../type/NftId.sol";
|
19
|
+
import {ObjectType, POOL, BUNDLE} from "../type/ObjectType.sol";
|
20
|
+
import {PUBLIC_ROLE, POOL_OWNER_ROLE, POLICY_SERVICE_ROLE, RoleId} from "../type/RoleId.sol";
|
21
|
+
import {Fee, FeeLib} from "../type/Fee.sol";
|
22
|
+
import {Version, VersionLib} from "../type/Version.sol";
|
23
|
+
import {KEEP_STATE, StateId} from "../type/StateId.sol";
|
24
|
+
import {Seconds} from "../type/Seconds.sol";
|
25
|
+
import {TimestampLib, zeroTimestamp} from "../type/Timestamp.sol";
|
26
|
+
import {Version, VersionLib} from "../type/Version.sol";
|
27
|
+
|
28
|
+
import {IService} from "../shared/IService.sol";
|
29
|
+
import {Service} from "../shared/Service.sol";
|
30
|
+
import {BundleManager} from "../instance/BundleManager.sol";
|
31
|
+
import {ComponentService} from "../shared/ComponentService.sol";
|
32
32
|
import {IBundleService} from "./IBundleService.sol";
|
33
33
|
import {IPoolService} from "./IPoolService.sol";
|
34
|
-
import {IRegistryService} from "
|
35
|
-
import {InstanceService} from "../InstanceService.sol";
|
36
|
-
import {InstanceReader} from "../InstanceReader.sol";
|
37
|
-
import {IComponent} from "
|
38
|
-
import {IPoolComponent} from "
|
34
|
+
import {IRegistryService} from "../registry/IRegistryService.sol";
|
35
|
+
import {InstanceService} from "../instance/InstanceService.sol";
|
36
|
+
import {InstanceReader} from "../instance/InstanceReader.sol";
|
37
|
+
import {IComponent} from "../shared/IComponent.sol";
|
38
|
+
import {IPoolComponent} from "./IPoolComponent.sol";
|
39
39
|
|
40
40
|
string constant POOL_SERVICE_NAME = "PoolService";
|
41
41
|
|
@@ -44,6 +44,7 @@ contract PoolService is
|
|
44
44
|
IPoolService
|
45
45
|
{
|
46
46
|
using NftIdLib for NftId;
|
47
|
+
using AmountLib for Amount;
|
47
48
|
|
48
49
|
IBundleService internal _bundleService;
|
49
50
|
|
@@ -55,15 +56,14 @@ contract PoolService is
|
|
55
56
|
initializer
|
56
57
|
virtual override
|
57
58
|
{
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
|
63
|
-
initializeService(registryAddress, address(0), owner);
|
59
|
+
(
|
60
|
+
address registryAddress,,
|
61
|
+
//address managerAddress
|
62
|
+
address authority
|
63
|
+
) = abi.decode(data, (address, address, address));
|
64
64
|
|
65
|
+
initializeService(registryAddress, authority, owner);
|
65
66
|
_bundleService = IBundleService(getRegistry().getServiceAddress(BUNDLE(), getVersion().toMajorPart()));
|
66
|
-
|
67
67
|
registerInterface(type(IPoolService).interfaceId);
|
68
68
|
}
|
69
69
|
|
@@ -117,29 +117,31 @@ contract PoolService is
|
|
117
117
|
}
|
118
118
|
|
119
119
|
|
120
|
-
function setMaxCapitalAmount(
|
120
|
+
function setMaxCapitalAmount(Amount maxCapitalAmount)
|
121
121
|
external
|
122
122
|
virtual
|
123
123
|
{
|
124
|
-
|
124
|
+
/*
|
125
|
+
(NftId poolNftId,, IInstance instance) = _getAndVerifyCallingComponentAndInstance(POOL());
|
125
126
|
InstanceReader instanceReader = instance.getInstanceReader();
|
126
127
|
|
127
128
|
IComponents.ComponentInfo memory componentInfo = instanceReader.getComponentInfo(poolNftId);
|
128
129
|
IComponents.PoolInfo memory poolInfo = abi.decode(componentInfo.data, (IComponents.PoolInfo));
|
129
|
-
|
130
|
+
Amount previousMaxCapitalAmount = poolInfo.maxCapitalAmount;
|
130
131
|
|
131
132
|
poolInfo.maxCapitalAmount = maxCapitalAmount;
|
132
133
|
componentInfo.data = abi.encode(poolInfo);
|
133
134
|
instance.getInstanceStore().updatePoolSetup(poolNftId, componentInfo, KEEP_STATE());
|
134
135
|
|
135
136
|
emit LogPoolServiceMaxCapitalAmountUpdated(poolNftId, previousMaxCapitalAmount, maxCapitalAmount);
|
137
|
+
*/
|
136
138
|
}
|
137
139
|
|
138
140
|
function setBundleOwnerRole(RoleId bundleOwnerRole)
|
139
141
|
external
|
140
142
|
virtual
|
141
143
|
{
|
142
|
-
(NftId poolNftId
|
144
|
+
(NftId poolNftId,, IInstance instance) = _getAndVerifyCallingComponentAndInstance(POOL());
|
143
145
|
InstanceReader instanceReader = instance.getInstanceReader();
|
144
146
|
|
145
147
|
IComponents.ComponentInfo memory componentInfo = instanceReader.getComponentInfo(poolNftId);
|
@@ -166,7 +168,7 @@ contract PoolService is
|
|
166
168
|
external
|
167
169
|
virtual
|
168
170
|
{
|
169
|
-
(NftId poolNftId
|
171
|
+
(NftId poolNftId,, IInstance instance) = _getAndVerifyCallingComponentAndInstance(POOL());
|
170
172
|
InstanceReader instanceReader = instance.getInstanceReader();
|
171
173
|
|
172
174
|
IComponents.ComponentInfo memory componentInfo = instanceReader.getComponentInfo(poolNftId);
|
@@ -181,7 +183,6 @@ contract PoolService is
|
|
181
183
|
// TODO add logging
|
182
184
|
}
|
183
185
|
|
184
|
-
|
185
186
|
function createBundle(
|
186
187
|
address owner, // initial bundle owner
|
187
188
|
Fee memory fee, // fees deducted from premium that go to bundle owner
|
@@ -193,21 +194,25 @@ contract PoolService is
|
|
193
194
|
virtual
|
194
195
|
returns(NftId bundleNftId)
|
195
196
|
{
|
196
|
-
(NftId poolNftId,, IInstance instance) =
|
197
|
+
(NftId poolNftId,, IInstance instance) = _getAndVerifyCallingComponentAndInstance(POOL());
|
197
198
|
InstanceReader instanceReader = instance.getInstanceReader();
|
198
199
|
|
199
|
-
//
|
200
|
-
|
200
|
+
// pool fee book keeping
|
201
|
+
IComponents.ComponentInfo memory componentInfo = instanceReader.getComponentInfo(poolNftId);
|
202
|
+
Amount stakingNetAmount = _processStakingFees(componentInfo, stakingAmount);
|
201
203
|
|
202
204
|
bundleNftId = _bundleService.create(
|
203
205
|
instance,
|
204
206
|
poolNftId,
|
205
207
|
owner,
|
206
208
|
fee,
|
207
|
-
|
209
|
+
stakingNetAmount,
|
208
210
|
lifetime,
|
209
211
|
filter);
|
210
212
|
|
213
|
+
// collect tokens from bundle owner
|
214
|
+
_transferStakingAmount(componentInfo, owner, stakingAmount);
|
215
|
+
|
211
216
|
emit LogPoolServiceBundleCreated(instance.getNftId(), poolNftId, bundleNftId);
|
212
217
|
}
|
213
218
|
|
@@ -216,7 +221,7 @@ contract PoolService is
|
|
216
221
|
external
|
217
222
|
virtual
|
218
223
|
{
|
219
|
-
(NftId poolNftId,, IInstance instance) =
|
224
|
+
(NftId poolNftId,, IInstance instance) = _getAndVerifyCallingComponentAndInstance(POOL());
|
220
225
|
|
221
226
|
// TODO book keeping for pool collateral released outside of retention level
|
222
227
|
|
@@ -228,17 +233,50 @@ contract PoolService is
|
|
228
233
|
emit LogPoolServiceBundleClosed(instance.getNftId(), poolNftId, bundleNftId);
|
229
234
|
}
|
230
235
|
|
236
|
+
function processSale(
|
237
|
+
NftId bundleNftId,
|
238
|
+
IPolicy.Premium memory premium,
|
239
|
+
Amount actualAmountTransferred
|
240
|
+
)
|
241
|
+
external
|
242
|
+
virtual
|
243
|
+
restricted
|
244
|
+
{
|
245
|
+
IRegistry registry = getRegistry();
|
246
|
+
IRegistry.ObjectInfo memory bundleObjectInfo = registry.getObjectInfo(bundleNftId);
|
247
|
+
IRegistry.ObjectInfo memory poolObjectInfo = registry.getObjectInfo(bundleObjectInfo.parentNftId);
|
248
|
+
IRegistry.ObjectInfo memory instanceObjectInfo = registry.getObjectInfo(poolObjectInfo.parentNftId);
|
249
|
+
IInstance instance = IInstance(instanceObjectInfo.objectAddress);
|
250
|
+
|
251
|
+
Amount poolFeeAmount = AmountLib.toAmount(premium.poolFeeFixAmount + premium.poolFeeVarAmount);
|
252
|
+
Amount bundleFeeAmount = AmountLib.toAmount(premium.bundleFeeFixAmount + premium.bundleFeeVarAmount);
|
253
|
+
Amount expectedTransferAmount = AmountLib.toAmount(premium.netPremiumAmount) + poolFeeAmount + bundleFeeAmount;
|
254
|
+
if (!(actualAmountTransferred == expectedTransferAmount)) {
|
255
|
+
revert ErrorPoolServiceInvalidTransferAmount(expectedTransferAmount, actualAmountTransferred);
|
256
|
+
}
|
257
|
+
|
258
|
+
// update pool fee balance
|
259
|
+
if (poolFeeAmount.gtz()) {
|
260
|
+
IComponents.ComponentInfo memory poolComponentInfo = instance.getInstanceReader().getComponentInfo(poolObjectInfo.nftId);
|
261
|
+
poolComponentInfo.feeAmount = poolComponentInfo.feeAmount.add(poolFeeAmount);
|
262
|
+
instance.getInstanceStore().updatePoolSetup(poolObjectInfo.nftId, poolComponentInfo, KEEP_STATE());
|
263
|
+
}
|
264
|
+
|
265
|
+
if (bundleFeeAmount.gtz()) {
|
266
|
+
_bundleService.updateBundleFees(instance, bundleNftId, bundleFeeAmount);
|
267
|
+
}
|
268
|
+
}
|
231
269
|
|
232
270
|
function lockCollateral(
|
233
271
|
IInstance instance,
|
234
272
|
NftId productNftId,
|
235
273
|
NftId applicationNftId,
|
236
274
|
IPolicy.PolicyInfo memory applicationInfo,
|
237
|
-
|
275
|
+
Amount premiumAmount // premium amount after product and distribution fees
|
238
276
|
)
|
239
277
|
external
|
240
278
|
virtual
|
241
|
-
|
279
|
+
restricted
|
242
280
|
{
|
243
281
|
InstanceReader instanceReader = instance.getInstanceReader();
|
244
282
|
NftId poolNftId = instanceReader.getProductSetupInfo(productNftId).poolNftId;
|
@@ -255,10 +293,10 @@ contract PoolService is
|
|
255
293
|
IComponents.PoolInfo memory poolInfo = abi.decode(componentInfo.data, (IComponents.PoolInfo));
|
256
294
|
|
257
295
|
// TODO add correct required collateral calculation (collateralization level mibht be != 1, retention level might be < 1)
|
258
|
-
|
296
|
+
Amount collateralAmount = applicationInfo.sumInsuredAmount;
|
259
297
|
|
260
298
|
// TODO add correct net premium calculation (pool fee might be > 0)
|
261
|
-
|
299
|
+
Amount premiumAfterPoolFeeAmount = premiumAmount;
|
262
300
|
|
263
301
|
// lock collateral amount from involvedd bundle
|
264
302
|
_bundleService.lockCollateral(
|
@@ -281,6 +319,24 @@ contract PoolService is
|
|
281
319
|
}
|
282
320
|
|
283
321
|
|
322
|
+
function reduceCollateral(
|
323
|
+
IInstance instance,
|
324
|
+
NftId policyNftId,
|
325
|
+
IPolicy.PolicyInfo memory policyInfo,
|
326
|
+
Amount payoutAmount
|
327
|
+
)
|
328
|
+
external
|
329
|
+
virtual
|
330
|
+
restricted
|
331
|
+
{
|
332
|
+
_bundleService.releaseCollateral(
|
333
|
+
instance,
|
334
|
+
policyNftId,
|
335
|
+
policyInfo.bundleNftId,
|
336
|
+
payoutAmount);
|
337
|
+
}
|
338
|
+
|
339
|
+
|
284
340
|
/// @dev releases the remaining collateral linked to the specified policy
|
285
341
|
/// may only be called by the policy service for unlocked pool components
|
286
342
|
function releaseCollateral(
|
@@ -290,14 +346,59 @@ contract PoolService is
|
|
290
346
|
)
|
291
347
|
external
|
292
348
|
virtual
|
293
|
-
|
349
|
+
restricted
|
294
350
|
{
|
295
|
-
// release collateral from involved bundle
|
296
351
|
_bundleService.releaseCollateral(
|
297
352
|
instance,
|
298
353
|
policyNftId,
|
299
354
|
policyInfo.bundleNftId,
|
300
|
-
policyInfo.sumInsuredAmount);
|
355
|
+
policyInfo.sumInsuredAmount - policyInfo.claimAmount);
|
356
|
+
|
357
|
+
_bundleService.unlinkPolicy(
|
358
|
+
instance,
|
359
|
+
policyNftId);
|
360
|
+
}
|
361
|
+
|
362
|
+
|
363
|
+
function _processStakingFees(
|
364
|
+
IComponents.ComponentInfo memory componentInfo,
|
365
|
+
Amount stakingAmount
|
366
|
+
)
|
367
|
+
internal
|
368
|
+
returns (Amount stakingNetAmount)
|
369
|
+
{
|
370
|
+
stakingNetAmount = stakingAmount;
|
371
|
+
|
372
|
+
// check if any staking fees apply
|
373
|
+
Fee memory stakingFee = abi.decode(componentInfo.data, (IComponents.PoolInfo)).stakingFee;
|
374
|
+
if (FeeLib.gtz(stakingFee)) {
|
375
|
+
(Amount feeAmount, Amount netAmount) = FeeLib.calculateFee(stakingFee, stakingAmount);
|
376
|
+
stakingNetAmount = netAmount;
|
377
|
+
|
378
|
+
// TODO update fee balance for pool
|
379
|
+
}
|
380
|
+
}
|
381
|
+
|
382
|
+
|
383
|
+
// TODO create (I)TreasuryService that deals with all gif related token transfers
|
384
|
+
/// @dev transfers the specified amount from the bundle owner to the pool's wallet
|
385
|
+
function _transferStakingAmount(
|
386
|
+
IComponents.ComponentInfo memory componentInfo,
|
387
|
+
address bundleOwner,
|
388
|
+
Amount stakingAmount
|
389
|
+
)
|
390
|
+
internal
|
391
|
+
{
|
392
|
+
TokenHandler tokenHandler = componentInfo.tokenHandler;
|
393
|
+
address poolWallet = componentInfo.wallet;
|
394
|
+
|
395
|
+
if(stakingAmount.gtz()) {
|
396
|
+
tokenHandler.transfer(
|
397
|
+
bundleOwner,
|
398
|
+
poolWallet,
|
399
|
+
stakingAmount
|
400
|
+
);
|
401
|
+
}
|
301
402
|
}
|
302
403
|
|
303
|
-
}
|
404
|
+
}
|
@@ -0,0 +1,42 @@
|
|
1
|
+
// SPDX-License-Identifier: Apache-2.0
|
2
|
+
pragma solidity ^0.8.20;
|
3
|
+
|
4
|
+
import {IVersionable} from "../shared/IVersionable.sol";
|
5
|
+
import {ProxyManager} from "../shared/ProxyManager.sol";
|
6
|
+
import {PoolService} from "./PoolService.sol";
|
7
|
+
import {Registry} from "../registry/Registry.sol";
|
8
|
+
import {RegistryService} from "../registry/RegistryService.sol";
|
9
|
+
import {REGISTRY} from "../type/ObjectType.sol";
|
10
|
+
|
11
|
+
contract PoolServiceManager is ProxyManager {
|
12
|
+
|
13
|
+
PoolService private _poolService;
|
14
|
+
|
15
|
+
/// @dev initializes proxy manager with pool service implementation
|
16
|
+
constructor(
|
17
|
+
address authority,
|
18
|
+
address registryAddress,
|
19
|
+
bytes32 salt
|
20
|
+
)
|
21
|
+
ProxyManager(registryAddress)
|
22
|
+
{
|
23
|
+
PoolService poolSrv = new PoolService{salt: salt}();
|
24
|
+
bytes memory data = abi.encode(registryAddress, address(this), authority);
|
25
|
+
IVersionable versionable = deployDetermenistic(
|
26
|
+
address(poolSrv),
|
27
|
+
data,
|
28
|
+
salt);
|
29
|
+
|
30
|
+
_poolService = PoolService(address(versionable));
|
31
|
+
}
|
32
|
+
|
33
|
+
//--- view functions ----------------------------------------------------//
|
34
|
+
function getPoolService()
|
35
|
+
external
|
36
|
+
view
|
37
|
+
returns (PoolService poolService)
|
38
|
+
{
|
39
|
+
return _poolService;
|
40
|
+
}
|
41
|
+
|
42
|
+
}
|