@etherisc/gif-next 0.0.2-f9bc4c7-556 → 0.0.2-faaba97-954
Sign up to get free protection for your applications and to get access to all the features.
- package/README.md +249 -14
- package/artifacts/contracts/components/Component.sol/Component.dbg.json +4 -0
- package/artifacts/contracts/components/Component.sol/Component.json +842 -0
- package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +4 -0
- package/artifacts/contracts/components/Distribution.sol/Distribution.json +1329 -0
- package/artifacts/contracts/components/IComponent.sol/IComponent.dbg.json +4 -0
- package/artifacts/contracts/components/IComponent.sol/IComponent.json +605 -0
- package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +4 -0
- package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.json +969 -0
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.json +823 -115
- package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.json +608 -57
- package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
- package/artifacts/contracts/components/Pool.sol/Pool.json +1132 -143
- package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
- package/artifacts/contracts/components/Product.sol/Product.json +967 -105
- package/artifacts/contracts/instance/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.dbg.json +4 -0
- package/artifacts/contracts/instance/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.json +1206 -0
- package/artifacts/contracts/instance/BundleManager.sol/BundleManager.dbg.json +4 -0
- package/artifacts/contracts/instance/BundleManager.sol/BundleManager.json +778 -0
- package/artifacts/contracts/instance/Cloneable.sol/Cloneable.dbg.json +4 -0
- package/artifacts/contracts/instance/Cloneable.sol/Cloneable.json +190 -0
- package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstance.sol/IInstance.json +1549 -1048
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +4 -0
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +633 -0
- package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
- package/artifacts/contracts/instance/Instance.sol/Instance.json +2291 -1198
- package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +4 -0
- package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +1330 -0
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +4 -0
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +1289 -0
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +4 -0
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +1179 -0
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +741 -0
- package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.dbg.json +4 -0
- package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.json +256 -0
- package/artifacts/contracts/instance/base/ComponentService.sol/ComponentService.dbg.json +4 -0
- package/artifacts/contracts/instance/base/ComponentService.sol/ComponentService.json +607 -0
- package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
- package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.json +45 -127
- 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 +85 -245
- package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json +1 -1
- package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.json +36 -11
- package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +4 -0
- package/artifacts/contracts/instance/module/IAccess.sol/IAccess.json +237 -0
- package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +4 -0
- package/artifacts/contracts/instance/module/{bundle/IBundle.sol → IBundle.sol}/IBundle.json +1 -1
- package/artifacts/contracts/instance/module/IComponents.sol/IComponents.dbg.json +4 -0
- package/artifacts/contracts/instance/module/{access/IAccess.sol/IAccess.json → IComponents.sol/IComponents.json} +2 -2
- package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +4 -0
- package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.json +10 -0
- package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +4 -0
- package/artifacts/contracts/instance/module/{policy/IPolicy.sol → IPolicy.sol}/IPolicy.json +1 -1
- package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +4 -0
- package/artifacts/contracts/instance/module/{risk/IRisk.sol → IRisk.sol}/IRisk.json +1 -1
- package/artifacts/contracts/instance/module/ISetup.sol/ISetup.dbg.json +4 -0
- package/artifacts/contracts/instance/{base/ModuleBase.sol/ModuleBase.json → module/ISetup.sol/ISetup.json} +2 -2
- package/artifacts/contracts/instance/module/ITreasury.sol/ITreasury.dbg.json +4 -0
- package/artifacts/contracts/instance/module/{treasury/ITreasury.sol → ITreasury.sol}/ITreasury.json +1 -1
- package/artifacts/contracts/instance/service/ApplicationService.sol/ApplicationService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/ApplicationService.sol/ApplicationService.json +1039 -0
- package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.json +673 -0
- package/artifacts/contracts/instance/service/BundleService.sol/BundleService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/BundleService.sol/BundleService.json +1231 -0
- package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.json +721 -0
- package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.json +817 -0
- package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.json +641 -0
- package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +1798 -0
- package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.json +805 -0
- package/artifacts/contracts/instance/service/IApplicationService.sol/IApplicationService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/IApplicationService.sol/IApplicationService.json +622 -0
- package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.json +659 -0
- package/artifacts/contracts/instance/service/IClaimService.sol/IClaimService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/IClaimService.sol/IClaimService.json +475 -0
- package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.json +1090 -0
- package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.json +606 -0
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +577 -109
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +186 -213
- package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.json +1092 -0
- package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.json +697 -0
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +965 -199
- package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.json +661 -0
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +460 -293
- package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.json +653 -0
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +199 -12
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +485 -34
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +4 -0
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +866 -0
- package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +4 -0
- package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.json +52 -0
- package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
- package/artifacts/contracts/registry/Registry.sol/Registry.json +487 -101
- package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.dbg.json +4 -0
- package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.json +285 -0
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +4 -0
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +1158 -0
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +4 -0
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +670 -0
- package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.dbg.json +4 -0
- package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.json +559 -0
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +4 -0
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +498 -0
- package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.dbg.json +4 -0
- package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.json +107 -0
- 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/INftOwnable.sol/INftOwnable.dbg.json +4 -0
- package/artifacts/contracts/{components/IBaseComponent.sol/IBaseComponent.json → shared/INftOwnable.sol/INftOwnable.json} +38 -74
- package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +4 -0
- package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.json +129 -0
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +100 -33
- package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +4 -0
- package/artifacts/contracts/{experiment/inheritance/IB.sol/IB.json → shared/IRegistryLinked.sol/IRegistryLinked.json} +18 -20
- package/artifacts/contracts/shared/IService.sol/IService.dbg.json +4 -0
- package/artifacts/contracts/{instance/base/InstanceBase.sol/InstanceBase.json → shared/IService.sol/IService.json} +159 -150
- package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +1 -1
- package/artifacts/contracts/shared/IVersionable.sol/IVersionable.json +16 -125
- package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +4 -0
- package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +251 -0
- package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +4 -0
- package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +248 -0
- package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +4 -0
- package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +582 -0
- package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
- package/artifacts/contracts/shared/Registerable.sol/Registerable.json +256 -25
- package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +4 -0
- package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +84 -0
- package/artifacts/contracts/shared/Service.sol/Service.dbg.json +4 -0
- package/artifacts/contracts/{registry/IChainNft.sol/IChainNft.json → shared/Service.sol/Service.json} +261 -217
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +4 -0
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +96 -0
- package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +4 -0
- package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +129 -0
- package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +1 -1
- package/artifacts/contracts/shared/Versionable.sol/Versionable.json +29 -115
- package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json +1 -1
- package/artifacts/contracts/test/TestFee.sol/TestFee.json +4 -4
- package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json +1 -1
- package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +272 -26
- package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +1 -1
- package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.json +14 -14
- package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +1 -1
- package/artifacts/contracts/test/TestService.sol/TestService.json +347 -130
- package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json +1 -1
- package/artifacts/contracts/test/TestToken.sol/TestUsdc.json +91 -53
- package/artifacts/contracts/test/TestVersion.sol/TestVersion.dbg.json +1 -1
- package/artifacts/contracts/test/TestVersion.sol/TestVersion.json +2 -2
- package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json +1 -1
- package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.json +38 -140
- package/artifacts/contracts/test/Usdc.sol/USDC.dbg.json +1 -1
- package/artifacts/contracts/test/Usdc.sol/USDC.json +91 -53
- package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.dbg.json +1 -1
- package/artifacts/contracts/types/Amount.sol/AmountLib.dbg.json +4 -0
- package/artifacts/contracts/types/Amount.sol/AmountLib.json +161 -0
- package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
- package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.json +2 -2
- package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/ClaimId.sol/ClaimIdLib.dbg.json +4 -0
- package/artifacts/contracts/types/ClaimId.sol/ClaimIdLib.json +100 -0
- package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.dbg.json +4 -0
- package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.json +104 -0
- package/artifacts/contracts/types/Fee.sol/FeeLib.dbg.json +1 -1
- package/artifacts/contracts/types/Fee.sol/FeeLib.json +84 -14
- package/artifacts/contracts/types/Key32.sol/Key32Lib.dbg.json +1 -1
- package/artifacts/contracts/types/Key32.sol/Key32Lib.json +31 -17
- package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/NftId.sol/NftIdLib.json +17 -4
- package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
- package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.json +26 -3
- package/artifacts/contracts/types/NumberId.sol/NumberIdLib.dbg.json +4 -0
- package/artifacts/contracts/types/NumberId.sol/NumberIdLib.json +100 -0
- package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
- package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.json +2 -2
- package/artifacts/contracts/types/PayoutId.sol/PayoutIdLib.dbg.json +4 -0
- package/artifacts/contracts/types/PayoutId.sol/PayoutIdLib.json +100 -0
- package/artifacts/contracts/types/Referral.sol/ReferralLib.dbg.json +4 -0
- package/artifacts/contracts/types/Referral.sol/ReferralLib.json +142 -0
- package/artifacts/contracts/types/RiskId.sol/RiskIdLib.dbg.json +4 -0
- package/artifacts/contracts/types/RiskId.sol/RiskIdLib.json +86 -0
- package/artifacts/contracts/types/RoleId.sol/RoleIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/RoleId.sol/RoleIdLib.json +134 -8
- package/artifacts/contracts/types/Seconds.sol/SecondsLib.dbg.json +4 -0
- package/artifacts/contracts/types/Seconds.sol/SecondsLib.json +124 -0
- package/artifacts/contracts/types/StateId.sol/StateIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/StateId.sol/StateIdLib.json +2 -2
- package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json +1 -1
- package/artifacts/contracts/types/Timestamp.sol/TimestampLib.json +38 -7
- package/artifacts/contracts/types/UFixed.sol/MathLib.dbg.json +4 -0
- package/artifacts/contracts/{experiment/types/TypeB.sol/TypeBLib.json → types/UFixed.sol/MathLib.json} +4 -4
- package/artifacts/contracts/types/UFixed.sol/UFixedLib.dbg.json +4 -0
- package/artifacts/contracts/types/UFixed.sol/{UFixedMathLib.json → UFixedLib.json} +3 -3
- package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +1 -1
- package/artifacts/contracts/types/Version.sol/VersionLib.json +40 -2
- package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +1 -1
- package/artifacts/contracts/types/Version.sol/VersionPartLib.json +22 -3
- package/contracts/components/Component.sol +253 -0
- package/contracts/components/Distribution.sol +280 -0
- package/contracts/components/IComponent.sol +76 -0
- package/contracts/components/IDistributionComponent.sol +71 -0
- package/contracts/components/IPoolComponent.sol +98 -42
- package/contracts/components/IProductComponent.sol +30 -9
- package/contracts/components/Pool.sol +238 -109
- package/contracts/components/Product.sol +218 -42
- package/contracts/instance/AccessManagerUpgradeableInitializeable.sol +13 -0
- package/contracts/instance/BundleManager.sol +127 -0
- package/contracts/instance/Cloneable.sol +51 -0
- package/contracts/instance/IInstance.sol +87 -41
- package/contracts/instance/IInstanceService.sol +72 -0
- package/contracts/instance/Instance.sol +311 -52
- package/contracts/instance/InstanceAccessManager.sol +527 -0
- package/contracts/instance/InstanceReader.sol +291 -0
- package/contracts/instance/InstanceService.sol +495 -0
- package/contracts/instance/InstanceServiceManager.sol +54 -0
- package/contracts/instance/ObjectManager.sol +82 -0
- package/contracts/instance/base/ComponentService.sol +121 -0
- package/contracts/instance/base/IKeyValueStore.sol +13 -13
- package/contracts/instance/base/ILifecycle.sol +3 -3
- package/contracts/instance/base/KeyValueStore.sol +64 -40
- package/contracts/instance/base/Lifecycle.sol +27 -13
- package/contracts/instance/module/IAccess.sol +54 -0
- package/contracts/instance/module/IBundle.sol +23 -0
- package/contracts/instance/module/IComponents.sol +41 -0
- package/contracts/instance/module/IDistribution.sol +41 -0
- package/contracts/instance/module/IPolicy.sol +72 -0
- package/contracts/instance/module/IRisk.sol +11 -0
- package/contracts/instance/module/ISetup.sol +33 -0
- package/contracts/instance/module/ITreasury.sol +23 -0
- package/contracts/instance/service/ApplicationService.sol +350 -0
- package/contracts/instance/service/ApplicationServiceManager.sol +35 -0
- package/contracts/instance/service/BundleService.sol +431 -0
- package/contracts/instance/service/BundleServiceManager.sol +51 -0
- package/contracts/instance/service/ClaimService.sol +151 -0
- package/contracts/instance/service/ClaimServiceManager.sol +35 -0
- package/contracts/instance/service/DistributionService.sol +435 -0
- package/contracts/instance/service/DistributionServiceManager.sol +51 -0
- package/contracts/instance/service/IApplicationService.sol +82 -0
- package/contracts/instance/service/IBundleService.sol +93 -0
- package/contracts/instance/service/IClaimService.sol +61 -0
- package/contracts/instance/service/IDistributionService.sol +99 -0
- package/contracts/instance/service/IPolicyService.sol +72 -0
- package/contracts/instance/service/IPoolService.sol +81 -12
- package/contracts/instance/service/IProductService.sol +21 -39
- package/contracts/instance/service/PolicyService.sol +362 -0
- package/contracts/instance/service/PolicyServiceManager.sol +54 -0
- package/contracts/instance/service/PoolService.sol +249 -69
- package/contracts/instance/service/PoolServiceManager.sol +51 -0
- package/contracts/instance/service/ProductService.sol +147 -291
- package/contracts/instance/service/ProductServiceManager.sol +54 -0
- package/contracts/registry/ChainNft.sol +87 -36
- package/contracts/registry/IRegistry.sol +68 -24
- package/contracts/registry/IRegistryService.sol +68 -0
- package/contracts/registry/ITransferInterceptor.sol +7 -0
- package/contracts/registry/Registry.sol +372 -286
- package/contracts/registry/RegistryAccessManager.sol +216 -0
- package/contracts/registry/RegistryService.sol +282 -0
- package/contracts/registry/RegistryServiceManager.sol +62 -0
- package/contracts/registry/ReleaseManager.sol +324 -0
- package/contracts/registry/TokenRegistry.sol +116 -0
- package/contracts/shared/ContractDeployerLib.sol +72 -0
- package/contracts/shared/ERC165.sol +14 -8
- package/contracts/shared/INftOwnable.sol +23 -0
- package/contracts/shared/IPolicyHolder.sol +26 -0
- package/contracts/shared/IRegisterable.sol +10 -19
- package/contracts/shared/IRegistryLinked.sol +12 -0
- package/contracts/shared/IService.sol +16 -0
- package/contracts/shared/IVersionable.sol +38 -37
- package/contracts/shared/NftOwnable.sol +120 -0
- package/contracts/shared/PolicyHolder.sol +81 -0
- package/contracts/shared/ProxyManager.sol +169 -0
- package/contracts/shared/Registerable.sol +54 -66
- package/contracts/shared/RegistryLinked.sol +48 -0
- package/contracts/shared/Service.sol +72 -0
- package/contracts/shared/TokenHandler.sol +33 -0
- package/contracts/shared/UpgradableProxyWithAdmin.sol +16 -0
- package/contracts/shared/Versionable.sol +38 -68
- package/contracts/test/TestFee.sol +2 -2
- package/contracts/test/TestRegisterable.sol +5 -6
- package/contracts/test/TestRoleId.sol +1 -1
- package/contracts/test/TestService.sol +7 -14
- package/contracts/types/Amount.sol +60 -0
- package/contracts/types/Blocknumber.sol +1 -0
- package/contracts/types/ClaimId.sol +52 -0
- package/contracts/types/DistributorType.sol +55 -0
- package/contracts/types/Fee.sol +22 -9
- package/contracts/types/Key32.sol +8 -3
- package/contracts/types/NftId.sol +8 -0
- package/contracts/types/NftIdSet.sol +26 -24
- package/contracts/types/NumberId.sol +52 -0
- package/contracts/types/ObjectType.sol +56 -14
- package/contracts/types/PayoutId.sol +54 -0
- package/contracts/types/Referral.sol +89 -0
- package/contracts/types/RiskId.sol +43 -0
- package/contracts/types/RoleId.sol +69 -10
- package/contracts/types/Seconds.sol +54 -0
- package/contracts/types/StateId.sol +6 -1
- package/contracts/types/Timestamp.sol +17 -13
- package/contracts/types/UFixed.sol +129 -12
- package/contracts/types/Version.sol +14 -1
- package/package.json +6 -5
- package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.dbg.json +0 -4
- package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.json +0 -174
- package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.dbg.json +0 -4
- 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/IA.sol/ISharedA.json +0 -37
- package/artifacts/contracts/experiment/inheritance/IB.sol/IB.dbg.json +0 -4
- 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/instance/IInstanceLinked.sol/IInstanceLinked.dbg.json +0 -4
- package/artifacts/contracts/instance/IInstanceLinked.sol/IInstanceLinked.json +0 -24
- package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.dbg.json +0 -4
- package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.json +0 -300
- package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.dbg.json +0 -4
- package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.json +0 -63
- package/artifacts/contracts/instance/base/IService.sol/IService.dbg.json +0 -4
- package/artifacts/contracts/instance/base/IService.sol/IService.json +0 -300
- package/artifacts/contracts/instance/base/InstanceBase.sol/InstanceBase.dbg.json +0 -4
- package/artifacts/contracts/instance/base/ModuleBase.sol/ModuleBase.dbg.json +0 -4
- package/artifacts/contracts/instance/base/ServiceBase.sol/ServiceBase.dbg.json +0 -4
- package/artifacts/contracts/instance/base/ServiceBase.sol/ServiceBase.json +0 -300
- package/artifacts/contracts/instance/module/access/Access.sol/AccessModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/access/Access.sol/AccessModule.json +0 -333
- package/artifacts/contracts/instance/module/access/IAccess.sol/IAccess.dbg.json +0 -4
- package/artifacts/contracts/instance/module/access/IAccess.sol/IAccessModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/access/IAccess.sol/IAccessModule.json +0 -333
- package/artifacts/contracts/instance/module/bundle/BundleModule.sol/BundleModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/bundle/BundleModule.sol/BundleModule.json +0 -296
- package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundle.dbg.json +0 -4
- package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundleModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundleModule.json +0 -296
- package/artifacts/contracts/instance/module/compensation/CompensationModule.sol/CompensationModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/compensation/CompensationModule.sol/CompensationModule.json +0 -10
- package/artifacts/contracts/instance/module/compensation/ICompensation.sol/ICompensation.dbg.json +0 -4
- package/artifacts/contracts/instance/module/compensation/ICompensation.sol/ICompensation.json +0 -10
- package/artifacts/contracts/instance/module/compensation/ICompensation.sol/ICompensationModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/compensation/ICompensation.sol/ICompensationModule.json +0 -10
- package/artifacts/contracts/instance/module/component/ComponentModule.sol/ComponentModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/component/ComponentModule.sol/ComponentModule.json +0 -188
- package/artifacts/contracts/instance/module/component/IComponent.sol/IComponent.dbg.json +0 -4
- package/artifacts/contracts/instance/module/component/IComponent.sol/IComponent.json +0 -10
- package/artifacts/contracts/instance/module/component/IComponent.sol/IComponentModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/component/IComponent.sol/IComponentModule.json +0 -188
- package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicy.dbg.json +0 -4
- package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicyModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicyModule.json +0 -261
- package/artifacts/contracts/instance/module/policy/PolicyModule.sol/PolicyModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/policy/PolicyModule.sol/PolicyModule.json +0 -261
- package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPool.dbg.json +0 -4
- package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPool.json +0 -10
- package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPoolModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPoolModule.json +0 -149
- package/artifacts/contracts/instance/module/pool/PoolModule.sol/PoolModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/pool/PoolModule.sol/PoolModule.json +0 -149
- package/artifacts/contracts/instance/module/risk/IRisk.sol/IRisk.dbg.json +0 -4
- package/artifacts/contracts/instance/module/risk/IRisk.sol/IRiskModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/risk/IRisk.sol/IRiskModule.json +0 -10
- package/artifacts/contracts/instance/module/risk/RiskModule.sol/RiskModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/risk/RiskModule.sol/RiskModule.json +0 -10
- package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasury.dbg.json +0 -4
- package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasuryModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasuryModule.json +0 -533
- package/artifacts/contracts/instance/module/treasury/TokenHandler.sol/TokenHandler.dbg.json +0 -4
- package/artifacts/contracts/instance/module/treasury/TokenHandler.sol/TokenHandler.json +0 -76
- package/artifacts/contracts/instance/module/treasury/TreasuryModule.sol/TreasuryModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/treasury/TreasuryModule.sol/TreasuryModule.json +0 -533
- package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.dbg.json +0 -4
- package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.json +0 -523
- package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.dbg.json +0 -4
- package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.json +0 -364
- package/artifacts/contracts/registry/IChainNft.sol/IChainNft.dbg.json +0 -4
- package/artifacts/contracts/registry/IRegistryLinked.sol/IRegistryLinked.dbg.json +0 -4
- package/artifacts/contracts/registry/IRegistryLinked.sol/IRegistryLinked.json +0 -24
- package/artifacts/contracts/shared/IOwnable.sol/IOwnable.dbg.json +0 -4
- package/artifacts/contracts/shared/IOwnable.sol/IOwnable.json +0 -24
- package/artifacts/contracts/test/TestPool.sol/TestPool.dbg.json +0 -4
- package/artifacts/contracts/test/TestPool.sol/TestPool.json +0 -387
- package/artifacts/contracts/test/TestProduct.sol/TestProduct.dbg.json +0 -4
- package/artifacts/contracts/test/TestProduct.sol/TestProduct.json +0 -393
- package/artifacts/contracts/types/UFixed.sol/UFixedMathLib.dbg.json +0 -4
- package/contracts/components/BaseComponent.sol +0 -88
- package/contracts/components/IBaseComponent.sol +0 -19
- 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/README.md +0 -112
- 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/IInstanceLinked.sol +0 -8
- package/contracts/instance/base/ComponentServiceBase.sol +0 -42
- package/contracts/instance/base/IInstanceBase.sol +0 -14
- package/contracts/instance/base/IService.sol +0 -15
- package/contracts/instance/base/InstanceBase.sol +0 -80
- package/contracts/instance/base/ModuleBase.sol +0 -52
- package/contracts/instance/base/ServiceBase.sol +0 -37
- package/contracts/instance/module/access/Access.sol +0 -149
- package/contracts/instance/module/access/IAccess.sol +0 -53
- package/contracts/instance/module/bundle/BundleModule.sol +0 -136
- package/contracts/instance/module/bundle/IBundle.sol +0 -58
- package/contracts/instance/module/compensation/CompensationModule.sol +0 -8
- package/contracts/instance/module/compensation/ICompensation.sol +0 -10
- package/contracts/instance/module/component/ComponentModule.sol +0 -95
- package/contracts/instance/module/component/IComponent.sol +0 -53
- package/contracts/instance/module/policy/IPolicy.sol +0 -60
- package/contracts/instance/module/policy/PolicyModule.sol +0 -76
- package/contracts/instance/module/pool/IPoolModule.sol +0 -41
- package/contracts/instance/module/pool/PoolModule.sol +0 -87
- package/contracts/instance/module/risk/IRisk.sol +0 -10
- package/contracts/instance/module/risk/RiskModule.sol +0 -8
- package/contracts/instance/module/treasury/ITreasury.sol +0 -103
- package/contracts/instance/module/treasury/TokenHandler.sol +0 -48
- package/contracts/instance/module/treasury/TreasuryModule.sol +0 -152
- package/contracts/instance/service/ComponentOwnerService.sol +0 -170
- package/contracts/instance/service/IComponentOwnerService.sol +0 -22
- package/contracts/registry/IChainNft.sol +0 -21
- package/contracts/registry/IRegistryLinked.sol +0 -8
- package/contracts/shared/IOwnable.sol +0 -6
- package/contracts/test/TestPool.sol +0 -22
- package/contracts/test/TestProduct.sol +0 -44
@@ -11,35 +11,37 @@ library LibNftIdSet {
|
|
11
11
|
mapping(NftId nftid => uint256 index) at;
|
12
12
|
}
|
13
13
|
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
14
|
+
error ErrorNftIdSetAlreadyAdded(NftId nftId);
|
15
|
+
error ErrorNftIdSetNotInSet(NftId nftId);
|
16
|
+
|
17
|
+
|
18
|
+
function add(Set storage set, NftId nftId) external {
|
19
|
+
if (set.at[nftId] > 0) {
|
20
|
+
revert ErrorNftIdSetAlreadyAdded(nftId);
|
21
21
|
}
|
22
|
+
|
23
|
+
set.ids.push(nftId);
|
24
|
+
set.at[nftId] = set.ids.length;
|
22
25
|
}
|
23
26
|
|
24
|
-
function remove(Set storage set, NftId nftId) external
|
27
|
+
function remove(Set storage set, NftId nftId) external {
|
25
28
|
uint256 nftIdIndex = set.at[nftId];
|
26
29
|
|
27
|
-
if (nftIdIndex
|
28
|
-
|
29
|
-
uint256 lastIndex = set.ids.length - 1;
|
30
|
-
|
31
|
-
if (lastIndex != toDeleteIndex) {
|
32
|
-
NftId lastId = set.ids[lastIndex];
|
33
|
-
set.ids[toDeleteIndex] = lastId;
|
34
|
-
set.at[lastId] = nftIdIndex; // Replace lastValue's index to valueIndex
|
35
|
-
}
|
36
|
-
|
37
|
-
set.ids.pop();
|
38
|
-
delete set.at[nftId];
|
39
|
-
return true;
|
40
|
-
} else {
|
41
|
-
return false;
|
30
|
+
if (nftIdIndex == 0) {
|
31
|
+
revert ErrorNftIdSetNotInSet(nftId);
|
42
32
|
}
|
33
|
+
|
34
|
+
uint256 toDeleteIndex = nftIdIndex - 1;
|
35
|
+
uint256 lastIndex = set.ids.length - 1;
|
36
|
+
|
37
|
+
if (lastIndex != toDeleteIndex) {
|
38
|
+
NftId lastId = set.ids[lastIndex];
|
39
|
+
set.ids[toDeleteIndex] = lastId;
|
40
|
+
set.at[lastId] = nftIdIndex; // Replace lastValue's index to valueIndex
|
41
|
+
}
|
42
|
+
|
43
|
+
set.ids.pop();
|
44
|
+
delete set.at[nftId];
|
43
45
|
}
|
44
46
|
|
45
47
|
function isEmpty(Set storage set) external view returns(bool empty) {
|
@@ -50,7 +52,7 @@ library LibNftIdSet {
|
|
50
52
|
return set.at[nftId] > 0;
|
51
53
|
}
|
52
54
|
|
53
|
-
function
|
55
|
+
function size(Set storage set) external view returns(uint256 length) {
|
54
56
|
return set.ids.length;
|
55
57
|
}
|
56
58
|
|
@@ -0,0 +1,52 @@
|
|
1
|
+
// SPDX-License-Identifier: Apache-2.0
|
2
|
+
pragma solidity ^0.8.20;
|
3
|
+
|
4
|
+
// uint32 allows for 4'294'967'296 individual items
|
5
|
+
type NumberId is uint32;
|
6
|
+
|
7
|
+
// type bindings
|
8
|
+
using {
|
9
|
+
eqNumberId as ==,
|
10
|
+
neNumberId as !=,
|
11
|
+
NumberIdLib.eqz,
|
12
|
+
NumberIdLib.gtz,
|
13
|
+
NumberIdLib.toInt
|
14
|
+
} for NumberId global;
|
15
|
+
|
16
|
+
|
17
|
+
// pure free functions for operators
|
18
|
+
function eqNumberId(NumberId a, NumberId b) pure returns (bool isSame) {
|
19
|
+
return NumberId.unwrap(a) == NumberId.unwrap(b);
|
20
|
+
}
|
21
|
+
|
22
|
+
function neNumberId(NumberId a, NumberId b) pure returns (bool isDifferent) {
|
23
|
+
return NumberId.unwrap(a) != NumberId.unwrap(b);
|
24
|
+
}
|
25
|
+
|
26
|
+
// library functions that operate on user defined type
|
27
|
+
library NumberIdLib {
|
28
|
+
/// @dev Converts the NumberId to a uint.
|
29
|
+
function zero() public pure returns (NumberId) {
|
30
|
+
return NumberId.wrap(0);
|
31
|
+
}
|
32
|
+
|
33
|
+
/// @dev Converts an uint into a NumberId.
|
34
|
+
function toNumberId(uint256 a) public pure returns (NumberId) {
|
35
|
+
return NumberId.wrap(uint32(a));
|
36
|
+
}
|
37
|
+
|
38
|
+
/// @dev Converts the NumberId to a uint.
|
39
|
+
function toInt(NumberId a) public pure returns (uint32) {
|
40
|
+
return uint32(NumberId.unwrap(a));
|
41
|
+
}
|
42
|
+
|
43
|
+
/// @dev Returns true if the value is non-zero (> 0).
|
44
|
+
function gtz(NumberId a) public pure returns (bool) {
|
45
|
+
return NumberId.unwrap(a) > 0;
|
46
|
+
}
|
47
|
+
|
48
|
+
/// @dev Returns true if the value is zero (== 0).
|
49
|
+
function eqz(NumberId a) public pure returns (bool) {
|
50
|
+
return NumberId.unwrap(a) == 0;
|
51
|
+
}
|
52
|
+
}
|
@@ -1,5 +1,5 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
|
-
pragma solidity ^0.8.
|
2
|
+
pragma solidity ^0.8.20;
|
3
3
|
|
4
4
|
type ObjectType is uint8;
|
5
5
|
|
@@ -17,56 +17,97 @@ function PROTOCOL() pure returns (ObjectType) {
|
|
17
17
|
return toObjectType(10);
|
18
18
|
}
|
19
19
|
|
20
|
-
function
|
20
|
+
function ROLE() pure returns (ObjectType) {
|
21
21
|
return toObjectType(20);
|
22
22
|
}
|
23
23
|
|
24
|
-
function
|
24
|
+
function TARGET() pure returns (ObjectType) {
|
25
25
|
return toObjectType(30);
|
26
26
|
}
|
27
27
|
|
28
|
-
function
|
28
|
+
function REGISTRY() pure returns (ObjectType) {
|
29
29
|
return toObjectType(40);
|
30
30
|
}
|
31
31
|
|
32
|
-
function
|
32
|
+
function TOKEN() pure returns (ObjectType) {
|
33
33
|
return toObjectType(50);
|
34
34
|
}
|
35
35
|
|
36
|
-
function
|
36
|
+
function SERVICE() pure returns (ObjectType) {
|
37
37
|
return toObjectType(60);
|
38
38
|
}
|
39
39
|
|
40
|
-
function
|
40
|
+
function INSTANCE() pure returns (ObjectType) {
|
41
|
+
return toObjectType(70);
|
42
|
+
}
|
43
|
+
|
44
|
+
function STAKE() pure returns (ObjectType) {
|
45
|
+
return toObjectType(80);
|
46
|
+
}
|
47
|
+
|
48
|
+
function COMPONENT() pure returns (ObjectType) {
|
41
49
|
return toObjectType(100);
|
42
50
|
}
|
43
51
|
|
44
|
-
|
52
|
+
// TODO replace by PRODUCT_SETUP
|
53
|
+
function TREASURY() pure returns (ObjectType) {
|
54
|
+
return toObjectType(101);
|
55
|
+
}
|
56
|
+
|
57
|
+
function PRODUCT_SETUP() pure returns (ObjectType) {
|
58
|
+
return toObjectType(101);
|
59
|
+
}
|
60
|
+
|
61
|
+
function PRODUCT() pure returns (ObjectType) {
|
45
62
|
return toObjectType(110);
|
46
63
|
}
|
47
64
|
|
48
|
-
function
|
65
|
+
function DISTRIBUTION() pure returns (ObjectType) {
|
49
66
|
return toObjectType(120);
|
50
67
|
}
|
51
68
|
|
52
|
-
function
|
69
|
+
function DISTRIBUTOR_TYPE() pure returns (ObjectType) {
|
70
|
+
return toObjectType(121);
|
71
|
+
}
|
72
|
+
|
73
|
+
function DISTRIBUTOR() pure returns (ObjectType) {
|
74
|
+
return toObjectType(122);
|
75
|
+
}
|
76
|
+
|
77
|
+
function REFERRAL() pure returns (ObjectType) {
|
78
|
+
return toObjectType(123);
|
79
|
+
}
|
80
|
+
|
81
|
+
function ORACLE() pure returns (ObjectType) {
|
53
82
|
return toObjectType(130);
|
54
83
|
}
|
55
84
|
|
56
|
-
function
|
85
|
+
function POOL() pure returns (ObjectType) {
|
86
|
+
return toObjectType(140);
|
87
|
+
}
|
88
|
+
|
89
|
+
function RISK() pure returns (ObjectType) {
|
57
90
|
return toObjectType(200);
|
58
91
|
}
|
59
92
|
|
60
|
-
function
|
93
|
+
function APPLICATION() pure returns (ObjectType) {
|
61
94
|
return toObjectType(210);
|
62
95
|
}
|
63
96
|
|
97
|
+
function POLICY() pure returns (ObjectType) {
|
98
|
+
return toObjectType(211);
|
99
|
+
}
|
100
|
+
|
64
101
|
function CLAIM() pure returns (ObjectType) {
|
65
|
-
return toObjectType(
|
102
|
+
return toObjectType(212);
|
103
|
+
}
|
104
|
+
|
105
|
+
function BUNDLE() pure returns (ObjectType) {
|
106
|
+
return toObjectType(220);
|
66
107
|
}
|
67
108
|
|
68
109
|
function PAYOUT() pure returns (ObjectType) {
|
69
|
-
return toObjectType(
|
110
|
+
return toObjectType(212);
|
70
111
|
}
|
71
112
|
|
72
113
|
/// @dev Converts the uint8 to a ObjectType.
|
@@ -74,6 +115,7 @@ function toObjectType(uint256 objectType) pure returns (ObjectType) {
|
|
74
115
|
return ObjectType.wrap(uint8(objectType));
|
75
116
|
}
|
76
117
|
|
118
|
+
// TODO move to ObjecTypeLib and rename to zero()
|
77
119
|
/// @dev Return the ObjectType zero (0)
|
78
120
|
function zeroObjectType() pure returns (ObjectType) {
|
79
121
|
return ObjectType.wrap(0);
|
@@ -0,0 +1,54 @@
|
|
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
|
+
// type bindings
|
8
|
+
using {
|
9
|
+
eqPayoutId as ==,
|
10
|
+
nePayoutId as !=,
|
11
|
+
PayoutIdLib.eqz,
|
12
|
+
PayoutIdLib.gtz,
|
13
|
+
PayoutIdLib.toInt
|
14
|
+
} for PayoutId global;
|
15
|
+
|
16
|
+
|
17
|
+
// pure free functions for operators
|
18
|
+
function eqPayoutId(PayoutId a, PayoutId b) pure returns (bool isSame) {
|
19
|
+
return PayoutId.unwrap(a) == PayoutId.unwrap(b);
|
20
|
+
}
|
21
|
+
|
22
|
+
function nePayoutId(PayoutId a, PayoutId b) pure returns (bool isDifferent) {
|
23
|
+
return PayoutId.unwrap(a) != PayoutId.unwrap(b);
|
24
|
+
}
|
25
|
+
|
26
|
+
// TODO come up with a way to code claim id into payout id
|
27
|
+
// eg payoutId.getClaimId(), payoutId.getPayoutNo()
|
28
|
+
// library functions that operate on user defined type
|
29
|
+
library PayoutIdLib {
|
30
|
+
/// @dev Converts the PayoutId to a uint.
|
31
|
+
function zero() public pure returns (PayoutId) {
|
32
|
+
return PayoutId.wrap(0);
|
33
|
+
}
|
34
|
+
|
35
|
+
/// @dev Converts an uint into a PayoutId.
|
36
|
+
function toPayoutId(uint256 a) public pure returns (PayoutId) {
|
37
|
+
return PayoutId.wrap(uint24(a));
|
38
|
+
}
|
39
|
+
|
40
|
+
/// @dev Converts the PayoutId to a uint.
|
41
|
+
function toInt(PayoutId a) public pure returns (uint24) {
|
42
|
+
return uint24(PayoutId.unwrap(a));
|
43
|
+
}
|
44
|
+
|
45
|
+
/// @dev Returns true if the value is non-zero (> 0).
|
46
|
+
function gtz(PayoutId a) public pure returns (bool) {
|
47
|
+
return PayoutId.unwrap(a) > 0;
|
48
|
+
}
|
49
|
+
|
50
|
+
/// @dev Returns true if the value is zero (== 0).
|
51
|
+
function eqz(PayoutId a) public pure returns (bool) {
|
52
|
+
return PayoutId.unwrap(a) == 0;
|
53
|
+
}
|
54
|
+
}
|
@@ -0,0 +1,89 @@
|
|
1
|
+
// SPDX-License-Identifier: Apache-2.0
|
2
|
+
pragma solidity ^0.8.19;
|
3
|
+
|
4
|
+
import {Key32, KeyId, Key32Lib} from "./Key32.sol";
|
5
|
+
import {NftId} from "./NftId.sol";
|
6
|
+
import {REFERRAL} from "./ObjectType.sol";
|
7
|
+
|
8
|
+
type ReferralId is bytes8;
|
9
|
+
type ReferralStatus is uint8;
|
10
|
+
|
11
|
+
// type bindings
|
12
|
+
using {
|
13
|
+
eqReferralId as ==,
|
14
|
+
neReferralId as !=,
|
15
|
+
ReferralLib.toKey32
|
16
|
+
} for ReferralId global;
|
17
|
+
|
18
|
+
using {
|
19
|
+
eqReferralStatus as ==,
|
20
|
+
neReferralStatus as !=
|
21
|
+
} for ReferralStatus global;
|
22
|
+
|
23
|
+
// general pure free functions
|
24
|
+
|
25
|
+
// @dev Returns true iff a and b are identical
|
26
|
+
function eqReferralId(ReferralId a, ReferralId b) pure returns (bool isSame) {
|
27
|
+
return ReferralId.unwrap(a) == ReferralId.unwrap(b);
|
28
|
+
}
|
29
|
+
|
30
|
+
// @dev Returns true iff a and b are different
|
31
|
+
function neReferralId(ReferralId a, ReferralId b) pure returns (bool isDifferent) {
|
32
|
+
return ReferralId.unwrap(a) != ReferralId.unwrap(b);
|
33
|
+
}
|
34
|
+
|
35
|
+
// @dev Returns true iff a and b are identical
|
36
|
+
function eqReferralStatus(ReferralStatus a, ReferralStatus b) pure returns (bool isSame) {
|
37
|
+
return ReferralStatus.unwrap(a) == ReferralStatus.unwrap(b);
|
38
|
+
}
|
39
|
+
|
40
|
+
// @dev Returns true iff a and b are different
|
41
|
+
function neReferralStatus(ReferralStatus a, ReferralStatus b) pure returns (bool isDifferent) {
|
42
|
+
return ReferralStatus.unwrap(a) != ReferralStatus.unwrap(b);
|
43
|
+
}
|
44
|
+
|
45
|
+
function REFERRAL_OK() pure returns (ReferralStatus) {
|
46
|
+
return ReferralStatus.wrap(10);
|
47
|
+
}
|
48
|
+
|
49
|
+
function REFERRAL_ERROR_UNKNOWN() pure returns (ReferralStatus) {
|
50
|
+
return ReferralStatus.wrap(100);
|
51
|
+
}
|
52
|
+
|
53
|
+
function REFERRAL_ERROR_EXPIRED() pure returns (ReferralStatus) {
|
54
|
+
return ReferralStatus.wrap(110);
|
55
|
+
}
|
56
|
+
|
57
|
+
function REFERRAL_ERROR_EXHAUSTED() pure returns (ReferralStatus) {
|
58
|
+
return ReferralStatus.wrap(120);
|
59
|
+
}
|
60
|
+
|
61
|
+
library ReferralLib {
|
62
|
+
|
63
|
+
function zero() public pure returns (ReferralId) {
|
64
|
+
return ReferralId.wrap(bytes8(0));
|
65
|
+
}
|
66
|
+
|
67
|
+
// @dev Converts a referral string into an id.
|
68
|
+
function toReferralId(NftId distributionNftId, string memory referral) public pure returns (ReferralId) {
|
69
|
+
return ReferralId.wrap(bytes8(keccak256(abi.encode(distributionNftId, referral))));
|
70
|
+
}
|
71
|
+
|
72
|
+
function toReferralStatus(uint8 status) public pure returns (ReferralStatus) {
|
73
|
+
return ReferralStatus.wrap(status);
|
74
|
+
}
|
75
|
+
|
76
|
+
/// @dev Returns the key32 value for the specified nft id and object type.
|
77
|
+
function toKey32(ReferralId id) public pure returns (Key32 key) {
|
78
|
+
return Key32Lib.toKey32(REFERRAL(), toKeyId(id));
|
79
|
+
}
|
80
|
+
|
81
|
+
/// @dev Returns the key id value for the specified nft id
|
82
|
+
function toKeyId(ReferralId id) public pure returns (KeyId keyId) {
|
83
|
+
return KeyId.wrap(bytes31(ReferralId.unwrap(id)));
|
84
|
+
}
|
85
|
+
|
86
|
+
function eqz(ReferralId id) public pure returns (bool) {
|
87
|
+
return eqReferralId(id, zero());
|
88
|
+
}
|
89
|
+
}
|
@@ -0,0 +1,43 @@
|
|
1
|
+
// SPDX-License-Identifier: Apache-2.0
|
2
|
+
pragma solidity ^0.8.19;
|
3
|
+
|
4
|
+
import {Key32, KeyId, Key32Lib} from "./Key32.sol";
|
5
|
+
import {RISK} from "./ObjectType.sol";
|
6
|
+
|
7
|
+
type RiskId is bytes8;
|
8
|
+
|
9
|
+
// type bindings
|
10
|
+
using {
|
11
|
+
eqRiskId as ==,
|
12
|
+
neRiskId as !=,
|
13
|
+
RiskIdLib.toKey32
|
14
|
+
} for RiskId global;
|
15
|
+
|
16
|
+
// general pure free functions
|
17
|
+
|
18
|
+
// @dev Returns true iff risk ids a and b are identical
|
19
|
+
function eqRiskId(RiskId a, RiskId b) pure returns (bool isSame) {
|
20
|
+
return RiskId.unwrap(a) == RiskId.unwrap(b);
|
21
|
+
}
|
22
|
+
|
23
|
+
// @dev Returns true iff risk ids a and b are different
|
24
|
+
function neRiskId(RiskId a, RiskId b) pure returns (bool isDifferent) {
|
25
|
+
return RiskId.unwrap(a) != RiskId.unwrap(b);
|
26
|
+
}
|
27
|
+
|
28
|
+
library RiskIdLib {
|
29
|
+
// @dev Converts a role string into a role id.
|
30
|
+
function toRiskId(string memory risk) public pure returns (RiskId) {
|
31
|
+
return RiskId.wrap(bytes8(keccak256(abi.encode(risk))));
|
32
|
+
}
|
33
|
+
|
34
|
+
/// @dev Returns the key32 value for the specified nft id and object type.
|
35
|
+
function toKey32(RiskId id) public pure returns (Key32 key) {
|
36
|
+
return Key32Lib.toKey32(RISK(), toKeyId(id));
|
37
|
+
}
|
38
|
+
|
39
|
+
/// @dev Returns the key id value for the specified nft id
|
40
|
+
function toKeyId(RiskId id) public pure returns (KeyId keyId) {
|
41
|
+
return KeyId.wrap(bytes31(RiskId.unwrap(id)));
|
42
|
+
}
|
43
|
+
}
|
@@ -1,24 +1,53 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
2
|
pragma solidity ^0.8.19;
|
3
3
|
|
4
|
-
|
4
|
+
import {Key32, KeyId, Key32Lib} from "./Key32.sol";
|
5
|
+
import {ROLE} from "./ObjectType.sol";
|
6
|
+
|
7
|
+
type RoleId is uint64;
|
5
8
|
|
6
9
|
// type bindings
|
7
10
|
using {
|
8
11
|
eqRoleId as ==,
|
9
|
-
neRoleId as
|
12
|
+
neRoleId as !=,
|
13
|
+
RoleIdLib.eqz,
|
14
|
+
RoleIdLib.gtz,
|
15
|
+
RoleIdLib.toInt,
|
16
|
+
RoleIdLib.toKey32
|
10
17
|
} for RoleId global;
|
11
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
|
+
|
12
26
|
// general pure free functions
|
13
|
-
function
|
27
|
+
function DISTRIBUTION_OWNER_ROLE_NAME() pure returns (string memory) { return "DistributionOwnerRole"; }
|
14
28
|
function ORACLE_OWNER_ROLE_NAME() pure returns (string memory) { return "OracleOwnerRole"; }
|
15
29
|
function POOL_OWNER_ROLE_NAME() pure returns (string memory) { return "PoolOwnerRole"; }
|
16
30
|
function PRODUCT_OWNER_ROLE_NAME() pure returns (string memory) { return "ProductOwnerRole"; }
|
17
31
|
|
18
|
-
function
|
19
|
-
function ORACLE_OWNER_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(
|
20
|
-
function POOL_OWNER_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(
|
21
|
-
function PRODUCT_OWNER_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(
|
32
|
+
function DISTRIBUTION_OWNER_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(2); }
|
33
|
+
function ORACLE_OWNER_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(3); }
|
34
|
+
function POOL_OWNER_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(4); }
|
35
|
+
function PRODUCT_OWNER_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(5); }
|
36
|
+
|
37
|
+
function INSTANCE_OWNER_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(1900); }
|
38
|
+
function INSTANCE_SERVICE_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(2000); }
|
39
|
+
function DISTRIBUTION_SERVICE_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(2100); }
|
40
|
+
function POOL_SERVICE_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(2200); }
|
41
|
+
function PRODUCT_SERVICE_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(2300); }
|
42
|
+
function APPLICATION_SERVICE_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(2400); }
|
43
|
+
function POLICY_SERVICE_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(2410); }
|
44
|
+
function CLAIM_SERVICE_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(2420); }
|
45
|
+
function BUNDLE_SERVICE_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(2500); }
|
46
|
+
function INSTANCE_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(2600); }
|
47
|
+
|
48
|
+
function GIF_ADMIN_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(1500); }
|
49
|
+
function GIF_MANAGER_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(1600); }
|
50
|
+
function RELEASE_MANAGER_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(1700); }
|
22
51
|
|
23
52
|
// @dev Returns true iff role ids a and b are identical
|
24
53
|
function eqRoleId(RoleId a, RoleId b) pure returns (bool isSame) {
|
@@ -31,8 +60,38 @@ function neRoleId(RoleId a, RoleId b) pure returns (bool isDifferent) {
|
|
31
60
|
}
|
32
61
|
|
33
62
|
library RoleIdLib {
|
34
|
-
|
35
|
-
function
|
36
|
-
return RoleId.wrap(
|
63
|
+
/// @dev Converts the RoleId to a uint.
|
64
|
+
function zero() public pure returns (RoleId) {
|
65
|
+
return RoleId.wrap(0);
|
66
|
+
}
|
67
|
+
|
68
|
+
/// @dev Converts an uint into a RoleId.
|
69
|
+
function toRoleId(uint256 a) public pure returns (RoleId) {
|
70
|
+
return RoleId.wrap(uint64(a));
|
71
|
+
}
|
72
|
+
|
73
|
+
/// @dev Converts the RoleId to a uint.
|
74
|
+
function toInt(RoleId a) public pure returns (uint64) {
|
75
|
+
return uint64(RoleId.unwrap(a));
|
76
|
+
}
|
77
|
+
|
78
|
+
/// @dev Returns true if the value is non-zero (> 0).
|
79
|
+
function gtz(RoleId a) public pure returns (bool) {
|
80
|
+
return RoleId.unwrap(a) > 0;
|
81
|
+
}
|
82
|
+
|
83
|
+
/// @dev Returns true if the value is zero (== 0).
|
84
|
+
function eqz(RoleId a) public pure returns (bool) {
|
85
|
+
return RoleId.unwrap(a) == 0;
|
86
|
+
}
|
87
|
+
|
88
|
+
/// @dev Returns the key32 value for the specified id and object type.
|
89
|
+
function toKey32(RoleId a) public pure returns (Key32 key) {
|
90
|
+
return Key32Lib.toKey32(ROLE(), toKeyId(a));
|
91
|
+
}
|
92
|
+
|
93
|
+
/// @dev Returns the key id value for the specified id
|
94
|
+
function toKeyId(RoleId a) public pure returns (KeyId keyId) {
|
95
|
+
return KeyId.wrap(bytes31(uint248(RoleId.unwrap(a))));
|
37
96
|
}
|
38
97
|
}
|
@@ -0,0 +1,54 @@
|
|
1
|
+
// SPDX-License-Identifier: Apache-2.0
|
2
|
+
pragma solidity ^0.8.20;
|
3
|
+
|
4
|
+
type Seconds is uint40;
|
5
|
+
|
6
|
+
using {
|
7
|
+
SecondsLib.eqz,
|
8
|
+
SecondsLib.gtz,
|
9
|
+
SecondsLib.toInt
|
10
|
+
} for Seconds global;
|
11
|
+
|
12
|
+
|
13
|
+
library SecondsLib {
|
14
|
+
|
15
|
+
error ErrorSecondsLibDurationTooBig(uint256 duration);
|
16
|
+
|
17
|
+
function zero() public pure returns (Seconds) {
|
18
|
+
return Seconds.wrap(0);
|
19
|
+
}
|
20
|
+
|
21
|
+
function max() public pure returns (Seconds) {
|
22
|
+
return Seconds.wrap(_max());
|
23
|
+
}
|
24
|
+
|
25
|
+
/// @dev converts the uint duration into Seconds
|
26
|
+
/// function reverts if duration is exceeding max Seconds value
|
27
|
+
function toSeconds(uint256 duration) public pure returns (Seconds) {
|
28
|
+
// if(duration > type(uint40).max) {
|
29
|
+
if(duration > _max()) {
|
30
|
+
revert ErrorSecondsLibDurationTooBig(duration);
|
31
|
+
}
|
32
|
+
|
33
|
+
return Seconds.wrap(uint40(duration));
|
34
|
+
}
|
35
|
+
|
36
|
+
/// @dev return true if duration equals 0
|
37
|
+
function eqz(Seconds duration) public pure returns (bool) {
|
38
|
+
return Seconds.unwrap(duration) == 0;
|
39
|
+
}
|
40
|
+
|
41
|
+
/// @dev return true if duration is larger than 0
|
42
|
+
function gtz(Seconds duration) public pure returns (bool) {
|
43
|
+
return Seconds.unwrap(duration) > 0;
|
44
|
+
}
|
45
|
+
|
46
|
+
function toInt(Seconds duration) public pure returns (uint256) {
|
47
|
+
return uint256(uint40(Seconds.unwrap(duration)));
|
48
|
+
}
|
49
|
+
|
50
|
+
function _max() internal pure returns (uint40) {
|
51
|
+
// IMPORTANT: type nees to match with actual definition for Seconds
|
52
|
+
return type(uint40).max;
|
53
|
+
}
|
54
|
+
}
|
@@ -1,5 +1,5 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
|
-
pragma solidity ^0.8.
|
2
|
+
pragma solidity ^0.8.20;
|
3
3
|
|
4
4
|
// uint96 allows for chain ids up to 13 digits
|
5
5
|
type StateId is uint8;
|
@@ -58,11 +58,16 @@ function PAID() pure returns (StateId) {
|
|
58
58
|
return toStateId(220);
|
59
59
|
}
|
60
60
|
|
61
|
+
function KEEP_STATE() pure returns (StateId) {
|
62
|
+
return toStateId(type(uint8).max);
|
63
|
+
}
|
64
|
+
|
61
65
|
/// @dev Converts the uint8 to a StateId.
|
62
66
|
function toStateId(uint256 id) pure returns (StateId) {
|
63
67
|
return StateId.wrap(uint8(id));
|
64
68
|
}
|
65
69
|
|
70
|
+
// TODO move to StateIdLib and rename to zero()
|
66
71
|
/// @dev Return the StateId zero (0)
|
67
72
|
function zeroStateId() pure returns (StateId) {
|
68
73
|
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,17 @@ 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
|
+
function blockTimestamp() public view returns (Timestamp) {
|
64
|
+
return Timestamp.wrap(uint40(block.timestamp));
|
65
|
+
}
|
66
|
+
|
63
67
|
/// @dev return true if Timestamp a is after Timestamp b
|
64
68
|
function gt(Timestamp a, Timestamp b) public pure returns (bool isAfter) {
|
65
69
|
return gtTimestamp(a, b);
|
@@ -99,22 +103,22 @@ library TimestampLib {
|
|
99
103
|
return neTimestamp(a, b);
|
100
104
|
}
|
101
105
|
|
102
|
-
/// @dev return true if Timestamp is larger than 0
|
103
|
-
function gtz(Timestamp timestamp) public pure returns (bool) {
|
104
|
-
return Timestamp.unwrap(timestamp) > 0;
|
105
|
-
}
|
106
|
-
|
107
106
|
/// @dev return true if Timestamp equals 0
|
108
107
|
function eqz(Timestamp timestamp) public pure returns (bool) {
|
109
108
|
return Timestamp.unwrap(timestamp) == 0;
|
110
109
|
}
|
111
110
|
|
111
|
+
/// @dev return true if Timestamp is larger than 0
|
112
|
+
function gtz(Timestamp timestamp) public pure returns (bool) {
|
113
|
+
return Timestamp.unwrap(timestamp) > 0;
|
114
|
+
}
|
115
|
+
|
112
116
|
/// @dev return true if Timestamp a is not equal to Timestamp b
|
113
117
|
function addSeconds(
|
114
118
|
Timestamp timestamp,
|
115
|
-
|
119
|
+
Seconds duration
|
116
120
|
) public pure returns (Timestamp) {
|
117
|
-
return toTimestamp(Timestamp.unwrap(timestamp) +
|
121
|
+
return toTimestamp(Timestamp.unwrap(timestamp) + duration.toInt());
|
118
122
|
}
|
119
123
|
|
120
124
|
function toInt(Timestamp timestamp) public pure returns (uint256) {
|