@etherisc/gif-next 0.0.2-f619be3-760 → 0.0.2-f63e99e-607
Sign up to get free protection for your applications and to get access to all the features.
- package/README.md +256 -11
- package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.dbg.json +4 -0
- package/artifacts/contracts/{instance/component/ComponentModule.sol/ComponentModule.json → components/BaseComponent.sol/BaseComponent.json} +171 -143
- package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +4 -0
- package/artifacts/contracts/components/Distribution.sol/Distribution.json +618 -0
- package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.dbg.json +4 -0
- package/artifacts/contracts/components/{IPool.sol/IPoolComponent.json → IBaseComponent.sol/IBaseComponent.json} +136 -111
- 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 +4 -0
- package/artifacts/contracts/{instance/policy/IPolicy.sol/IPolicyModule.json → components/IPoolComponent.sol/IPoolComponent.json} +124 -129
- package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +4 -0
- package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.json +157 -0
- package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
- package/artifacts/contracts/components/Pool.sol/Pool.json +531 -77
- package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
- package/artifacts/contracts/components/Product.sol/Product.json +526 -97
- 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 +1132 -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 +386 -1112
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +4 -0
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +480 -0
- package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
- package/artifacts/contracts/instance/Instance.sol/Instance.json +2794 -980
- 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 +1388 -0
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +4 -0
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +891 -0
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +492 -0
- package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.dbg.json +4 -0
- package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.json +510 -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/{lifecycle/ILifecycle.sol/ILifecycleModule.json → base/ILifecycle.sol/ILifecycle.json} +10 -77
- 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/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/{access/IAccess.sol/IAccess.json → module/IBundle.sol/IBundle.json} +2 -2
- package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +4 -0
- package/artifacts/contracts/instance/{component/IComponent.sol/IComponent.json → module/IDistribution.sol/IDistribution.json} +2 -2
- package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +4 -0
- package/artifacts/contracts/instance/{policy → module}/IPolicy.sol/IPolicy.json +1 -1
- package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +4 -0
- package/artifacts/contracts/instance/{pool/IPoolModule.sol/IPool.json → module/IRisk.sol/IRisk.json} +2 -2
- package/artifacts/contracts/instance/module/ISetup.sol/ISetup.dbg.json +4 -0
- package/artifacts/contracts/instance/module/ISetup.sol/ISetup.json +10 -0
- package/artifacts/contracts/instance/module/ITreasury.sol/ITreasury.dbg.json +4 -0
- package/artifacts/contracts/instance/{treasury → module}/ITreasury.sol/ITreasury.json +1 -1
- package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.json +827 -0
- package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +681 -0
- package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.json +436 -0
- package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.json +466 -0
- package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.json +446 -0
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +561 -0
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +751 -0
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +820 -0
- package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.json +448 -0
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +239 -2
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +589 -24
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +4 -0
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +853 -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 +741 -50
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +4 -0
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +1237 -0
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +4 -0
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +525 -0
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +4 -0
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +410 -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 +4 -0
- package/artifacts/contracts/shared/ERC165.sol/ERC165.json +35 -0
- 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 +4 -0
- package/artifacts/contracts/{components/Component.sol/Component.json → shared/IRegisterable.sol/IRegisterable.json} +98 -102
- package/artifacts/contracts/shared/IService.sol/IService.dbg.json +4 -0
- package/artifacts/contracts/shared/IService.sol/IService.json +421 -0
- package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +4 -0
- package/artifacts/contracts/shared/IVersionable.sol/IVersionable.json +205 -0
- 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 +4 -0
- package/artifacts/contracts/shared/Registerable.sol/Registerable.json +274 -0
- package/artifacts/contracts/shared/RegisterableUpgradable.sol/RegisterableUpgradable.dbg.json +4 -0
- package/artifacts/contracts/shared/RegisterableUpgradable.sol/RegisterableUpgradable.json +442 -0
- package/artifacts/contracts/shared/Service.sol/Service.dbg.json +4 -0
- package/artifacts/contracts/shared/Service.sol/Service.json +468 -0
- 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 +4 -0
- package/artifacts/contracts/shared/Versionable.sol/Versionable.json +228 -0
- package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json +4 -0
- package/artifacts/contracts/test/TestFee.sol/TestFee.json +119 -0
- package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json +4 -0
- package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +305 -0
- package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +4 -0
- package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.json +116 -0
- package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +4 -0
- package/artifacts/contracts/test/TestService.sol/TestService.json +600 -0
- package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json +4 -0
- package/artifacts/contracts/test/TestToken.sol/TestUsdc.json +376 -0
- package/artifacts/contracts/test/TestVersion.sol/TestVersion.dbg.json +4 -0
- package/artifacts/contracts/test/TestVersion.sol/TestVersion.json +218 -0
- package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json +4 -0
- package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.json +286 -0
- 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 +4 -0
- package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.json +10 -0
- 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 +4 -0
- package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.json +10 -0
- 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 +77 -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 +4 -0
- package/artifacts/contracts/types/Version.sol/VersionLib.json +177 -0
- package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +4 -0
- package/artifacts/contracts/types/Version.sol/VersionPartLib.json +49 -0
- package/contracts/components/BaseComponent.sol +91 -0
- package/contracts/components/Distribution.sol +160 -0
- package/contracts/components/IBaseComponent.sol +25 -0
- package/contracts/components/IDistributionComponent.sol +44 -0
- package/contracts/components/IPoolComponent.sol +62 -0
- package/contracts/components/IProductComponent.sol +35 -0
- package/contracts/components/Pool.sol +216 -25
- package/contracts/components/Product.sol +254 -46
- package/contracts/experiment/cloning/Cloner.sol +47 -0
- package/contracts/instance/AccessManagedSimple.sol +115 -0
- package/contracts/instance/AccessManagerSimple.sol +692 -0
- package/contracts/instance/IAccessManagerSimple.sol +391 -0
- package/contracts/instance/IInstance.sol +38 -24
- package/contracts/instance/IInstanceService.sol +30 -0
- package/contracts/instance/Instance.sol +423 -52
- package/contracts/instance/InstanceAccessManager.sol +288 -0
- package/contracts/instance/InstanceReader.sol +306 -0
- package/contracts/instance/InstanceService.sol +182 -0
- package/contracts/instance/InstanceServiceManager.sol +56 -0
- package/contracts/instance/base/ComponentServiceBase.sol +60 -0
- 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/base/Lifecycle.sol +100 -0
- package/contracts/instance/module/IAccess.sol +38 -0
- package/contracts/instance/module/IBundle.sol +20 -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 +44 -0
- package/contracts/instance/module/ITreasury.sol +23 -0
- package/contracts/instance/service/ComponentOwnerService.sol +317 -0
- package/contracts/instance/service/DistributionService.sol +102 -0
- package/contracts/instance/service/DistributionServiceManager.sol +53 -0
- package/contracts/instance/service/IComponentOwnerService.sol +20 -0
- package/contracts/instance/service/IDistributionService.sol +12 -0
- package/contracts/instance/service/IPoolService.sol +37 -0
- package/contracts/instance/service/IProductService.sol +107 -0
- package/contracts/instance/service/PoolService.sol +208 -0
- package/contracts/instance/service/PoolServiceManager.sol +53 -0
- package/contracts/registry/ChainNft.sol +129 -62
- package/contracts/registry/IRegistry.sol +70 -43
- package/contracts/registry/IRegistryService.sol +33 -0
- package/contracts/registry/ITransferInterceptor.sol +6 -0
- package/contracts/registry/Registry.sol +432 -125
- package/contracts/registry/RegistryService.sol +399 -0
- package/contracts/registry/RegistryServiceManager.sol +80 -0
- package/contracts/registry/TokenRegistry.sol +111 -0
- package/contracts/shared/ContractDeployerLib.sol +72 -0
- package/contracts/shared/ERC165.sol +25 -0
- package/contracts/shared/INftOwnable.sol +22 -0
- package/contracts/shared/IRegisterable.sol +17 -0
- package/contracts/shared/IService.sol +15 -0
- package/contracts/shared/IVersionable.sol +96 -0
- package/contracts/shared/NftOwnable.sol +136 -0
- package/contracts/shared/ProxyManager.sol +94 -0
- package/contracts/shared/Registerable.sol +90 -0
- package/contracts/shared/RegisterableUpgradable.sol +16 -0
- package/contracts/shared/Service.sol +54 -0
- package/contracts/shared/TokenHandler.sol +27 -0
- package/contracts/shared/UpgradableProxyWithAdmin.sol +16 -0
- package/contracts/shared/Versionable.sol +147 -0
- package/contracts/test/TestFee.sol +25 -0
- package/contracts/test/TestRegisterable.sol +18 -0
- package/contracts/test/TestRoleId.sol +14 -0
- package/contracts/test/TestService.sol +24 -0
- package/contracts/{mock/Dip.sol → test/TestToken.sol} +5 -5
- package/contracts/test/TestVersion.sol +44 -0
- package/contracts/test/TestVersionable.sol +17 -0
- package/contracts/{mock → test}/Usdc.sol +1 -1
- package/contracts/types/AddressSet.sol +58 -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 +22 -1
- package/contracts/types/NftIdSet.sol +60 -0
- package/contracts/types/NumberId.sol +52 -0
- package/contracts/types/ObjectType.sol +60 -15
- package/contracts/types/Referral.sol +85 -0
- package/contracts/types/RiskId.sol +43 -0
- package/contracts/types/RoleId.sol +89 -0
- package/contracts/types/StateId.sol +18 -4
- package/contracts/types/Timestamp.sol +29 -4
- package/contracts/types/UFixed.sol +138 -23
- package/contracts/types/Version.sol +107 -0
- package/package.json +11 -5
- package/artifacts/contracts/components/Component.sol/Component.dbg.json +0 -4
- package/artifacts/contracts/components/Component.sol/InstanceLinked.dbg.json +0 -4
- package/artifacts/contracts/components/Component.sol/InstanceLinked.json +0 -35
- package/artifacts/contracts/components/IPool.sol/IPoolComponent.dbg.json +0 -4
- package/artifacts/contracts/components/IProduct.sol/IProductComponent.dbg.json +0 -4
- package/artifacts/contracts/components/IProduct.sol/IProductComponent.json +0 -74
- package/artifacts/contracts/instance/access/Access.sol/AccessModule.dbg.json +0 -4
- package/artifacts/contracts/instance/access/Access.sol/AccessModule.json +0 -400
- package/artifacts/contracts/instance/access/IAccess.sol/IAccess.dbg.json +0 -4
- package/artifacts/contracts/instance/access/IAccess.sol/IAccessCheckRole.dbg.json +0 -4
- package/artifacts/contracts/instance/access/IAccess.sol/IAccessCheckRole.json +0 -35
- package/artifacts/contracts/instance/access/IAccess.sol/IAccessComponentTypeRoles.dbg.json +0 -4
- package/artifacts/contracts/instance/access/IAccess.sol/IAccessComponentTypeRoles.json +0 -50
- package/artifacts/contracts/instance/access/IAccess.sol/IAccessModule.dbg.json +0 -4
- package/artifacts/contracts/instance/access/IAccess.sol/IAccessModule.json +0 -336
- package/artifacts/contracts/instance/component/ComponentModule.sol/ComponentModule.dbg.json +0 -4
- package/artifacts/contracts/instance/component/ComponentModule.sol/ComponentOwnerService.dbg.json +0 -4
- package/artifacts/contracts/instance/component/ComponentModule.sol/ComponentOwnerService.json +0 -202
- package/artifacts/contracts/instance/component/IComponent.sol/IComponent.dbg.json +0 -4
- package/artifacts/contracts/instance/component/IComponent.sol/IComponentContract.dbg.json +0 -4
- package/artifacts/contracts/instance/component/IComponent.sol/IComponentContract.json +0 -205
- package/artifacts/contracts/instance/component/IComponent.sol/IComponentModule.dbg.json +0 -4
- package/artifacts/contracts/instance/component/IComponent.sol/IComponentModule.json +0 -217
- package/artifacts/contracts/instance/component/IComponent.sol/IComponentOwnerService.dbg.json +0 -4
- package/artifacts/contracts/instance/component/IComponent.sol/IComponentOwnerService.json +0 -141
- package/artifacts/contracts/instance/component/IComponent.sol/IInstanceLinked.dbg.json +0 -4
- package/artifacts/contracts/instance/component/IComponent.sol/IInstanceLinked.json +0 -24
- package/artifacts/contracts/instance/lifecycle/ILifecycle.sol/ILifecycle.dbg.json +0 -4
- package/artifacts/contracts/instance/lifecycle/ILifecycle.sol/ILifecycle.json +0 -134
- package/artifacts/contracts/instance/lifecycle/ILifecycle.sol/ILifecycleModule.dbg.json +0 -4
- package/artifacts/contracts/instance/lifecycle/LifecycleModule.sol/LifecycleModule.dbg.json +0 -4
- package/artifacts/contracts/instance/lifecycle/LifecycleModule.sol/LifecycleModule.json +0 -221
- package/artifacts/contracts/instance/policy/IPolicy.sol/IPolicy.dbg.json +0 -4
- package/artifacts/contracts/instance/policy/IPolicy.sol/IPolicyModule.dbg.json +0 -4
- package/artifacts/contracts/instance/policy/PolicyModule.sol/PolicyModule.dbg.json +0 -4
- package/artifacts/contracts/instance/policy/PolicyModule.sol/PolicyModule.json +0 -254
- package/artifacts/contracts/instance/pool/IPoolModule.sol/IPool.dbg.json +0 -4
- package/artifacts/contracts/instance/pool/IPoolModule.sol/IPoolModule.dbg.json +0 -4
- package/artifacts/contracts/instance/pool/IPoolModule.sol/IPoolModule.json +0 -129
- package/artifacts/contracts/instance/pool/PoolModule.sol/PoolModule.dbg.json +0 -4
- package/artifacts/contracts/instance/pool/PoolModule.sol/PoolModule.json +0 -155
- package/artifacts/contracts/instance/product/IProductService.sol/IProductModule.dbg.json +0 -4
- package/artifacts/contracts/instance/product/IProductService.sol/IProductModule.json +0 -75
- package/artifacts/contracts/instance/product/IProductService.sol/IProductService.dbg.json +0 -4
- package/artifacts/contracts/instance/product/IProductService.sol/IProductService.json +0 -127
- package/artifacts/contracts/instance/product/ProductService.sol/ProductModule.dbg.json +0 -4
- package/artifacts/contracts/instance/product/ProductService.sol/ProductModule.json +0 -75
- package/artifacts/contracts/instance/product/ProductService.sol/ProductService.dbg.json +0 -4
- package/artifacts/contracts/instance/product/ProductService.sol/ProductService.json +0 -196
- package/artifacts/contracts/instance/treasury/ITreasury.sol/ITreasury.dbg.json +0 -4
- package/artifacts/contracts/instance/treasury/ITreasury.sol/ITreasuryModule.dbg.json +0 -4
- package/artifacts/contracts/instance/treasury/ITreasury.sol/ITreasuryModule.json +0 -490
- package/artifacts/contracts/instance/treasury/TokenHandler.sol/TokenHandler.dbg.json +0 -4
- package/artifacts/contracts/instance/treasury/TokenHandler.sol/TokenHandler.json +0 -45
- package/artifacts/contracts/instance/treasury/TreasuryModule.sol/TreasuryModule.dbg.json +0 -4
- package/artifacts/contracts/instance/treasury/TreasuryModule.sol/TreasuryModule.json +0 -490
- package/artifacts/contracts/mock/Dip.sol/DIP.dbg.json +0 -4
- package/artifacts/contracts/mock/Dip.sol/DIP.json +0 -338
- package/artifacts/contracts/mock/TestPool.sol/TestPool.dbg.json +0 -4
- package/artifacts/contracts/mock/TestPool.sol/TestPool.json +0 -294
- package/artifacts/contracts/mock/TestProduct.sol/TestProduct.dbg.json +0 -4
- package/artifacts/contracts/mock/TestProduct.sol/TestProduct.json +0 -384
- package/artifacts/contracts/mock/Usdc.sol/USDC.dbg.json +0 -4
- package/artifacts/contracts/mock/Usdc.sol/USDC.json +0 -338
- 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/IRegistry.sol/IOwnable.dbg.json +0 -4
- package/artifacts/contracts/registry/IRegistry.sol/IOwnable.json +0 -24
- package/artifacts/contracts/registry/IRegistry.sol/IRegisterable.dbg.json +0 -4
- package/artifacts/contracts/registry/IRegistry.sol/IRegisterable.json +0 -166
- package/artifacts/contracts/registry/IRegistry.sol/IRegistryLinked.dbg.json +0 -4
- package/artifacts/contracts/registry/IRegistry.sol/IRegistryLinked.json +0 -49
- package/artifacts/contracts/registry/Registry.sol/Registerable.dbg.json +0 -4
- package/artifacts/contracts/registry/Registry.sol/Registerable.json +0 -166
- package/artifacts/contracts/registry/Registry.sol/RegistryLinked.dbg.json +0 -4
- package/artifacts/contracts/registry/Registry.sol/RegistryLinked.json +0 -60
- package/artifacts/contracts/types/UFixed.sol/UFixedMathLib.dbg.json +0 -4
- package/artifacts/contracts/types/UFixed.sol/UFixedMathLib.json +0 -479
- package/contracts/components/Component.sol +0 -77
- package/contracts/components/IPool.sol +0 -15
- package/contracts/components/IProduct.sol +0 -16
- package/contracts/experiment/statemachine/README.md +0 -112
- package/contracts/instance/access/Access.sol +0 -165
- package/contracts/instance/access/IAccess.sol +0 -63
- package/contracts/instance/component/ComponentModule.sol +0 -274
- package/contracts/instance/component/IComponent.sol +0 -74
- package/contracts/instance/lifecycle/ILifecycle.sol +0 -47
- package/contracts/instance/lifecycle/LifecycleModule.sol +0 -88
- package/contracts/instance/policy/IPolicy.sol +0 -50
- package/contracts/instance/policy/PolicyModule.sol +0 -114
- package/contracts/instance/pool/IPoolModule.sol +0 -23
- package/contracts/instance/pool/PoolModule.sol +0 -81
- package/contracts/instance/product/IProductService.sol +0 -36
- package/contracts/instance/product/ProductService.sol +0 -136
- package/contracts/instance/treasury/ITreasury.sol +0 -91
- package/contracts/instance/treasury/TokenHandler.sol +0 -24
- package/contracts/instance/treasury/TreasuryModule.sol +0 -168
- package/contracts/mock/TestPool.sol +0 -16
- package/contracts/mock/TestProduct.sol +0 -39
- package/contracts/registry/IChainNft.sol +0 -21
@@ -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;
|
@@ -15,9 +13,16 @@ using {
|
|
15
13
|
gteUFixed as >=,
|
16
14
|
ltUFixed as <,
|
17
15
|
lteUFixed as <=,
|
18
|
-
eqUFixed as
|
16
|
+
eqUFixed as ==,
|
17
|
+
neUFixed as !=,
|
18
|
+
UFixedLib.toInt,
|
19
|
+
UFixedLib.gtz
|
19
20
|
} for UFixed global;
|
20
21
|
|
22
|
+
function zeroUFixed() pure returns (UFixed zero) {
|
23
|
+
return UFixed.wrap(0);
|
24
|
+
}
|
25
|
+
|
21
26
|
function addUFixed(UFixed a, UFixed b) pure returns (UFixed) {
|
22
27
|
return UFixed.wrap(UFixed.unwrap(a) + UFixed.unwrap(b));
|
23
28
|
}
|
@@ -29,14 +34,14 @@ function subUFixed(UFixed a, UFixed b) pure returns (UFixed) {
|
|
29
34
|
|
30
35
|
function mulUFixed(UFixed a, UFixed b) pure returns (UFixed) {
|
31
36
|
return
|
32
|
-
UFixed.wrap(
|
37
|
+
UFixed.wrap(MathLib.mulDiv(UFixed.unwrap(a), UFixed.unwrap(b), 10 ** 18));
|
33
38
|
}
|
34
39
|
|
35
40
|
function divUFixed(UFixed a, UFixed b) pure returns (UFixed) {
|
36
41
|
require(UFixed.unwrap(b) > 0, "ERROR:UFM-020:DIVISOR_ZERO");
|
37
42
|
|
38
43
|
return
|
39
|
-
UFixed.wrap(
|
44
|
+
UFixed.wrap(MathLib.mulDiv(UFixed.unwrap(a), 10 ** 18, UFixed.unwrap(b)));
|
40
45
|
}
|
41
46
|
|
42
47
|
function gtUFixed(UFixed a, UFixed b) pure returns (bool isGreaterThan) {
|
@@ -59,6 +64,10 @@ function eqUFixed(UFixed a, UFixed b) pure returns (bool isEqual) {
|
|
59
64
|
return UFixed.unwrap(a) == UFixed.unwrap(b);
|
60
65
|
}
|
61
66
|
|
67
|
+
function neUFixed(UFixed a, UFixed b) pure returns (bool isEqual) {
|
68
|
+
return UFixed.unwrap(a) != UFixed.unwrap(b);
|
69
|
+
}
|
70
|
+
|
62
71
|
function gtzUFixed(UFixed a) pure returns (bool isZero) {
|
63
72
|
return UFixed.unwrap(a) > 0;
|
64
73
|
}
|
@@ -75,8 +84,115 @@ function deltaUFixed(UFixed a, UFixed b) pure returns (UFixed) {
|
|
75
84
|
return b - a;
|
76
85
|
}
|
77
86
|
|
78
|
-
|
87
|
+
/// @dev copied from https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v4.9.3/contracts/utils/math/Math.sol
|
88
|
+
library MathLib {
|
89
|
+
|
90
|
+
enum Rounding {
|
91
|
+
Down, // Toward negative infinity
|
92
|
+
Up, // Toward infinity
|
93
|
+
Zero // Toward zero
|
94
|
+
}
|
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
|
+
}
|
79
192
|
|
193
|
+
}
|
194
|
+
|
195
|
+
library UFixedLib {
|
80
196
|
int8 public constant EXP = 18;
|
81
197
|
uint256 public constant MULTIPLIER = 10 ** uint256(int256(EXP));
|
82
198
|
uint256 public constant MULTIPLIER_HALF = MULTIPLIER / 2;
|
@@ -96,51 +212,50 @@ library UFixedMathLib {
|
|
96
212
|
return uint8(2);
|
97
213
|
}
|
98
214
|
|
99
|
-
/// @dev returns the decimals precision of the UFixed type
|
100
|
-
function decimals() public pure returns (uint256) {
|
101
|
-
return uint8(EXP);
|
102
|
-
}
|
103
|
-
|
104
215
|
/// @dev Converts the uint256 to a UFixed.
|
105
|
-
function
|
216
|
+
function toUFixed(uint256 a) public pure returns (UFixed) {
|
106
217
|
return UFixed.wrap(a * MULTIPLIER);
|
107
218
|
}
|
108
219
|
|
109
|
-
// TODO rename to toUFixed
|
110
220
|
/// @dev Converts the uint256 to a UFixed with given exponent.
|
111
|
-
function
|
221
|
+
function toUFixed(uint256 a, int8 exp) public pure returns (UFixed) {
|
112
222
|
require(EXP + exp >= 0, "ERROR:FM-010:EXPONENT_TOO_SMALL");
|
113
223
|
require(EXP + exp <= 64, "ERROR:FM-011:EXPONENT_TOO_LARGE");
|
114
224
|
|
115
225
|
return UFixed.wrap(a * 10 ** uint8(EXP + exp));
|
116
226
|
}
|
117
227
|
|
228
|
+
/// @dev returns the decimals precision of the UFixed type
|
229
|
+
function decimals() public pure returns (uint256) {
|
230
|
+
return uint8(EXP);
|
231
|
+
}
|
232
|
+
|
118
233
|
/// @dev Converts a UFixed to a uint256.
|
119
|
-
function
|
120
|
-
return
|
234
|
+
function toInt(UFixed a) public pure returns (uint256) {
|
235
|
+
return toIntWithRounding(a, ROUNDING_HALF_UP());
|
121
236
|
}
|
122
237
|
|
123
238
|
/// @dev Converts a UFixed to a uint256 with given rounding mode.
|
124
|
-
function
|
239
|
+
function toIntWithRounding(UFixed a, uint8 rounding) public pure returns (uint256) {
|
125
240
|
if (rounding == ROUNDING_HALF_UP()) {
|
126
241
|
return
|
127
|
-
|
242
|
+
MathLib.mulDiv(
|
128
243
|
UFixed.unwrap(a) + MULTIPLIER_HALF,
|
129
244
|
1,
|
130
245
|
MULTIPLIER,
|
131
|
-
|
246
|
+
MathLib.Rounding.Down
|
132
247
|
);
|
133
248
|
} else if (rounding == ROUNDING_DOWN()) {
|
134
249
|
return
|
135
|
-
|
250
|
+
MathLib.mulDiv(
|
136
251
|
UFixed.unwrap(a),
|
137
252
|
1,
|
138
253
|
MULTIPLIER,
|
139
|
-
|
254
|
+
MathLib.Rounding.Down
|
140
255
|
);
|
141
256
|
} else {
|
142
257
|
return
|
143
|
-
|
258
|
+
MathLib.mulDiv(UFixed.unwrap(a), 1, MULTIPLIER, MathLib.Rounding.Up);
|
144
259
|
}
|
145
260
|
}
|
146
261
|
|
@@ -0,0 +1,107 @@
|
|
1
|
+
// SPDX-License-Identifier: Apache-2.0
|
2
|
+
pragma solidity ^0.8.19;
|
3
|
+
|
4
|
+
type VersionPart is uint8;
|
5
|
+
|
6
|
+
using {
|
7
|
+
versionPartGt as >,
|
8
|
+
versionPartEq as ==,
|
9
|
+
versionPartNe as !=,
|
10
|
+
VersionPartLib.toInt
|
11
|
+
}
|
12
|
+
for VersionPart global;
|
13
|
+
|
14
|
+
function versionPartGt(VersionPart a, VersionPart b) pure returns(bool isGreaterThan) { return VersionPart.unwrap(a) > VersionPart.unwrap(b); }
|
15
|
+
function versionPartEq(VersionPart a, VersionPart b) pure returns(bool isSame) { return VersionPart.unwrap(a) == VersionPart.unwrap(b); }
|
16
|
+
function versionPartNe(VersionPart a, VersionPart b) pure returns(bool isSame) { return VersionPart.unwrap(a) != VersionPart.unwrap(b); }
|
17
|
+
|
18
|
+
library VersionPartLib {
|
19
|
+
function toInt(VersionPart a) external pure returns(uint) { return VersionPart.unwrap(a); }
|
20
|
+
function toVersionPart(uint256 a) external pure returns(VersionPart) { return VersionPart.wrap(uint8(a)); }
|
21
|
+
}
|
22
|
+
|
23
|
+
type Version is uint24; // contains major,minor,patch version parts
|
24
|
+
|
25
|
+
using {
|
26
|
+
versionGt as >,
|
27
|
+
versionEq as ==,
|
28
|
+
VersionLib.toInt,
|
29
|
+
VersionLib.toUint64,
|
30
|
+
VersionLib.toMajorPart,
|
31
|
+
VersionLib.toVersionParts
|
32
|
+
}
|
33
|
+
for Version global;
|
34
|
+
|
35
|
+
function versionGt(Version a, Version b) pure returns(bool isGreaterThan) { return Version.unwrap(a) > Version.unwrap(b); }
|
36
|
+
function versionEq(Version a, Version b) pure returns(bool isSame) { return Version.unwrap(a) == Version.unwrap(b); }
|
37
|
+
|
38
|
+
library VersionLib {
|
39
|
+
function toInt(Version version) external pure returns(uint) { return Version.unwrap(version); }
|
40
|
+
|
41
|
+
function toUint64(Version version) external pure returns(uint64) { return Version.unwrap(version); }
|
42
|
+
|
43
|
+
function toMajorPart(Version version)
|
44
|
+
external
|
45
|
+
pure
|
46
|
+
returns(VersionPart major)
|
47
|
+
{
|
48
|
+
uint24 versionInt = Version.unwrap(version);
|
49
|
+
uint8 majorInt = uint8(versionInt >> 16);
|
50
|
+
return VersionPart.wrap(majorInt);
|
51
|
+
}
|
52
|
+
|
53
|
+
function toVersionParts(Version version)
|
54
|
+
external
|
55
|
+
pure
|
56
|
+
returns(
|
57
|
+
VersionPart major,
|
58
|
+
VersionPart minor,
|
59
|
+
VersionPart patch
|
60
|
+
)
|
61
|
+
{
|
62
|
+
uint24 versionInt = Version.unwrap(version);
|
63
|
+
uint8 majorInt = uint8(versionInt >> 16);
|
64
|
+
|
65
|
+
versionInt -= majorInt << 16;
|
66
|
+
uint8 minorInt = uint8(versionInt >> 8);
|
67
|
+
uint8 patchInt = uint8(versionInt - (minorInt << 8));
|
68
|
+
|
69
|
+
return (
|
70
|
+
VersionPart.wrap(majorInt),
|
71
|
+
VersionPart.wrap(minorInt),
|
72
|
+
VersionPart.wrap(patchInt)
|
73
|
+
);
|
74
|
+
}
|
75
|
+
|
76
|
+
function toVersionPart(uint256 versionPart) external pure returns(VersionPart) {
|
77
|
+
return VersionPart.wrap(uint8(versionPart));
|
78
|
+
}
|
79
|
+
|
80
|
+
function toVersion(
|
81
|
+
uint256 major,
|
82
|
+
uint256 minor,
|
83
|
+
uint256 patch
|
84
|
+
)
|
85
|
+
external
|
86
|
+
pure
|
87
|
+
returns(Version)
|
88
|
+
{
|
89
|
+
require(
|
90
|
+
major < 256 && minor < 256 && patch < 256,
|
91
|
+
"ERROR:VRS-010:VERSION_PART_TOO_BIG");
|
92
|
+
|
93
|
+
return Version.wrap(
|
94
|
+
uint24(
|
95
|
+
(major << 16) + (minor << 8) + patch));
|
96
|
+
}
|
97
|
+
|
98
|
+
// TODO check for overflow?
|
99
|
+
function toVersion(uint64 versionNumber) external pure returns(Version) {
|
100
|
+
//assert(versionNumber <= type(Version).max);
|
101
|
+
return Version.wrap(uint24(versionNumber));
|
102
|
+
}
|
103
|
+
|
104
|
+
function zeroVersion() external pure returns(Version) {
|
105
|
+
return Version.wrap(0);
|
106
|
+
}
|
107
|
+
}
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@etherisc/gif-next",
|
3
|
-
"version": "0.0.2-
|
3
|
+
"version": "0.0.2-f63e99e-607",
|
4
4
|
"description": "This is the repository for the next version of the Generic Insurance Framework (GIF) smart contracts. ",
|
5
5
|
"main": "index.js",
|
6
6
|
"scripts": {
|
@@ -11,7 +11,8 @@
|
|
11
11
|
"coverage": "hh coverage",
|
12
12
|
"styleFix": "prettier --write --plugin=prettier-plugin-solidity 'contracts/**/*.sol' 'test_forge/**/*.t.sol'",
|
13
13
|
"styleCheck": "prettier --check --plugin=prettier-plugin-solidity 'contracts/**/*.sol' 'test_forge/**/*.t.sol'",
|
14
|
-
"lint": "solhint 'contracts/**/*.sol' 'test_forge/**/*.t.sol'"
|
14
|
+
"lint": "solhint 'contracts/**/*.sol' 'test_forge/**/*.t.sol'",
|
15
|
+
"eslint": "eslint ."
|
15
16
|
},
|
16
17
|
"repository": {
|
17
18
|
"type": "git",
|
@@ -31,16 +32,21 @@
|
|
31
32
|
"@nomicfoundation/hardhat-foundry": "^1.1.1",
|
32
33
|
"@nomicfoundation/hardhat-toolbox": "^3.0.0",
|
33
34
|
"@nomicfoundation/hardhat-verify": "^1.1.1",
|
35
|
+
"@typescript-eslint/eslint-plugin": "^6.7.2",
|
36
|
+
"@typescript-eslint/parser": "^6.7.2",
|
34
37
|
"dotenv": "^16.3.1",
|
38
|
+
"eslint": "^8.50.0",
|
35
39
|
"hardhat": "^2.17.2",
|
36
40
|
"prettier": "^3.0.3",
|
37
|
-
"prettier-plugin-solidity": "^1.1.3"
|
41
|
+
"prettier-plugin-solidity": "^1.1.3",
|
42
|
+
"typescript": "^5"
|
38
43
|
},
|
39
44
|
"dependencies": {
|
40
|
-
"@openzeppelin/contracts": "
|
41
|
-
"@openzeppelin/contracts-upgradeable": "
|
45
|
+
"@openzeppelin/contracts": "5.0.0",
|
46
|
+
"@openzeppelin/contracts-upgradeable": "5.0.0",
|
42
47
|
"abi-coder": "^5.0.0",
|
43
48
|
"ethers": "^6.7.1",
|
49
|
+
"solidity-docgen": "^0.6.0-beta.36",
|
44
50
|
"winston": "^3.10.0"
|
45
51
|
}
|
46
52
|
}
|
@@ -1,35 +0,0 @@
|
|
1
|
-
{
|
2
|
-
"_format": "hh-sol-artifact-1",
|
3
|
-
"contractName": "InstanceLinked",
|
4
|
-
"sourceName": "contracts/components/Component.sol",
|
5
|
-
"abi": [
|
6
|
-
{
|
7
|
-
"inputs": [
|
8
|
-
{
|
9
|
-
"internalType": "address",
|
10
|
-
"name": "instance",
|
11
|
-
"type": "address"
|
12
|
-
}
|
13
|
-
],
|
14
|
-
"stateMutability": "nonpayable",
|
15
|
-
"type": "constructor"
|
16
|
-
},
|
17
|
-
{
|
18
|
-
"inputs": [],
|
19
|
-
"name": "getInstance",
|
20
|
-
"outputs": [
|
21
|
-
{
|
22
|
-
"internalType": "contract IInstance",
|
23
|
-
"name": "instance",
|
24
|
-
"type": "address"
|
25
|
-
}
|
26
|
-
],
|
27
|
-
"stateMutability": "view",
|
28
|
-
"type": "function"
|
29
|
-
}
|
30
|
-
],
|
31
|
-
"bytecode": "0x608060405234801561001057600080fd5b5060405161011438038061011483398101604081905261002f91610054565b600080546001600160a01b0319166001600160a01b0392909216919091179055610084565b60006020828403121561006657600080fd5b81516001600160a01b038116811461007d57600080fd5b9392505050565b6082806100926000396000f3fe6080604052348015600f57600080fd5b506004361060285760003560e01c8063de7b5d1414602d575b600080fd5b600054604080516001600160a01b039092168252519081900360200190f3fea264697066735822122073a0ea8fa4352d28b2a129d826cfd42d4c8f65d3a006cdf283aa909e0fac0e4264736f6c63430008140033",
|
32
|
-
"deployedBytecode": "0x6080604052348015600f57600080fd5b506004361060285760003560e01c8063de7b5d1414602d575b600080fd5b600054604080516001600160a01b039092168252519081900360200190f3fea264697066735822122073a0ea8fa4352d28b2a129d826cfd42d4c8f65d3a006cdf283aa909e0fac0e4264736f6c63430008140033",
|
33
|
-
"linkReferences": {},
|
34
|
-
"deployedLinkReferences": {}
|
35
|
-
}
|
@@ -1,74 +0,0 @@
|
|
1
|
-
{
|
2
|
-
"_format": "hh-sol-artifact-1",
|
3
|
-
"contractName": "IProductComponent",
|
4
|
-
"sourceName": "contracts/components/IProduct.sol",
|
5
|
-
"abi": [
|
6
|
-
{
|
7
|
-
"inputs": [],
|
8
|
-
"name": "getPolicyFee",
|
9
|
-
"outputs": [
|
10
|
-
{
|
11
|
-
"components": [
|
12
|
-
{
|
13
|
-
"internalType": "UFixed",
|
14
|
-
"name": "fractionalFee",
|
15
|
-
"type": "uint256"
|
16
|
-
},
|
17
|
-
{
|
18
|
-
"internalType": "uint256",
|
19
|
-
"name": "fixedFee",
|
20
|
-
"type": "uint256"
|
21
|
-
}
|
22
|
-
],
|
23
|
-
"internalType": "struct Fee",
|
24
|
-
"name": "policyFee",
|
25
|
-
"type": "tuple"
|
26
|
-
}
|
27
|
-
],
|
28
|
-
"stateMutability": "view",
|
29
|
-
"type": "function"
|
30
|
-
},
|
31
|
-
{
|
32
|
-
"inputs": [],
|
33
|
-
"name": "getPoolNftId",
|
34
|
-
"outputs": [
|
35
|
-
{
|
36
|
-
"internalType": "NftId",
|
37
|
-
"name": "poolNftId",
|
38
|
-
"type": "uint96"
|
39
|
-
}
|
40
|
-
],
|
41
|
-
"stateMutability": "view",
|
42
|
-
"type": "function"
|
43
|
-
},
|
44
|
-
{
|
45
|
-
"inputs": [],
|
46
|
-
"name": "getProcessingFee",
|
47
|
-
"outputs": [
|
48
|
-
{
|
49
|
-
"components": [
|
50
|
-
{
|
51
|
-
"internalType": "UFixed",
|
52
|
-
"name": "fractionalFee",
|
53
|
-
"type": "uint256"
|
54
|
-
},
|
55
|
-
{
|
56
|
-
"internalType": "uint256",
|
57
|
-
"name": "fixedFee",
|
58
|
-
"type": "uint256"
|
59
|
-
}
|
60
|
-
],
|
61
|
-
"internalType": "struct Fee",
|
62
|
-
"name": "processingFee",
|
63
|
-
"type": "tuple"
|
64
|
-
}
|
65
|
-
],
|
66
|
-
"stateMutability": "view",
|
67
|
-
"type": "function"
|
68
|
-
}
|
69
|
-
],
|
70
|
-
"bytecode": "0x",
|
71
|
-
"deployedBytecode": "0x",
|
72
|
-
"linkReferences": {},
|
73
|
-
"deployedLinkReferences": {}
|
74
|
-
}
|