@etherisc/gif-next 0.0.2-e5a2253-213 → 0.0.2-e69072e-892
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 +4 -0
- package/artifacts/contracts/components/{BaseComponent.sol/BaseComponent.json → Component.sol/Component.json} +340 -59
- package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +1 -1
- package/artifacts/contracts/components/Distribution.sol/Distribution.json +804 -211
- package/artifacts/contracts/components/IComponent.sol/IComponent.dbg.json +4 -0
- package/artifacts/contracts/components/{IBaseComponent.sol/IBaseComponent.json → IComponent.sol/IComponent.json} +95 -56
- package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.json +699 -22
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.json +814 -60
- package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.json +519 -4
- package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
- package/artifacts/contracts/components/Pool.sol/Pool.json +896 -298
- package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
- package/artifacts/contracts/components/Product.sol/Product.json +442 -129
- package/artifacts/contracts/instance/BundleManager.sol/BundleManager.dbg.json +1 -1
- package/artifacts/contracts/instance/BundleManager.sol/BundleManager.json +38 -62
- 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 +910 -289
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +110 -171
- package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
- package/artifacts/contracts/instance/Instance.sol/Instance.json +874 -557
- package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +52 -115
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +101 -168
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +346 -263
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +319 -86
- package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.dbg.json +1 -1
- package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.json +8 -32
- package/artifacts/contracts/instance/base/ComponentService.sol/ComponentService.dbg.json +4 -0
- package/artifacts/contracts/instance/base/{ComponentServiceBase.sol/ComponentServiceBase.json → ComponentService.sol/ComponentService.json} +119 -189
- 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 +2 -2
- package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json +1 -1
- package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.json +2 -2
- 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/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 +258 -283
- package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.json +305 -80
- 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 +983 -221
- package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.json +441 -72
- 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 +130 -217
- package/artifacts/contracts/instance/service/IClaimService.sol/IClaimService.dbg.json +4 -0
- package/artifacts/contracts/{shared/RegisterableUpgradable.sol/RegisterableUpgradable.json → instance/service/IClaimService.sol/IClaimService.json} +146 -179
- package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.json +552 -140
- package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.json +40 -292
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +22 -174
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +22 -174
- package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.json +161 -407
- package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.json +311 -114
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +139 -237
- package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.json +302 -77
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +139 -237
- package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.json +302 -77
- 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 +98 -5
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +112 -198
- 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 +112 -27
- package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.json +18 -18
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +216 -234
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +300 -81
- package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.dbg.json +1 -1
- package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.json +70 -53
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +151 -50
- 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 -34
- 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 -174
- 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 +120 -27
- 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 -61
- package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
- package/artifacts/contracts/shared/Registerable.sol/Registerable.json +129 -51
- 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 +114 -157
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
- 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/TestRegisterable.sol/TestRegisterable.dbg.json +1 -1
- package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +129 -51
- 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 +135 -214
- 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/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/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/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 +2 -2
- 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 +2 -2
- 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/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/UFixedLib.dbg.json +1 -1
- package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +1 -1
- package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +1 -1
- package/contracts/components/Component.sol +221 -0
- package/contracts/components/Distribution.sol +206 -67
- package/contracts/components/IComponent.sol +68 -0
- package/contracts/components/IDistributionComponent.sol +44 -9
- package/contracts/components/IPoolComponent.sol +124 -39
- package/contracts/components/IProductComponent.sol +8 -3
- package/contracts/components/Pool.sol +284 -164
- package/contracts/components/Product.sol +110 -116
- package/contracts/instance/BundleManager.sol +8 -12
- package/contracts/instance/IInstance.sol +41 -9
- package/contracts/instance/IInstanceService.sol +20 -1
- package/contracts/instance/Instance.sol +90 -61
- package/contracts/instance/InstanceAccessManager.sol +18 -24
- package/contracts/instance/InstanceReader.sol +3 -25
- package/contracts/instance/InstanceService.sol +195 -50
- package/contracts/instance/InstanceServiceManager.sol +1 -1
- package/contracts/instance/ObjectManager.sol +7 -24
- package/contracts/instance/base/{ComponentServiceBase.sol → ComponentService.sol} +9 -13
- package/contracts/instance/module/IAccess.sol +3 -4
- package/contracts/instance/module/IBundle.sol +2 -1
- package/contracts/instance/module/IDistribution.sol +2 -0
- package/contracts/instance/module/IPolicy.sol +30 -3
- package/contracts/instance/module/ISetup.sol +10 -10
- package/contracts/instance/service/ApplicationService.sol +350 -0
- package/contracts/instance/service/ApplicationServiceManager.sol +35 -0
- package/contracts/instance/service/BundleService.sol +17 -12
- 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 +312 -33
- package/contracts/instance/service/DistributionServiceManager.sol +1 -1
- package/contracts/instance/service/IApplicationService.sol +82 -0
- package/contracts/instance/service/IBundleService.sol +14 -3
- package/contracts/instance/service/IClaimService.sol +61 -0
- package/contracts/instance/service/IDistributionService.sol +74 -0
- package/contracts/instance/service/IPolicyService.sol +26 -50
- package/contracts/instance/service/PolicyService.sol +127 -262
- package/contracts/instance/service/PolicyServiceManager.sol +2 -2
- package/contracts/instance/service/PoolService.sol +12 -45
- package/contracts/instance/service/PoolServiceManager.sol +1 -1
- package/contracts/instance/service/ProductService.sol +50 -26
- package/contracts/instance/service/ProductServiceManager.sol +2 -2
- package/contracts/registry/IRegistry.sol +16 -8
- package/contracts/registry/IRegistryService.sol +19 -10
- package/contracts/registry/Registry.sol +120 -52
- package/contracts/registry/RegistryAccessManager.sol +31 -25
- package/contracts/registry/RegistryService.sol +91 -128
- package/contracts/registry/RegistryServiceManager.sol +13 -13
- package/contracts/registry/ReleaseManager.sol +86 -106
- package/contracts/registry/TokenRegistry.sol +19 -13
- 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 +4 -4
- 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 -80
- package/contracts/shared/PolicyHolder.sol +81 -0
- package/contracts/shared/ProxyManager.sol +100 -25
- package/contracts/shared/Registerable.sol +16 -32
- package/contracts/shared/RegistryLinked.sol +48 -0
- package/contracts/shared/Service.sol +19 -19
- package/contracts/shared/Versionable.sol +4 -92
- package/contracts/test/TestRegisterable.sol +1 -1
- package/contracts/test/TestService.sol +1 -1
- package/contracts/types/ClaimId.sol +52 -0
- package/contracts/types/DistributorType.sol +2 -2
- package/contracts/types/ObjectType.sol +9 -5
- package/contracts/types/PayoutId.sol +54 -0
- package/contracts/types/RoleId.sol +12 -7
- package/contracts/types/Seconds.sol +54 -0
- package/contracts/types/Timestamp.sol +12 -13
- package/package.json +3 -3
- package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.dbg.json +0 -4
- package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.dbg.json +0 -4
- 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/artifacts/contracts/instance/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.dbg.json +0 -4
- package/artifacts/contracts/instance/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.json +0 -1206
- package/artifacts/contracts/instance/IInstanceBase.sol/IInstanceBase.dbg.json +0 -4
- package/artifacts/contracts/instance/IInstanceBase.sol/IInstanceBase.json +0 -448
- package/artifacts/contracts/instance/InstanceBase.sol/InstanceBase.dbg.json +0 -4
- package/artifacts/contracts/instance/InstanceBase.sol/InstanceBase.json +0 -763
- package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.dbg.json +0 -4
- package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.dbg.json +0 -4
- package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.json +0 -100
- package/artifacts/contracts/shared/RegisterableUpgradable.sol/RegisterableUpgradable.dbg.json +0 -4
- package/contracts/components/BaseComponent.sol +0 -168
- package/contracts/components/IBaseComponent.sol +0 -35
- package/contracts/experiment/cloning/Cloner.sol +0 -47
- package/contracts/experiment/errors/Require.sol +0 -38
- package/contracts/experiment/errors/Revert.sol +0 -44
- package/contracts/experiment/inheritance/A.sol +0 -53
- package/contracts/experiment/inheritance/B.sol +0 -28
- package/contracts/experiment/inheritance/C.sol +0 -34
- package/contracts/experiment/inheritance/IA.sol +0 -13
- package/contracts/experiment/inheritance/IB.sol +0 -10
- package/contracts/experiment/inheritance/IC.sol +0 -12
- package/contracts/experiment/statemachine/Dummy.sol +0 -27
- package/contracts/experiment/statemachine/ISM.sol +0 -25
- package/contracts/experiment/statemachine/SM.sol +0 -57
- package/contracts/experiment/statemachine/SimpleStateMachine.sol +0 -31
- package/contracts/experiment/types/TypeA.sol +0 -47
- package/contracts/experiment/types/TypeB.sol +0 -29
- package/contracts/instance/AccessManagerUpgradeableInitializeable.sol +0 -23
- package/contracts/instance/IInstanceBase.sol +0 -25
- package/contracts/instance/InstanceBase.sol +0 -39
- package/contracts/instance/base/IInstanceBase.sol +0 -21
- package/contracts/shared/RegisterableUpgradable.sol +0 -16
@@ -1,100 +0,0 @@
|
|
1
|
-
{
|
2
|
-
"_format": "hh-sol-artifact-1",
|
3
|
-
"contractName": "IInstanceBase",
|
4
|
-
"sourceName": "contracts/instance/base/IInstanceBase.sol",
|
5
|
-
"abi": [
|
6
|
-
{
|
7
|
-
"inputs": [],
|
8
|
-
"name": "getDistributionService",
|
9
|
-
"outputs": [
|
10
|
-
{
|
11
|
-
"internalType": "contract IDistributionService",
|
12
|
-
"name": "",
|
13
|
-
"type": "address"
|
14
|
-
}
|
15
|
-
],
|
16
|
-
"stateMutability": "view",
|
17
|
-
"type": "function"
|
18
|
-
},
|
19
|
-
{
|
20
|
-
"inputs": [],
|
21
|
-
"name": "getKeyValueStore",
|
22
|
-
"outputs": [
|
23
|
-
{
|
24
|
-
"internalType": "contract IKeyValueStore",
|
25
|
-
"name": "keyValueStore",
|
26
|
-
"type": "address"
|
27
|
-
}
|
28
|
-
],
|
29
|
-
"stateMutability": "view",
|
30
|
-
"type": "function"
|
31
|
-
},
|
32
|
-
{
|
33
|
-
"inputs": [],
|
34
|
-
"name": "getPoolService",
|
35
|
-
"outputs": [
|
36
|
-
{
|
37
|
-
"internalType": "contract IPoolService",
|
38
|
-
"name": "service",
|
39
|
-
"type": "address"
|
40
|
-
}
|
41
|
-
],
|
42
|
-
"stateMutability": "view",
|
43
|
-
"type": "function"
|
44
|
-
},
|
45
|
-
{
|
46
|
-
"inputs": [],
|
47
|
-
"name": "getProductService",
|
48
|
-
"outputs": [
|
49
|
-
{
|
50
|
-
"internalType": "contract IProductService",
|
51
|
-
"name": "service",
|
52
|
-
"type": "address"
|
53
|
-
}
|
54
|
-
],
|
55
|
-
"stateMutability": "view",
|
56
|
-
"type": "function"
|
57
|
-
},
|
58
|
-
{
|
59
|
-
"inputs": [
|
60
|
-
{
|
61
|
-
"internalType": "Key32",
|
62
|
-
"name": "key",
|
63
|
-
"type": "bytes32"
|
64
|
-
}
|
65
|
-
],
|
66
|
-
"name": "getState",
|
67
|
-
"outputs": [
|
68
|
-
{
|
69
|
-
"internalType": "StateId",
|
70
|
-
"name": "state",
|
71
|
-
"type": "uint8"
|
72
|
-
}
|
73
|
-
],
|
74
|
-
"stateMutability": "view",
|
75
|
-
"type": "function"
|
76
|
-
},
|
77
|
-
{
|
78
|
-
"inputs": [
|
79
|
-
{
|
80
|
-
"internalType": "Key32",
|
81
|
-
"name": "key",
|
82
|
-
"type": "bytes32"
|
83
|
-
},
|
84
|
-
{
|
85
|
-
"internalType": "StateId",
|
86
|
-
"name": "state",
|
87
|
-
"type": "uint8"
|
88
|
-
}
|
89
|
-
],
|
90
|
-
"name": "updateState",
|
91
|
-
"outputs": [],
|
92
|
-
"stateMutability": "nonpayable",
|
93
|
-
"type": "function"
|
94
|
-
}
|
95
|
-
],
|
96
|
-
"bytecode": "0x",
|
97
|
-
"deployedBytecode": "0x",
|
98
|
-
"linkReferences": {},
|
99
|
-
"deployedLinkReferences": {}
|
100
|
-
}
|
@@ -1,168 +0,0 @@
|
|
1
|
-
// SPDX-License-Identifier: Apache-2.0
|
2
|
-
pragma solidity ^0.8.20;
|
3
|
-
|
4
|
-
import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
|
5
|
-
import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
|
6
|
-
|
7
|
-
import {IBaseComponent} from "./IBaseComponent.sol";
|
8
|
-
import {IProductService} from "../instance/service/IProductService.sol";
|
9
|
-
import {IInstanceService} from "../instance/IInstanceService.sol";
|
10
|
-
import {IInstance} from "../instance/IInstance.sol";
|
11
|
-
import {InstanceAccessManager} from "../instance/InstanceAccessManager.sol";
|
12
|
-
import {IRegistry} from "../registry/IRegistry.sol";
|
13
|
-
import {NftId, zeroNftId, NftIdLib} from "../types/NftId.sol";
|
14
|
-
import {ObjectType, INSTANCE, PRODUCT} from "../types/ObjectType.sol";
|
15
|
-
import {VersionLib} from "../types/Version.sol";
|
16
|
-
import {Registerable} from "../shared/Registerable.sol";
|
17
|
-
import {RoleId, RoleIdLib} from "../types/RoleId.sol";
|
18
|
-
import {IAccess} from "../instance/module/IAccess.sol";
|
19
|
-
|
20
|
-
// TODO also inherit oz accessmanaged
|
21
|
-
abstract contract BaseComponent is
|
22
|
-
Registerable,
|
23
|
-
IBaseComponent
|
24
|
-
{
|
25
|
-
using NftIdLib for NftId;
|
26
|
-
|
27
|
-
IInstanceService internal _instanceService;
|
28
|
-
IProductService internal _productService;
|
29
|
-
|
30
|
-
address internal _deployer;
|
31
|
-
address internal _wallet;
|
32
|
-
IERC20Metadata internal _token;
|
33
|
-
IInstance internal _instance;
|
34
|
-
NftId internal _productNftId;
|
35
|
-
|
36
|
-
modifier onlyProductService() {
|
37
|
-
if(msg.sender != address(_productService)) {
|
38
|
-
revert ErrorBaseComponentNotProductService(msg.sender);
|
39
|
-
}
|
40
|
-
_;
|
41
|
-
}
|
42
|
-
|
43
|
-
modifier onlyInstanceRole(uint64 roleIdNum) {
|
44
|
-
RoleId roleId = RoleIdLib.toRoleId(roleIdNum);
|
45
|
-
InstanceAccessManager accessManager = InstanceAccessManager(_instance.authority());
|
46
|
-
if( !accessManager.hasRole(roleId, msg.sender)) {
|
47
|
-
revert ErrorBaseComponentUnauthorized(msg.sender, roleIdNum);
|
48
|
-
}
|
49
|
-
_;
|
50
|
-
}
|
51
|
-
|
52
|
-
// TODO move to oz accessmanaged locked (which is included in restricted modifier)
|
53
|
-
modifier isNotLocked() {
|
54
|
-
InstanceAccessManager accessManager = InstanceAccessManager(_instance.authority());
|
55
|
-
if (accessManager.isTargetLocked(address(this))) {
|
56
|
-
revert IAccess.ErrorIAccessTargetLocked(address(this));
|
57
|
-
}
|
58
|
-
_;
|
59
|
-
}
|
60
|
-
|
61
|
-
constructor(
|
62
|
-
address registry,
|
63
|
-
NftId instanceNftId,
|
64
|
-
address token,
|
65
|
-
ObjectType componentType,
|
66
|
-
bool isInterceptor,
|
67
|
-
address initialOwner
|
68
|
-
)
|
69
|
-
{
|
70
|
-
bytes memory data = "";
|
71
|
-
_initializeRegisterable(registry, instanceNftId, componentType, isInterceptor, initialOwner, data);
|
72
|
-
|
73
|
-
IRegistry.ObjectInfo memory instanceInfo = _registry.getObjectInfo(instanceNftId);
|
74
|
-
_instance = IInstance(instanceInfo.objectAddress);
|
75
|
-
require(
|
76
|
-
_instance.supportsInterface(type(IInstance).interfaceId),
|
77
|
-
""
|
78
|
-
);
|
79
|
-
|
80
|
-
_instanceService = IInstanceService(_registry.getServiceAddress(INSTANCE(), VersionLib.toVersion(3, 0, 0).toMajorPart()));
|
81
|
-
_productService = IProductService(_registry.getServiceAddress(PRODUCT(), VersionLib.toVersion(3, 0, 0).toMajorPart()));
|
82
|
-
_wallet = address(this);
|
83
|
-
_token = IERC20Metadata(token);
|
84
|
-
|
85
|
-
_registerInterface(type(IBaseComponent).interfaceId);
|
86
|
-
}
|
87
|
-
|
88
|
-
function getName() public pure virtual returns (string memory name);
|
89
|
-
|
90
|
-
// from component contract
|
91
|
-
// TODO only owner and instance owner
|
92
|
-
function lock() external onlyOwner override {
|
93
|
-
_instanceService.setTargetLocked(getName(), true);
|
94
|
-
}
|
95
|
-
|
96
|
-
// TODO only owner and instance owner
|
97
|
-
function unlock() external onlyOwner override {
|
98
|
-
_instanceService.setTargetLocked(getName(), false);
|
99
|
-
}
|
100
|
-
|
101
|
-
function getWallet()
|
102
|
-
external
|
103
|
-
view
|
104
|
-
override
|
105
|
-
returns (address walletAddress)
|
106
|
-
{
|
107
|
-
return _wallet;
|
108
|
-
}
|
109
|
-
|
110
|
-
/// @dev Sets the wallet address for the component.
|
111
|
-
/// if the current wallet has tokens, these will be transferred.
|
112
|
-
/// if the new wallet address is externally owned, an approval from the
|
113
|
-
/// owner of the external wallet for the component to move all tokens must exist.
|
114
|
-
function setWallet(address newWallet) external override onlyOwner {
|
115
|
-
address currentWallet = _wallet;
|
116
|
-
uint256 currentBalance = _token.balanceOf(currentWallet);
|
117
|
-
|
118
|
-
// checks
|
119
|
-
if (newWallet == currentWallet) {
|
120
|
-
revert ErrorBaseComponentWalletAddressIsSameAsCurrent(newWallet);
|
121
|
-
}
|
122
|
-
|
123
|
-
if (currentBalance > 0) {
|
124
|
-
if (currentWallet == address(this)) {
|
125
|
-
// move tokens from component smart contract to external wallet
|
126
|
-
} else {
|
127
|
-
// move tokens from external wallet to component smart contract or another external wallet
|
128
|
-
uint256 allowance = _token.allowance(currentWallet, address(this));
|
129
|
-
if (allowance < currentBalance) {
|
130
|
-
revert ErrorBaseComponentWalletAllowanceTooSmall(currentWallet, newWallet, allowance, currentBalance);
|
131
|
-
}
|
132
|
-
}
|
133
|
-
}
|
134
|
-
|
135
|
-
// effects
|
136
|
-
_wallet = newWallet;
|
137
|
-
emit LogBaseComponentWalletAddressChanged(newWallet);
|
138
|
-
|
139
|
-
// interactions
|
140
|
-
if (currentBalance > 0) {
|
141
|
-
// transfer tokens from current wallet to new wallet
|
142
|
-
if (currentWallet == address(this)) {
|
143
|
-
// transferFrom requires self allowance too
|
144
|
-
_token.approve(address(this), currentBalance);
|
145
|
-
}
|
146
|
-
|
147
|
-
SafeERC20.safeTransferFrom(_token, currentWallet, newWallet, currentBalance);
|
148
|
-
emit LogBaseComponentWalletTokensTransferred(currentWallet, newWallet, currentBalance);
|
149
|
-
}
|
150
|
-
}
|
151
|
-
|
152
|
-
function getToken() public view override returns (IERC20Metadata token) {
|
153
|
-
return _token;
|
154
|
-
}
|
155
|
-
|
156
|
-
function getInstance() public view override returns (IInstance instance) {
|
157
|
-
return _instance;
|
158
|
-
}
|
159
|
-
|
160
|
-
function setProductNftId(NftId productNftId) public override onlyOwner {
|
161
|
-
require(_productNftId.eq(zeroNftId()), "product nft id already set");
|
162
|
-
_productNftId = productNftId;
|
163
|
-
}
|
164
|
-
|
165
|
-
function getProductNftId() public view override returns (NftId productNftId) {
|
166
|
-
return _productNftId;
|
167
|
-
}
|
168
|
-
}
|
@@ -1,35 +0,0 @@
|
|
1
|
-
// SPDX-License-Identifier: Apache-2.0
|
2
|
-
pragma solidity ^0.8.20;
|
3
|
-
|
4
|
-
import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
|
5
|
-
|
6
|
-
import {IRegisterable} from "../shared/IRegisterable.sol";
|
7
|
-
import {IInstance} from "../instance/IInstance.sol";
|
8
|
-
import {NftId} from "../types/NftId.sol";
|
9
|
-
|
10
|
-
interface IBaseComponent is IRegisterable {
|
11
|
-
error ErrorBaseComponentWalletAddressIsSameAsCurrent(address newWallet);
|
12
|
-
error ErrorBaseComponentWalletAllowanceTooSmall(address oldWallet, address newWallet, uint256 allowance, uint256 balance);
|
13
|
-
error ErrorBaseComponentUnauthorized(address caller, uint64 requiredRoleIdNum);
|
14
|
-
error ErrorBaseComponentNotProductService(address caller);
|
15
|
-
|
16
|
-
event LogBaseComponentWalletAddressChanged(address newWallet);
|
17
|
-
event LogBaseComponentWalletTokensTransferred(address from, address to, uint256 amount);
|
18
|
-
|
19
|
-
function getName() external pure returns (string memory name);
|
20
|
-
|
21
|
-
// TODO remove and replace with accessmanaged target locking mechanism
|
22
|
-
function lock() external;
|
23
|
-
function unlock() external;
|
24
|
-
|
25
|
-
function getToken() external view returns (IERC20Metadata token);
|
26
|
-
|
27
|
-
function setWallet(address walletAddress) external;
|
28
|
-
function getWallet() external view returns (address walletAddress);
|
29
|
-
|
30
|
-
function getInstance() external view returns (IInstance instance);
|
31
|
-
|
32
|
-
function setProductNftId(NftId productNftId) external;
|
33
|
-
function getProductNftId() external view returns (NftId productNftId);
|
34
|
-
|
35
|
-
}
|
@@ -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
|
-
}
|