@etherisc/gif-next 0.0.2-e94f4c7-084 → 0.0.2-e964d24-516
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/artifacts/contracts/distribution/Distribution.sol/Distribution.dbg.json +4 -0
- package/artifacts/contracts/{components → distribution}/Distribution.sol/Distribution.json +45 -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 +780 -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/Cloneable.sol/Cloneable.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstance.sol/IInstance.json +252 -2210
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +21 -38
- package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
- package/artifacts/contracts/instance/Instance.sol/Instance.json +352 -2691
- package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +71 -53
- 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 +233 -67
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +65 -226
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +39 -124
- package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.dbg.json +4 -0
- package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.json +2788 -0
- package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.dbg.json +1 -1
- package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.json +2 -2
- package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
- package/artifacts/contracts/instance/base/ILifecycle.sol/ILifecycle.dbg.json +1 -1
- package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
- package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.json +6 -6
- package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json +1 -1
- package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.json +4 -4
- 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 +696 -0
- package/artifacts/contracts/pool/IBundleService.sol/IBundleService.dbg.json +4 -0
- package/artifacts/contracts/{instance/service → pool}/IBundleService.sol/IBundleService.json +57 -31
- 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 +153 -36
- 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 +708 -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 +648 -0
- package/artifacts/contracts/product/ClaimService.sol/ClaimService.dbg.json +4 -0
- package/artifacts/contracts/product/ClaimService.sol/ClaimService.json +1376 -0
- package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +4 -0
- package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.json +748 -0
- package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.dbg.json +4 -0
- package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.json +493 -0
- package/artifacts/contracts/product/IClaimService.sol/IClaimService.dbg.json +4 -0
- package/artifacts/contracts/{instance/service → product}/IClaimService.sol/IClaimService.json +230 -89
- package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.dbg.json +4 -0
- package/artifacts/contracts/{instance/service → product}/IPolicyService.sol/IPolicyService.json +36 -354
- 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} +37 -154
- 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 +740 -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 +688 -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 +640 -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/IRegistryService.sol/IRegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +5 -13
- 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 +6 -6
- package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.json +4 -4
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +21 -29
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +27 -40
- package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.dbg.json +1 -1
- package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.json +9 -9
- 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 +20 -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/StakeingServiceManager.sol/StakingServiceManager.dbg.json +4 -0
- package/artifacts/contracts/staking/StakeingServiceManager.sol/StakingServiceManager.json +628 -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/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/{types → type}/ClaimId.sol/ClaimIdLib.json +5 -5
- 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/{types → type}/PayoutId.sol/PayoutIdLib.json +5 -5
- 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 +5 -5
- 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 +15 -14
- package/contracts/{instance/service → distribution}/DistributionService.sol +80 -163
- package/contracts/{instance/service → distribution}/DistributionServiceManager.sol +5 -5
- package/contracts/{components → distribution}/IDistributionComponent.sol +7 -7
- package/contracts/{instance/service → distribution}/IDistributionService.sol +18 -30
- package/contracts/instance/BundleManager.sol +4 -4
- package/contracts/instance/IInstance.sol +37 -62
- package/contracts/instance/IInstanceService.sol +18 -13
- package/contracts/instance/Instance.sol +94 -175
- package/contracts/instance/InstanceAccessManager.sol +38 -24
- package/contracts/instance/InstanceAuthorizationsLib.sol +308 -0
- package/contracts/instance/InstanceReader.sol +68 -17
- package/contracts/instance/InstanceService.sol +96 -266
- package/contracts/instance/InstanceServiceManager.sol +1 -1
- package/contracts/instance/InstanceStore.sol +211 -0
- package/contracts/instance/ObjectManager.sol +4 -4
- package/contracts/instance/base/IKeyValueStore.sol +5 -5
- package/contracts/instance/base/ILifecycle.sol +3 -3
- package/contracts/instance/base/KeyValueStore.sol +6 -37
- package/contracts/instance/base/Lifecycle.sol +8 -5
- 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 +12 -12
- 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 +84 -145
- package/contracts/{instance/service → pool}/BundleServiceManager.sol +5 -5
- package/contracts/{instance/service → pool}/IBundleService.sol +41 -25
- package/contracts/{components → pool}/IPoolComponent.sol +13 -12
- package/contracts/{instance/service → pool}/IPoolService.sol +26 -14
- package/contracts/{components → pool}/Pool.sol +18 -18
- package/contracts/{instance/service → pool}/PoolService.sol +125 -58
- package/contracts/{instance/service → pool}/PoolServiceManager.sol +5 -5
- package/contracts/product/ApplicationService.sol +186 -0
- package/contracts/{instance/service → product}/ApplicationServiceManager.sol +2 -2
- package/contracts/product/ClaimService.sol +437 -0
- package/contracts/{instance/service → product}/ClaimServiceManager.sol +2 -2
- package/contracts/{instance/service → product}/IApplicationService.sol +12 -28
- package/contracts/product/IClaimService.sol +90 -0
- package/contracts/product/IPolicyService.sol +80 -0
- 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/product/PolicyService.sol +376 -0
- package/contracts/{instance/service → product}/PolicyServiceManager.sol +5 -5
- package/contracts/product/PricingService.sol +275 -0
- package/contracts/product/PricingServiceManager.sol +51 -0
- package/contracts/{components → product}/Product.sol +37 -33
- package/contracts/{instance/service → product}/ProductService.sol +46 -46
- package/contracts/{instance/service → product}/ProductServiceManager.sol +5 -5
- package/contracts/registry/IRegistry.sol +4 -4
- package/contracts/registry/IRegistryService.sol +4 -6
- package/contracts/registry/Registry.sol +3 -3
- package/contracts/registry/RegistryAccessManager.sol +1 -1
- package/contracts/registry/RegistryService.sol +23 -20
- package/contracts/registry/RegistryServiceManager.sol +0 -2
- package/contracts/registry/ReleaseManager.sol +5 -5
- package/contracts/registry/TokenRegistry.sol +2 -2
- package/contracts/{components → shared}/Component.sol +26 -8
- package/contracts/{instance/base → shared}/ComponentService.sol +63 -34
- 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 +3 -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/StakeingServiceManager.sol +37 -0
- package/contracts/staking/StakingService.sol +166 -0
- package/contracts/{types → type}/Amount.sol +39 -0
- package/contracts/{types → type}/Fee.sol +7 -6
- package/contracts/{types → type}/NftIdSet.sol +1 -1
- package/contracts/{types → type}/ObjectType.sol +5 -1
- 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/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 -1060
- package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +0 -4
- package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.json +0 -681
- package/artifacts/contracts/instance/service/BundleService.sol/BundleService.dbg.json +0 -4
- package/artifacts/contracts/instance/service/BundleService.sol/BundleService.json +0 -1289
- package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.dbg.json +0 -4
- package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.json +0 -725
- package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.dbg.json +0 -4
- package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.json +0 -1040
- package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +0 -4
- package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.json +0 -685
- package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +0 -4
- package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +0 -1774
- package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +0 -4
- package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.json +0 -793
- 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 -1543
- package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +0 -4
- package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.json +0 -741
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +0 -4
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +0 -1449
- package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.dbg.json +0 -4
- package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.json +0 -709
- 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 -209
- 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/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/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 -355
- package/contracts/instance/service/ClaimService.sol +0 -239
- package/contracts/instance/service/IClaimService.sol +0 -92
- package/contracts/instance/service/IPolicyService.sol +0 -139
- package/contracts/instance/service/PolicyService.sol +0 -571
- 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}/ClaimId.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}/PayoutId.sol +0 -0
- /package/contracts/{types → type}/Referral.sol +0 -0
- /package/contracts/{types → type}/RiskId.sol +0 -0
- /package/contracts/{types → type}/RoleId.sol +0 -0
- /package/contracts/{types → type}/Seconds.sol +0 -0
- /package/contracts/{types → type}/StateId.sol +0 -0
- /package/contracts/{types → type}/Timestamp.sol +0 -0
- /package/contracts/{types → type}/UFixed.sol +0 -0
- /package/contracts/{types → type}/Version.sol +0 -0
@@ -1,37 +1,37 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
2
|
pragma solidity ^0.8.19;
|
3
3
|
|
4
|
-
import {IBundle} from "
|
5
|
-
import {IComponents} from "../module/IComponents.sol";
|
6
|
-
import {IRegistry} from "
|
7
|
-
import {IInstance} from "
|
8
|
-
import {TokenHandler} from "
|
9
|
-
import {ISetup} from "../module/ISetup.sol";
|
10
|
-
import {IPolicy} from "../module/IPolicy.sol";
|
11
|
-
|
12
|
-
import {IVersionable} from "
|
13
|
-
import {INftOwnable} from "
|
14
|
-
import {NftId, NftIdLib, zeroNftId} from "
|
15
|
-
import {ObjectType, POOL, BUNDLE} from "
|
16
|
-
import {POOL_OWNER_ROLE, RoleId} from "
|
17
|
-
import {Pool} from "
|
18
|
-
|
19
|
-
import {Amount, AmountLib} from "
|
20
|
-
import {Fee, FeeLib} from "
|
21
|
-
import {StateId, ACTIVE, PAUSED, CLOSED, KEEP_STATE} from "
|
22
|
-
import {Seconds} from "
|
23
|
-
import {TimestampLib, zeroTimestamp} from "
|
24
|
-
import {Version, VersionLib} from "
|
25
|
-
import {Versionable} from "
|
26
|
-
|
27
|
-
import {IService} from "
|
28
|
-
import {Service} from "
|
29
|
-
import {BundleManager} from "../BundleManager.sol";
|
30
|
-
import {ComponentService} from "../
|
4
|
+
import {IBundle} from "../instance/module/IBundle.sol";
|
5
|
+
import {IComponents} from "../instance/module/IComponents.sol";
|
6
|
+
import {IRegistry} from "../registry/IRegistry.sol";
|
7
|
+
import {IInstance} from "../instance/IInstance.sol";
|
8
|
+
import {TokenHandler} from "../instance/module/ITreasury.sol";
|
9
|
+
import {ISetup} from "../instance/module/ISetup.sol";
|
10
|
+
import {IPolicy} from "../instance/module/IPolicy.sol";
|
11
|
+
|
12
|
+
import {IVersionable} from "../shared/IVersionable.sol";
|
13
|
+
import {INftOwnable} from "../shared/INftOwnable.sol";
|
14
|
+
import {NftId, NftIdLib, zeroNftId} from "../type/NftId.sol";
|
15
|
+
import {ObjectType, POOL, BUNDLE} from "../type/ObjectType.sol";
|
16
|
+
import {POOL_OWNER_ROLE, RoleId} from "../type/RoleId.sol";
|
17
|
+
import {Pool} from "./Pool.sol";
|
18
|
+
|
19
|
+
import {Amount, AmountLib} from "../type/Amount.sol";
|
20
|
+
import {Fee, FeeLib} from "../type/Fee.sol";
|
21
|
+
import {StateId, ACTIVE, PAUSED, CLOSED, KEEP_STATE} from "../type/StateId.sol";
|
22
|
+
import {Seconds} from "../type/Seconds.sol";
|
23
|
+
import {TimestampLib, zeroTimestamp} from "../type/Timestamp.sol";
|
24
|
+
import {Version, VersionLib} from "../type/Version.sol";
|
25
|
+
import {Versionable} from "../shared/Versionable.sol";
|
26
|
+
|
27
|
+
import {IService} from "../shared/IService.sol";
|
28
|
+
import {Service} from "../shared/Service.sol";
|
29
|
+
import {BundleManager} from "../instance/BundleManager.sol";
|
30
|
+
import {ComponentService} from "../shared/ComponentService.sol";
|
31
31
|
import {IBundleService} from "./IBundleService.sol";
|
32
|
-
import {IRegistryService} from "
|
33
|
-
import {InstanceService} from "../InstanceService.sol";
|
34
|
-
import {InstanceReader} from "../InstanceReader.sol";
|
32
|
+
import {IRegistryService} from "../registry/IRegistryService.sol";
|
33
|
+
import {InstanceService} from "../instance/InstanceService.sol";
|
34
|
+
import {InstanceReader} from "../instance/InstanceReader.sol";
|
35
35
|
|
36
36
|
string constant BUNDLE_SERVICE_NAME = "BundleService";
|
37
37
|
|
@@ -75,16 +75,16 @@ contract BundleService is
|
|
75
75
|
function _updatePoolWithStakes(
|
76
76
|
IInstance instance,
|
77
77
|
NftId poolNftId,
|
78
|
-
|
78
|
+
Amount stakingAmount
|
79
79
|
)
|
80
80
|
internal
|
81
81
|
returns (
|
82
82
|
TokenHandler tokenHandler,
|
83
83
|
address wallet,
|
84
|
-
|
84
|
+
Amount netStakingAmount
|
85
85
|
)
|
86
86
|
{
|
87
|
-
if(stakingAmount
|
87
|
+
if(stakingAmount.gtz()) {
|
88
88
|
InstanceReader instanceReader = instance.getInstanceReader();
|
89
89
|
IComponents.ComponentInfo memory componentInfo = instanceReader.getComponentInfo(poolNftId);
|
90
90
|
|
@@ -92,21 +92,21 @@ contract BundleService is
|
|
92
92
|
wallet = componentInfo.wallet;
|
93
93
|
|
94
94
|
IComponents.PoolInfo memory poolInfo = abi.decode(componentInfo.data, (IComponents.PoolInfo));
|
95
|
-
|
95
|
+
Amount poolFeeAmount;
|
96
96
|
|
97
97
|
// calculate pool fee and net staking amount
|
98
98
|
(poolFeeAmount, netStakingAmount) = FeeLib.calculateFee(poolInfo.stakingFee, stakingAmount);
|
99
99
|
|
100
100
|
// update pool balance and fee amount
|
101
|
-
poolInfo.balanceAmount
|
101
|
+
poolInfo.balanceAmount = poolInfo.balanceAmount + netStakingAmount;
|
102
102
|
|
103
|
-
if(poolFeeAmount
|
104
|
-
poolInfo.feeAmount
|
103
|
+
if(poolFeeAmount.gtz()) {
|
104
|
+
poolInfo.feeAmount = poolInfo.feeAmount + poolFeeAmount;
|
105
105
|
}
|
106
106
|
|
107
107
|
// save updated pool info
|
108
108
|
componentInfo.data = abi.encode(poolInfo);
|
109
|
-
instance.updatePoolSetup(poolNftId, componentInfo, KEEP_STATE());
|
109
|
+
instance.getInstanceStore().updatePoolSetup(poolNftId, componentInfo, KEEP_STATE());
|
110
110
|
}
|
111
111
|
}
|
112
112
|
|
@@ -115,7 +115,7 @@ contract BundleService is
|
|
115
115
|
IInstance instance,
|
116
116
|
NftId poolNftId,
|
117
117
|
address owner,
|
118
|
-
Fee memory
|
118
|
+
Fee memory bundleFee,
|
119
119
|
Amount stakingAmount,
|
120
120
|
Seconds lifetime,
|
121
121
|
bytes calldata filter
|
@@ -125,21 +125,6 @@ contract BundleService is
|
|
125
125
|
// TODO add restricted and add authz for pool service
|
126
126
|
returns(NftId bundleNftId)
|
127
127
|
{
|
128
|
-
InstanceReader instanceReader = instance.getInstanceReader();
|
129
|
-
|
130
|
-
// create initial bundle info
|
131
|
-
IBundle.BundleInfo memory bundleInfo = IBundle.BundleInfo(
|
132
|
-
poolNftId,
|
133
|
-
fee,
|
134
|
-
filter,
|
135
|
-
stakingAmount,
|
136
|
-
AmountLib.zero(),
|
137
|
-
AmountLib.zero(),
|
138
|
-
lifetime,
|
139
|
-
TimestampLib.blockTimestamp().addSeconds(lifetime),
|
140
|
-
zeroTimestamp()
|
141
|
-
);
|
142
|
-
|
143
128
|
// register bundle with registry
|
144
129
|
bundleNftId = getRegistryService().registerBundle(
|
145
130
|
IRegistry.ObjectInfo(
|
@@ -154,23 +139,27 @@ contract BundleService is
|
|
154
139
|
);
|
155
140
|
|
156
141
|
// create bundle info in instance
|
157
|
-
instance.createBundle(
|
142
|
+
instance.getInstanceStore().createBundle(
|
143
|
+
bundleNftId,
|
144
|
+
IBundle.BundleInfo(
|
145
|
+
poolNftId,
|
146
|
+
bundleFee,
|
147
|
+
filter,
|
148
|
+
stakingAmount,
|
149
|
+
AmountLib.zero(),
|
150
|
+
AmountLib.zero(),
|
151
|
+
lifetime,
|
152
|
+
TimestampLib.blockTimestamp().addSeconds(lifetime),
|
153
|
+
zeroTimestamp()));
|
158
154
|
|
159
155
|
// put bundle under bundle managemet
|
160
156
|
BundleManager bundleManager = instance.getBundleManager();
|
161
157
|
bundleManager.add(bundleNftId);
|
162
|
-
|
163
|
-
// transfer full staking amount to pool wallet
|
164
|
-
IComponents.ComponentInfo memory componentInfo = instanceReader.getComponentInfo(poolNftId);
|
165
|
-
componentInfo.tokenHandler.transfer(
|
166
|
-
owner,
|
167
|
-
componentInfo.wallet,
|
168
|
-
stakingAmount.toInt()
|
169
|
-
);
|
170
158
|
|
171
159
|
// TODO add logging
|
172
160
|
}
|
173
161
|
|
162
|
+
|
174
163
|
function setFee(
|
175
164
|
NftId bundleNftId,
|
176
165
|
Fee memory fee
|
@@ -178,21 +167,19 @@ contract BundleService is
|
|
178
167
|
external
|
179
168
|
override
|
180
169
|
{
|
181
|
-
(NftId poolNftId
|
170
|
+
(NftId poolNftId,, IInstance instance) = _getAndVerifyCallingComponentAndInstance(POOL());
|
182
171
|
InstanceReader instanceReader = instance.getInstanceReader();
|
183
|
-
|
184
172
|
IBundle.BundleInfo memory bundleInfo = instanceReader.getBundleInfo(bundleNftId);
|
185
173
|
if(bundleInfo.poolNftId.eqz()) {
|
186
174
|
revert ErrorBundleServiceBundleUnknown(bundleNftId);
|
187
175
|
}
|
188
176
|
|
189
177
|
if(bundleInfo.poolNftId != poolNftId) {
|
190
|
-
revert ErrorBundleServiceBundlePoolMismatch(
|
178
|
+
revert ErrorBundleServiceBundlePoolMismatch(bundleNftId, bundleInfo.poolNftId, poolNftId);
|
191
179
|
}
|
192
180
|
|
193
181
|
bundleInfo.fee = fee;
|
194
|
-
|
195
|
-
instance.updateBundle(bundleNftId, bundleInfo, KEEP_STATE());
|
182
|
+
instance.getInstanceStore().updateBundle(bundleNftId, bundleInfo, KEEP_STATE());
|
196
183
|
}
|
197
184
|
|
198
185
|
|
@@ -201,8 +188,8 @@ contract BundleService is
|
|
201
188
|
IInstance instance,
|
202
189
|
NftId policyNftId,
|
203
190
|
NftId bundleNftId,
|
204
|
-
|
205
|
-
|
191
|
+
Amount collateralAmount, // required amount to collateralize policy
|
192
|
+
Amount premiumAmount // premium part that reaches bundle for this policy
|
206
193
|
)
|
207
194
|
external
|
208
195
|
onlyService // TODO replace with restricted + appropriate granting
|
@@ -217,7 +204,7 @@ contract BundleService is
|
|
217
204
|
}
|
218
205
|
|
219
206
|
// ensure bundle capacity is sufficent to collateralize policy
|
220
|
-
|
207
|
+
Amount capacity = bundleInfo.capitalAmount + premiumAmount - bundleInfo.lockedAmount;
|
221
208
|
if(capacity < collateralAmount) {
|
222
209
|
revert ErrorBundleServiceCapacityInsufficient(bundleNftId, capacity, collateralAmount);
|
223
210
|
}
|
@@ -225,7 +212,7 @@ contract BundleService is
|
|
225
212
|
// TODO add more validation
|
226
213
|
|
227
214
|
// updated locked amount
|
228
|
-
bundleInfo.lockedAmount =
|
215
|
+
bundleInfo.lockedAmount = bundleInfo.lockedAmount + collateralAmount;
|
229
216
|
|
230
217
|
// update capital and fees when premiums are involved
|
231
218
|
_updateBundleWithPremium(instance, bundleNftId, bundleInfo, premiumAmount);
|
@@ -239,24 +226,24 @@ contract BundleService is
|
|
239
226
|
IInstance instance,
|
240
227
|
NftId bundleNftId,
|
241
228
|
IBundle.BundleInfo memory bundleInfo,
|
242
|
-
|
229
|
+
Amount premiumAmount
|
243
230
|
)
|
244
231
|
internal
|
245
232
|
{
|
246
233
|
// update bundle capital and fee amounts
|
247
|
-
if(premiumAmount
|
234
|
+
if(premiumAmount.gtz()) {
|
248
235
|
// calculate fees and net premium amounts
|
249
236
|
(
|
250
237
|
,
|
251
|
-
|
238
|
+
Amount netPremiumAmount
|
252
239
|
) = FeeLib.calculateFee(bundleInfo.fee, premiumAmount);
|
253
240
|
|
254
241
|
// update bundle info with additional capital
|
255
|
-
bundleInfo.capitalAmount =
|
242
|
+
bundleInfo.capitalAmount = bundleInfo.capitalAmount + netPremiumAmount;
|
256
243
|
}
|
257
244
|
|
258
245
|
// save updated bundle info
|
259
|
-
instance.updateBundle(bundleNftId, bundleInfo, KEEP_STATE());
|
246
|
+
instance.getInstanceStore().updateBundle(bundleNftId, bundleInfo, KEEP_STATE());
|
260
247
|
}
|
261
248
|
|
262
249
|
function updateBundleFees(
|
@@ -268,18 +255,17 @@ contract BundleService is
|
|
268
255
|
{
|
269
256
|
IBundle.BundleInfo memory bundleInfo = instance.getInstanceReader().getBundleInfo(bundleNftId);
|
270
257
|
bundleInfo.feeAmount = bundleInfo.feeAmount.add(feeAmount);
|
271
|
-
instance.updateBundle(bundleNftId, bundleInfo, KEEP_STATE());
|
258
|
+
instance.getInstanceStore().updateBundle(bundleNftId, bundleInfo, KEEP_STATE());
|
272
259
|
}
|
273
260
|
|
274
|
-
|
275
261
|
function lock(NftId bundleNftId)
|
276
262
|
external
|
277
263
|
virtual
|
278
264
|
{
|
279
|
-
(,, IInstance instance) =
|
265
|
+
(,, IInstance instance) = _getAndVerifyCallingComponentAndInstance(POOL());
|
280
266
|
|
281
267
|
// udpate bundle state
|
282
|
-
instance.updateBundleState(bundleNftId, PAUSED());
|
268
|
+
instance.getInstanceStore().updateBundleState(bundleNftId, PAUSED());
|
283
269
|
|
284
270
|
// update set of active bundles
|
285
271
|
BundleManager bundleManager = instance.getBundleManager();
|
@@ -293,10 +279,10 @@ contract BundleService is
|
|
293
279
|
external
|
294
280
|
virtual
|
295
281
|
{
|
296
|
-
(,, IInstance instance) =
|
282
|
+
(,, IInstance instance) = _getAndVerifyCallingComponentAndInstance(POOL());
|
297
283
|
|
298
284
|
// udpate bundle state
|
299
|
-
instance.updateBundleState(bundleNftId, ACTIVE());
|
285
|
+
instance.getInstanceStore().updateBundleState(bundleNftId, ACTIVE());
|
300
286
|
|
301
287
|
// update set of active bundles
|
302
288
|
BundleManager bundleManager = instance.getBundleManager();
|
@@ -315,7 +301,7 @@ contract BundleService is
|
|
315
301
|
// TODO add restricted and autz for pool service
|
316
302
|
{
|
317
303
|
// udpate bundle state
|
318
|
-
instance.updateBundleState(bundleNftId, CLOSED());
|
304
|
+
instance.getInstanceStore().updateBundleState(bundleNftId, CLOSED());
|
319
305
|
|
320
306
|
// ensure no open policies attached to bundle
|
321
307
|
BundleManager bundleManager = instance.getBundleManager();
|
@@ -332,7 +318,7 @@ contract BundleService is
|
|
332
318
|
function increaseBalance(
|
333
319
|
IInstance instance,
|
334
320
|
NftId bundleNftId,
|
335
|
-
|
321
|
+
Amount premiumAmount
|
336
322
|
)
|
337
323
|
external
|
338
324
|
onlyService
|
@@ -349,7 +335,7 @@ contract BundleService is
|
|
349
335
|
function releaseCollateral(IInstance instance,
|
350
336
|
NftId policyNftId,
|
351
337
|
NftId bundleNftId,
|
352
|
-
|
338
|
+
Amount collateralAmount
|
353
339
|
)
|
354
340
|
external
|
355
341
|
onlyService
|
@@ -358,11 +344,8 @@ contract BundleService is
|
|
358
344
|
IBundle.BundleInfo memory bundleInfo = instanceReader.getBundleInfo(bundleNftId);
|
359
345
|
|
360
346
|
// reduce locked amount by released collateral amount
|
361
|
-
bundleInfo.lockedAmount =
|
362
|
-
|
363
|
-
instance.updateBundle(bundleNftId, bundleInfo, KEEP_STATE());
|
364
|
-
|
365
|
-
_unlinkPolicy(instance, policyNftId);
|
347
|
+
bundleInfo.lockedAmount = bundleInfo.lockedAmount - collateralAmount;
|
348
|
+
instance.getInstanceStore().updateBundle(bundleNftId, bundleInfo, KEEP_STATE());
|
366
349
|
}
|
367
350
|
|
368
351
|
/// @dev links policy to bundle
|
@@ -381,63 +364,19 @@ contract BundleService is
|
|
381
364
|
bundleManager.linkPolicy(policyNftId);
|
382
365
|
}
|
383
366
|
|
384
|
-
|
385
|
-
function
|
386
|
-
|
367
|
+
/// @dev unlinks policy from bundle
|
368
|
+
function unlinkPolicy(
|
369
|
+
IInstance instance,
|
370
|
+
NftId policyNftId
|
371
|
+
)
|
372
|
+
external
|
373
|
+
virtual
|
387
374
|
{
|
388
|
-
InstanceReader instanceReader = instance.getInstanceReader();
|
389
|
-
IPolicy.PolicyInfo memory policyInfo = instanceReader.getPolicyInfo(policyNftId);
|
390
|
-
|
391
|
-
// ensure policy has no open claims
|
392
|
-
if (policyInfo.openClaimsCount > 0) {
|
393
|
-
revert BundleManager.ErrorBundleManagerPolicyWithOpenClaims(
|
394
|
-
policyNftId,
|
395
|
-
policyInfo.openClaimsCount);
|
396
|
-
}
|
397
|
-
|
398
375
|
// ensure policy is closeable
|
399
|
-
if (
|
400
|
-
|
401
|
-
{
|
402
|
-
revert BundleManager.ErrorBundleManagerPolicyNotCloseable(policyNftId);
|
376
|
+
if (!instance.getInstanceReader().policyIsCloseable(policyNftId)) {
|
377
|
+
revert ErrorBundleServicePolicyNotCloseable(policyNftId);
|
403
378
|
}
|
404
|
-
|
405
|
-
BundleManager bundleManager = instance.getBundleManager();
|
406
|
-
bundleManager.unlinkPolicy(policyNftId);
|
407
|
-
}
|
408
379
|
|
409
|
-
|
410
|
-
function _processStakingByTreasury(
|
411
|
-
InstanceReader instanceReader,
|
412
|
-
NftId poolNftId,
|
413
|
-
NftId bundleNftId,
|
414
|
-
Amount stakingAmount
|
415
|
-
)
|
416
|
-
internal
|
417
|
-
{
|
418
|
-
// process token transfer(s)
|
419
|
-
if(stakingAmount.gtz()) {
|
420
|
-
IComponents.ComponentInfo memory componentInfo = instanceReader.getComponentInfo(poolNftId);
|
421
|
-
IComponents.PoolInfo memory poolInfo = abi.decode(componentInfo.data, (IComponents.PoolInfo));
|
422
|
-
|
423
|
-
TokenHandler tokenHandler = componentInfo.tokenHandler;
|
424
|
-
address bundleOwner = getRegistry().ownerOf(bundleNftId);
|
425
|
-
Fee memory stakingFee = poolInfo.stakingFee;
|
426
|
-
|
427
|
-
// pool fee and bundle capital book keeping
|
428
|
-
if (FeeLib.gtz(stakingFee)) {
|
429
|
-
(uint256 stakingFeeAmount, uint256 netAmount) = FeeLib.calculateFee(stakingFee, stakingAmount.toInt());
|
430
|
-
|
431
|
-
|
432
|
-
// TODO: track staking fees in pool's state (issue #177)
|
433
|
-
}
|
434
|
-
|
435
|
-
// transfer full staking amount to pool wallet
|
436
|
-
tokenHandler.transfer(
|
437
|
-
bundleOwner,
|
438
|
-
componentInfo.wallet,
|
439
|
-
stakingAmount.toInt()
|
440
|
-
);
|
441
|
-
}
|
380
|
+
instance.getBundleManager().unlinkPolicy(policyNftId);
|
442
381
|
}
|
443
382
|
}
|
@@ -1,12 +1,12 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
2
|
pragma solidity ^0.8.20;
|
3
3
|
|
4
|
-
import {IVersionable} from "
|
5
|
-
import {ProxyManager} from "
|
4
|
+
import {IVersionable} from "../shared/IVersionable.sol";
|
5
|
+
import {ProxyManager} from "../shared/ProxyManager.sol";
|
6
6
|
import {BundleService} from "./BundleService.sol";
|
7
|
-
import {Registry} from "
|
8
|
-
import {RegistryService} from "
|
9
|
-
import {ObjectType, REGISTRY} from "
|
7
|
+
import {Registry} from "../registry/Registry.sol";
|
8
|
+
import {RegistryService} from "../registry/RegistryService.sol";
|
9
|
+
import {ObjectType, REGISTRY} from "../type/ObjectType.sol";
|
10
10
|
|
11
11
|
contract BundleServiceManager is ProxyManager {
|
12
12
|
|
@@ -1,28 +1,30 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
2
|
pragma solidity ^0.8.19;
|
3
3
|
|
4
|
-
import {Amount} from "
|
5
|
-
import {NftId} from "
|
6
|
-
import {Fee} from "
|
7
|
-
import {IService} from "
|
8
|
-
import {IBundle} from "../module/IBundle.sol";
|
9
|
-
import {IInstance} from "
|
10
|
-
import {Seconds} from "
|
11
|
-
import {StateId} from "
|
12
|
-
import {Timestamp} from "
|
4
|
+
import {Amount} from "../type/Amount.sol";
|
5
|
+
import {NftId} from "../type/NftId.sol";
|
6
|
+
import {Fee} from "../type/Fee.sol";
|
7
|
+
import {IService} from "../shared/IService.sol";
|
8
|
+
import {IBundle} from "../instance/module/IBundle.sol";
|
9
|
+
import {IInstance} from "../instance/IInstance.sol";
|
10
|
+
import {Seconds} from "../type/Seconds.sol";
|
11
|
+
import {StateId} from "../type/StateId.sol";
|
12
|
+
import {Timestamp} from "../type/Timestamp.sol";
|
13
13
|
|
14
14
|
interface IBundleService is IService {
|
15
15
|
|
16
16
|
event LogBundleServiceBundleActivated(NftId bundleNftId);
|
17
17
|
event LogBundleServiceBundleLocked(NftId bundleNftId);
|
18
18
|
|
19
|
-
error ErrorBundleServiceInsufficientAllowance(address bundleOwner, address tokenHandlerAddress,
|
19
|
+
error ErrorBundleServiceInsufficientAllowance(address bundleOwner, address tokenHandlerAddress, Amount amount);
|
20
20
|
error ErrorBundleServiceBundleNotOpen(NftId bundleNftId, StateId state, Timestamp expiredAt);
|
21
|
-
error ErrorBundleServiceCapacityInsufficient(NftId bundleNftId,
|
21
|
+
error ErrorBundleServiceCapacityInsufficient(NftId bundleNftId, Amount capacityAmount, Amount collateralAmount);
|
22
22
|
error ErrorBundleServiceBundleWithOpenPolicies(NftId bundleNftId, uint256 openPoliciesCount);
|
23
23
|
|
24
24
|
error ErrorBundleServiceBundleUnknown(NftId bundleNftId);
|
25
|
-
error ErrorBundleServiceBundlePoolMismatch(NftId
|
25
|
+
error ErrorBundleServiceBundlePoolMismatch(NftId bundleNftId, NftId expectedPool, NftId actualPool);
|
26
|
+
|
27
|
+
error ErrorBundleServicePolicyNotCloseable(NftId policyNftId);
|
26
28
|
|
27
29
|
/// @dev create a new bundle for the specified attributes
|
28
30
|
/// may only be called by pool service
|
@@ -38,6 +40,13 @@ interface IBundleService is IService {
|
|
38
40
|
external
|
39
41
|
returns(NftId bundleNftId); // the nft id of the newly created bundle
|
40
42
|
|
43
|
+
|
44
|
+
/// @dev increase bundle stakes by the specified amount
|
45
|
+
/// may only be called by the bundle owner
|
46
|
+
// function stake(NftId bundleNftId, uint256 amount) external returns(uint256 netAmount);
|
47
|
+
|
48
|
+
// function unstake(NftId bundleNftId, uint256 amount) external returns(uint256 netAmount);
|
49
|
+
|
41
50
|
/// @dev locks the specified bundle, locked bundles are not available to collateralize new policies
|
42
51
|
/// only active bundles may be locked
|
43
52
|
/// may only be called by registered and unlocked pool components
|
@@ -74,15 +83,8 @@ interface IBundleService is IService {
|
|
74
83
|
IInstance instanceNftId,
|
75
84
|
NftId policyNftId,
|
76
85
|
NftId bundleNftId,
|
77
|
-
|
78
|
-
|
79
|
-
) external;
|
80
|
-
|
81
|
-
/// @dev updates the bundle's fees of with the provided fee amount
|
82
|
-
function updateBundleFees(
|
83
|
-
IInstance instance,
|
84
|
-
NftId bundleNftId,
|
85
|
-
Amount feeAmount
|
86
|
+
Amount collateralAmount,
|
87
|
+
Amount premiumAmount // premium after pool fee
|
86
88
|
) external;
|
87
89
|
|
88
90
|
/// @dev releases the specified collateral in the bundle
|
@@ -91,12 +93,26 @@ interface IBundleService is IService {
|
|
91
93
|
IInstance instance,
|
92
94
|
NftId policyNftId,
|
93
95
|
NftId bundleNftId,
|
94
|
-
|
96
|
+
Amount collateralAmount
|
95
97
|
) external;
|
96
98
|
|
97
|
-
|
99
|
+
/// @dev unlink policy from bundle
|
100
|
+
/// policy may only be unlinked if policy is closeable
|
101
|
+
/// may only be called by pool service
|
102
|
+
function unlinkPolicy(
|
103
|
+
IInstance instance,
|
104
|
+
NftId policyNftId
|
105
|
+
) external;
|
98
106
|
|
99
|
-
|
107
|
+
/// @dev updates the bundle's fees of with the provided fee amount
|
108
|
+
function updateBundleFees(
|
109
|
+
IInstance instance,
|
110
|
+
NftId bundleNftId,
|
111
|
+
Amount feeAmount
|
112
|
+
) external;
|
100
113
|
|
101
|
-
|
114
|
+
function increaseBalance(
|
115
|
+
IInstance instance,
|
116
|
+
NftId bundleNftId,
|
117
|
+
Amount amount) external;
|
102
118
|
}
|
@@ -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
|
@@ -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
|