@etherisc/gif-next 0.0.2-f7eda15-119 → 0.0.2-f831797-539
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +73 -1
- package/artifacts/contracts/components/Component.sol/Component.dbg.json +1 -1
- package/artifacts/contracts/components/Component.sol/Component.json +252 -94
- package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +1 -1
- package/artifacts/contracts/components/Distribution.sol/Distribution.json +611 -159
- package/artifacts/contracts/components/IComponent.sol/IComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IComponent.sol/IComponent.json +104 -72
- package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.json +311 -108
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.json +331 -164
- package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.json +108 -144
- package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
- package/artifacts/contracts/components/Pool.sol/Pool.json +553 -185
- package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
- package/artifacts/contracts/components/Product.sol/Product.json +356 -166
- package/artifacts/contracts/instance/BundleManager.sol/BundleManager.dbg.json +1 -1
- package/artifacts/contracts/instance/BundleManager.sol/BundleManager.json +30 -11
- package/artifacts/contracts/instance/Cloneable.sol/Cloneable.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstance.sol/IInstance.json +722 -422
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +94 -171
- package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
- package/artifacts/contracts/instance/Instance.sol/Instance.json +911 -779
- package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +39 -89
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +119 -216
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +276 -254
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +319 -99
- package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.dbg.json +1 -1
- package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.json +2 -2
- package/artifacts/contracts/instance/base/ComponentService.sol/ComponentService.dbg.json +1 -1
- package/artifacts/contracts/instance/base/ComponentService.sol/ComponentService.json +118 -169
- package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
- package/artifacts/contracts/instance/base/ILifecycle.sol/ILifecycle.dbg.json +1 -1
- package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
- package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.json +40 -10
- package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json +1 -1
- package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.json +36 -11
- package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IAccess.sol/IAccess.json +13 -13
- package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IComponents.sol/IComponents.dbg.json +4 -0
- package/artifacts/contracts/instance/module/IComponents.sol/IComponents.json +10 -0
- package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +1 -1
- package/artifacts/contracts/instance/module/ISetup.sol/ISetup.dbg.json +1 -1
- package/artifacts/contracts/instance/module/ITreasury.sol/ITreasury.dbg.json +1 -1
- package/artifacts/contracts/instance/service/ApplicationService.sol/ApplicationService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/ApplicationService.sol/ApplicationService.json +968 -0
- package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.json +665 -0
- package/artifacts/contracts/instance/service/BundleService.sol/BundleService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/BundleService.sol/BundleService.json +306 -315
- package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.json +305 -93
- package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.json +754 -0
- package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.json +637 -0
- package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +1207 -255
- package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.json +449 -85
- package/artifacts/contracts/instance/service/IApplicationService.sol/IApplicationService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/IApplicationService.sol/IApplicationService.json +556 -0
- package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.json +155 -240
- package/artifacts/contracts/instance/service/IClaimService.sol/IClaimService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/IClaimService.sol/IClaimService.json +409 -0
- package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.json +711 -139
- package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.json +60 -286
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +81 -147
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +22 -169
- package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.json +185 -391
- package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.json +311 -127
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +214 -204
- package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.json +306 -90
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +142 -221
- package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.json +302 -90
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +15 -2
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +83 -174
- package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
- package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
- package/artifacts/contracts/registry/Registry.sol/Registry.json +28 -15
- package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.json +2 -2
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +193 -216
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +300 -94
- package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.dbg.json +1 -1
- package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.json +11 -11
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +141 -37
- package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.dbg.json +1 -1
- package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +1 -1
- package/artifacts/contracts/shared/ERC165.sol/ERC165.json +41 -3
- package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
- package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.json +40 -29
- package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +4 -0
- package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.json +129 -0
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +21 -29
- package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +4 -0
- package/artifacts/contracts/{experiment/inheritance/IB.sol/IB.json → shared/IRegistryLinked.sol/IRegistryLinked.json} +18 -20
- package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
- package/artifacts/contracts/shared/IService.sol/IService.json +22 -169
- package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +1 -1
- package/artifacts/contracts/shared/IVersionable.sol/IVersionable.json +2 -152
- package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
- package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +113 -33
- package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +4 -0
- package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +248 -0
- package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +1 -1
- package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +294 -74
- package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
- package/artifacts/contracts/shared/Registerable.sol/Registerable.json +125 -55
- package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +4 -0
- package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +84 -0
- package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
- package/artifacts/contracts/shared/Service.sol/Service.json +113 -164
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +2 -2
- package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
- package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +2 -2
- package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +1 -1
- package/artifacts/contracts/shared/Versionable.sol/Versionable.json +2 -152
- package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json +1 -1
- package/artifacts/contracts/test/TestFee.sol/TestFee.json +2 -2
- package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json +1 -1
- package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +125 -55
- package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +1 -1
- package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.json +2 -2
- package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +1 -1
- package/artifacts/contracts/test/TestService.sol/TestService.json +134 -221
- package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json +1 -1
- package/artifacts/contracts/test/TestVersion.sol/TestVersion.dbg.json +1 -1
- package/artifacts/contracts/test/TestVersion.sol/TestVersion.json +2 -2
- package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json +1 -1
- package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.json +8 -190
- package/artifacts/contracts/test/Usdc.sol/USDC.dbg.json +1 -1
- 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/Blocknumber.sol/BlocknumberLib.json +2 -2
- package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/ClaimId.sol/ClaimIdLib.dbg.json +4 -0
- package/artifacts/contracts/types/ClaimId.sol/ClaimIdLib.json +100 -0
- package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.dbg.json +1 -1
- package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.json +2 -2
- package/artifacts/contracts/types/Fee.sol/FeeLib.dbg.json +1 -1
- package/artifacts/contracts/types/Fee.sol/FeeLib.json +2 -2
- package/artifacts/contracts/types/Key32.sol/Key32Lib.dbg.json +1 -1
- package/artifacts/contracts/types/Key32.sol/Key32Lib.json +2 -2
- package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/NftId.sol/NftIdLib.json +17 -4
- package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
- package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.json +2 -2
- package/artifacts/contracts/types/NumberId.sol/NumberIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
- package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.json +2 -2
- package/artifacts/contracts/types/PayoutId.sol/PayoutIdLib.dbg.json +4 -0
- package/artifacts/contracts/types/PayoutId.sol/PayoutIdLib.json +100 -0
- package/artifacts/contracts/types/Referral.sol/ReferralLib.dbg.json +1 -1
- package/artifacts/contracts/types/Referral.sol/ReferralLib.json +23 -4
- package/artifacts/contracts/types/RiskId.sol/RiskIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/RiskId.sol/RiskIdLib.json +2 -2
- package/artifacts/contracts/types/RoleId.sol/RoleIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/RoleId.sol/RoleIdLib.json +2 -2
- package/artifacts/contracts/types/Seconds.sol/SecondsLib.dbg.json +4 -0
- package/artifacts/contracts/types/Seconds.sol/SecondsLib.json +124 -0
- package/artifacts/contracts/types/StateId.sol/StateIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/StateId.sol/StateIdLib.json +2 -2
- package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json +1 -1
- package/artifacts/contracts/types/Timestamp.sol/TimestampLib.json +25 -7
- package/artifacts/contracts/types/UFixed.sol/MathLib.dbg.json +1 -1
- package/artifacts/contracts/types/UFixed.sol/MathLib.json +2 -2
- package/artifacts/contracts/types/UFixed.sol/UFixedLib.dbg.json +1 -1
- package/artifacts/contracts/types/UFixed.sol/UFixedLib.json +2 -2
- package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +1 -1
- package/artifacts/contracts/types/Version.sol/VersionLib.json +2 -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/Component.sol +103 -78
- package/contracts/components/Distribution.sol +187 -57
- package/contracts/components/IComponent.sol +48 -17
- package/contracts/components/IDistributionComponent.sol +39 -15
- package/contracts/components/IPoolComponent.sol +84 -31
- package/contracts/components/IProductComponent.sol +3 -2
- package/contracts/components/Pool.sol +217 -145
- package/contracts/components/Product.sol +97 -69
- package/contracts/instance/BundleManager.sol +7 -5
- package/contracts/instance/IInstance.sol +24 -3
- package/contracts/instance/IInstanceService.sol +20 -1
- package/contracts/instance/Instance.sol +65 -39
- package/contracts/instance/InstanceAccessManager.sol +12 -13
- package/contracts/instance/InstanceReader.sol +4 -3
- package/contracts/instance/InstanceService.sol +111 -57
- package/contracts/instance/InstanceServiceManager.sol +1 -1
- package/contracts/instance/base/ComponentService.sol +1 -1
- package/contracts/instance/base/KeyValueStore.sol +5 -2
- package/contracts/instance/base/Lifecycle.sol +11 -2
- package/contracts/instance/module/IAccess.sol +3 -4
- package/contracts/instance/module/IBundle.sol +2 -1
- package/contracts/instance/module/IComponents.sol +35 -0
- package/contracts/instance/module/IDistribution.sol +2 -0
- package/contracts/instance/module/IPolicy.sol +30 -3
- package/contracts/instance/module/ISetup.sol +7 -20
- package/contracts/instance/service/ApplicationService.sol +350 -0
- package/contracts/instance/service/ApplicationServiceManager.sol +35 -0
- package/contracts/instance/service/BundleService.sol +82 -39
- package/contracts/instance/service/BundleServiceManager.sol +1 -1
- package/contracts/instance/service/ClaimService.sol +151 -0
- package/contracts/instance/service/ClaimServiceManager.sol +35 -0
- package/contracts/instance/service/DistributionService.sol +360 -16
- package/contracts/instance/service/DistributionServiceManager.sol +1 -1
- package/contracts/instance/service/IApplicationService.sol +82 -0
- package/contracts/instance/service/IBundleService.sol +30 -12
- package/contracts/instance/service/IClaimService.sol +61 -0
- package/contracts/instance/service/IDistributionService.sol +86 -0
- package/contracts/instance/service/IPolicyService.sol +27 -49
- package/contracts/instance/service/IPoolService.sol +17 -2
- package/contracts/instance/service/PolicyService.sol +148 -283
- package/contracts/instance/service/PolicyServiceManager.sol +2 -2
- package/contracts/instance/service/PoolService.sol +75 -22
- package/contracts/instance/service/PoolServiceManager.sol +1 -1
- package/contracts/instance/service/ProductService.sol +10 -11
- package/contracts/instance/service/ProductServiceManager.sol +2 -2
- package/contracts/registry/IRegistry.sol +3 -2
- package/contracts/registry/IRegistryService.sol +10 -8
- package/contracts/registry/Registry.sol +20 -8
- package/contracts/registry/RegistryService.sol +69 -48
- package/contracts/registry/RegistryServiceManager.sol +13 -13
- package/contracts/registry/ReleaseManager.sol +18 -28
- package/contracts/registry/TokenRegistry.sol +16 -12
- package/contracts/shared/ERC165.sol +14 -12
- package/contracts/shared/INftOwnable.sol +11 -10
- package/contracts/shared/IPolicyHolder.sol +26 -0
- package/contracts/shared/IRegisterable.sol +3 -3
- package/contracts/shared/IRegistryLinked.sol +12 -0
- package/contracts/shared/IService.sol +2 -0
- package/contracts/shared/IVersionable.sol +4 -47
- package/contracts/shared/NftOwnable.sol +66 -85
- package/contracts/shared/PolicyHolder.sol +81 -0
- package/contracts/shared/ProxyManager.sol +100 -25
- package/contracts/shared/Registerable.sol +7 -19
- package/contracts/shared/RegistryLinked.sol +48 -0
- package/contracts/shared/Service.sol +15 -17
- package/contracts/shared/TokenHandler.sol +11 -5
- package/contracts/shared/Versionable.sol +4 -92
- package/contracts/test/TestRegisterable.sol +1 -1
- package/contracts/test/TestService.sol +1 -1
- package/contracts/types/Blocknumber.sol +1 -0
- package/contracts/types/ClaimId.sol +52 -0
- package/contracts/types/DistributorType.sol +2 -2
- package/contracts/types/Fee.sol +1 -0
- package/contracts/types/NftId.sol +8 -0
- package/contracts/types/ObjectType.sol +10 -5
- package/contracts/types/PayoutId.sol +54 -0
- package/contracts/types/Referral.sol +4 -0
- package/contracts/types/RoleId.sol +10 -5
- package/contracts/types/Seconds.sol +54 -0
- package/contracts/types/StateId.sol +1 -0
- package/contracts/types/Timestamp.sol +13 -13
- package/contracts/types/UFixed.sol +1 -0
- package/contracts/types/Version.sol +1 -0
- package/package.json +3 -3
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Cloner.dbg.json +0 -4
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Cloner.json +0 -66
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock1.dbg.json +0 -4
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock1.json +0 -24
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock2.dbg.json +0 -4
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock2.json +0 -42
- package/artifacts/contracts/experiment/errors/Require.sol/Require.dbg.json +0 -4
- package/artifacts/contracts/experiment/errors/Require.sol/Require.json +0 -105
- package/artifacts/contracts/experiment/errors/Revert.sol/Revert.dbg.json +0 -4
- package/artifacts/contracts/experiment/errors/Revert.sol/Revert.json +0 -105
- package/artifacts/contracts/experiment/inheritance/A.sol/A.dbg.json +0 -4
- package/artifacts/contracts/experiment/inheritance/A.sol/A.json +0 -128
- package/artifacts/contracts/experiment/inheritance/A.sol/AShared.dbg.json +0 -4
- package/artifacts/contracts/experiment/inheritance/A.sol/AShared.json +0 -42
- package/artifacts/contracts/experiment/inheritance/B.sol/B.dbg.json +0 -4
- package/artifacts/contracts/experiment/inheritance/B.sol/B.json +0 -76
- package/artifacts/contracts/experiment/inheritance/C.sol/C.dbg.json +0 -4
- package/artifacts/contracts/experiment/inheritance/C.sol/C.json +0 -89
- package/artifacts/contracts/experiment/inheritance/IA.sol/IA.dbg.json +0 -4
- package/artifacts/contracts/experiment/inheritance/IA.sol/IA.json +0 -128
- package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.dbg.json +0 -4
- package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.json +0 -37
- package/artifacts/contracts/experiment/inheritance/IB.sol/IB.dbg.json +0 -4
- package/artifacts/contracts/experiment/inheritance/IC.sol/IC.dbg.json +0 -4
- package/artifacts/contracts/experiment/inheritance/IC.sol/IC.json +0 -63
- package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.dbg.json +0 -4
- package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.json +0 -59
- package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.dbg.json +0 -4
- package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.json +0 -124
- package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.dbg.json +0 -4
- package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.json +0 -74
- package/artifacts/contracts/experiment/statemachine/SM.sol/SM.dbg.json +0 -4
- package/artifacts/contracts/experiment/statemachine/SM.sol/SM.json +0 -124
- package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.dbg.json +0 -4
- package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.json +0 -207
- package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.dbg.json +0 -4
- package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.json +0 -10
- package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.dbg.json +0 -4
- package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.json +0 -10
- package/contracts/experiment/cloning/Cloner.sol +0 -47
- package/contracts/experiment/errors/Require.sol +0 -38
- package/contracts/experiment/errors/Revert.sol +0 -44
- package/contracts/experiment/inheritance/A.sol +0 -53
- package/contracts/experiment/inheritance/B.sol +0 -28
- package/contracts/experiment/inheritance/C.sol +0 -34
- package/contracts/experiment/inheritance/IA.sol +0 -13
- package/contracts/experiment/inheritance/IB.sol +0 -10
- package/contracts/experiment/inheritance/IC.sol +0 -12
- package/contracts/experiment/statemachine/Dummy.sol +0 -27
- package/contracts/experiment/statemachine/ISM.sol +0 -25
- package/contracts/experiment/statemachine/SM.sol +0 -57
- package/contracts/experiment/statemachine/SimpleStateMachine.sol +0 -31
- package/contracts/experiment/types/TypeA.sol +0 -47
- package/contracts/experiment/types/TypeB.sol +0 -29
package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.json
DELETED
@@ -1,207 +0,0 @@
|
|
1
|
-
{
|
2
|
-
"_format": "hh-sol-artifact-1",
|
3
|
-
"contractName": "SimpleStateMachine",
|
4
|
-
"sourceName": "contracts/experiment/statemachine/SimpleStateMachine.sol",
|
5
|
-
"abi": [
|
6
|
-
{
|
7
|
-
"inputs": [],
|
8
|
-
"stateMutability": "nonpayable",
|
9
|
-
"type": "constructor"
|
10
|
-
},
|
11
|
-
{
|
12
|
-
"inputs": [],
|
13
|
-
"name": "ErrorInitialStateUndefined",
|
14
|
-
"type": "error"
|
15
|
-
},
|
16
|
-
{
|
17
|
-
"inputs": [],
|
18
|
-
"name": "ErrorNextStateUndefined",
|
19
|
-
"type": "error"
|
20
|
-
},
|
21
|
-
{
|
22
|
-
"inputs": [],
|
23
|
-
"name": "ErrorStartStateUndefined",
|
24
|
-
"type": "error"
|
25
|
-
},
|
26
|
-
{
|
27
|
-
"inputs": [
|
28
|
-
{
|
29
|
-
"internalType": "StateId",
|
30
|
-
"name": "currentStateId",
|
31
|
-
"type": "uint8"
|
32
|
-
},
|
33
|
-
{
|
34
|
-
"internalType": "StateId",
|
35
|
-
"name": "newStateId",
|
36
|
-
"type": "uint8"
|
37
|
-
}
|
38
|
-
],
|
39
|
-
"name": "ErrorStateChangeInvalid",
|
40
|
-
"type": "error"
|
41
|
-
},
|
42
|
-
{
|
43
|
-
"anonymous": false,
|
44
|
-
"inputs": [
|
45
|
-
{
|
46
|
-
"indexed": false,
|
47
|
-
"internalType": "StateId",
|
48
|
-
"name": "initialStateId",
|
49
|
-
"type": "uint8"
|
50
|
-
}
|
51
|
-
],
|
52
|
-
"name": "LogInitialStateSet",
|
53
|
-
"type": "event"
|
54
|
-
},
|
55
|
-
{
|
56
|
-
"anonymous": false,
|
57
|
-
"inputs": [
|
58
|
-
{
|
59
|
-
"indexed": false,
|
60
|
-
"internalType": "StateId",
|
61
|
-
"name": "oldStateId",
|
62
|
-
"type": "uint8"
|
63
|
-
},
|
64
|
-
{
|
65
|
-
"indexed": false,
|
66
|
-
"internalType": "StateId",
|
67
|
-
"name": "newStateId",
|
68
|
-
"type": "uint8"
|
69
|
-
}
|
70
|
-
],
|
71
|
-
"name": "LogStateChanged",
|
72
|
-
"type": "event"
|
73
|
-
},
|
74
|
-
{
|
75
|
-
"inputs": [],
|
76
|
-
"name": "ACTIVE",
|
77
|
-
"outputs": [
|
78
|
-
{
|
79
|
-
"internalType": "StateId",
|
80
|
-
"name": "stateId",
|
81
|
-
"type": "uint8"
|
82
|
-
}
|
83
|
-
],
|
84
|
-
"stateMutability": "pure",
|
85
|
-
"type": "function"
|
86
|
-
},
|
87
|
-
{
|
88
|
-
"inputs": [],
|
89
|
-
"name": "ARCHIVED",
|
90
|
-
"outputs": [
|
91
|
-
{
|
92
|
-
"internalType": "StateId",
|
93
|
-
"name": "stateId",
|
94
|
-
"type": "uint8"
|
95
|
-
}
|
96
|
-
],
|
97
|
-
"stateMutability": "pure",
|
98
|
-
"type": "function"
|
99
|
-
},
|
100
|
-
{
|
101
|
-
"inputs": [],
|
102
|
-
"name": "PAUSED",
|
103
|
-
"outputs": [
|
104
|
-
{
|
105
|
-
"internalType": "StateId",
|
106
|
-
"name": "stateId",
|
107
|
-
"type": "uint8"
|
108
|
-
}
|
109
|
-
],
|
110
|
-
"stateMutability": "pure",
|
111
|
-
"type": "function"
|
112
|
-
},
|
113
|
-
{
|
114
|
-
"inputs": [],
|
115
|
-
"name": "STATE_ACTIVE",
|
116
|
-
"outputs": [
|
117
|
-
{
|
118
|
-
"internalType": "uint8",
|
119
|
-
"name": "",
|
120
|
-
"type": "uint8"
|
121
|
-
}
|
122
|
-
],
|
123
|
-
"stateMutability": "view",
|
124
|
-
"type": "function"
|
125
|
-
},
|
126
|
-
{
|
127
|
-
"inputs": [],
|
128
|
-
"name": "STATE_ARCHIVED",
|
129
|
-
"outputs": [
|
130
|
-
{
|
131
|
-
"internalType": "uint8",
|
132
|
-
"name": "",
|
133
|
-
"type": "uint8"
|
134
|
-
}
|
135
|
-
],
|
136
|
-
"stateMutability": "view",
|
137
|
-
"type": "function"
|
138
|
-
},
|
139
|
-
{
|
140
|
-
"inputs": [],
|
141
|
-
"name": "STATE_PAUSED",
|
142
|
-
"outputs": [
|
143
|
-
{
|
144
|
-
"internalType": "uint8",
|
145
|
-
"name": "",
|
146
|
-
"type": "uint8"
|
147
|
-
}
|
148
|
-
],
|
149
|
-
"stateMutability": "view",
|
150
|
-
"type": "function"
|
151
|
-
},
|
152
|
-
{
|
153
|
-
"inputs": [
|
154
|
-
{
|
155
|
-
"internalType": "StateId",
|
156
|
-
"name": "newStateId",
|
157
|
-
"type": "uint8"
|
158
|
-
}
|
159
|
-
],
|
160
|
-
"name": "changeToState",
|
161
|
-
"outputs": [],
|
162
|
-
"stateMutability": "nonpayable",
|
163
|
-
"type": "function"
|
164
|
-
},
|
165
|
-
{
|
166
|
-
"inputs": [],
|
167
|
-
"name": "getState",
|
168
|
-
"outputs": [
|
169
|
-
{
|
170
|
-
"internalType": "StateId",
|
171
|
-
"name": "state",
|
172
|
-
"type": "uint8"
|
173
|
-
}
|
174
|
-
],
|
175
|
-
"stateMutability": "view",
|
176
|
-
"type": "function"
|
177
|
-
},
|
178
|
-
{
|
179
|
-
"inputs": [
|
180
|
-
{
|
181
|
-
"internalType": "StateId",
|
182
|
-
"name": "currentStateId",
|
183
|
-
"type": "uint8"
|
184
|
-
},
|
185
|
-
{
|
186
|
-
"internalType": "StateId",
|
187
|
-
"name": "newStateId",
|
188
|
-
"type": "uint8"
|
189
|
-
}
|
190
|
-
],
|
191
|
-
"name": "isValidTransition",
|
192
|
-
"outputs": [
|
193
|
-
{
|
194
|
-
"internalType": "bool",
|
195
|
-
"name": "isValid",
|
196
|
-
"type": "bool"
|
197
|
-
}
|
198
|
-
],
|
199
|
-
"stateMutability": "view",
|
200
|
-
"type": "function"
|
201
|
-
}
|
202
|
-
],
|
203
|
-
"bytecode": "0x608060405234801561001057600080fd5b5061001d600a6014610044565b6100296014600a610044565b6100356014601e610044565b61003f600a6100c9565b610108565b6100568260005b60ff90811691161490565b156100745760405163b5f9d83760e01b815260040160405180910390fd5b61007f81600061004b565b1561009d5760405163e9c8e0f360e01b815260040160405180910390fd5b60ff9182166000908152602081815260408083209390941682529190915220805460ff19166001179055565b6100d481600061004b565b156100f25760405163251d7b3360e21b815260040160405180910390fd5b6001805460ff191660ff92909216919091179055565b610286806101176000396000f3fe608060405234801561001057600080fd5b50600436106100925760003560e01c806360cb89b91161006657806360cb89b9146100de57806379412d28146100e5578063a9aad58c14610125578063c80c07381461012c578063c90bd0471461013457600080fd5b80622f211a146100975780630c06bb31146100b65780631865c57d146100be57806357c26a35146100c9575b600080fd5b61009f601e81565b60405160ff90911681526020015b60405180910390f35b61009f601481565b60015460ff1661009f565b6100dc6100d73660046101fb565b61013b565b005b601e61009f565b6101156100f336600461021d565b60ff918216600090815260208181526040808320938516835292905220541690565b60405190151581526020016100ad565b601461009f565b61009f600a81565b600a61009f565b60015460ff90811660009081526020818152604080832085851684529091529020541661019057600154604051635d7cbd3d60e01b815260ff9182166004820152908216602482015260440160405180910390fd5b6001805460ff83811660ff1983168117909355604080519190921680825260208201939093527fddbd36f3979db212a01f1175ab2c9205f870d98acf5f28bac835ab5e83337812910160405180910390a15050565b803560ff811681146101f657600080fd5b919050565b60006020828403121561020d57600080fd5b610216826101e5565b9392505050565b6000806040838503121561023057600080fd5b610239836101e5565b9150610247602084016101e5565b9050925092905056fea2646970667358221220c86bc91b6f99eb5927702a99f9c7c9f1aafa586718f762b8f95f1e50db1b38b964736f6c63430008140033",
|
204
|
-
"deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100925760003560e01c806360cb89b91161006657806360cb89b9146100de57806379412d28146100e5578063a9aad58c14610125578063c80c07381461012c578063c90bd0471461013457600080fd5b80622f211a146100975780630c06bb31146100b65780631865c57d146100be57806357c26a35146100c9575b600080fd5b61009f601e81565b60405160ff90911681526020015b60405180910390f35b61009f601481565b60015460ff1661009f565b6100dc6100d73660046101fb565b61013b565b005b601e61009f565b6101156100f336600461021d565b60ff918216600090815260208181526040808320938516835292905220541690565b60405190151581526020016100ad565b601461009f565b61009f600a81565b600a61009f565b60015460ff90811660009081526020818152604080832085851684529091529020541661019057600154604051635d7cbd3d60e01b815260ff9182166004820152908216602482015260440160405180910390fd5b6001805460ff83811660ff1983168117909355604080519190921680825260208201939093527fddbd36f3979db212a01f1175ab2c9205f870d98acf5f28bac835ab5e83337812910160405180910390a15050565b803560ff811681146101f657600080fd5b919050565b60006020828403121561020d57600080fd5b610216826101e5565b9392505050565b6000806040838503121561023057600080fd5b610239836101e5565b9150610247602084016101e5565b9050925092905056fea2646970667358221220c86bc91b6f99eb5927702a99f9c7c9f1aafa586718f762b8f95f1e50db1b38b964736f6c63430008140033",
|
205
|
-
"linkReferences": {},
|
206
|
-
"deployedLinkReferences": {}
|
207
|
-
}
|
@@ -1,10 +0,0 @@
|
|
1
|
-
{
|
2
|
-
"_format": "hh-sol-artifact-1",
|
3
|
-
"contractName": "TypeALib",
|
4
|
-
"sourceName": "contracts/experiment/types/TypeA.sol",
|
5
|
-
"abi": [],
|
6
|
-
"bytecode": "0x60566037600b82828239805160001a607314602a57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600080fdfea264697066735822122093fd13de095db220ed5748653d42b1ae7bf41db959dbec592038060eacc641a164736f6c63430008140033",
|
7
|
-
"deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600080fdfea264697066735822122093fd13de095db220ed5748653d42b1ae7bf41db959dbec592038060eacc641a164736f6c63430008140033",
|
8
|
-
"linkReferences": {},
|
9
|
-
"deployedLinkReferences": {}
|
10
|
-
}
|
@@ -1,10 +0,0 @@
|
|
1
|
-
{
|
2
|
-
"_format": "hh-sol-artifact-1",
|
3
|
-
"contractName": "TypeBLib",
|
4
|
-
"sourceName": "contracts/experiment/types/TypeB.sol",
|
5
|
-
"abi": [],
|
6
|
-
"bytecode": "0x60566037600b82828239805160001a607314602a57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600080fdfea264697066735822122032a558edadaf027db09db28520087387052afa1b5982f309365dff5079b8c42a64736f6c63430008140033",
|
7
|
-
"deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600080fdfea264697066735822122032a558edadaf027db09db28520087387052afa1b5982f309365dff5079b8c42a64736f6c63430008140033",
|
8
|
-
"linkReferences": {},
|
9
|
-
"deployedLinkReferences": {}
|
10
|
-
}
|
@@ -1,47 +0,0 @@
|
|
1
|
-
// SPDX-License-Identifier: Apache-2.0
|
2
|
-
pragma solidity ^0.8.20;
|
3
|
-
|
4
|
-
import {Clones} from "@openzeppelin/contracts/proxy/Clones.sol";
|
5
|
-
|
6
|
-
|
7
|
-
contract Cloner {
|
8
|
-
|
9
|
-
Mock1 public mock1;
|
10
|
-
Mock2 public mock2;
|
11
|
-
|
12
|
-
constructor() {
|
13
|
-
mock1 = new Mock1();
|
14
|
-
mock2 = new Mock2();
|
15
|
-
}
|
16
|
-
|
17
|
-
function createClone(address master)
|
18
|
-
external
|
19
|
-
returns (address cloned)
|
20
|
-
{
|
21
|
-
cloned = Clones.clone(master);
|
22
|
-
}
|
23
|
-
}
|
24
|
-
|
25
|
-
|
26
|
-
contract Mock1 {
|
27
|
-
function getValue() external virtual view returns (uint256) {
|
28
|
-
return 42;
|
29
|
-
}
|
30
|
-
}
|
31
|
-
|
32
|
-
contract Mock2 is Mock1 {
|
33
|
-
uint256 internal _value;
|
34
|
-
|
35
|
-
constructor() {
|
36
|
-
_value = 42;
|
37
|
-
}
|
38
|
-
|
39
|
-
function setValue(uint256 value) external virtual {
|
40
|
-
_value = value;
|
41
|
-
}
|
42
|
-
|
43
|
-
function getValue() external virtual override view returns (uint256) {
|
44
|
-
return _value;
|
45
|
-
}
|
46
|
-
}
|
47
|
-
|
@@ -1,38 +0,0 @@
|
|
1
|
-
// SPDX-License-Identifier: Apache-2.0
|
2
|
-
pragma solidity ^0.8.19;
|
3
|
-
|
4
|
-
contract Require {
|
5
|
-
error AsmallerThanB_S();
|
6
|
-
error AsmallerThanB_M(uint a);
|
7
|
-
error AsmallerThanB_L(uint a, uint b);
|
8
|
-
|
9
|
-
uint256 private _b;
|
10
|
-
|
11
|
-
constructor() {
|
12
|
-
_b = 42;
|
13
|
-
}
|
14
|
-
|
15
|
-
function isAlargerThanBRequire_S(
|
16
|
-
uint a
|
17
|
-
) external view returns (bool isLarger) {
|
18
|
-
require(a > _b, "ERROR:ABC-001");
|
19
|
-
|
20
|
-
return true;
|
21
|
-
}
|
22
|
-
|
23
|
-
function isAlargerThanBRequire_M(
|
24
|
-
uint a
|
25
|
-
) external view returns (bool isLarger) {
|
26
|
-
require(a > _b, "ERROR:ABC-002:A_IS_SMALLER");
|
27
|
-
|
28
|
-
return true;
|
29
|
-
}
|
30
|
-
|
31
|
-
function isAlargerThanBRequire_L(
|
32
|
-
uint a
|
33
|
-
) external view returns (bool isLarger) {
|
34
|
-
require(a > _b, "ERROR:ABC-003:A_IS_SMALLER_THAN_B");
|
35
|
-
|
36
|
-
return true;
|
37
|
-
}
|
38
|
-
}
|
@@ -1,44 +0,0 @@
|
|
1
|
-
// SPDX-License-Identifier: Apache-2.0
|
2
|
-
pragma solidity ^0.8.19;
|
3
|
-
|
4
|
-
contract Revert {
|
5
|
-
error AsmallerThanB_S();
|
6
|
-
error AsmallerThanB_M(uint a);
|
7
|
-
error AsmallerThanB_L(uint a, uint b);
|
8
|
-
|
9
|
-
uint256 private _b;
|
10
|
-
|
11
|
-
constructor() {
|
12
|
-
_b = 42;
|
13
|
-
}
|
14
|
-
|
15
|
-
function isAlargerThanBRevert_S(
|
16
|
-
uint a
|
17
|
-
) external view returns (bool isLarger) {
|
18
|
-
if (a <= _b) {
|
19
|
-
revert AsmallerThanB_S();
|
20
|
-
}
|
21
|
-
|
22
|
-
return true;
|
23
|
-
}
|
24
|
-
|
25
|
-
function isAlargerThanBRevert_M(
|
26
|
-
uint a
|
27
|
-
) external view returns (bool isLarger) {
|
28
|
-
if (a <= _b) {
|
29
|
-
revert AsmallerThanB_M(a);
|
30
|
-
}
|
31
|
-
|
32
|
-
return true;
|
33
|
-
}
|
34
|
-
|
35
|
-
function isAlargerThanBRevert_L(
|
36
|
-
uint a
|
37
|
-
) external view returns (bool isLarger) {
|
38
|
-
if (a <= _b) {
|
39
|
-
revert AsmallerThanB_L(a, _b);
|
40
|
-
}
|
41
|
-
|
42
|
-
return true;
|
43
|
-
}
|
44
|
-
}
|
@@ -1,53 +0,0 @@
|
|
1
|
-
// SPDX-License-Identifier: Apache-2.0
|
2
|
-
pragma solidity ^0.8.19;
|
3
|
-
|
4
|
-
import {IA, ISharedA} from "./IA.sol";
|
5
|
-
import {B} from "./B.sol";
|
6
|
-
import {C} from "./C.sol";
|
7
|
-
|
8
|
-
/*
|
9
|
-
|
10
|
-
# dependency graph
|
11
|
-
|
12
|
-
B <...+
|
13
|
-
^ |
|
14
|
-
| |
|
15
|
-
A --> C
|
16
|
-
|
17
|
-
- A is the main contract
|
18
|
-
- A provides functionality implemented by modules B and C
|
19
|
-
- B and C rely on functionality shared by A
|
20
|
-
- C accesses functionality of module B
|
21
|
-
|
22
|
-
# chisel session
|
23
|
-
|
24
|
-
import {A} from "./contracts/experiment/A.sol";
|
25
|
-
A a = new A();
|
26
|
-
uint(a.getA())
|
27
|
-
uint(a.getB()))
|
28
|
-
uint(a.getC())
|
29
|
-
uint(a.getAfromB())
|
30
|
-
uint(a.getAfromC())
|
31
|
-
uint(a.getBfromC())
|
32
|
-
a.setA(100);
|
33
|
-
a.setB(10);
|
34
|
-
a.setC(20);
|
35
|
-
*/
|
36
|
-
|
37
|
-
contract AShared is ISharedA {
|
38
|
-
uint256 private _x;
|
39
|
-
|
40
|
-
constructor() {
|
41
|
-
_x = 42;
|
42
|
-
}
|
43
|
-
|
44
|
-
function getA() external view override returns (uint256) {
|
45
|
-
return _x;
|
46
|
-
}
|
47
|
-
|
48
|
-
function setA(uint256 newA) external override {
|
49
|
-
_x = newA;
|
50
|
-
}
|
51
|
-
}
|
52
|
-
|
53
|
-
contract A is AShared, B, C, IA {}
|
@@ -1,28 +0,0 @@
|
|
1
|
-
// SPDX-License-Identifier: Apache-2.0
|
2
|
-
pragma solidity ^0.8.19;
|
3
|
-
|
4
|
-
import {ISharedA} from "./IA.sol";
|
5
|
-
import {IB} from "./IB.sol";
|
6
|
-
|
7
|
-
abstract contract B is ISharedA, IB {
|
8
|
-
// names of private variables can be re-used in inheritance
|
9
|
-
uint256 private _x;
|
10
|
-
|
11
|
-
constructor() {
|
12
|
-
_x = 1;
|
13
|
-
}
|
14
|
-
|
15
|
-
// access own state
|
16
|
-
function getB() external view override returns (uint256) {
|
17
|
-
return _x;
|
18
|
-
}
|
19
|
-
|
20
|
-
function setB(uint256 newB) external override {
|
21
|
-
_x = newB;
|
22
|
-
}
|
23
|
-
|
24
|
-
// access state from parent contract A
|
25
|
-
function getAfromB() external view override returns (uint256) {
|
26
|
-
return this.getA();
|
27
|
-
}
|
28
|
-
}
|
@@ -1,34 +0,0 @@
|
|
1
|
-
// SPDX-License-Identifier: Apache-2.0
|
2
|
-
pragma solidity ^0.8.19;
|
3
|
-
|
4
|
-
import {ISharedA} from "./IA.sol";
|
5
|
-
import {IB} from "./IB.sol";
|
6
|
-
import {IC} from "./IC.sol";
|
7
|
-
|
8
|
-
abstract contract C is ISharedA, IC {
|
9
|
-
uint256 private _x;
|
10
|
-
|
11
|
-
constructor() {
|
12
|
-
_x = 2;
|
13
|
-
}
|
14
|
-
|
15
|
-
// access own state
|
16
|
-
function getC() external view override returns (uint256) {
|
17
|
-
return _x;
|
18
|
-
}
|
19
|
-
|
20
|
-
function setC(uint256 newC) external override {
|
21
|
-
_x = newC;
|
22
|
-
}
|
23
|
-
|
24
|
-
// access state from parent contract A
|
25
|
-
function getAfromC() external view override returns (uint256) {
|
26
|
-
return this.getA();
|
27
|
-
}
|
28
|
-
|
29
|
-
// access state from other module B
|
30
|
-
function getBfromC() external view override returns (uint256) {
|
31
|
-
IB b = IB(address(this));
|
32
|
-
return b.getB();
|
33
|
-
}
|
34
|
-
}
|
@@ -1,13 +0,0 @@
|
|
1
|
-
// SPDX-License-Identifier: Apache-2.0
|
2
|
-
pragma solidity ^0.8.19;
|
3
|
-
|
4
|
-
import {IB} from "./IB.sol";
|
5
|
-
import {IC} from "./IC.sol";
|
6
|
-
|
7
|
-
interface ISharedA {
|
8
|
-
function getA() external view returns (uint256);
|
9
|
-
|
10
|
-
function setA(uint256 newA) external;
|
11
|
-
}
|
12
|
-
|
13
|
-
interface IA is ISharedA, IB, IC {}
|
@@ -1,12 +0,0 @@
|
|
1
|
-
// SPDX-License-Identifier: Apache-2.0
|
2
|
-
pragma solidity ^0.8.19;
|
3
|
-
|
4
|
-
interface IC {
|
5
|
-
function getAfromC() external view returns (uint256);
|
6
|
-
|
7
|
-
function getBfromC() external view returns (uint256);
|
8
|
-
|
9
|
-
function getC() external view returns (uint256);
|
10
|
-
|
11
|
-
function setC(uint256 newA) external;
|
12
|
-
}
|
@@ -1,27 +0,0 @@
|
|
1
|
-
// SPDX-License-Identifier: Apache-2.0
|
2
|
-
pragma solidity ^0.8.19;
|
3
|
-
|
4
|
-
import {ObjectType} from "../../types/ObjectType.sol";
|
5
|
-
import {StateId, toStateId, zeroStateId} from "../../types/StateId.sol";
|
6
|
-
|
7
|
-
contract LifeCycleModule {
|
8
|
-
mapping(ObjectType objectType => StateId initialState)
|
9
|
-
private _initialState;
|
10
|
-
|
11
|
-
mapping(ObjectType objectType => mapping(StateId stateFrom => mapping(StateId stateTo => bool isValid)))
|
12
|
-
private _isValidTransition;
|
13
|
-
|
14
|
-
function getInitialState(
|
15
|
-
ObjectType objectType
|
16
|
-
) external view returns (StateId) {
|
17
|
-
return _initialState[objectType];
|
18
|
-
}
|
19
|
-
|
20
|
-
function isValidTransition(
|
21
|
-
ObjectType objectType,
|
22
|
-
StateId fromId,
|
23
|
-
StateId toId
|
24
|
-
) external view returns (bool) {
|
25
|
-
return _isValidTransition[objectType][fromId][toId];
|
26
|
-
}
|
27
|
-
}
|
@@ -1,25 +0,0 @@
|
|
1
|
-
// SPDX-License-Identifier: Apache-2.0
|
2
|
-
pragma solidity ^0.8.19;
|
3
|
-
|
4
|
-
import {StateId} from "../../types/StateId.sol";
|
5
|
-
|
6
|
-
interface ISMEE {
|
7
|
-
error ErrorInitialStateUndefined();
|
8
|
-
error ErrorStartStateUndefined();
|
9
|
-
error ErrorNextStateUndefined();
|
10
|
-
error ErrorStateChangeInvalid(StateId currentStateId, StateId newStateId);
|
11
|
-
|
12
|
-
event LogInitialStateSet(StateId initialStateId);
|
13
|
-
event LogStateChanged(StateId oldStateId, StateId newStateId);
|
14
|
-
}
|
15
|
-
|
16
|
-
interface ISM is ISMEE {
|
17
|
-
function changeToState(StateId newStateId) external;
|
18
|
-
|
19
|
-
function isValidTransition(
|
20
|
-
StateId currentStateId,
|
21
|
-
StateId newStateId
|
22
|
-
) external view returns (bool isValid);
|
23
|
-
|
24
|
-
function getState() external view returns (StateId currentStateId);
|
25
|
-
}
|
@@ -1,57 +0,0 @@
|
|
1
|
-
// SPDX-License-Identifier: Apache-2.0
|
2
|
-
pragma solidity ^0.8.19;
|
3
|
-
|
4
|
-
import {StateId, toStateId, zeroStateId} from "../../types/StateId.sol";
|
5
|
-
import {ISM} from "./ISM.sol";
|
6
|
-
|
7
|
-
contract SM is ISM {
|
8
|
-
mapping(StateId currentState => mapping(StateId newState => bool isValid))
|
9
|
-
private _isValidTransition;
|
10
|
-
|
11
|
-
StateId internal _state;
|
12
|
-
|
13
|
-
function setInitialState(StateId initialStateId) internal {
|
14
|
-
if (initialStateId == zeroStateId()) {
|
15
|
-
revert ErrorInitialStateUndefined();
|
16
|
-
}
|
17
|
-
|
18
|
-
_state = initialStateId;
|
19
|
-
}
|
20
|
-
|
21
|
-
function addTransition(
|
22
|
-
StateId currentStateId,
|
23
|
-
StateId nextStateId
|
24
|
-
) internal {
|
25
|
-
if (currentStateId == zeroStateId()) {
|
26
|
-
revert ErrorStartStateUndefined();
|
27
|
-
}
|
28
|
-
|
29
|
-
if (nextStateId == zeroStateId()) {
|
30
|
-
revert ErrorNextStateUndefined();
|
31
|
-
}
|
32
|
-
|
33
|
-
_isValidTransition[currentStateId][nextStateId] = true;
|
34
|
-
}
|
35
|
-
|
36
|
-
function changeToState(StateId newStateId) external override {
|
37
|
-
if (!_isValidTransition[_state][newStateId]) {
|
38
|
-
revert ErrorStateChangeInvalid(_state, newStateId);
|
39
|
-
}
|
40
|
-
|
41
|
-
StateId stateOld = _state;
|
42
|
-
_state = newStateId;
|
43
|
-
|
44
|
-
emit LogStateChanged(stateOld, _state);
|
45
|
-
}
|
46
|
-
|
47
|
-
function isValidTransition(
|
48
|
-
StateId currentStateId,
|
49
|
-
StateId newStateId
|
50
|
-
) external view override returns (bool isValid) {
|
51
|
-
return _isValidTransition[currentStateId][newStateId];
|
52
|
-
}
|
53
|
-
|
54
|
-
function getState() external view override returns (StateId state) {
|
55
|
-
return _state;
|
56
|
-
}
|
57
|
-
}
|
@@ -1,31 +0,0 @@
|
|
1
|
-
// SPDX-License-Identifier: Apache-2.0
|
2
|
-
pragma solidity ^0.8.19;
|
3
|
-
|
4
|
-
import {StateId, toStateId} from "../../types/StateId.sol";
|
5
|
-
import {SM} from "./SM.sol";
|
6
|
-
|
7
|
-
contract SimpleStateMachine is SM {
|
8
|
-
uint8 public constant STATE_ACTIVE = 10;
|
9
|
-
uint8 public constant STATE_PAUSED = 20;
|
10
|
-
uint8 public constant STATE_ARCHIVED = 30;
|
11
|
-
|
12
|
-
constructor() {
|
13
|
-
addTransition(ACTIVE(), PAUSED());
|
14
|
-
addTransition(PAUSED(), ACTIVE());
|
15
|
-
addTransition(PAUSED(), ARCHIVED());
|
16
|
-
|
17
|
-
setInitialState(ACTIVE());
|
18
|
-
}
|
19
|
-
|
20
|
-
function ACTIVE() public pure returns (StateId stateId) {
|
21
|
-
return toStateId(STATE_ACTIVE);
|
22
|
-
}
|
23
|
-
|
24
|
-
function PAUSED() public pure returns (StateId stateId) {
|
25
|
-
return toStateId(STATE_PAUSED);
|
26
|
-
}
|
27
|
-
|
28
|
-
function ARCHIVED() public pure returns (StateId stateId) {
|
29
|
-
return toStateId(STATE_ARCHIVED);
|
30
|
-
}
|
31
|
-
}
|