@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
@@ -3,11 +3,11 @@ pragma solidity ^0.8.20;
|
|
3
3
|
|
4
4
|
import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
|
5
5
|
|
6
|
-
import {Fee} from "../../
|
7
|
-
import {NftId} from "../../
|
8
|
-
import {RoleId} from "../../
|
6
|
+
import {Fee} from "../../type/Fee.sol";
|
7
|
+
import {NftId} from "../../type/NftId.sol";
|
8
|
+
import {RoleId} from "../../type/RoleId.sol";
|
9
9
|
import {TokenHandler} from "../../shared/TokenHandler.sol";
|
10
|
-
import {UFixed} from "../../
|
10
|
+
import {UFixed} from "../../type/UFixed.sol";
|
11
11
|
|
12
12
|
interface ISetup {
|
13
13
|
|
@@ -3,8 +3,8 @@ pragma solidity ^0.8.20;
|
|
3
3
|
|
4
4
|
import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
|
5
5
|
|
6
|
-
import {Fee} from "../../
|
7
|
-
import {NftId} from "../../
|
6
|
+
import {Fee} from "../../type/Fee.sol";
|
7
|
+
import {NftId} from "../../type/NftId.sol";
|
8
8
|
import {TokenHandler} from "../../shared/TokenHandler.sol";
|
9
9
|
|
10
10
|
interface ITreasury {
|
@@ -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
|
|
@@ -53,12 +53,13 @@ contract BundleService is
|
|
53
53
|
initializer
|
54
54
|
virtual override
|
55
55
|
{
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
56
|
+
(
|
57
|
+
address registryAddress,,
|
58
|
+
//address managerAddress
|
59
|
+
address authority
|
60
|
+
) = abi.decode(data, (address, address, address));
|
61
|
+
|
62
|
+
initializeService(registryAddress, authority, owner);
|
62
63
|
registerInterface(type(IBundleService).interfaceId);
|
63
64
|
}
|
64
65
|
|
@@ -75,16 +76,16 @@ contract BundleService is
|
|
75
76
|
function _updatePoolWithStakes(
|
76
77
|
IInstance instance,
|
77
78
|
NftId poolNftId,
|
78
|
-
|
79
|
+
Amount stakingAmount
|
79
80
|
)
|
80
81
|
internal
|
81
82
|
returns (
|
82
83
|
TokenHandler tokenHandler,
|
83
84
|
address wallet,
|
84
|
-
|
85
|
+
Amount netStakingAmount
|
85
86
|
)
|
86
87
|
{
|
87
|
-
if(stakingAmount
|
88
|
+
if(stakingAmount.gtz()) {
|
88
89
|
InstanceReader instanceReader = instance.getInstanceReader();
|
89
90
|
IComponents.ComponentInfo memory componentInfo = instanceReader.getComponentInfo(poolNftId);
|
90
91
|
|
@@ -92,16 +93,16 @@ contract BundleService is
|
|
92
93
|
wallet = componentInfo.wallet;
|
93
94
|
|
94
95
|
IComponents.PoolInfo memory poolInfo = abi.decode(componentInfo.data, (IComponents.PoolInfo));
|
95
|
-
|
96
|
+
Amount poolFeeAmount;
|
96
97
|
|
97
98
|
// calculate pool fee and net staking amount
|
98
99
|
(poolFeeAmount, netStakingAmount) = FeeLib.calculateFee(poolInfo.stakingFee, stakingAmount);
|
99
100
|
|
100
101
|
// update pool balance and fee amount
|
101
|
-
poolInfo.balanceAmount
|
102
|
+
poolInfo.balanceAmount = poolInfo.balanceAmount + netStakingAmount;
|
102
103
|
|
103
|
-
if(poolFeeAmount
|
104
|
-
poolInfo.feeAmount
|
104
|
+
if(poolFeeAmount.gtz()) {
|
105
|
+
poolInfo.feeAmount = poolInfo.feeAmount + poolFeeAmount;
|
105
106
|
}
|
106
107
|
|
107
108
|
// save updated pool info
|
@@ -115,31 +116,16 @@ contract BundleService is
|
|
115
116
|
IInstance instance,
|
116
117
|
NftId poolNftId,
|
117
118
|
address owner,
|
118
|
-
Fee memory
|
119
|
+
Fee memory bundleFee,
|
119
120
|
Amount stakingAmount,
|
120
121
|
Seconds lifetime,
|
121
122
|
bytes calldata filter
|
122
123
|
)
|
123
124
|
external
|
124
125
|
override
|
125
|
-
|
126
|
+
restricted
|
126
127
|
returns(NftId bundleNftId)
|
127
128
|
{
|
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
129
|
// register bundle with registry
|
144
130
|
bundleNftId = getRegistryService().registerBundle(
|
145
131
|
IRegistry.ObjectInfo(
|
@@ -154,23 +140,27 @@ contract BundleService is
|
|
154
140
|
);
|
155
141
|
|
156
142
|
// create bundle info in instance
|
157
|
-
instance.getInstanceStore().createBundle(
|
143
|
+
instance.getInstanceStore().createBundle(
|
144
|
+
bundleNftId,
|
145
|
+
IBundle.BundleInfo(
|
146
|
+
poolNftId,
|
147
|
+
bundleFee,
|
148
|
+
filter,
|
149
|
+
stakingAmount,
|
150
|
+
AmountLib.zero(),
|
151
|
+
AmountLib.zero(),
|
152
|
+
lifetime,
|
153
|
+
TimestampLib.blockTimestamp().addSeconds(lifetime),
|
154
|
+
zeroTimestamp()));
|
158
155
|
|
159
156
|
// put bundle under bundle managemet
|
160
157
|
BundleManager bundleManager = instance.getBundleManager();
|
161
158
|
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
159
|
|
171
160
|
// TODO add logging
|
172
161
|
}
|
173
162
|
|
163
|
+
|
174
164
|
function setFee(
|
175
165
|
NftId bundleNftId,
|
176
166
|
Fee memory fee
|
@@ -178,15 +168,18 @@ contract BundleService is
|
|
178
168
|
external
|
179
169
|
override
|
180
170
|
{
|
181
|
-
(NftId poolNftId
|
171
|
+
(NftId poolNftId,, IInstance instance) = _getAndVerifyCallingComponentAndInstance(POOL());
|
182
172
|
InstanceReader instanceReader = instance.getInstanceReader();
|
183
|
-
|
184
173
|
IBundle.BundleInfo memory bundleInfo = instanceReader.getBundleInfo(bundleNftId);
|
185
|
-
|
186
|
-
|
174
|
+
if(bundleInfo.poolNftId.eqz()) {
|
175
|
+
revert ErrorBundleServiceBundleUnknown(bundleNftId);
|
176
|
+
}
|
187
177
|
|
188
|
-
bundleInfo.
|
178
|
+
if(bundleInfo.poolNftId != poolNftId) {
|
179
|
+
revert ErrorBundleServiceBundlePoolMismatch(bundleNftId, bundleInfo.poolNftId, poolNftId);
|
180
|
+
}
|
189
181
|
|
182
|
+
bundleInfo.fee = fee;
|
190
183
|
instance.getInstanceStore().updateBundle(bundleNftId, bundleInfo, KEEP_STATE());
|
191
184
|
}
|
192
185
|
|
@@ -196,11 +189,11 @@ contract BundleService is
|
|
196
189
|
IInstance instance,
|
197
190
|
NftId policyNftId,
|
198
191
|
NftId bundleNftId,
|
199
|
-
|
200
|
-
|
192
|
+
Amount collateralAmount, // required amount to collateralize policy
|
193
|
+
Amount premiumAmount // premium part that reaches bundle for this policy
|
201
194
|
)
|
202
195
|
external
|
203
|
-
|
196
|
+
restricted
|
204
197
|
{
|
205
198
|
InstanceReader instanceReader = instance.getInstanceReader();
|
206
199
|
StateId bundleState = instanceReader.getMetadata(bundleNftId.toKey32(BUNDLE())).state;
|
@@ -212,7 +205,7 @@ contract BundleService is
|
|
212
205
|
}
|
213
206
|
|
214
207
|
// ensure bundle capacity is sufficent to collateralize policy
|
215
|
-
|
208
|
+
Amount capacity = bundleInfo.capitalAmount + premiumAmount - bundleInfo.lockedAmount;
|
216
209
|
if(capacity < collateralAmount) {
|
217
210
|
revert ErrorBundleServiceCapacityInsufficient(bundleNftId, capacity, collateralAmount);
|
218
211
|
}
|
@@ -220,7 +213,7 @@ contract BundleService is
|
|
220
213
|
// TODO add more validation
|
221
214
|
|
222
215
|
// updated locked amount
|
223
|
-
bundleInfo.lockedAmount =
|
216
|
+
bundleInfo.lockedAmount = bundleInfo.lockedAmount + collateralAmount;
|
224
217
|
|
225
218
|
// update capital and fees when premiums are involved
|
226
219
|
_updateBundleWithPremium(instance, bundleNftId, bundleInfo, premiumAmount);
|
@@ -234,37 +227,43 @@ contract BundleService is
|
|
234
227
|
IInstance instance,
|
235
228
|
NftId bundleNftId,
|
236
229
|
IBundle.BundleInfo memory bundleInfo,
|
237
|
-
|
230
|
+
Amount premiumAmount
|
238
231
|
)
|
239
232
|
internal
|
240
233
|
{
|
241
234
|
// update bundle capital and fee amounts
|
242
|
-
if(premiumAmount
|
235
|
+
if(premiumAmount.gtz()) {
|
243
236
|
// calculate fees and net premium amounts
|
244
237
|
(
|
245
|
-
|
246
|
-
|
238
|
+
,
|
239
|
+
Amount netPremiumAmount
|
247
240
|
) = FeeLib.calculateFee(bundleInfo.fee, premiumAmount);
|
248
241
|
|
249
242
|
// update bundle info with additional capital
|
250
|
-
bundleInfo.capitalAmount =
|
251
|
-
|
252
|
-
// update bundle info with additional fees
|
253
|
-
if(feeAmount > 0) {
|
254
|
-
bundleInfo.feeAmount = AmountLib.toAmount(bundleInfo.feeAmount.toInt() + feeAmount);
|
255
|
-
}
|
243
|
+
bundleInfo.capitalAmount = bundleInfo.capitalAmount + netPremiumAmount;
|
256
244
|
}
|
257
245
|
|
258
246
|
// save updated bundle info
|
259
247
|
instance.getInstanceStore().updateBundle(bundleNftId, bundleInfo, KEEP_STATE());
|
260
248
|
}
|
261
249
|
|
250
|
+
function updateBundleFees(
|
251
|
+
IInstance instance,
|
252
|
+
NftId bundleNftId,
|
253
|
+
Amount feeAmount
|
254
|
+
)
|
255
|
+
external
|
256
|
+
{
|
257
|
+
IBundle.BundleInfo memory bundleInfo = instance.getInstanceReader().getBundleInfo(bundleNftId);
|
258
|
+
bundleInfo.feeAmount = bundleInfo.feeAmount.add(feeAmount);
|
259
|
+
instance.getInstanceStore().updateBundle(bundleNftId, bundleInfo, KEEP_STATE());
|
260
|
+
}
|
262
261
|
|
263
262
|
function lock(NftId bundleNftId)
|
264
263
|
external
|
265
264
|
virtual
|
266
265
|
{
|
267
|
-
(,, IInstance instance) =
|
266
|
+
(,, IInstance instance) = _getAndVerifyCallingComponentAndInstance(POOL());
|
268
267
|
|
269
268
|
// udpate bundle state
|
270
269
|
instance.getInstanceStore().updateBundleState(bundleNftId, PAUSED());
|
@@ -281,7 +280,7 @@ contract BundleService is
|
|
281
280
|
external
|
282
281
|
virtual
|
283
282
|
{
|
284
|
-
(,, IInstance instance) =
|
283
|
+
(,, IInstance instance) = _getAndVerifyCallingComponentAndInstance(POOL());
|
285
284
|
|
286
285
|
// udpate bundle state
|
287
286
|
instance.getInstanceStore().updateBundleState(bundleNftId, ACTIVE());
|
@@ -300,7 +299,7 @@ contract BundleService is
|
|
300
299
|
)
|
301
300
|
external
|
302
301
|
virtual
|
303
|
-
|
302
|
+
restricted
|
304
303
|
{
|
305
304
|
// udpate bundle state
|
306
305
|
instance.getInstanceStore().updateBundleState(bundleNftId, CLOSED());
|
@@ -320,10 +319,10 @@ contract BundleService is
|
|
320
319
|
function increaseBalance(
|
321
320
|
IInstance instance,
|
322
321
|
NftId bundleNftId,
|
323
|
-
|
322
|
+
Amount premiumAmount
|
324
323
|
)
|
325
324
|
external
|
326
|
-
|
325
|
+
restricted
|
327
326
|
{
|
328
327
|
InstanceReader instanceReader = instance.getInstanceReader();
|
329
328
|
IBundle.BundleInfo memory bundleInfo = instanceReader.getBundleInfo(bundleNftId);
|
@@ -337,20 +336,17 @@ contract BundleService is
|
|
337
336
|
function releaseCollateral(IInstance instance,
|
338
337
|
NftId policyNftId,
|
339
338
|
NftId bundleNftId,
|
340
|
-
|
339
|
+
Amount collateralAmount
|
341
340
|
)
|
342
341
|
external
|
343
|
-
|
342
|
+
restricted
|
344
343
|
{
|
345
344
|
InstanceReader instanceReader = instance.getInstanceReader();
|
346
345
|
IBundle.BundleInfo memory bundleInfo = instanceReader.getBundleInfo(bundleNftId);
|
347
346
|
|
348
347
|
// reduce locked amount by released collateral amount
|
349
|
-
bundleInfo.lockedAmount =
|
350
|
-
|
348
|
+
bundleInfo.lockedAmount = bundleInfo.lockedAmount - collateralAmount;
|
351
349
|
instance.getInstanceStore().updateBundle(bundleNftId, bundleInfo, KEEP_STATE());
|
352
|
-
|
353
|
-
_unlinkPolicy(instance, policyNftId);
|
354
350
|
}
|
355
351
|
|
356
352
|
/// @dev links policy to bundle
|
@@ -364,68 +360,25 @@ contract BundleService is
|
|
364
360
|
if (policyInfo.activatedAt.gtz() && policyInfo.activatedAt < TimestampLib.blockTimestamp()) {
|
365
361
|
revert BundleManager.ErrorBundleManagerPolicyAlreadyActivated(policyNftId);
|
366
362
|
}
|
367
|
-
|
363
|
+
|
368
364
|
BundleManager bundleManager = instance.getBundleManager();
|
369
365
|
bundleManager.linkPolicy(policyNftId);
|
370
366
|
}
|
371
367
|
|
372
|
-
|
373
|
-
function
|
374
|
-
|
368
|
+
/// @dev unlinks policy from bundle
|
369
|
+
function unlinkPolicy(
|
370
|
+
IInstance instance,
|
371
|
+
NftId policyNftId
|
372
|
+
)
|
373
|
+
external
|
374
|
+
virtual
|
375
|
+
restricted
|
375
376
|
{
|
376
|
-
InstanceReader instanceReader = instance.getInstanceReader();
|
377
|
-
IPolicy.PolicyInfo memory policyInfo = instanceReader.getPolicyInfo(policyNftId);
|
378
|
-
|
379
|
-
// ensure policy has no open claims
|
380
|
-
if (policyInfo.openClaimsCount > 0) {
|
381
|
-
revert BundleManager.ErrorBundleManagerPolicyWithOpenClaims(
|
382
|
-
policyNftId,
|
383
|
-
policyInfo.openClaimsCount);
|
384
|
-
}
|
385
|
-
|
386
377
|
// ensure policy is closeable
|
387
|
-
if (
|
388
|
-
|
389
|
-
{
|
390
|
-
revert BundleManager.ErrorBundleManagerPolicyNotCloseable(policyNftId);
|
378
|
+
if (!instance.getInstanceReader().policyIsCloseable(policyNftId)) {
|
379
|
+
revert ErrorBundleServicePolicyNotCloseable(policyNftId);
|
391
380
|
}
|
392
|
-
|
393
|
-
BundleManager bundleManager = instance.getBundleManager();
|
394
|
-
bundleManager.unlinkPolicy(policyNftId);
|
395
|
-
}
|
396
|
-
|
397
|
-
// TODO move this to pool service
|
398
|
-
function _processStakingByTreasury(
|
399
|
-
InstanceReader instanceReader,
|
400
|
-
NftId poolNftId,
|
401
|
-
NftId bundleNftId,
|
402
|
-
Amount stakingAmount
|
403
|
-
)
|
404
|
-
internal
|
405
|
-
{
|
406
|
-
// process token transfer(s)
|
407
|
-
if(stakingAmount.gtz()) {
|
408
|
-
IComponents.ComponentInfo memory componentInfo = instanceReader.getComponentInfo(poolNftId);
|
409
|
-
IComponents.PoolInfo memory poolInfo = abi.decode(componentInfo.data, (IComponents.PoolInfo));
|
410
|
-
|
411
|
-
TokenHandler tokenHandler = componentInfo.tokenHandler;
|
412
|
-
address bundleOwner = getRegistry().ownerOf(bundleNftId);
|
413
|
-
Fee memory stakingFee = poolInfo.stakingFee;
|
414
|
-
|
415
|
-
// pool fee and bundle capital book keeping
|
416
|
-
if (FeeLib.gtz(stakingFee)) {
|
417
|
-
(uint256 stakingFeeAmount, uint256 netAmount) = FeeLib.calculateFee(stakingFee, stakingAmount.toInt());
|
418
|
-
|
419
381
|
|
420
|
-
|
421
|
-
}
|
422
|
-
|
423
|
-
// transfer full staking amount to pool wallet
|
424
|
-
tokenHandler.transfer(
|
425
|
-
bundleOwner,
|
426
|
-
componentInfo.wallet,
|
427
|
-
stakingAmount.toInt()
|
428
|
-
);
|
429
|
-
}
|
382
|
+
instance.getBundleManager().unlinkPolicy(policyNftId);
|
430
383
|
}
|
431
384
|
}
|
@@ -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 {BundleService} from "./BundleService.sol";
|
7
|
+
import {Registry} from "../registry/Registry.sol";
|
8
|
+
import {RegistryService} from "../registry/RegistryService.sol";
|
9
|
+
import {ObjectType, REGISTRY} from "../type/ObjectType.sol";
|
10
|
+
|
11
|
+
contract BundleServiceManager is ProxyManager {
|
12
|
+
|
13
|
+
BundleService private _bundleService;
|
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
|
+
BundleService bundleSrv = new BundleService{salt: salt}();
|
24
|
+
bytes memory data = abi.encode(registryAddress, address(this), authority);
|
25
|
+
IVersionable versionable = deployDetermenistic(
|
26
|
+
address(bundleSrv),
|
27
|
+
data,
|
28
|
+
salt);
|
29
|
+
|
30
|
+
_bundleService = BundleService(address(versionable));
|
31
|
+
}
|
32
|
+
|
33
|
+
//--- view functions ----------------------------------------------------//
|
34
|
+
function getBundleService()
|
35
|
+
external
|
36
|
+
view
|
37
|
+
returns (BundleService)
|
38
|
+
{
|
39
|
+
return _bundleService;
|
40
|
+
}
|
41
|
+
|
42
|
+
}
|
@@ -1,26 +1,31 @@
|
|
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
|
+
error ErrorBundleServiceBundleUnknown(NftId bundleNftId);
|
25
|
+
error ErrorBundleServiceBundlePoolMismatch(NftId bundleNftId, NftId expectedPool, NftId actualPool);
|
26
|
+
|
27
|
+
error ErrorBundleServicePolicyNotCloseable(NftId policyNftId);
|
28
|
+
|
24
29
|
/// @dev create a new bundle for the specified attributes
|
25
30
|
/// may only be called by pool service
|
26
31
|
function create(
|
@@ -35,6 +40,13 @@ interface IBundleService is IService {
|
|
35
40
|
external
|
36
41
|
returns(NftId bundleNftId); // the nft id of the newly created bundle
|
37
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
|
+
|
38
50
|
/// @dev locks the specified bundle, locked bundles are not available to collateralize new policies
|
39
51
|
/// only active bundles may be locked
|
40
52
|
/// may only be called by registered and unlocked pool components
|
@@ -71,23 +83,36 @@ interface IBundleService is IService {
|
|
71
83
|
IInstance instanceNftId,
|
72
84
|
NftId policyNftId,
|
73
85
|
NftId bundleNftId,
|
74
|
-
|
75
|
-
|
86
|
+
Amount collateralAmount,
|
87
|
+
Amount premiumAmount // premium after pool fee
|
76
88
|
) external;
|
77
89
|
|
78
|
-
|
79
90
|
/// @dev releases the specified collateral in the bundle
|
80
91
|
/// may only be called by pool service
|
81
92
|
function releaseCollateral(
|
82
93
|
IInstance instance,
|
83
94
|
NftId policyNftId,
|
84
95
|
NftId bundleNftId,
|
85
|
-
|
96
|
+
Amount collateralAmount
|
86
97
|
) external;
|
87
98
|
|
88
|
-
|
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;
|
89
106
|
|
90
|
-
|
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;
|
91
113
|
|
92
|
-
|
114
|
+
function increaseBalance(
|
115
|
+
IInstance instance,
|
116
|
+
NftId bundleNftId,
|
117
|
+
Amount amount) external;
|
93
118
|
}
|