@etherisc/gif-next 0.0.2-efdb520-159 → 0.0.2-f02157b-803
Sign up to get free protection for your applications and to get access to all the features.
- package/README.md +176 -11
- package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.dbg.json +1 -1
- package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.json +168 -28
- package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +4 -0
- package/artifacts/contracts/components/Distribution.sol/Distribution.json +610 -0
- package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.json +121 -28
- package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +4 -0
- package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.json +152 -0
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.json +74 -181
- package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.json +55 -177
- package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
- package/artifacts/contracts/components/Pool.sol/Pool.json +447 -60
- package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
- package/artifacts/contracts/components/Product.sol/Product.json +519 -70
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Cloner.dbg.json +4 -0
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Cloner.json +66 -0
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock1.dbg.json +4 -0
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock1.json +24 -0
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock2.dbg.json +4 -0
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock2.json +42 -0
- package/artifacts/contracts/experiment/errors/Require.sol/Require.dbg.json +1 -1
- package/artifacts/contracts/experiment/errors/Revert.sol/Revert.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/A.sol/A.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/A.sol/AShared.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/B.sol/B.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/C.sol/C.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/IA.sol/IA.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/IB.sol/IB.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/IC.sol/IC.dbg.json +1 -1
- package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.dbg.json +1 -1
- package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.json +2 -2
- package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.dbg.json +1 -1
- package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.dbg.json +1 -1
- package/artifacts/contracts/experiment/statemachine/SM.sol/SM.dbg.json +1 -1
- package/artifacts/contracts/experiment/statemachine/SM.sol/SM.json +2 -2
- package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.dbg.json +1 -1
- package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.json +2 -2
- package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.dbg.json +1 -1
- package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.dbg.json +1 -1
- package/artifacts/contracts/instance/AccessManagedSimple.sol/AccessManagedSimple.dbg.json +4 -0
- package/artifacts/contracts/instance/AccessManagedSimple.sol/AccessManagedSimple.json +101 -0
- package/artifacts/contracts/instance/AccessManagerSimple.sol/AccessManagerSimple.dbg.json +4 -0
- package/artifacts/contracts/instance/AccessManagerSimple.sol/AccessManagerSimple.json +1119 -0
- package/artifacts/contracts/instance/IAccessManagerSimple.sol/IAccessManagerSimple.dbg.json +4 -0
- package/artifacts/contracts/instance/IAccessManagerSimple.sol/IAccessManagerSimple.json +1082 -0
- package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstance.sol/IInstance.json +240 -1911
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +4 -0
- package/artifacts/contracts/instance/{service/ServiceBase.sol/ServiceBase.json → IInstanceService.sol/IInstanceService.json} +187 -66
- package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
- package/artifacts/contracts/instance/Instance.sol/Instance.json +2329 -1158
- package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +4 -0
- package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +917 -0
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +4 -0
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +1257 -0
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +4 -0
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +703 -0
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +424 -0
- package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.dbg.json +4 -0
- package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.json +481 -0
- package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.dbg.json +4 -0
- package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.json +113 -0
- package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.dbg.json +4 -0
- package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.json +429 -0
- package/artifacts/contracts/instance/base/ILifecycle.sol/ILifecycle.dbg.json +4 -0
- package/artifacts/contracts/instance/{module/lifecycle/ILifecycle.sol/ILifecycleModule.json → base/ILifecycle.sol/ILifecycle.json} +10 -77
- package/artifacts/contracts/instance/base/IService.sol/IService.dbg.json +4 -0
- package/artifacts/contracts/instance/{service → base}/IService.sol/IService.json +180 -59
- package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.dbg.json +4 -0
- package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.json +502 -0
- package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json +4 -0
- package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.json +169 -0
- package/artifacts/contracts/instance/base/ServiceBase.sol/ServiceBase.dbg.json +4 -0
- package/artifacts/contracts/instance/{InstanceBase.sol/InstanceBase.json → base/ServiceBase.sol/ServiceBase.json} +225 -70
- package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +4 -0
- package/artifacts/contracts/instance/module/IAccess.sol/IAccess.json +211 -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/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/{access/IAccess.sol/IAccess.json → IRisk.sol/IRisk.json} +2 -2
- package/artifacts/contracts/instance/module/ISetup.sol/ISetup.dbg.json +4 -0
- package/artifacts/contracts/instance/module/{pool/IPoolModule.sol/IPool.json → 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/ComponentOwnerService.sol/ComponentOwnerService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.json +393 -85
- package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.json +182 -80
- package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/{ComponentServiceBase.sol/ComponentServiceBase.json → IDistributionService.sol/IDistributionService.json} +209 -63
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +240 -55
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +330 -56
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +186 -12
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +190 -51
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +4 -0
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +872 -0
- package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +4 -0
- package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.json +34 -0
- package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
- package/artifacts/contracts/registry/Registry.sol/Registry.json +380 -139
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +4 -0
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +1261 -0
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +4 -0
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +504 -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 +2 -2
- package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +4 -0
- package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.json +127 -0
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +117 -37
- package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +1 -1
- package/artifacts/contracts/shared/IVersionable.sol/IVersionable.json +60 -19
- package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +4 -0
- package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +158 -0
- package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +4 -0
- package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +349 -0
- package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
- package/artifacts/contracts/shared/Registerable.sol/Registerable.json +190 -37
- 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 +83 -19
- package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json +1 -1
- package/artifacts/contracts/test/TestFee.sol/TestFee.json +30 -6
- package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json +1 -1
- package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +204 -36
- package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +1 -1
- package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.json +44 -10
- package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +1 -1
- package/artifacts/contracts/test/TestService.sol/TestService.json +277 -84
- 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 +14 -18
- package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json +1 -1
- package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.json +106 -50
- package/artifacts/contracts/test/Usdc.sol/USDC.dbg.json +4 -0
- package/artifacts/contracts/test/Usdc.sol/USDC.json +376 -0
- package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.dbg.json +1 -1
- package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
- package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +1 -1
- 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 +4 -0
- package/artifacts/contracts/types/Fee.sol/FeeLib.json +257 -0
- package/artifacts/contracts/types/Key32.sol/Key32Lib.dbg.json +4 -0
- package/artifacts/contracts/types/Key32.sol/Key32Lib.json +125 -0
- package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/NftId.sol/NftIdLib.json +65 -4
- package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
- package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.json +2 -2
- 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/Referral.sol/ReferralLib.dbg.json +4 -0
- package/artifacts/contracts/types/Referral.sol/ReferralLib.json +123 -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 +4 -0
- package/artifacts/contracts/types/RoleId.sol/RoleIdLib.json +156 -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 +15 -2
- package/artifacts/contracts/types/UFixed.sol/MathLib.dbg.json +4 -0
- package/artifacts/contracts/types/UFixed.sol/MathLib.json +10 -0
- package/artifacts/contracts/types/UFixed.sol/UFixedLib.dbg.json +4 -0
- package/artifacts/contracts/types/UFixed.sol/UFixedLib.json +479 -0
- package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +1 -1
- package/artifacts/contracts/types/Version.sol/VersionLib.json +101 -2
- package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +1 -1
- package/artifacts/contracts/types/Version.sol/VersionPartLib.json +2 -2
- package/contracts/components/BaseComponent.sol +20 -23
- package/contracts/components/Distribution.sol +166 -0
- package/contracts/components/IBaseComponent.sol +8 -3
- package/contracts/components/IDistributionComponent.sol +43 -0
- package/contracts/components/IPoolComponent.sol +14 -9
- package/contracts/components/IProductComponent.sol +25 -9
- package/contracts/components/Pool.sol +115 -30
- package/contracts/components/Product.sol +212 -32
- package/contracts/experiment/cloning/Cloner.sol +47 -0
- package/contracts/instance/AccessManagedSimple.sol +114 -0
- package/contracts/instance/AccessManagerSimple.sol +682 -0
- package/contracts/instance/IAccessManagerSimple.sol +391 -0
- package/contracts/instance/IInstance.sol +17 -39
- package/contracts/instance/IInstanceService.sol +17 -0
- package/contracts/instance/Instance.sol +420 -46
- package/contracts/instance/InstanceAccessManager.sol +288 -0
- package/contracts/instance/InstanceReader.sol +280 -0
- package/contracts/instance/InstanceService.sol +102 -0
- package/contracts/instance/InstanceServiceManager.sol +56 -0
- package/contracts/instance/{service → base}/ComponentServiceBase.sol +13 -5
- package/contracts/instance/base/IInstanceBase.sol +23 -0
- package/contracts/instance/base/IKeyValueStore.sol +49 -0
- package/contracts/instance/base/ILifecycle.sol +30 -0
- package/contracts/instance/base/KeyValueStore.sol +172 -0
- package/contracts/instance/{module/lifecycle/LifecycleModule.sol → base/Lifecycle.sol} +51 -40
- package/contracts/instance/base/ServiceBase.sol +44 -0
- package/contracts/instance/module/IAccess.sol +38 -0
- package/contracts/instance/module/IBundle.sol +19 -0
- package/contracts/instance/module/IDistribution.sol +39 -0
- package/contracts/instance/module/IPolicy.sol +45 -0
- package/contracts/instance/module/IRisk.sol +11 -0
- package/contracts/instance/module/ISetup.sol +43 -0
- package/contracts/instance/module/ITreasury.sol +23 -0
- package/contracts/instance/service/ComponentOwnerService.sol +245 -102
- package/contracts/instance/service/IComponentOwnerService.sol +1 -3
- package/contracts/instance/service/IDistributionService.sol +12 -0
- package/contracts/instance/service/IPoolService.sol +8 -1
- package/contracts/instance/service/IProductService.sol +56 -7
- package/contracts/registry/ChainNft.sol +80 -37
- package/contracts/registry/IRegistry.sol +28 -28
- package/contracts/registry/IRegistryService.sol +35 -0
- package/contracts/registry/ITransferInterceptor.sol +6 -0
- package/contracts/registry/Registry.sol +315 -273
- package/contracts/registry/RegistryService.sol +439 -0
- package/contracts/registry/RegistryServiceManager.sol +64 -0
- package/contracts/shared/ContractDeployerLib.sol +72 -0
- package/contracts/shared/INftOwnable.sol +22 -0
- package/contracts/shared/IRegisterable.sol +8 -15
- package/contracts/shared/IVersionable.sol +56 -12
- package/contracts/shared/NftOwnable.sol +136 -0
- package/contracts/shared/ProxyManager.sol +94 -0
- package/contracts/shared/Registerable.sol +62 -59
- package/contracts/shared/TokenHandler.sol +27 -0
- package/contracts/shared/UpgradableProxyWithAdmin.sol +16 -0
- package/contracts/shared/Versionable.sol +112 -57
- package/contracts/test/TestFee.sol +4 -4
- package/contracts/test/TestRegisterable.sol +5 -6
- package/contracts/test/TestRoleId.sol +2 -2
- package/contracts/test/TestService.sol +7 -16
- package/contracts/test/TestVersion.sol +4 -7
- package/contracts/test/TestVersionable.sol +2 -5
- package/contracts/test/Usdc.sol +26 -0
- package/contracts/types/DistributorType.sol +55 -0
- package/contracts/types/Fee.sol +44 -20
- package/contracts/types/Key32.sol +50 -0
- package/contracts/types/NftId.sol +16 -1
- package/contracts/types/NumberId.sol +52 -0
- package/contracts/types/ObjectType.sol +51 -14
- package/contracts/types/Referral.sol +85 -0
- package/contracts/types/RiskId.sol +43 -0
- package/contracts/types/RoleId.sol +57 -11
- package/contracts/types/StateId.sol +8 -2
- package/contracts/types/Timestamp.sol +7 -3
- package/contracts/types/UFixed.sol +144 -25
- package/contracts/types/Version.sol +38 -25
- package/package.json +4 -3
- 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/IServiceLinked.sol/IServiceLinked.dbg.json +0 -4
- package/artifacts/contracts/instance/IServiceLinked.sol/IServiceLinked.json +0 -50
- package/artifacts/contracts/instance/InstanceBase.sol/InstanceBase.dbg.json +0 -4
- 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 -276
- 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 -276
- 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/lifecycle/ILifecycle.sol/ILifecycle.dbg.json +0 -4
- package/artifacts/contracts/instance/module/lifecycle/ILifecycle.sol/ILifecycle.json +0 -134
- package/artifacts/contracts/instance/module/lifecycle/ILifecycle.sol/ILifecycleModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/lifecycle/LifecycleModule.sol/LifecycleModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/lifecycle/LifecycleModule.sol/LifecycleModule.json +0 -221
- 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/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/product/IProductModule.sol/IProductModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/product/IProductModule.sol/IProductModule.json +0 -10
- package/artifacts/contracts/instance/module/product/ProductModule.sol/ProductModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/product/ProductModule.sol/ProductModule.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 -538
- 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 -538
- package/artifacts/contracts/instance/service/ComponentServiceBase.sol/ComponentServiceBase.dbg.json +0 -4
- package/artifacts/contracts/instance/service/IService.sol/IService.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 -499
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +0 -4
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +0 -685
- package/artifacts/contracts/instance/service/ServiceBase.sol/ServiceBase.dbg.json +0 -4
- package/artifacts/contracts/registry/IChainNft.sol/IChainNft.dbg.json +0 -4
- package/artifacts/contracts/registry/IChainNft.sol/IChainNft.json +0 -452
- 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/artifacts/contracts/types/UFixed.sol/UFixedMathLib.json +0 -453
- package/contracts/experiment/statemachine/README.md +0 -112
- package/contracts/instance/IInstanceLinked.sol +0 -8
- package/contracts/instance/IServiceLinked.sol +0 -12
- package/contracts/instance/InstanceBase.sol +0 -74
- 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 -228
- package/contracts/instance/module/bundle/IBundle.sol +0 -53
- package/contracts/instance/module/component/ComponentModule.sol +0 -104
- package/contracts/instance/module/component/IComponent.sol +0 -53
- package/contracts/instance/module/lifecycle/ILifecycle.sol +0 -47
- package/contracts/instance/module/policy/IPolicy.sol +0 -60
- package/contracts/instance/module/policy/PolicyModule.sol +0 -84
- package/contracts/instance/module/pool/IPoolModule.sol +0 -41
- package/contracts/instance/module/pool/PoolModule.sol +0 -87
- package/contracts/instance/module/product/IProductModule.sol +0 -6
- package/contracts/instance/module/product/ProductModule.sol +0 -8
- package/contracts/instance/module/treasury/ITreasury.sol +0 -104
- package/contracts/instance/module/treasury/TokenHandler.sol +0 -48
- package/contracts/instance/module/treasury/TreasuryModule.sol +0 -148
- package/contracts/instance/service/PoolService.sol +0 -98
- package/contracts/instance/service/ProductService.sol +0 -358
- package/contracts/instance/service/ServiceBase.sol +0 -39
- 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
- /package/contracts/instance/{service → base}/IService.sol +0 -0
@@ -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,93 @@ 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 DISTRIBUTION_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 POLICY() pure returns (ObjectType) {
|
61
94
|
return toObjectType(210);
|
62
95
|
}
|
63
96
|
|
97
|
+
function BUNDLE() pure returns (ObjectType) {
|
98
|
+
return toObjectType(220);
|
99
|
+
}
|
100
|
+
|
64
101
|
function CLAIM() pure returns (ObjectType) {
|
65
|
-
return toObjectType(
|
102
|
+
return toObjectType(211);
|
66
103
|
}
|
67
104
|
|
68
105
|
function PAYOUT() pure returns (ObjectType) {
|
69
|
-
return toObjectType(
|
106
|
+
return toObjectType(212);
|
70
107
|
}
|
71
108
|
|
72
109
|
/// @dev Converts the uint8 to a ObjectType.
|
@@ -0,0 +1,85 @@
|
|
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
|
+
}
|
@@ -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,29 +1,38 @@
|
|
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
|
|
12
19
|
// general pure free functions
|
13
|
-
function
|
20
|
+
function DISTRIBUTION_OWNER_ROLE_NAME() pure returns (string memory) { return "DistributionOwnerRole"; }
|
14
21
|
function ORACLE_OWNER_ROLE_NAME() pure returns (string memory) { return "OracleOwnerRole"; }
|
15
22
|
function POOL_OWNER_ROLE_NAME() pure returns (string memory) { return "PoolOwnerRole"; }
|
16
23
|
function PRODUCT_OWNER_ROLE_NAME() pure returns (string memory) { return "ProductOwnerRole"; }
|
17
24
|
|
18
|
-
|
19
|
-
function
|
20
|
-
function
|
21
|
-
function
|
25
|
+
// TODO correct numbers (maybe they are already defined in RegistryService)
|
26
|
+
function DISTRIBUTION_OWNER_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(100); }
|
27
|
+
function ORACLE_OWNER_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(200); }
|
28
|
+
function POOL_OWNER_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(300); }
|
29
|
+
function PRODUCT_OWNER_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(400); }
|
22
30
|
|
23
|
-
|
24
|
-
function
|
25
|
-
|
26
|
-
}
|
31
|
+
function DISTRIBUTION_REGISTRAR_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(1000); }
|
32
|
+
function POLICY_REGISTRAR_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(1100); }
|
33
|
+
function BUNDLE_REGISTRAR_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(1200); }
|
34
|
+
function POOL_REGISTRAR_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(1300); }
|
35
|
+
function PRODUCT_REGISTRAR_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(1400); }
|
27
36
|
|
28
37
|
// @dev Returns true iff role ids a and b are identical
|
29
38
|
function eqRoleId(RoleId a, RoleId b) pure returns (bool isSame) {
|
@@ -34,3 +43,40 @@ function eqRoleId(RoleId a, RoleId b) pure returns (bool isSame) {
|
|
34
43
|
function neRoleId(RoleId a, RoleId b) pure returns (bool isDifferent) {
|
35
44
|
return RoleId.unwrap(a) != RoleId.unwrap(b);
|
36
45
|
}
|
46
|
+
|
47
|
+
library RoleIdLib {
|
48
|
+
/// @dev Converts the RoleId to a uint.
|
49
|
+
function zero() public pure returns (RoleId) {
|
50
|
+
return RoleId.wrap(0);
|
51
|
+
}
|
52
|
+
|
53
|
+
/// @dev Converts an uint into a RoleId.
|
54
|
+
function toRoleId(uint256 a) public pure returns (RoleId) {
|
55
|
+
return RoleId.wrap(uint64(a));
|
56
|
+
}
|
57
|
+
|
58
|
+
/// @dev Converts the RoleId to a uint.
|
59
|
+
function toInt(RoleId a) public pure returns (uint64) {
|
60
|
+
return uint64(RoleId.unwrap(a));
|
61
|
+
}
|
62
|
+
|
63
|
+
/// @dev Returns true if the value is non-zero (> 0).
|
64
|
+
function gtz(RoleId a) public pure returns (bool) {
|
65
|
+
return RoleId.unwrap(a) > 0;
|
66
|
+
}
|
67
|
+
|
68
|
+
/// @dev Returns true if the value is zero (== 0).
|
69
|
+
function eqz(RoleId a) public pure returns (bool) {
|
70
|
+
return RoleId.unwrap(a) == 0;
|
71
|
+
}
|
72
|
+
|
73
|
+
/// @dev Returns the key32 value for the specified id and object type.
|
74
|
+
function toKey32(RoleId a) public pure returns (Key32 key) {
|
75
|
+
return Key32Lib.toKey32(ROLE(), toKeyId(a));
|
76
|
+
}
|
77
|
+
|
78
|
+
/// @dev Returns the key id value for the specified id
|
79
|
+
function toKeyId(RoleId a) public pure returns (KeyId keyId) {
|
80
|
+
return KeyId.wrap(bytes31(uint248(RoleId.unwrap(a))));
|
81
|
+
}
|
82
|
+
}
|
@@ -1,11 +1,17 @@
|
|
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;
|
6
6
|
|
7
7
|
// type bindings
|
8
|
-
using {
|
8
|
+
using {
|
9
|
+
eqStateId as ==,
|
10
|
+
neStateId as !=,
|
11
|
+
StateIdLib.eqz,
|
12
|
+
StateIdLib.gtz,
|
13
|
+
StateIdLib.toInt
|
14
|
+
} for StateId global;
|
9
15
|
|
10
16
|
// general pure free functions
|
11
17
|
function APPLIED() pure returns (StateId) {
|
@@ -50,9 +50,9 @@ function toTimestamp(uint256 timestamp) pure returns (Timestamp) {
|
|
50
50
|
return Timestamp.wrap(uint40(timestamp));
|
51
51
|
}
|
52
52
|
|
53
|
-
function blockTimestamp() view returns (Timestamp) {
|
54
|
-
|
55
|
-
}
|
53
|
+
// function blockTimestamp() view returns (Timestamp) {
|
54
|
+
// return toTimestamp(block.timestamp);
|
55
|
+
// }
|
56
56
|
|
57
57
|
/// @dev Return the Timestamp zero (0)
|
58
58
|
function zeroTimestamp() pure returns (Timestamp) {
|
@@ -60,6 +60,10 @@ function zeroTimestamp() pure returns (Timestamp) {
|
|
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);
|
@@ -1,7 +1,5 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
|
-
pragma solidity ^0.8.
|
3
|
-
|
4
|
-
import {Math} from "@openzeppelin/contracts/utils/math/Math.sol";
|
2
|
+
pragma solidity ^0.8.20;
|
5
3
|
|
6
4
|
/// @dev UFixed is a fixed point number with 18 decimals precision.
|
7
5
|
type UFixed is uint256;
|
@@ -16,9 +14,15 @@ using {
|
|
16
14
|
ltUFixed as <,
|
17
15
|
lteUFixed as <=,
|
18
16
|
eqUFixed as ==,
|
19
|
-
|
17
|
+
neUFixed as !=,
|
18
|
+
UFixedLib.toInt,
|
19
|
+
UFixedLib.gtz
|
20
20
|
} for UFixed global;
|
21
21
|
|
22
|
+
function zeroUFixed() pure returns (UFixed zero) {
|
23
|
+
return UFixed.wrap(0);
|
24
|
+
}
|
25
|
+
|
22
26
|
function addUFixed(UFixed a, UFixed b) pure returns (UFixed) {
|
23
27
|
return UFixed.wrap(UFixed.unwrap(a) + UFixed.unwrap(b));
|
24
28
|
}
|
@@ -30,14 +34,14 @@ function subUFixed(UFixed a, UFixed b) pure returns (UFixed) {
|
|
30
34
|
|
31
35
|
function mulUFixed(UFixed a, UFixed b) pure returns (UFixed) {
|
32
36
|
return
|
33
|
-
UFixed.wrap(
|
37
|
+
UFixed.wrap(MathLib.mulDiv(UFixed.unwrap(a), UFixed.unwrap(b), 10 ** 18));
|
34
38
|
}
|
35
39
|
|
36
40
|
function divUFixed(UFixed a, UFixed b) pure returns (UFixed) {
|
37
41
|
require(UFixed.unwrap(b) > 0, "ERROR:UFM-020:DIVISOR_ZERO");
|
38
42
|
|
39
43
|
return
|
40
|
-
UFixed.wrap(
|
44
|
+
UFixed.wrap(MathLib.mulDiv(UFixed.unwrap(a), 10 ** 18, UFixed.unwrap(b)));
|
41
45
|
}
|
42
46
|
|
43
47
|
function gtUFixed(UFixed a, UFixed b) pure returns (bool isGreaterThan) {
|
@@ -60,6 +64,10 @@ function eqUFixed(UFixed a, UFixed b) pure returns (bool isEqual) {
|
|
60
64
|
return UFixed.unwrap(a) == UFixed.unwrap(b);
|
61
65
|
}
|
62
66
|
|
67
|
+
function neUFixed(UFixed a, UFixed b) pure returns (bool isEqual) {
|
68
|
+
return UFixed.unwrap(a) != UFixed.unwrap(b);
|
69
|
+
}
|
70
|
+
|
63
71
|
function gtzUFixed(UFixed a) pure returns (bool isZero) {
|
64
72
|
return UFixed.unwrap(a) > 0;
|
65
73
|
}
|
@@ -76,20 +84,134 @@ function deltaUFixed(UFixed a, UFixed b) pure returns (UFixed) {
|
|
76
84
|
return b - a;
|
77
85
|
}
|
78
86
|
|
79
|
-
|
87
|
+
/// @dev copied from https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v4.9.3/contracts/utils/math/Math.sol
|
88
|
+
library MathLib {
|
89
|
+
|
80
90
|
enum Rounding {
|
81
|
-
|
82
|
-
|
83
|
-
|
84
|
-
Up,
|
85
|
-
/// @dev Round half up - round(value)
|
86
|
-
HalfUp
|
91
|
+
Down, // Toward negative infinity
|
92
|
+
Up, // Toward infinity
|
93
|
+
Zero // Toward zero
|
87
94
|
}
|
88
95
|
|
96
|
+
/**
|
97
|
+
* @notice Calculates floor(x * y / denominator) with full precision. Throws if result overflows a uint256 or denominator == 0
|
98
|
+
* @dev Original credit to Remco Bloemen under MIT license (https://xn--2-umb.com/21/muldiv)
|
99
|
+
* with further edits by Uniswap Labs also under MIT license.
|
100
|
+
*/
|
101
|
+
function mulDiv(uint256 x, uint256 y, uint256 denominator) internal pure returns (uint256 result) {
|
102
|
+
unchecked {
|
103
|
+
// 512-bit multiply [prod1 prod0] = x * y. Compute the product mod 2^256 and mod 2^256 - 1, then use
|
104
|
+
// use the Chinese Remainder Theorem to reconstruct the 512 bit result. The result is stored in two 256
|
105
|
+
// variables such that product = prod1 * 2^256 + prod0.
|
106
|
+
uint256 prod0; // Least significant 256 bits of the product
|
107
|
+
uint256 prod1; // Most significant 256 bits of the product
|
108
|
+
assembly {
|
109
|
+
let mm := mulmod(x, y, not(0))
|
110
|
+
prod0 := mul(x, y)
|
111
|
+
prod1 := sub(sub(mm, prod0), lt(mm, prod0))
|
112
|
+
}
|
113
|
+
|
114
|
+
// Handle non-overflow cases, 256 by 256 division.
|
115
|
+
if (prod1 == 0) {
|
116
|
+
// Solidity will revert if denominator == 0, unlike the div opcode on its own.
|
117
|
+
// The surrounding unchecked block does not change this fact.
|
118
|
+
// See https://docs.soliditylang.org/en/latest/control-structures.html#checked-or-unchecked-arithmetic.
|
119
|
+
return prod0 / denominator;
|
120
|
+
}
|
121
|
+
|
122
|
+
// Make sure the result is less than 2^256. Also prevents denominator == 0.
|
123
|
+
require(denominator > prod1, "Math: mulDiv overflow");
|
124
|
+
|
125
|
+
///////////////////////////////////////////////
|
126
|
+
// 512 by 256 division.
|
127
|
+
///////////////////////////////////////////////
|
128
|
+
|
129
|
+
// Make division exact by subtracting the remainder from [prod1 prod0].
|
130
|
+
uint256 remainder;
|
131
|
+
assembly {
|
132
|
+
// Compute remainder using mulmod.
|
133
|
+
remainder := mulmod(x, y, denominator)
|
134
|
+
|
135
|
+
// Subtract 256 bit number from 512 bit number.
|
136
|
+
prod1 := sub(prod1, gt(remainder, prod0))
|
137
|
+
prod0 := sub(prod0, remainder)
|
138
|
+
}
|
139
|
+
|
140
|
+
// Factor powers of two out of denominator and compute largest power of two divisor of denominator. Always >= 1.
|
141
|
+
// See https://cs.stackexchange.com/q/138556/92363.
|
142
|
+
|
143
|
+
// Does not overflow because the denominator cannot be zero at this stage in the function.
|
144
|
+
uint256 twos = denominator & (~denominator + 1);
|
145
|
+
assembly {
|
146
|
+
// Divide denominator by twos.
|
147
|
+
denominator := div(denominator, twos)
|
148
|
+
|
149
|
+
// Divide [prod1 prod0] by twos.
|
150
|
+
prod0 := div(prod0, twos)
|
151
|
+
|
152
|
+
// Flip twos such that it is 2^256 / twos. If twos is zero, then it becomes one.
|
153
|
+
twos := add(div(sub(0, twos), twos), 1)
|
154
|
+
}
|
155
|
+
|
156
|
+
// Shift in bits from prod1 into prod0.
|
157
|
+
prod0 |= prod1 * twos;
|
158
|
+
|
159
|
+
// Invert denominator mod 2^256. Now that denominator is an odd number, it has an inverse modulo 2^256 such
|
160
|
+
// that denominator * inv = 1 mod 2^256. Compute the inverse by starting with a seed that is correct for
|
161
|
+
// four bits. That is, denominator * inv = 1 mod 2^4.
|
162
|
+
uint256 inverse = (3 * denominator) ^ 2;
|
163
|
+
|
164
|
+
// Use the Newton-Raphson iteration to improve the precision. Thanks to Hensel's lifting lemma, this also works
|
165
|
+
// in modular arithmetic, doubling the correct bits in each step.
|
166
|
+
inverse *= 2 - denominator * inverse; // inverse mod 2^8
|
167
|
+
inverse *= 2 - denominator * inverse; // inverse mod 2^16
|
168
|
+
inverse *= 2 - denominator * inverse; // inverse mod 2^32
|
169
|
+
inverse *= 2 - denominator * inverse; // inverse mod 2^64
|
170
|
+
inverse *= 2 - denominator * inverse; // inverse mod 2^128
|
171
|
+
inverse *= 2 - denominator * inverse; // inverse mod 2^256
|
172
|
+
|
173
|
+
// Because the division is now exact we can divide by multiplying with the modular inverse of denominator.
|
174
|
+
// This will give us the correct result modulo 2^256. Since the preconditions guarantee that the outcome is
|
175
|
+
// less than 2^256, this is the final result. We don't need to compute the high bits of the result and prod1
|
176
|
+
// is no longer required.
|
177
|
+
result = prod0 * inverse;
|
178
|
+
return result;
|
179
|
+
}
|
180
|
+
}
|
181
|
+
|
182
|
+
/**
|
183
|
+
* @notice Calculates x * y / denominator with full precision, following the selected rounding direction.
|
184
|
+
*/
|
185
|
+
function mulDiv(uint256 x, uint256 y, uint256 denominator, Rounding rounding) internal pure returns (uint256) {
|
186
|
+
uint256 result = mulDiv(x, y, denominator);
|
187
|
+
if (rounding == Rounding.Up && mulmod(x, y, denominator) > 0) {
|
188
|
+
result += 1;
|
189
|
+
}
|
190
|
+
return result;
|
191
|
+
}
|
192
|
+
|
193
|
+
}
|
194
|
+
|
195
|
+
library UFixedLib {
|
89
196
|
int8 public constant EXP = 18;
|
90
197
|
uint256 public constant MULTIPLIER = 10 ** uint256(int256(EXP));
|
91
198
|
uint256 public constant MULTIPLIER_HALF = MULTIPLIER / 2;
|
92
199
|
|
200
|
+
/// @dev returns the rounding mode DOWN - 0.4 becomes 0, 0.5 becomes 0, 0.6 becomes 0
|
201
|
+
function ROUNDING_DOWN() public pure returns (uint8) {
|
202
|
+
return uint8(0);
|
203
|
+
}
|
204
|
+
|
205
|
+
/// @dev returns the rounding mode UP - 0.4 becomes 1, 0.5 becomes 1, 0.6 becomes 1
|
206
|
+
function ROUNDING_UP() public pure returns (uint8) {
|
207
|
+
return uint8(1);
|
208
|
+
}
|
209
|
+
|
210
|
+
/// @dev returns the rounding mode HALF_UP - 0.4 becomes 0, 0.5 becomes 1, 0.6 becomes 1
|
211
|
+
function ROUNDING_HALF_UP() public pure returns (uint8) {
|
212
|
+
return uint8(2);
|
213
|
+
}
|
214
|
+
|
93
215
|
/// @dev Converts the uint256 to a UFixed.
|
94
216
|
function toUFixed(uint256 a) public pure returns (UFixed) {
|
95
217
|
return UFixed.wrap(a * MULTIPLIER);
|
@@ -103,9 +225,6 @@ library UFixedMathLib {
|
|
103
225
|
return UFixed.wrap(a * 10 ** uint8(EXP + exp));
|
104
226
|
}
|
105
227
|
|
106
|
-
/// @dev Default rounding mode used by ftoi is HalfUp
|
107
|
-
Rounding public constant ROUNDING_DEFAULT = Rounding.HalfUp;
|
108
|
-
|
109
228
|
/// @dev returns the decimals precision of the UFixed type
|
110
229
|
function decimals() public pure returns (uint256) {
|
111
230
|
return uint8(EXP);
|
@@ -113,30 +232,30 @@ library UFixedMathLib {
|
|
113
232
|
|
114
233
|
/// @dev Converts a UFixed to a uint256.
|
115
234
|
function toInt(UFixed a) public pure returns (uint256) {
|
116
|
-
return toIntWithRounding(a,
|
235
|
+
return toIntWithRounding(a, ROUNDING_HALF_UP());
|
117
236
|
}
|
118
237
|
|
119
238
|
/// @dev Converts a UFixed to a uint256 with given rounding mode.
|
120
|
-
function toIntWithRounding(UFixed a,
|
121
|
-
if (rounding ==
|
239
|
+
function toIntWithRounding(UFixed a, uint8 rounding) public pure returns (uint256) {
|
240
|
+
if (rounding == ROUNDING_HALF_UP()) {
|
122
241
|
return
|
123
|
-
|
242
|
+
MathLib.mulDiv(
|
124
243
|
UFixed.unwrap(a) + MULTIPLIER_HALF,
|
125
244
|
1,
|
126
245
|
MULTIPLIER,
|
127
|
-
|
246
|
+
MathLib.Rounding.Down
|
128
247
|
);
|
129
|
-
} else if (rounding ==
|
248
|
+
} else if (rounding == ROUNDING_DOWN()) {
|
130
249
|
return
|
131
|
-
|
250
|
+
MathLib.mulDiv(
|
132
251
|
UFixed.unwrap(a),
|
133
252
|
1,
|
134
253
|
MULTIPLIER,
|
135
|
-
|
254
|
+
MathLib.Rounding.Down
|
136
255
|
);
|
137
256
|
} else {
|
138
257
|
return
|
139
|
-
|
258
|
+
MathLib.mulDiv(UFixed.unwrap(a), 1, MULTIPLIER, MathLib.Rounding.Up);
|
140
259
|
}
|
141
260
|
}
|
142
261
|
|