@etherisc/gif-next 0.0.2-fd275d2-234 → 0.0.2-fd4931b-974
Sign up to get free protection for your applications and to get access to all the features.
- package/README.md +28 -14
- package/artifacts/contracts/distribution/Distribution.sol/Distribution.dbg.json +4 -0
- package/artifacts/contracts/distribution/Distribution.sol/Distribution.json +1410 -0
- package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.dbg.json +4 -0
- package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.json +1343 -0
- package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +4 -0
- package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.json +799 -0
- package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.dbg.json +4 -0
- package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.json +969 -0
- package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.dbg.json +4 -0
- package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.json +808 -0
- package/artifacts/contracts/instance/BundleManager.sol/BundleManager.dbg.json +1 -1
- package/artifacts/contracts/instance/BundleManager.sol/BundleManager.json +73 -104
- package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstance.sol/IInstance.json +299 -1344
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +356 -181
- package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
- package/artifacts/contracts/instance/Instance.sol/Instance.json +453 -3116
- package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +612 -181
- package/artifacts/contracts/instance/InstanceAuthorizationsLib.sol/InstanceAuthorizationsLib.dbg.json +4 -0
- package/artifacts/contracts/instance/InstanceAuthorizationsLib.sol/InstanceAuthorizationsLib.json +132 -0
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +485 -337
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +493 -400
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +330 -127
- package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.dbg.json +4 -0
- package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.json +3468 -0
- package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.dbg.json +4 -0
- package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.json +318 -0
- package/artifacts/contracts/instance/base/Cloneable.sol/Cloneable.dbg.json +4 -0
- package/artifacts/contracts/instance/{Cloneable.sol → base/Cloneable.sol}/Cloneable.json +6 -1
- package/artifacts/contracts/instance/base/ObjectManager.sol/ObjectManager.dbg.json +4 -0
- package/artifacts/contracts/instance/base/ObjectManager.sol/ObjectManager.json +256 -0
- package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IAccess.sol/IAccess.json +71 -45
- package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IComponents.sol/IComponents.dbg.json +4 -0
- package/artifacts/contracts/instance/module/{ISetup.sol/ISetup.json → IComponents.sol/IComponents.json} +2 -2
- package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +1 -1
- package/artifacts/contracts/mock/Dip.sol/Dip.dbg.json +4 -0
- package/artifacts/contracts/mock/Dip.sol/Dip.json +376 -0
- package/artifacts/contracts/pool/BundleService.sol/BundleService.dbg.json +4 -0
- package/artifacts/contracts/pool/BundleService.sol/BundleService.json +1091 -0
- package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.dbg.json +4 -0
- package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.json +723 -0
- package/artifacts/contracts/pool/IBundleService.sol/IBundleService.dbg.json +4 -0
- package/artifacts/contracts/{instance/service/IProductService.sol/IProductService.json → pool/IBundleService.sol/IBundleService.json} +284 -360
- package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.dbg.json +4 -0
- package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.json +1148 -0
- package/artifacts/contracts/pool/IPoolService.sol/IPoolService.dbg.json +4 -0
- package/artifacts/contracts/pool/IPoolService.sol/IPoolService.json +1044 -0
- package/artifacts/contracts/pool/Pool.sol/Pool.dbg.json +4 -0
- package/artifacts/contracts/pool/Pool.sol/Pool.json +1559 -0
- package/artifacts/contracts/pool/PoolService.sol/PoolService.dbg.json +4 -0
- package/artifacts/contracts/pool/PoolService.sol/PoolService.json +1411 -0
- package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.dbg.json +4 -0
- package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.json +719 -0
- package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.dbg.json +4 -0
- package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.json +820 -0
- package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +4 -0
- package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.json +699 -0
- package/artifacts/contracts/product/ClaimService.sol/ClaimService.dbg.json +4 -0
- package/artifacts/contracts/product/ClaimService.sol/ClaimService.json +1264 -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/IComponentOwnerService.sol/IComponentOwnerService.json → product/IApplicationService.sol/IApplicationService.json} +231 -204
- 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/product/IPolicyService.sol/IPolicyService.json +701 -0
- package/artifacts/contracts/product/IPricingService.sol/IPricingService.dbg.json +4 -0
- package/artifacts/contracts/{instance/service/IPoolService.sol/IPoolService.json → product/IPricingService.sol/IPricingService.json} +244 -383
- package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.dbg.json +4 -0
- package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.json +989 -0
- package/artifacts/contracts/product/IProductService.sol/IProductService.dbg.json +4 -0
- package/artifacts/contracts/{components/BaseComponent.sol/BaseComponent.json → product/IProductService.sol/IProductService.json} +140 -86
- package/artifacts/contracts/product/PolicyService.sol/PolicyService.dbg.json +4 -0
- package/artifacts/contracts/product/PolicyService.sol/PolicyService.json +1132 -0
- package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +4 -0
- package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.json +731 -0
- package/artifacts/contracts/product/PricingService.sol/PricingService.dbg.json +4 -0
- package/artifacts/contracts/product/PricingService.sol/PricingService.json +969 -0
- package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.dbg.json +4 -0
- package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.json +755 -0
- package/artifacts/contracts/product/Product.sol/Product.dbg.json +4 -0
- package/artifacts/contracts/product/Product.sol/Product.json +1391 -0
- package/artifacts/contracts/product/ProductService.sol/ProductService.dbg.json +4 -0
- package/artifacts/contracts/product/ProductService.sol/ProductService.json +673 -0
- package/artifacts/contracts/product/ProductServiceManager.sol/ProductServiceManager.dbg.json +4 -0
- package/artifacts/contracts/product/ProductServiceManager.sol/ProductServiceManager.json +675 -0
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +15 -2
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +345 -121
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +368 -222
- package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
- package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.json +18 -0
- package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
- package/artifacts/contracts/registry/Registry.sol/Registry.json +434 -197
- package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.dbg.json +4 -0
- package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.json +298 -0
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +438 -333
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +324 -136
- package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.dbg.json +4 -0
- package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.json +1112 -0
- package/artifacts/contracts/registry/ServiceAuthorizationsLib.sol/ServiceAuthorizationsLib.dbg.json +4 -0
- package/artifacts/contracts/registry/ServiceAuthorizationsLib.sol/ServiceAuthorizationsLib.json +137 -0
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +449 -67
- package/artifacts/contracts/shared/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.dbg.json +4 -0
- package/artifacts/contracts/shared/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.json +1206 -0
- package/artifacts/contracts/shared/Component.sol/Component.dbg.json +4 -0
- package/artifacts/contracts/shared/Component.sol/Component.json +890 -0
- package/artifacts/contracts/shared/ComponentService.sol/ComponentService.dbg.json +4 -0
- package/artifacts/contracts/shared/ComponentService.sol/ComponentService.json +1461 -0
- package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.dbg.json +4 -0
- package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.json +765 -0
- package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.dbg.json +4 -0
- package/artifacts/contracts/{instance/base/ComponentServiceBase.sol/ComponentServiceBase.json → shared/ComponentVerifyingService.sol/ComponentVerifyingService.json} +196 -216
- package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +1 -1
- package/artifacts/contracts/shared/ERC165.sol/ERC165.json +41 -3
- package/artifacts/contracts/shared/IComponent.sol/IComponent.dbg.json +4 -0
- package/artifacts/contracts/{instance/service/IDistributionService.sol/IDistributionService.json → shared/IComponent.sol/IComponent.json} +344 -165
- package/artifacts/contracts/shared/IComponentService.sol/IComponentService.dbg.json +4 -0
- package/artifacts/contracts/shared/IComponentService.sol/IComponentService.json +854 -0
- package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.dbg.json +4 -0
- package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.json +699 -0
- package/artifacts/contracts/shared/IKeyValueStore.sol/IKeyValueStore.dbg.json +4 -0
- package/artifacts/contracts/{instance/base → shared}/IKeyValueStore.sol/IKeyValueStore.json +50 -1
- package/artifacts/contracts/shared/ILifecycle.sol/ILifecycle.dbg.json +4 -0
- package/artifacts/contracts/{instance/base → shared}/ILifecycle.sol/ILifecycle.json +1 -1
- package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
- package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.json +27 -29
- package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +4 -0
- package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.json +207 -0
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +8 -34
- package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +4 -0
- package/artifacts/contracts/{experiment/inheritance/IA.sol/ISharedA.json → shared/IRegistryLinked.sol/IRegistryLinked.json} +15 -17
- package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
- package/artifacts/contracts/shared/IService.sol/IService.json +84 -178
- package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +1 -1
- package/artifacts/contracts/shared/IVersionable.sol/IVersionable.json +2 -152
- package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.dbg.json +4 -0
- package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.json +1030 -0
- package/artifacts/contracts/shared/KeyValueStore.sol/KeyValueStore.dbg.json +4 -0
- package/artifacts/contracts/shared/KeyValueStore.sol/KeyValueStore.json +581 -0
- package/artifacts/contracts/shared/Lifecycle.sol/Lifecycle.dbg.json +4 -0
- package/artifacts/contracts/shared/Lifecycle.sol/Lifecycle.json +194 -0
- package/artifacts/contracts/shared/NftIdSetManager.sol/NftIdSetManager.dbg.json +4 -0
- package/artifacts/contracts/shared/NftIdSetManager.sol/NftIdSetManager.json +314 -0
- package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
- package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +109 -29
- package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +4 -0
- package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +320 -0
- package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +1 -1
- package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +310 -61
- package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
- package/artifacts/contracts/shared/Registerable.sol/Registerable.json +126 -53
- package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +4 -0
- package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +71 -0
- package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
- package/artifacts/contracts/shared/Service.sol/Service.json +185 -165
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +60 -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/shared/Versionable.sol/Versionable.json +2 -152
- package/artifacts/contracts/staking/IStaking.sol/IStaking.dbg.json +4 -0
- package/artifacts/contracts/staking/IStaking.sol/IStaking.json +1770 -0
- package/artifacts/contracts/staking/IStakingService.sol/IStakingService.dbg.json +4 -0
- package/artifacts/contracts/staking/IStakingService.sol/IStakingService.json +626 -0
- package/artifacts/contracts/staking/Staking.sol/Staking.dbg.json +4 -0
- package/artifacts/contracts/staking/Staking.sol/Staking.json +2500 -0
- package/artifacts/contracts/staking/StakingManager.sol/StakingManager.dbg.json +4 -0
- package/artifacts/contracts/staking/StakingManager.sol/StakingManager.json +844 -0
- package/artifacts/contracts/staking/StakingReader.sol/StakingReader.dbg.json +4 -0
- package/artifacts/contracts/staking/StakingReader.sol/StakingReader.json +263 -0
- package/artifacts/contracts/staking/StakingService.sol/StakingService.dbg.json +4 -0
- package/artifacts/contracts/staking/StakingService.sol/StakingService.json +960 -0
- package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.dbg.json +4 -0
- package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.json +694 -0
- package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.dbg.json +4 -0
- package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.json +308 -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 +16 -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/type/NftId.sol/NftIdLib.json +185 -0
- 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/type/Referral.sol/ReferralLib.json +142 -0
- 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/type/Seconds.sol/SecondsLib.json +148 -0
- 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 +39 -8
- 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/distribution/Distribution.sol +263 -0
- package/contracts/distribution/DistributionService.sol +298 -0
- package/contracts/{instance/service → distribution}/DistributionServiceManager.sol +20 -20
- package/contracts/distribution/IDistributionComponent.sol +66 -0
- package/contracts/distribution/IDistributionService.sol +81 -0
- package/contracts/instance/BundleManager.sol +24 -50
- package/contracts/instance/IInstance.sol +57 -36
- package/contracts/instance/IInstanceService.sol +65 -14
- package/contracts/instance/Instance.sol +147 -373
- package/contracts/instance/InstanceAccessManager.sol +432 -177
- package/contracts/instance/InstanceAuthorizationsLib.sol +336 -0
- package/contracts/instance/InstanceReader.sol +136 -85
- package/contracts/instance/InstanceService.sol +304 -169
- package/contracts/instance/InstanceServiceManager.sol +12 -25
- package/contracts/instance/InstanceStore.sol +260 -0
- package/contracts/instance/base/BalanceStore.sol +118 -0
- package/contracts/instance/{Cloneable.sol → base/Cloneable.sol} +8 -3
- package/contracts/instance/{ObjectManager.sol → base/ObjectManager.sol} +17 -30
- package/contracts/instance/module/IAccess.sol +37 -21
- package/contracts/instance/module/IBundle.sol +8 -8
- package/contracts/instance/module/IComponents.sol +52 -0
- package/contracts/instance/module/IDistribution.sol +7 -4
- package/contracts/instance/module/IPolicy.sol +56 -17
- package/contracts/instance/module/IRisk.sol +1 -1
- package/contracts/{test/Usdc.sol → mock/Dip.sol} +5 -5
- package/contracts/pool/BundleService.sol +296 -0
- package/contracts/pool/BundleServiceManager.sol +42 -0
- package/contracts/pool/IBundleService.sol +106 -0
- package/contracts/pool/IPoolComponent.sol +112 -0
- package/contracts/pool/IPoolService.sol +147 -0
- package/contracts/pool/Pool.sol +299 -0
- package/contracts/pool/PoolService.sol +424 -0
- package/contracts/pool/PoolServiceManager.sol +42 -0
- package/contracts/product/ApplicationService.sol +254 -0
- package/contracts/product/ApplicationServiceManager.sol +38 -0
- package/contracts/product/ClaimService.sol +437 -0
- package/contracts/product/ClaimServiceManager.sol +38 -0
- package/contracts/product/IApplicationService.sol +62 -0
- package/contracts/product/IClaimService.sol +93 -0
- package/contracts/product/IPolicyService.sol +78 -0
- package/contracts/product/IPricingService.sol +39 -0
- package/contracts/product/IProductComponent.sol +42 -0
- package/contracts/product/IProductService.sol +33 -0
- package/contracts/product/PolicyService.sol +473 -0
- package/contracts/product/PolicyServiceManager.sol +42 -0
- package/contracts/product/PricingService.sol +301 -0
- package/contracts/product/PricingServiceManager.sol +42 -0
- package/contracts/product/Product.sol +377 -0
- package/contracts/product/ProductService.sol +124 -0
- package/contracts/product/ProductServiceManager.sol +42 -0
- package/contracts/registry/ChainNft.sol +14 -0
- package/contracts/registry/IRegistry.sol +65 -28
- package/contracts/registry/IRegistryService.sol +46 -28
- package/contracts/registry/ITransferInterceptor.sol +1 -0
- package/contracts/registry/Registry.sol +353 -238
- package/contracts/registry/RegistryAccessManager.sol +167 -0
- package/contracts/registry/RegistryService.sol +165 -195
- package/contracts/registry/RegistryServiceManager.sol +34 -42
- package/contracts/registry/ReleaseManager.sol +530 -0
- package/contracts/registry/ServiceAuthorizationsLib.sol +173 -0
- package/contracts/registry/TokenRegistry.sol +261 -53
- package/contracts/shared/AccessManagerUpgradeableInitializeable.sol +13 -0
- package/contracts/shared/Component.sol +286 -0
- package/contracts/shared/ComponentService.sol +595 -0
- package/contracts/shared/ComponentServiceManager.sol +35 -0
- package/contracts/shared/ComponentVerifyingService.sol +111 -0
- package/contracts/shared/ERC165.sol +14 -12
- package/contracts/shared/IComponent.sol +74 -0
- package/contracts/shared/IComponentService.sol +91 -0
- package/contracts/shared/IInstanceLinkedComponent.sol +46 -0
- package/contracts/{instance/base → shared}/IKeyValueStore.sol +14 -10
- package/contracts/{instance/base → shared}/ILifecycle.sol +3 -3
- package/contracts/shared/INftOwnable.sol +12 -11
- package/contracts/shared/IPolicyHolder.sol +45 -0
- package/contracts/shared/IRegisterable.sol +4 -6
- package/contracts/shared/IRegistryLinked.sol +11 -0
- package/contracts/shared/IService.sol +7 -4
- package/contracts/shared/IVersionable.sol +5 -48
- package/contracts/shared/InstanceLinkedComponent.sol +145 -0
- package/contracts/shared/KeyValueStore.sol +130 -0
- package/contracts/{instance/base → shared}/Lifecycle.sol +28 -7
- package/contracts/shared/NftIdSetManager.sol +69 -0
- package/contracts/shared/NftOwnable.sol +64 -80
- package/contracts/shared/PolicyHolder.sol +101 -0
- package/contracts/shared/ProxyManager.sol +126 -25
- package/contracts/shared/Registerable.sol +26 -41
- package/contracts/shared/RegistryLinked.sol +43 -0
- package/contracts/shared/Service.sol +45 -23
- package/contracts/shared/TokenHandler.sol +37 -6
- package/contracts/shared/Versionable.sol +4 -92
- package/contracts/staking/IStaking.sol +113 -0
- package/contracts/staking/IStakingService.sol +122 -0
- package/contracts/staking/Staking.sol +348 -0
- package/contracts/staking/StakingManager.sol +52 -0
- package/contracts/staking/StakingReader.sol +92 -0
- package/contracts/staking/StakingService.sol +294 -0
- package/contracts/staking/StakingServiceManager.sol +44 -0
- package/contracts/staking/TargetManagerLib.sol +141 -0
- package/contracts/type/Amount.sol +114 -0
- package/contracts/{types → type}/Blocknumber.sol +7 -1
- package/contracts/type/ClaimId.sol +75 -0
- package/contracts/{types → type}/DistributorType.sol +2 -2
- package/contracts/{types → type}/Fee.sol +32 -22
- package/contracts/{types → type}/NftId.sol +17 -11
- package/contracts/{types → type}/NftIdSet.sol +1 -1
- package/contracts/{types → type}/ObjectType.sol +26 -9
- package/contracts/type/PayoutId.sol +82 -0
- package/contracts/{types → type}/Referral.sol +4 -0
- package/contracts/type/RoleId.sol +143 -0
- package/contracts/type/Seconds.sol +63 -0
- package/contracts/{types → type}/StateId.sol +24 -6
- package/contracts/{types → type}/Timestamp.sol +18 -13
- package/contracts/{types → type}/UFixed.sol +1 -0
- package/contracts/{types → type}/Version.sol +1 -0
- package/package.json +3 -3
- package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.dbg.json +0 -4
- package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +0 -4
- package/artifacts/contracts/components/Distribution.sol/Distribution.json +0 -618
- package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.dbg.json +0 -4
- package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.json +0 -280
- package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +0 -4
- package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.json +0 -152
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +0 -4
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.json +0 -249
- package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +0 -4
- package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.json +0 -157
- package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +0 -4
- package/artifacts/contracts/components/Pool.sol/Pool.json +0 -787
- package/artifacts/contracts/components/Product.sol/Product.dbg.json +0 -4
- package/artifacts/contracts/components/Product.sol/Product.json +0 -729
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Cloner.dbg.json +0 -4
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Cloner.json +0 -66
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock1.dbg.json +0 -4
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock1.json +0 -24
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock2.dbg.json +0 -4
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock2.json +0 -42
- package/artifacts/contracts/experiment/errors/Require.sol/Require.dbg.json +0 -4
- package/artifacts/contracts/experiment/errors/Require.sol/Require.json +0 -105
- package/artifacts/contracts/experiment/errors/Revert.sol/Revert.dbg.json +0 -4
- package/artifacts/contracts/experiment/errors/Revert.sol/Revert.json +0 -105
- package/artifacts/contracts/experiment/inheritance/A.sol/A.dbg.json +0 -4
- package/artifacts/contracts/experiment/inheritance/A.sol/A.json +0 -128
- package/artifacts/contracts/experiment/inheritance/A.sol/AShared.dbg.json +0 -4
- package/artifacts/contracts/experiment/inheritance/A.sol/AShared.json +0 -42
- package/artifacts/contracts/experiment/inheritance/B.sol/B.dbg.json +0 -4
- package/artifacts/contracts/experiment/inheritance/B.sol/B.json +0 -76
- package/artifacts/contracts/experiment/inheritance/C.sol/C.dbg.json +0 -4
- package/artifacts/contracts/experiment/inheritance/C.sol/C.json +0 -89
- package/artifacts/contracts/experiment/inheritance/IA.sol/IA.dbg.json +0 -4
- package/artifacts/contracts/experiment/inheritance/IA.sol/IA.json +0 -128
- package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.dbg.json +0 -4
- package/artifacts/contracts/experiment/inheritance/IB.sol/IB.dbg.json +0 -4
- package/artifacts/contracts/experiment/inheritance/IB.sol/IB.json +0 -50
- package/artifacts/contracts/experiment/inheritance/IC.sol/IC.dbg.json +0 -4
- package/artifacts/contracts/experiment/inheritance/IC.sol/IC.json +0 -63
- package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.dbg.json +0 -4
- package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.json +0 -59
- package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.dbg.json +0 -4
- package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.json +0 -124
- package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.dbg.json +0 -4
- package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.json +0 -74
- package/artifacts/contracts/experiment/statemachine/SM.sol/SM.dbg.json +0 -4
- package/artifacts/contracts/experiment/statemachine/SM.sol/SM.json +0 -124
- package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.dbg.json +0 -4
- package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.json +0 -207
- package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.dbg.json +0 -4
- package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.json +0 -10
- package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.dbg.json +0 -4
- package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.json +0 -10
- package/artifacts/contracts/instance/AccessManagedSimple.sol/AccessManagedSimple.dbg.json +0 -4
- package/artifacts/contracts/instance/AccessManagedSimple.sol/AccessManagedSimple.json +0 -101
- package/artifacts/contracts/instance/AccessManagerSimple.sol/AccessManagerSimple.dbg.json +0 -4
- package/artifacts/contracts/instance/AccessManagerSimple.sol/AccessManagerSimple.json +0 -1132
- package/artifacts/contracts/instance/Cloneable.sol/Cloneable.dbg.json +0 -4
- package/artifacts/contracts/instance/IAccessManagerSimple.sol/IAccessManagerSimple.dbg.json +0 -4
- package/artifacts/contracts/instance/IAccessManagerSimple.sol/IAccessManagerSimple.json +0 -1082
- package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.dbg.json +0 -4
- package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.json +0 -272
- package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.dbg.json +0 -4
- package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.dbg.json +0 -4
- package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.json +0 -113
- package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.dbg.json +0 -4
- package/artifacts/contracts/instance/base/ILifecycle.sol/ILifecycle.dbg.json +0 -4
- package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.dbg.json +0 -4
- package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.json +0 -502
- package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json +0 -4
- package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.json +0 -169
- package/artifacts/contracts/instance/module/ISetup.sol/ISetup.dbg.json +0 -4
- package/artifacts/contracts/instance/module/ITreasury.sol/ITreasury.dbg.json +0 -4
- package/artifacts/contracts/instance/module/ITreasury.sol/ITreasury.json +0 -10
- package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.dbg.json +0 -4
- package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.json +0 -827
- package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +0 -4
- package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +0 -716
- package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +0 -4
- package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.json +0 -444
- package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.dbg.json +0 -4
- package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.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/PoolService.sol/PoolService.dbg.json +0 -4
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +0 -971
- package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.dbg.json +0 -4
- package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.json +0 -460
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +0 -4
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +0 -1147
- package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.dbg.json +0 -4
- package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.json +0 -488
- package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.dbg.json +0 -4
- package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.json +0 -107
- package/artifacts/contracts/shared/RegisterableUpgradable.sol/RegisterableUpgradable.dbg.json +0 -4
- package/artifacts/contracts/shared/RegisterableUpgradable.sol/RegisterableUpgradable.json +0 -442
- 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 -305
- 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 -600
- 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 -286
- 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/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/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 -257
- 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/NftId.sol/NftIdLib.json +0 -153
- 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/Referral.sol/ReferralLib.dbg.json +0 -4
- package/artifacts/contracts/types/Referral.sol/ReferralLib.json +0 -123
- 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/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/components/BaseComponent.sol +0 -91
- package/contracts/components/Distribution.sol +0 -163
- package/contracts/components/IBaseComponent.sol +0 -25
- package/contracts/components/IDistributionComponent.sol +0 -44
- package/contracts/components/IPoolComponent.sol +0 -62
- package/contracts/components/IProductComponent.sol +0 -35
- package/contracts/components/Pool.sol +0 -247
- package/contracts/components/Product.sol +0 -289
- package/contracts/experiment/cloning/Cloner.sol +0 -47
- package/contracts/experiment/errors/Require.sol +0 -38
- package/contracts/experiment/errors/Revert.sol +0 -44
- package/contracts/experiment/inheritance/A.sol +0 -53
- package/contracts/experiment/inheritance/B.sol +0 -28
- package/contracts/experiment/inheritance/C.sol +0 -34
- package/contracts/experiment/inheritance/IA.sol +0 -13
- package/contracts/experiment/inheritance/IB.sol +0 -10
- package/contracts/experiment/inheritance/IC.sol +0 -12
- package/contracts/experiment/statemachine/Dummy.sol +0 -27
- package/contracts/experiment/statemachine/ISM.sol +0 -25
- package/contracts/experiment/statemachine/SM.sol +0 -57
- package/contracts/experiment/statemachine/SimpleStateMachine.sol +0 -31
- package/contracts/experiment/types/TypeA.sol +0 -47
- package/contracts/experiment/types/TypeB.sol +0 -29
- package/contracts/instance/AccessManagedSimple.sol +0 -115
- package/contracts/instance/AccessManagerSimple.sol +0 -692
- package/contracts/instance/IAccessManagerSimple.sol +0 -391
- package/contracts/instance/base/ComponentServiceBase.sol +0 -134
- package/contracts/instance/base/IInstanceBase.sol +0 -23
- package/contracts/instance/base/KeyValueStore.sol +0 -172
- package/contracts/instance/module/ISetup.sol +0 -46
- package/contracts/instance/module/ITreasury.sol +0 -23
- package/contracts/instance/service/ComponentOwnerService.sol +0 -317
- package/contracts/instance/service/DistributionService.sol +0 -88
- package/contracts/instance/service/IComponentOwnerService.sol +0 -20
- package/contracts/instance/service/IDistributionService.sol +0 -12
- package/contracts/instance/service/IPoolService.sol +0 -43
- package/contracts/instance/service/IProductService.sol +0 -110
- package/contracts/instance/service/PoolService.sol +0 -206
- package/contracts/instance/service/PoolServiceManager.sol +0 -54
- package/contracts/instance/service/ProductService.sol +0 -561
- package/contracts/instance/service/ProductServiceManager.sol +0 -54
- package/contracts/shared/ContractDeployerLib.sol +0 -72
- package/contracts/shared/RegisterableUpgradable.sol +0 -16
- 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 -24
- package/contracts/test/TestToken.sol +0 -26
- package/contracts/test/TestVersion.sol +0 -44
- package/contracts/test/TestVersionable.sol +0 -17
- package/contracts/types/ChainId.sol +0 -38
- package/contracts/types/NumberId.sol +0 -52
- package/contracts/types/RoleId.sol +0 -90
- /package/contracts/{types → type}/AddressSet.sol +0 -0
- /package/contracts/{types → type}/Key32.sol +0 -0
- /package/contracts/{types → type}/RiskId.sol +0 -0
@@ -3,7 +3,7 @@ pragma solidity ^0.8.20;
|
|
3
3
|
|
4
4
|
import {Key32, KeyId, Key32Lib} from "./Key32.sol";
|
5
5
|
import {NftId} from "./NftId.sol";
|
6
|
-
import {
|
6
|
+
import {DISTRIBUTOR_TYPE} from "./ObjectType.sol";
|
7
7
|
|
8
8
|
type DistributorType is bytes8;
|
9
9
|
|
@@ -45,7 +45,7 @@ library DistributorTypeLib {
|
|
45
45
|
|
46
46
|
/// @dev Returns the key32 value for the specified nft id and object type.
|
47
47
|
function toKey32(DistributorType id) public pure returns (Key32 key) {
|
48
|
-
return Key32Lib.toKey32(
|
48
|
+
return Key32Lib.toKey32(DISTRIBUTOR_TYPE(), toKeyId(id));
|
49
49
|
}
|
50
50
|
|
51
51
|
/// @dev Returns the key id value for the specified nft id
|
@@ -1,30 +1,20 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
2
|
pragma solidity ^0.8.19;
|
3
3
|
|
4
|
+
import {Amount, AmountLib} from "./Amount.sol";
|
4
5
|
import {UFixed, UFixedLib} from "./UFixed.sol";
|
5
6
|
|
6
7
|
struct Fee {
|
7
8
|
UFixed fractionalFee;
|
9
|
+
// TODO migrate fixed fee to Amount
|
8
10
|
uint256 fixedFee;
|
9
11
|
}
|
10
12
|
|
11
13
|
library FeeLib {
|
12
14
|
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
)
|
17
|
-
public
|
18
|
-
pure
|
19
|
-
returns (
|
20
|
-
uint256 feeAmount,
|
21
|
-
uint256 netAmount
|
22
|
-
)
|
23
|
-
{
|
24
|
-
UFixed fractionalAmount = UFixedLib.toUFixed(amount) *
|
25
|
-
fee.fractionalFee;
|
26
|
-
feeAmount = fractionalAmount.toInt() + fee.fixedFee;
|
27
|
-
netAmount = amount - feeAmount;
|
15
|
+
/// @dev Return a zero fee struct (0, 0)
|
16
|
+
function zero() public pure returns (Fee memory fee) {
|
17
|
+
return Fee(UFixed.wrap(0), 0);
|
28
18
|
}
|
29
19
|
|
30
20
|
/// @dev Converts the uint256 to a fee struct.
|
@@ -35,22 +25,42 @@ library FeeLib {
|
|
35
25
|
return Fee(fractionalFee, fixedFee);
|
36
26
|
}
|
37
27
|
|
28
|
+
/// @dev Calculates fee and net amounts for the provided parameters
|
29
|
+
function calculateFee(
|
30
|
+
Fee memory fee,
|
31
|
+
Amount amount
|
32
|
+
)
|
33
|
+
public
|
34
|
+
pure
|
35
|
+
returns (
|
36
|
+
Amount feeAmount,
|
37
|
+
Amount netAmount
|
38
|
+
)
|
39
|
+
{
|
40
|
+
netAmount = amount;
|
41
|
+
if(gtz(fee)) {
|
42
|
+
UFixed fractionalAmount =
|
43
|
+
amount.toUFixed() * fee.fractionalFee;
|
44
|
+
feeAmount = AmountLib.toAmount(fractionalAmount.toInt() + fee.fixedFee);
|
45
|
+
netAmount = netAmount - feeAmount;
|
46
|
+
}
|
47
|
+
}
|
48
|
+
|
38
49
|
/// @dev Return the percent fee struct (x%, 0)
|
39
50
|
function percentageFee(uint8 percent) public pure returns (Fee memory fee) {
|
40
51
|
return Fee(UFixedLib.toUFixed(percent, -2), 0);
|
41
52
|
}
|
42
53
|
|
43
|
-
/// @dev Return a zero fee struct (0, 0)
|
44
|
-
function zeroFee() public pure returns (Fee memory fee) {
|
45
|
-
return Fee(UFixed.wrap(0), 0);
|
46
|
-
}
|
47
|
-
|
48
54
|
// pure free functions for operators
|
49
|
-
function
|
55
|
+
function eq(Fee memory a, Fee memory b) public pure returns (bool isSame) {
|
50
56
|
return a.fixedFee == b.fixedFee && a.fractionalFee == b.fractionalFee;
|
51
57
|
}
|
52
58
|
|
53
|
-
function
|
59
|
+
function gtz(Fee memory fee) public pure returns (bool) {
|
60
|
+
return UFixed.unwrap(fee.fractionalFee) > 0 || fee.fixedFee > 0;
|
61
|
+
}
|
62
|
+
|
63
|
+
function eqz(Fee memory fee) public pure returns (bool) {
|
54
64
|
return fee.fixedFee == 0 && UFixed.unwrap(fee.fractionalFee) == 0;
|
55
65
|
}
|
56
66
|
}
|
@@ -18,17 +18,6 @@ using {
|
|
18
18
|
NftIdLib.toKey32
|
19
19
|
} for NftId global;
|
20
20
|
|
21
|
-
// general pure free functions
|
22
|
-
/// @dev Converts the uint256 to a NftId.
|
23
|
-
function toNftId(uint256 id) pure returns (NftId) {
|
24
|
-
return NftId.wrap(uint96(id));
|
25
|
-
}
|
26
|
-
|
27
|
-
/// @dev Return the NftId zero (0)
|
28
|
-
function zeroNftId() pure returns (NftId) {
|
29
|
-
return NftId.wrap(0);
|
30
|
-
}
|
31
|
-
|
32
21
|
// pure free functions for operators
|
33
22
|
function eqNftId(NftId a, NftId b) pure returns (bool isSame) {
|
34
23
|
return NftId.unwrap(a) == NftId.unwrap(b);
|
@@ -38,8 +27,25 @@ function neNftId(NftId a, NftId b) pure returns (bool isDifferent) {
|
|
38
27
|
return NftId.unwrap(a) != NftId.unwrap(b);
|
39
28
|
}
|
40
29
|
|
30
|
+
// @dev Converts the uint256 to a NftId.
|
31
|
+
function toNftId(uint256 id) pure returns (NftId) {
|
32
|
+
return NftId.wrap(uint96(id));
|
33
|
+
}
|
34
|
+
|
41
35
|
// library functions that operate on user defined type
|
42
36
|
library NftIdLib {
|
37
|
+
|
38
|
+
/// @dev the zero nft id
|
39
|
+
/// is never a valid nft id and implies a non-initialized value
|
40
|
+
function zero() public pure returns (NftId) {
|
41
|
+
return NftId.wrap(0);
|
42
|
+
}
|
43
|
+
|
44
|
+
/// @dev Converts the uint256 to a NftId.
|
45
|
+
function toNftId(uint256 id) public pure returns (NftId) {
|
46
|
+
return NftId.wrap(uint96(id));
|
47
|
+
}
|
48
|
+
|
43
49
|
/// @dev Converts the NftId to a uint256.
|
44
50
|
function toInt(NftId nftId) public pure returns (uint96) {
|
45
51
|
return uint96(NftId.unwrap(nftId));
|
@@ -1,7 +1,7 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
2
|
pragma solidity ^0.8.19;
|
3
3
|
|
4
|
-
import {NftId} from "../
|
4
|
+
import {NftId} from "../type/NftId.sol";
|
5
5
|
|
6
6
|
// based on https://github.com/OpenZeppelin/openzeppelin-contracts/blob/master/contracts/utils/structs/EnumerableSet.sol
|
7
7
|
library LibNftIdSet {
|
@@ -8,11 +8,16 @@ using {
|
|
8
8
|
eqObjectType as ==,
|
9
9
|
neObjectType as !=,
|
10
10
|
ObjectTypeLib.toInt,
|
11
|
+
ObjectTypeLib.eqz,
|
11
12
|
ObjectTypeLib.gtz
|
12
13
|
} for ObjectType global;
|
13
14
|
|
14
15
|
// general pure free functions
|
15
16
|
|
17
|
+
function RELEASE() pure returns (ObjectType) {
|
18
|
+
return toObjectType(1);
|
19
|
+
}
|
20
|
+
|
16
21
|
function PROTOCOL() pure returns (ObjectType) {
|
17
22
|
return toObjectType(10);
|
18
23
|
}
|
@@ -29,6 +34,10 @@ function REGISTRY() pure returns (ObjectType) {
|
|
29
34
|
return toObjectType(40);
|
30
35
|
}
|
31
36
|
|
37
|
+
function STAKING() pure returns (ObjectType) {
|
38
|
+
return toObjectType(45);
|
39
|
+
}
|
40
|
+
|
32
41
|
function TOKEN() pure returns (ObjectType) {
|
33
42
|
return toObjectType(50);
|
34
43
|
}
|
@@ -49,8 +58,7 @@ function COMPONENT() pure returns (ObjectType) {
|
|
49
58
|
return toObjectType(100);
|
50
59
|
}
|
51
60
|
|
52
|
-
|
53
|
-
function TREASURY() pure returns (ObjectType) {
|
61
|
+
function FEE() pure returns (ObjectType) {
|
54
62
|
return toObjectType(101);
|
55
63
|
}
|
56
64
|
|
@@ -66,7 +74,7 @@ function DISTRIBUTION() pure returns (ObjectType) {
|
|
66
74
|
return toObjectType(120);
|
67
75
|
}
|
68
76
|
|
69
|
-
function
|
77
|
+
function DISTRIBUTOR_TYPE() pure returns (ObjectType) {
|
70
78
|
return toObjectType(121);
|
71
79
|
}
|
72
80
|
|
@@ -86,24 +94,32 @@ function POOL() pure returns (ObjectType) {
|
|
86
94
|
return toObjectType(140);
|
87
95
|
}
|
88
96
|
|
97
|
+
function BUNDLE() pure returns (ObjectType) {
|
98
|
+
return toObjectType(220);
|
99
|
+
}
|
100
|
+
|
89
101
|
function RISK() pure returns (ObjectType) {
|
90
102
|
return toObjectType(200);
|
91
103
|
}
|
92
104
|
|
93
|
-
function
|
105
|
+
function APPLICATION() pure returns (ObjectType) {
|
94
106
|
return toObjectType(210);
|
95
107
|
}
|
96
108
|
|
97
|
-
function
|
98
|
-
return toObjectType(
|
109
|
+
function POLICY() pure returns (ObjectType) {
|
110
|
+
return toObjectType(211);
|
99
111
|
}
|
100
112
|
|
101
113
|
function CLAIM() pure returns (ObjectType) {
|
102
|
-
return toObjectType(
|
114
|
+
return toObjectType(212);
|
103
115
|
}
|
104
116
|
|
105
117
|
function PAYOUT() pure returns (ObjectType) {
|
106
|
-
return toObjectType(
|
118
|
+
return toObjectType(213);
|
119
|
+
}
|
120
|
+
|
121
|
+
function PRICE() pure returns (ObjectType) {
|
122
|
+
return toObjectType(230);
|
107
123
|
}
|
108
124
|
|
109
125
|
/// @dev Converts the uint8 to a ObjectType.
|
@@ -111,6 +127,7 @@ function toObjectType(uint256 objectType) pure returns (ObjectType) {
|
|
111
127
|
return ObjectType.wrap(uint8(objectType));
|
112
128
|
}
|
113
129
|
|
130
|
+
// TODO move to ObjecTypeLib and rename to zero()
|
114
131
|
/// @dev Return the ObjectType zero (0)
|
115
132
|
function zeroObjectType() pure returns (ObjectType) {
|
116
133
|
return ObjectType.wrap(0);
|
@@ -149,4 +166,4 @@ library ObjectTypeLib {
|
|
149
166
|
function eq(ObjectType a, ObjectType b) public pure returns (bool isSame) {
|
150
167
|
return eqObjectType(a, b);
|
151
168
|
}
|
152
|
-
}
|
169
|
+
}
|
@@ -0,0 +1,82 @@
|
|
1
|
+
// SPDX-License-Identifier: Apache-2.0
|
2
|
+
pragma solidity ^0.8.20;
|
3
|
+
|
4
|
+
// uint24 allows for 65'535 claims with 255 payouts each per policy
|
5
|
+
type PayoutId is uint24;
|
6
|
+
|
7
|
+
import {ClaimId} from "./ClaimId.sol";
|
8
|
+
import {PAYOUT} from "./ObjectType.sol";
|
9
|
+
import {Key32, KeyId, Key32Lib} from "./Key32.sol";
|
10
|
+
import {NftId} from "./NftId.sol";
|
11
|
+
|
12
|
+
// type bindings
|
13
|
+
using {
|
14
|
+
eqPayoutId as ==,
|
15
|
+
nePayoutId as !=,
|
16
|
+
PayoutIdLib.eqz,
|
17
|
+
PayoutIdLib.gtz,
|
18
|
+
PayoutIdLib.toInt,
|
19
|
+
PayoutIdLib.toClaimId,
|
20
|
+
PayoutIdLib.toPayoutNo,
|
21
|
+
PayoutIdLib.toKey32
|
22
|
+
} for PayoutId global;
|
23
|
+
|
24
|
+
|
25
|
+
// pure free functions for operators
|
26
|
+
function eqPayoutId(PayoutId a, PayoutId b) pure returns (bool isSame) {
|
27
|
+
return PayoutId.unwrap(a) == PayoutId.unwrap(b);
|
28
|
+
}
|
29
|
+
|
30
|
+
function nePayoutId(PayoutId a, PayoutId b) pure returns (bool isDifferent) {
|
31
|
+
return PayoutId.unwrap(a) != PayoutId.unwrap(b);
|
32
|
+
}
|
33
|
+
|
34
|
+
// library functions that operate on user defined type
|
35
|
+
library PayoutIdLib {
|
36
|
+
/// @dev Converts the PayoutId to a uint.
|
37
|
+
function zero() public pure returns (PayoutId) {
|
38
|
+
return PayoutId.wrap(0);
|
39
|
+
}
|
40
|
+
|
41
|
+
/// @dev Converts an uint into a PayoutId.
|
42
|
+
function toPayoutId(ClaimId claimId, uint8 payoutNo) public pure returns (PayoutId) {
|
43
|
+
return PayoutId.wrap((ClaimId.unwrap(claimId) << 8) + payoutNo);
|
44
|
+
}
|
45
|
+
|
46
|
+
function toClaimId(PayoutId payoutId) public pure returns (ClaimId) {
|
47
|
+
return ClaimId.wrap(uint16(PayoutId.unwrap(payoutId) >> 8));
|
48
|
+
}
|
49
|
+
|
50
|
+
function toPayoutNo(PayoutId payoutId) public pure returns (uint8) {
|
51
|
+
return uint8(PayoutId.unwrap(payoutId) & 255);
|
52
|
+
}
|
53
|
+
|
54
|
+
/// @dev Converts the PayoutId to a uint.
|
55
|
+
function toInt(PayoutId a) public pure returns (uint24) {
|
56
|
+
return uint24(PayoutId.unwrap(a));
|
57
|
+
}
|
58
|
+
|
59
|
+
/// @dev Returns true if the value is non-zero (> 0).
|
60
|
+
function gtz(PayoutId a) public pure returns (bool) {
|
61
|
+
return PayoutId.unwrap(a) > 0;
|
62
|
+
}
|
63
|
+
|
64
|
+
/// @dev Returns true if the value is zero (== 0).
|
65
|
+
function eqz(PayoutId a) public pure returns (bool) {
|
66
|
+
return PayoutId.unwrap(a) == 0;
|
67
|
+
}
|
68
|
+
|
69
|
+
/// @dev Converts the PayoutId and NftId to a Key32.
|
70
|
+
function toKey32(PayoutId payoutId, NftId policyNftId) public pure returns (Key32) {
|
71
|
+
return Key32Lib.toKey32(PAYOUT(), toKeyId(payoutId, policyNftId));
|
72
|
+
}
|
73
|
+
|
74
|
+
/// @dev Converts the PayoutId and NftId to a Key32.
|
75
|
+
function toKeyId(PayoutId payoutId, NftId policyNftId) public pure returns (KeyId) {
|
76
|
+
return KeyId.wrap(
|
77
|
+
bytes31(
|
78
|
+
bytes15(
|
79
|
+
uint120(
|
80
|
+
(NftId.unwrap(policyNftId) << 24) + PayoutId.unwrap(payoutId)))));
|
81
|
+
}
|
82
|
+
}
|
@@ -0,0 +1,143 @@
|
|
1
|
+
// SPDX-License-Identifier: Apache-2.0
|
2
|
+
pragma solidity ^0.8.19;
|
3
|
+
|
4
|
+
import {Key32, KeyId, Key32Lib} from "./Key32.sol";
|
5
|
+
import {ROLE} from "./ObjectType.sol";
|
6
|
+
|
7
|
+
type RoleId is uint64;
|
8
|
+
|
9
|
+
// type bindings
|
10
|
+
using {
|
11
|
+
eqRoleId as ==,
|
12
|
+
neRoleId as !=,
|
13
|
+
RoleIdLib.eqz,
|
14
|
+
RoleIdLib.gtz,
|
15
|
+
RoleIdLib.toInt,
|
16
|
+
RoleIdLib.toKey32
|
17
|
+
} for RoleId global;
|
18
|
+
|
19
|
+
|
20
|
+
/// @dev role id needs to match with oz AccessManager.ADMIN_ROLE
|
21
|
+
function ADMIN_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(type(uint64).min); }
|
22
|
+
|
23
|
+
/// @dev role id needs to match with oz AccessManager.PUBLIC_ROLE
|
24
|
+
function PUBLIC_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(type(uint64).max); }
|
25
|
+
|
26
|
+
// general pure free functions
|
27
|
+
|
28
|
+
/// @dev cental role for gif release management.
|
29
|
+
/// this role is necessary to call ReleaseManager.createNextRelease/activateNextRelease
|
30
|
+
/// the actual deployment of a release requires the GIF_MANAGER_ROLE.
|
31
|
+
/// GIF_ADMIN_ROLE is the admin of the GIF_MANAGER_ROLE.
|
32
|
+
/// only a single holder may hold this role at any time
|
33
|
+
function GIF_ADMIN_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(1500); }
|
34
|
+
|
35
|
+
/// @dev role for token whith/blacklisting, deploying and registering the services for a new major release
|
36
|
+
/// registering services for a new major release is only possible after a new initial release has been created by the GIF_ADMIN_ROLE
|
37
|
+
/// token white/blacklisting is possible for any active release
|
38
|
+
function GIF_MANAGER_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(1600); }
|
39
|
+
|
40
|
+
/// @dev instance specific role to register/own a distribution component
|
41
|
+
function DISTRIBUTION_OWNER_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(2); }
|
42
|
+
|
43
|
+
/// @dev instance specific role to register/own an oracle component
|
44
|
+
function ORACLE_OWNER_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(3); }
|
45
|
+
|
46
|
+
/// @dev instance specific role to register/own a pool component
|
47
|
+
function POOL_OWNER_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(4); }
|
48
|
+
|
49
|
+
/// @dev instance specific role to register/own a product component
|
50
|
+
function PRODUCT_OWNER_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(5); }
|
51
|
+
|
52
|
+
/// @dev role associated with an instance contract
|
53
|
+
/// this role is the admin role for the INSTANCE_OWNER_ROLE
|
54
|
+
function INSTANCE_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(2600); }
|
55
|
+
|
56
|
+
/// @dev required role to register/own an instance
|
57
|
+
/// allows instance specific target, role and access management
|
58
|
+
function INSTANCE_OWNER_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(1900); }
|
59
|
+
|
60
|
+
function REGISTRY_SERVICE_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(1800); }
|
61
|
+
|
62
|
+
/// @dev instance specific role for instance service
|
63
|
+
function INSTANCE_SERVICE_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(2000); }
|
64
|
+
|
65
|
+
/// @dev role for creating gif target on instance service
|
66
|
+
function CAN_CREATE_GIF_TARGET_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(1700); }
|
67
|
+
|
68
|
+
/// @dev role for registering gif components
|
69
|
+
function COMPONENT_SERVICE_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(2001); }
|
70
|
+
|
71
|
+
/// @dev instance specific role for distribution service
|
72
|
+
function DISTRIBUTION_SERVICE_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(2100); }
|
73
|
+
|
74
|
+
/// @dev instance specific role for pool service
|
75
|
+
function POOL_SERVICE_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(2200); }
|
76
|
+
|
77
|
+
/// @dev instance specific role for product service
|
78
|
+
function PRODUCT_SERVICE_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(2300); }
|
79
|
+
|
80
|
+
/// @dev instance specific role for application service
|
81
|
+
function APPLICATION_SERVICE_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(2400); }
|
82
|
+
|
83
|
+
/// @dev instance specific role for policy service
|
84
|
+
function POLICY_SERVICE_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(2410); }
|
85
|
+
|
86
|
+
/// @dev instance specific role for claim service
|
87
|
+
function CLAIM_SERVICE_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(2420); }
|
88
|
+
|
89
|
+
/// @dev instance specific role for bundle service
|
90
|
+
function BUNDLE_SERVICE_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(2500); }
|
91
|
+
|
92
|
+
/// @dev instance specific role for pricing service
|
93
|
+
function PRICING_SERVICE_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(2800); }
|
94
|
+
|
95
|
+
/// @dev instance specific role for staking service
|
96
|
+
function STAKING_SERVICE_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(2900); }
|
97
|
+
|
98
|
+
// @dev Returns true iff role ids a and b are identical
|
99
|
+
function eqRoleId(RoleId a, RoleId b) pure returns (bool isSame) {
|
100
|
+
return RoleId.unwrap(a) == RoleId.unwrap(b);
|
101
|
+
}
|
102
|
+
|
103
|
+
// @dev Returns true iff role ids a and b are different
|
104
|
+
function neRoleId(RoleId a, RoleId b) pure returns (bool isDifferent) {
|
105
|
+
return RoleId.unwrap(a) != RoleId.unwrap(b);
|
106
|
+
}
|
107
|
+
|
108
|
+
library RoleIdLib {
|
109
|
+
/// @dev Converts the RoleId to a uint.
|
110
|
+
function zero() public pure returns (RoleId) {
|
111
|
+
return RoleId.wrap(0);
|
112
|
+
}
|
113
|
+
|
114
|
+
/// @dev Converts an uint into a RoleId.
|
115
|
+
function toRoleId(uint256 a) public pure returns (RoleId) {
|
116
|
+
return RoleId.wrap(uint64(a));
|
117
|
+
}
|
118
|
+
|
119
|
+
/// @dev Converts the RoleId to a uint.
|
120
|
+
function toInt(RoleId a) public pure returns (uint64) {
|
121
|
+
return uint64(RoleId.unwrap(a));
|
122
|
+
}
|
123
|
+
|
124
|
+
/// @dev Returns true if the value is non-zero (> 0).
|
125
|
+
function gtz(RoleId a) public pure returns (bool) {
|
126
|
+
return RoleId.unwrap(a) > 0;
|
127
|
+
}
|
128
|
+
|
129
|
+
/// @dev Returns true if the value is zero (== 0).
|
130
|
+
function eqz(RoleId a) public pure returns (bool) {
|
131
|
+
return RoleId.unwrap(a) == 0;
|
132
|
+
}
|
133
|
+
|
134
|
+
/// @dev Returns the key32 value for the specified id and object type.
|
135
|
+
function toKey32(RoleId a) public pure returns (Key32 key) {
|
136
|
+
return Key32Lib.toKey32(ROLE(), toKeyId(a));
|
137
|
+
}
|
138
|
+
|
139
|
+
/// @dev Returns the key id value for the specified id
|
140
|
+
function toKeyId(RoleId a) public pure returns (KeyId keyId) {
|
141
|
+
return KeyId.wrap(bytes31(uint248(RoleId.unwrap(a))));
|
142
|
+
}
|
143
|
+
}
|
@@ -0,0 +1,63 @@
|
|
1
|
+
// SPDX-License-Identifier: Apache-2.0
|
2
|
+
pragma solidity ^0.8.20;
|
3
|
+
|
4
|
+
type Seconds is uint40;
|
5
|
+
|
6
|
+
using {
|
7
|
+
SecondsGt as >,
|
8
|
+
SecondsLib.eqz,
|
9
|
+
SecondsLib.gtz,
|
10
|
+
SecondsLib.toInt
|
11
|
+
} for Seconds global;
|
12
|
+
|
13
|
+
function SecondsGt(Seconds duration1, Seconds duration2) pure returns (bool) {
|
14
|
+
return SecondsLib.gt(duration1, duration2);
|
15
|
+
}
|
16
|
+
|
17
|
+
library SecondsLib {
|
18
|
+
|
19
|
+
error ErrorSecondsLibDurationTooBig(uint256 duration);
|
20
|
+
|
21
|
+
function zero() public pure returns (Seconds) {
|
22
|
+
return Seconds.wrap(0);
|
23
|
+
}
|
24
|
+
|
25
|
+
function max() public pure returns (Seconds) {
|
26
|
+
return Seconds.wrap(_max());
|
27
|
+
}
|
28
|
+
|
29
|
+
/// @dev converts the uint duration into Seconds
|
30
|
+
/// function reverts if duration is exceeding max Seconds value
|
31
|
+
function toSeconds(uint256 duration) public pure returns (Seconds) {
|
32
|
+
// if(duration > type(uint40).max) {
|
33
|
+
if(duration > _max()) {
|
34
|
+
revert ErrorSecondsLibDurationTooBig(duration);
|
35
|
+
}
|
36
|
+
|
37
|
+
return Seconds.wrap(uint40(duration));
|
38
|
+
}
|
39
|
+
|
40
|
+
/// @dev return true if duration equals 0
|
41
|
+
function eqz(Seconds duration) public pure returns (bool) {
|
42
|
+
return Seconds.unwrap(duration) == 0;
|
43
|
+
}
|
44
|
+
|
45
|
+
/// @dev return true if duration is larger than 0
|
46
|
+
function gtz(Seconds duration) public pure returns (bool) {
|
47
|
+
return Seconds.unwrap(duration) > 0;
|
48
|
+
}
|
49
|
+
|
50
|
+
/// @dev return true if duration1 is larger than duration2
|
51
|
+
function gt(Seconds duration1, Seconds duration2) public pure returns (bool) {
|
52
|
+
return Seconds.unwrap(duration1) > Seconds.unwrap(duration2);
|
53
|
+
}
|
54
|
+
|
55
|
+
function toInt(Seconds duration) public pure returns (uint256) {
|
56
|
+
return uint256(uint40(Seconds.unwrap(duration)));
|
57
|
+
}
|
58
|
+
|
59
|
+
function _max() internal pure returns (uint40) {
|
60
|
+
// IMPORTANT: type nees to match with actual definition for Seconds
|
61
|
+
return type(uint40).max;
|
62
|
+
}
|
63
|
+
}
|
@@ -14,6 +14,23 @@ using {
|
|
14
14
|
} for StateId global;
|
15
15
|
|
16
16
|
// general pure free functions
|
17
|
+
|
18
|
+
function INITIAL() pure returns (StateId) {
|
19
|
+
return toStateId(1);
|
20
|
+
}
|
21
|
+
|
22
|
+
function SCHEDULED() pure returns (StateId) {
|
23
|
+
return toStateId(2);
|
24
|
+
}
|
25
|
+
|
26
|
+
function DEPLOYING() pure returns (StateId) {
|
27
|
+
return toStateId(3);
|
28
|
+
}
|
29
|
+
|
30
|
+
function ACTIVE() pure returns (StateId) {
|
31
|
+
return toStateId(4);
|
32
|
+
}
|
33
|
+
|
17
34
|
function APPLIED() pure returns (StateId) {
|
18
35
|
return toStateId(10);
|
19
36
|
}
|
@@ -26,20 +43,20 @@ function DECLINED() pure returns (StateId) {
|
|
26
43
|
return toStateId(30);
|
27
44
|
}
|
28
45
|
|
29
|
-
function
|
46
|
+
function COLLATERALIZED() pure returns (StateId) {
|
30
47
|
return toStateId(40);
|
31
48
|
}
|
32
49
|
|
33
|
-
function
|
50
|
+
function SUBMITTED() pure returns (StateId) {
|
34
51
|
return toStateId(50);
|
35
52
|
}
|
36
53
|
|
37
|
-
function
|
38
|
-
return toStateId(
|
54
|
+
function CONFIRMED() pure returns (StateId) {
|
55
|
+
return toStateId(51);
|
39
56
|
}
|
40
57
|
|
41
|
-
function
|
42
|
-
return toStateId(
|
58
|
+
function EXPECTED() pure returns (StateId) {
|
59
|
+
return toStateId(60);
|
43
60
|
}
|
44
61
|
|
45
62
|
function PAUSED() pure returns (StateId) {
|
@@ -67,6 +84,7 @@ function toStateId(uint256 id) pure returns (StateId) {
|
|
67
84
|
return StateId.wrap(uint8(id));
|
68
85
|
}
|
69
86
|
|
87
|
+
// TODO move to StateIdLib and rename to zero()
|
70
88
|
/// @dev Return the StateId zero (0)
|
71
89
|
function zeroStateId() pure returns (StateId) {
|
72
90
|
return StateId.wrap(0);
|
@@ -1,5 +1,7 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
|
-
pragma solidity ^0.8.
|
2
|
+
pragma solidity ^0.8.20;
|
3
|
+
|
4
|
+
import {Seconds} from "./Seconds.sol";
|
3
5
|
|
4
6
|
type Timestamp is uint40;
|
5
7
|
|
@@ -12,7 +14,8 @@ using {
|
|
12
14
|
neTimestamp as !=,
|
13
15
|
TimestampLib.gtz,
|
14
16
|
TimestampLib.eqz,
|
15
|
-
TimestampLib.addSeconds
|
17
|
+
TimestampLib.addSeconds,
|
18
|
+
TimestampLib.toInt
|
16
19
|
} for Timestamp global;
|
17
20
|
|
18
21
|
/// @dev return true if Timestamp a is after Timestamp b
|
@@ -50,16 +53,18 @@ function toTimestamp(uint256 timestamp) pure returns (Timestamp) {
|
|
50
53
|
return Timestamp.wrap(uint40(timestamp));
|
51
54
|
}
|
52
55
|
|
53
|
-
//
|
54
|
-
// return toTimestamp(block.timestamp);
|
55
|
-
// }
|
56
|
-
|
56
|
+
// TODO move to TimestampLib and rename to zero()
|
57
57
|
/// @dev Return the Timestamp zero (0)
|
58
58
|
function zeroTimestamp() pure returns (Timestamp) {
|
59
59
|
return toTimestamp(0);
|
60
60
|
}
|
61
61
|
|
62
62
|
library TimestampLib {
|
63
|
+
|
64
|
+
function zero() public pure returns (Timestamp) {
|
65
|
+
return toTimestamp(0);
|
66
|
+
}
|
67
|
+
|
63
68
|
function blockTimestamp() public view returns (Timestamp) {
|
64
69
|
return Timestamp.wrap(uint40(block.timestamp));
|
65
70
|
}
|
@@ -103,22 +108,22 @@ library TimestampLib {
|
|
103
108
|
return neTimestamp(a, b);
|
104
109
|
}
|
105
110
|
|
106
|
-
/// @dev return true if Timestamp is larger than 0
|
107
|
-
function gtz(Timestamp timestamp) public pure returns (bool) {
|
108
|
-
return Timestamp.unwrap(timestamp) > 0;
|
109
|
-
}
|
110
|
-
|
111
111
|
/// @dev return true if Timestamp equals 0
|
112
112
|
function eqz(Timestamp timestamp) public pure returns (bool) {
|
113
113
|
return Timestamp.unwrap(timestamp) == 0;
|
114
114
|
}
|
115
115
|
|
116
|
+
/// @dev return true if Timestamp is larger than 0
|
117
|
+
function gtz(Timestamp timestamp) public pure returns (bool) {
|
118
|
+
return Timestamp.unwrap(timestamp) > 0;
|
119
|
+
}
|
120
|
+
|
116
121
|
/// @dev return true if Timestamp a is not equal to Timestamp b
|
117
122
|
function addSeconds(
|
118
123
|
Timestamp timestamp,
|
119
|
-
|
124
|
+
Seconds duration
|
120
125
|
) public pure returns (Timestamp) {
|
121
|
-
return toTimestamp(Timestamp.unwrap(timestamp) +
|
126
|
+
return toTimestamp(Timestamp.unwrap(timestamp) + duration.toInt());
|
122
127
|
}
|
123
128
|
|
124
129
|
function toInt(Timestamp timestamp) public pure returns (uint256) {
|