@etherisc/gif-next 0.0.2-fe88ad7-208 → 0.0.2-ff8087d-237
Sign up to get free protection for your applications and to get access to all the features.
- package/README.md +8 -13
- package/artifacts/contracts/components/Component.sol/Component.dbg.json +4 -0
- package/artifacts/contracts/components/Component.sol/Component.json +873 -0
- package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +1 -1
- package/artifacts/contracts/components/Distribution.sol/Distribution.json +903 -202
- package/artifacts/contracts/components/IComponent.sol/IComponent.dbg.json +4 -0
- package/artifacts/contracts/components/{BaseComponent.sol/BaseComponent.json → IComponent.sol/IComponent.json} +237 -83
- package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.json +879 -31
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.json +879 -59
- package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.json +720 -16
- package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
- package/artifacts/contracts/components/Pool.sol/Pool.json +760 -195
- package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
- package/artifacts/contracts/components/Product.sol/Product.json +564 -141
- package/artifacts/contracts/instance/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.dbg.json +1 -1
- package/artifacts/contracts/instance/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.json +15 -15
- package/artifacts/contracts/instance/BundleManager.sol/BundleManager.dbg.json +1 -1
- package/artifacts/contracts/instance/BundleManager.sol/BundleManager.json +69 -79
- package/artifacts/contracts/instance/Cloneable.sol/Cloneable.dbg.json +1 -1
- package/artifacts/contracts/instance/Cloneable.sol/Cloneable.json +5 -0
- package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstance.sol/IInstance.json +1474 -483
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +248 -218
- package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
- package/artifacts/contracts/instance/Instance.sol/Instance.json +1152 -794
- package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +462 -179
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +414 -267
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +482 -346
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +355 -91
- package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.dbg.json +1 -1
- package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.json +11 -40
- 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} +263 -164
- 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 +58 -75
- 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 +1124 -0
- package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.json +688 -0
- package/artifacts/contracts/instance/service/BundleService.sol/BundleService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/BundleService.sol/BundleService.json +641 -303
- package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.json +343 -79
- package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.json +1384 -0
- package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.json +752 -0
- package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +1434 -280
- package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.json +469 -73
- package/artifacts/contracts/instance/service/IApplicationService.sol/IApplicationService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/{IComponentOwnerService.sol/IComponentOwnerService.json → IApplicationService.sol/IApplicationService.json} +342 -189
- package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.json +310 -249
- package/artifacts/contracts/instance/service/IClaimService.sol/IClaimService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/IClaimService.sol/IClaimService.json +743 -0
- package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.json +757 -144
- package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.json +262 -275
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +703 -125
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +71 -165
- package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.json +632 -344
- package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.json +367 -91
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +1119 -224
- package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.json +361 -73
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +297 -210
- package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.json +298 -78
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +15 -2
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +117 -5
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +99 -217
- package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
- package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.json +18 -0
- package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
- package/artifacts/contracts/registry/Registry.sol/Registry.json +131 -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 +205 -250
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +287 -81
- package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.dbg.json +1 -1
- package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.json +81 -68
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +138 -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 +27 -29
- package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +4 -0
- package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.json +189 -0
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +8 -34
- package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +4 -0
- package/artifacts/contracts/{experiment/inheritance/IA.sol/ISharedA.json → shared/IRegistryLinked.sol/IRegistryLinked.json} +15 -17
- package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
- package/artifacts/contracts/shared/IService.sol/IService.json +71 -165
- 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 +107 -27
- package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +4 -0
- package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +302 -0
- package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +1 -1
- package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +283 -63
- package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
- package/artifacts/contracts/shared/Registerable.sol/Registerable.json +116 -51
- package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +4 -0
- package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +71 -0
- package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
- package/artifacts/contracts/shared/Service.sol/Service.json +173 -153
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +24 -6
- 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 +116 -51
- package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +1 -1
- package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.json +6 -6
- package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +1 -1
- package/artifacts/contracts/test/TestService.sol/TestService.json +191 -203
- 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/Amount.sol/AmountLib.dbg.json +4 -0
- package/artifacts/contracts/types/Amount.sol/AmountLib.json +281 -0
- package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
- package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.json +2 -2
- package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/ClaimId.sol/ClaimIdLib.dbg.json +4 -0
- package/artifacts/contracts/types/ClaimId.sol/ClaimIdLib.json +179 -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 +74 -19
- 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 +209 -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 +38 -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 +272 -0
- package/contracts/components/Distribution.sol +204 -82
- package/contracts/components/IComponent.sol +90 -0
- package/contracts/components/IDistributionComponent.sol +44 -17
- package/contracts/components/IPoolComponent.sol +90 -42
- package/contracts/components/IProductComponent.sol +15 -9
- package/contracts/components/Pool.sol +217 -186
- package/contracts/components/Product.sol +246 -166
- package/contracts/instance/AccessManagerUpgradeableInitializeable.sol +2 -12
- package/contracts/instance/BundleManager.sol +17 -20
- package/contracts/instance/Cloneable.sol +7 -2
- package/contracts/instance/IInstance.sol +67 -25
- package/contracts/instance/IInstanceService.sol +34 -11
- package/contracts/instance/Instance.sol +158 -116
- package/contracts/instance/InstanceAccessManager.sol +389 -165
- package/contracts/instance/InstanceReader.sol +87 -36
- package/contracts/instance/InstanceService.sol +295 -161
- package/contracts/instance/InstanceServiceManager.sol +1 -1
- package/contracts/instance/ObjectManager.sol +10 -29
- package/contracts/instance/base/ComponentService.sol +130 -0
- package/contracts/instance/base/KeyValueStore.sol +13 -36
- package/contracts/instance/base/Lifecycle.sol +26 -6
- package/contracts/instance/module/IAccess.sol +22 -16
- package/contracts/instance/module/IBundle.sol +8 -5
- package/contracts/instance/module/IComponents.sol +41 -0
- package/contracts/instance/module/IDistribution.sol +3 -0
- package/contracts/instance/module/IPolicy.sol +43 -11
- package/contracts/instance/module/ISetup.sol +7 -20
- package/contracts/instance/service/ApplicationService.sol +356 -0
- package/contracts/instance/service/ApplicationServiceManager.sol +35 -0
- package/contracts/instance/service/BundleService.sol +244 -119
- package/contracts/instance/service/BundleServiceManager.sol +1 -1
- package/contracts/instance/service/ClaimService.sol +443 -0
- package/contracts/instance/service/ClaimServiceManager.sol +35 -0
- package/contracts/instance/service/DistributionService.sol +360 -41
- package/contracts/instance/service/DistributionServiceManager.sol +1 -1
- package/contracts/instance/service/IApplicationService.sol +79 -0
- package/contracts/instance/service/IBundleService.sol +93 -20
- package/contracts/instance/service/IClaimService.sol +90 -0
- package/contracts/instance/service/IDistributionService.sol +89 -0
- package/contracts/instance/service/IPolicyService.sol +44 -51
- package/contracts/instance/service/IPoolService.sol +97 -3
- package/contracts/instance/service/PolicyService.sol +233 -364
- package/contracts/instance/service/PolicyServiceManager.sol +2 -2
- package/contracts/instance/service/PoolService.sol +319 -40
- package/contracts/instance/service/PoolServiceManager.sol +1 -1
- package/contracts/instance/service/ProductService.sol +90 -50
- package/contracts/instance/service/ProductServiceManager.sol +2 -2
- package/contracts/registry/ChainNft.sol +8 -0
- package/contracts/registry/IRegistry.sol +18 -8
- package/contracts/registry/IRegistryService.sol +21 -13
- package/contracts/registry/ITransferInterceptor.sol +1 -0
- package/contracts/registry/Registry.sol +142 -71
- package/contracts/registry/RegistryAccessManager.sol +31 -25
- package/contracts/registry/RegistryService.sol +93 -134
- package/contracts/registry/RegistryServiceManager.sol +13 -13
- package/contracts/registry/ReleaseManager.sol +103 -127
- 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 +40 -0
- package/contracts/shared/IRegisterable.sol +4 -6
- package/contracts/shared/IRegistryLinked.sol +11 -0
- package/contracts/shared/IService.sol +6 -4
- package/contracts/shared/IVersionable.sol +4 -47
- package/contracts/shared/NftOwnable.sol +64 -80
- package/contracts/shared/PolicyHolder.sol +94 -0
- package/contracts/shared/ProxyManager.sol +100 -25
- package/contracts/shared/Registerable.sol +24 -39
- package/contracts/shared/RegistryLinked.sol +43 -0
- package/contracts/shared/Service.sol +36 -22
- package/contracts/shared/TokenHandler.sol +14 -6
- package/contracts/shared/Versionable.sol +4 -92
- package/contracts/test/TestRegisterable.sol +1 -1
- package/contracts/test/TestService.sol +1 -1
- package/contracts/types/Amount.sol +109 -0
- package/contracts/types/Blocknumber.sol +1 -0
- package/contracts/types/ClaimId.sol +75 -0
- package/contracts/types/DistributorType.sol +2 -2
- package/contracts/types/Fee.sol +17 -8
- package/contracts/types/NftId.sol +8 -0
- package/contracts/types/ObjectType.sol +11 -6
- package/contracts/types/PayoutId.sol +82 -0
- package/contracts/types/Referral.sol +4 -0
- package/contracts/types/RoleId.sol +18 -11
- package/contracts/types/Seconds.sol +54 -0
- package/contracts/types/StateId.sol +7 -2
- package/contracts/types/Timestamp.sol +18 -13
- package/contracts/types/UFixed.sol +1 -0
- package/contracts/types/Version.sol +1 -0
- 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/components/IBaseComponent.sol/IBaseComponent.json +0 -397
- 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/IB.sol/IB.dbg.json +0 -4
- package/artifacts/contracts/experiment/inheritance/IB.sol/IB.json +0 -50
- 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/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 -113
- package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.dbg.json +0 -4
- package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.json +0 -814
- package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.dbg.json +0 -4
- package/artifacts/contracts/shared/RegisterableUpgradable.sol/RegisterableUpgradable.dbg.json +0 -4
- package/artifacts/contracts/shared/RegisterableUpgradable.sol/RegisterableUpgradable.json +0 -442
- package/contracts/components/BaseComponent.sol +0 -159
- package/contracts/components/IBaseComponent.sol +0 -34
- 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/IInstanceBase.sol +0 -26
- package/contracts/instance/InstanceBase.sol +0 -41
- package/contracts/instance/base/ComponentServiceBase.sol +0 -82
- package/contracts/instance/base/IInstanceBase.sol +0 -23
- package/contracts/instance/service/ComponentOwnerService.sol +0 -315
- package/contracts/instance/service/IComponentOwnerService.sol +0 -20
- package/contracts/shared/RegisterableUpgradable.sol +0 -16
@@ -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
|
-
}
|
@@ -1,47 +0,0 @@
|
|
1
|
-
// SPDX-License-Identifier: Apache-2.0
|
2
|
-
pragma solidity ^0.8.19;
|
3
|
-
|
4
|
-
/*
|
5
|
-
# chisel session for user defined types
|
6
|
-
|
7
|
-
import {TypeA, toTypeA} from "./contracts/experiment/types/TypeA.sol";
|
8
|
-
TypeA a = toTypeA(1);
|
9
|
-
TypeA b = toTypeA(2);
|
10
|
-
uint(a.toInt())
|
11
|
-
uint(b.toInt())
|
12
|
-
a == b
|
13
|
-
a != b
|
14
|
-
|
15
|
-
import {TypeB, toTypeB} from "./contracts/experiment/types/TypeB.sol";
|
16
|
-
TypeB x = toTypeB(33);
|
17
|
-
uint(x.toInt())
|
18
|
-
a == x; // -> error
|
19
|
-
a.toInt() == x.toInt() // -> no error
|
20
|
-
*/
|
21
|
-
|
22
|
-
// bytes5 allows for chain ids up to 13 digits
|
23
|
-
type TypeA is uint248;
|
24
|
-
|
25
|
-
// type bindings
|
26
|
-
using {eqTypeA as ==, neTypeA as !=, TypeALib.toInt} for TypeA global;
|
27
|
-
|
28
|
-
// general pure free functions
|
29
|
-
function toTypeA(uint256 typeA) pure returns (TypeA) {
|
30
|
-
return TypeA.wrap(uint248(typeA));
|
31
|
-
}
|
32
|
-
|
33
|
-
// pure free functions for operators
|
34
|
-
function eqTypeA(TypeA a, TypeA b) pure returns (bool isSame) {
|
35
|
-
return TypeA.unwrap(a) == TypeA.unwrap(b);
|
36
|
-
}
|
37
|
-
|
38
|
-
function neTypeA(TypeA a, TypeA b) pure returns (bool isDifferent) {
|
39
|
-
return TypeA.unwrap(a) != TypeA.unwrap(b);
|
40
|
-
}
|
41
|
-
|
42
|
-
// library functions that operate on user defined type
|
43
|
-
library TypeALib {
|
44
|
-
function toInt(TypeA typeA) internal pure returns (uint256) {
|
45
|
-
return uint256(TypeA.unwrap(typeA));
|
46
|
-
}
|
47
|
-
}
|
@@ -1,29 +0,0 @@
|
|
1
|
-
// SPDX-License-Identifier: Apache-2.0
|
2
|
-
pragma solidity ^0.8.19;
|
3
|
-
|
4
|
-
// bytes5 allows for chain ids up to 13 digits
|
5
|
-
type TypeB is uint248;
|
6
|
-
|
7
|
-
// type bindings
|
8
|
-
using {eqTypeB as ==, addTypeB as +, TypeBLib.toInt} for TypeB global;
|
9
|
-
|
10
|
-
// general pure free functions
|
11
|
-
function toTypeB(uint256 x) pure returns (TypeB) {
|
12
|
-
return TypeB.wrap(uint248(x));
|
13
|
-
}
|
14
|
-
|
15
|
-
// pure free functions for operators
|
16
|
-
function eqTypeB(TypeB a, TypeB b) pure returns (bool isSame) {
|
17
|
-
return TypeB.unwrap(a) == TypeB.unwrap(b);
|
18
|
-
}
|
19
|
-
|
20
|
-
function addTypeB(TypeB a, TypeB b) pure returns (TypeB sum) {
|
21
|
-
return TypeB.wrap(TypeB.unwrap(a) + TypeB.unwrap(b));
|
22
|
-
}
|
23
|
-
|
24
|
-
// library functions that operate on user defined type
|
25
|
-
library TypeBLib {
|
26
|
-
function toInt(TypeB b) internal pure returns (uint256) {
|
27
|
-
return uint256(TypeB.unwrap(b));
|
28
|
-
}
|
29
|
-
}
|
@@ -1,26 +0,0 @@
|
|
1
|
-
// SPDX-License-Identifier: Apache-2.0
|
2
|
-
pragma solidity ^0.8.20;
|
3
|
-
|
4
|
-
import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
|
5
|
-
|
6
|
-
import {BundleManager} from "./BundleManager.sol";
|
7
|
-
import {InstanceReader} from "./InstanceReader.sol";
|
8
|
-
|
9
|
-
import {IComponentOwnerService} from "./service/IComponentOwnerService.sol";
|
10
|
-
import {IDistributionService} from "./service/IDistributionService.sol";
|
11
|
-
import {IPoolService} from "./service/IPoolService.sol";
|
12
|
-
import {IProductService} from "./service/IProductService.sol";
|
13
|
-
import {IBundle} from "./module/IBundle.sol";
|
14
|
-
import {ISetup} from "./module/ISetup.sol";
|
15
|
-
import {NftId} from "../types/NftId.sol";
|
16
|
-
import {StateId} from "../types/StateId.sol";
|
17
|
-
import {RiskId} from "../types/RiskId.sol";
|
18
|
-
import {IRisk} from "./module/IRisk.sol";
|
19
|
-
import {IPolicy} from "./module/IPolicy.sol";
|
20
|
-
import {IKeyValueStore} from "./base/IKeyValueStore.sol";
|
21
|
-
|
22
|
-
|
23
|
-
interface IInstanceBase is IERC165, IKeyValueStore {
|
24
|
-
|
25
|
-
|
26
|
-
}
|
@@ -1,41 +0,0 @@
|
|
1
|
-
// SPDX-License-Identifier: Apache-2.0
|
2
|
-
pragma solidity ^0.8.20;
|
3
|
-
|
4
|
-
import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
|
5
|
-
import {ShortString, ShortStrings} from "@openzeppelin/contracts/utils/ShortStrings.sol";
|
6
|
-
|
7
|
-
import {IAccess} from "./module/IAccess.sol";
|
8
|
-
import {IBundle} from "./module/IBundle.sol";
|
9
|
-
import {IPolicy} from "./module/IPolicy.sol";
|
10
|
-
import {IRisk} from "./module/IRisk.sol";
|
11
|
-
import {ISetup} from "./module/ISetup.sol";
|
12
|
-
import {Key32, KeyId, Key32Lib} from "../types/Key32.sol";
|
13
|
-
import {KeyValueStore} from "./base/KeyValueStore.sol";
|
14
|
-
import {IInstance} from "./IInstance.sol";
|
15
|
-
import {InstanceReader} from "./InstanceReader.sol";
|
16
|
-
import {BundleManager} from "./BundleManager.sol";
|
17
|
-
import {NftId} from "../types/NftId.sol";
|
18
|
-
import {NumberId} from "../types/NumberId.sol";
|
19
|
-
import {ObjectType, BUNDLE, DISTRIBUTION, INSTANCE, POLICY, POOL, ROLE, PRODUCT, TARGET} from "../types/ObjectType.sol";
|
20
|
-
import {RiskId, RiskIdLib} from "../types/RiskId.sol";
|
21
|
-
import {RoleId, RoleIdLib} from "../types/RoleId.sol";
|
22
|
-
import {StateId, ACTIVE} from "../types/StateId.sol";
|
23
|
-
import {ERC165} from "../shared/ERC165.sol";
|
24
|
-
import {Registerable} from "../shared/Registerable.sol";
|
25
|
-
import {ComponentOwnerService} from "./service/ComponentOwnerService.sol";
|
26
|
-
import {IComponentOwnerService} from "./service/IComponentOwnerService.sol";
|
27
|
-
import {IDistributionService} from "./service/IDistributionService.sol";
|
28
|
-
import {IPoolService} from "./service/IPoolService.sol";
|
29
|
-
import {IProductService} from "./service/IProductService.sol";
|
30
|
-
import {VersionPart} from "../types/Version.sol";
|
31
|
-
import {IInstanceBase} from "./IInstanceBase.sol";
|
32
|
-
|
33
|
-
contract InstanceBase is
|
34
|
-
IInstanceBase,
|
35
|
-
KeyValueStore,
|
36
|
-
ERC165,
|
37
|
-
Registerable
|
38
|
-
{
|
39
|
-
|
40
|
-
|
41
|
-
}
|
@@ -1,82 +0,0 @@
|
|
1
|
-
// SPDX-License-Identifier: Apache-2.0
|
2
|
-
pragma solidity ^0.8.19;
|
3
|
-
|
4
|
-
import {IRegistry} from "../../registry/IRegistry.sol";
|
5
|
-
import {IRegistryService} from "../../registry/IRegistryService.sol";
|
6
|
-
import {IInstance} from "../../instance/IInstance.sol";
|
7
|
-
import {IAccess} from "../module/IAccess.sol";
|
8
|
-
import {ObjectType, INSTANCE, REGISTRY} from "../../types/ObjectType.sol";
|
9
|
-
import {NftId} from "../../types/NftId.sol";
|
10
|
-
import {RoleId} from "../../types/RoleId.sol";
|
11
|
-
|
12
|
-
import {Service} from "../../shared/Service.sol";
|
13
|
-
import {InstanceService} from "../InstanceService.sol";
|
14
|
-
import {InstanceAccessManager} from "../InstanceAccessManager.sol";
|
15
|
-
|
16
|
-
abstract contract ComponentServiceBase is Service {
|
17
|
-
|
18
|
-
error ErrorComponentServiceBaseComponentLocked(address componentAddress);
|
19
|
-
error ExpectedRoleMissing(RoleId expected, address caller);
|
20
|
-
error ComponentTypeInvalid(ObjectType componentType);
|
21
|
-
|
22
|
-
|
23
|
-
/// @dev modifier to check if caller is a registered service
|
24
|
-
modifier onlyService() {
|
25
|
-
address caller = msg.sender;
|
26
|
-
require(getRegistry().isRegisteredService(caller), "ERROR_NOT_SERVICE");
|
27
|
-
_;
|
28
|
-
}
|
29
|
-
|
30
|
-
// view functions
|
31
|
-
|
32
|
-
function getRegistryService() public view virtual returns (IRegistryService) {
|
33
|
-
address service = getRegistry().getServiceAddress(REGISTRY(), getMajorVersion());
|
34
|
-
return IRegistryService(service);
|
35
|
-
}
|
36
|
-
|
37
|
-
function getInstanceService() public view returns (InstanceService) {
|
38
|
-
address service = getRegistry().getServiceAddress(INSTANCE(), getMajorVersion());
|
39
|
-
return InstanceService(service);
|
40
|
-
}
|
41
|
-
|
42
|
-
// internal view functions
|
43
|
-
|
44
|
-
function _getInstance(NftId instanceNftId) internal view returns (IInstance) {
|
45
|
-
IRegistry.ObjectInfo memory instanceInfo = getRegistry().getObjectInfo(instanceNftId);
|
46
|
-
return IInstance(instanceInfo.objectAddress);
|
47
|
-
}
|
48
|
-
|
49
|
-
function _getInstanceNftId(IRegistry.ObjectInfo memory compObjInfo) internal view returns (NftId) {
|
50
|
-
IRegistry registry = getRegistry();
|
51
|
-
IRegistry.ObjectInfo memory instanceInfo = registry.getObjectInfo(compObjInfo.parentNftId);
|
52
|
-
return instanceInfo.nftId;
|
53
|
-
}
|
54
|
-
|
55
|
-
function _getAndVerifyComponentInfoAndInstance(
|
56
|
-
//address component,
|
57
|
-
ObjectType expectedType
|
58
|
-
)
|
59
|
-
internal
|
60
|
-
view
|
61
|
-
returns(
|
62
|
-
IRegistry.ObjectInfo memory info,
|
63
|
-
IInstance instance
|
64
|
-
)
|
65
|
-
{
|
66
|
-
IRegistry registry = getRegistry();
|
67
|
-
//TODO redundant check -> just check type
|
68
|
-
//NftId componentNftId = registry.getNftId(component);
|
69
|
-
//require(componentNftId.gtz(), "ERROR_COMPONENT_UNKNOWN");
|
70
|
-
|
71
|
-
info = registry.getObjectInfo(msg.sender);
|
72
|
-
require(info.objectType == expectedType, "OBJECT_TYPE_INVALID");
|
73
|
-
|
74
|
-
address instanceAddress = registry.getObjectInfo(info.parentNftId).objectAddress;
|
75
|
-
instance = IInstance(instanceAddress);
|
76
|
-
|
77
|
-
InstanceAccessManager accessManager = instance.getInstanceAccessManager();
|
78
|
-
if (accessManager.isTargetLocked(info.objectAddress)) {
|
79
|
-
revert IAccess.ErrorIAccessTargetLocked(info.objectAddress);
|
80
|
-
}
|
81
|
-
}
|
82
|
-
}
|
@@ -1,23 +0,0 @@
|
|
1
|
-
// SPDX-License-Identifier: Apache-2.0
|
2
|
-
pragma solidity ^0.8.20;
|
3
|
-
|
4
|
-
import {Key32} from "../../types/Key32.sol";
|
5
|
-
import {StateId} from "../../types/StateId.sol";
|
6
|
-
|
7
|
-
import {IKeyValueStore} from "./IKeyValueStore.sol";
|
8
|
-
|
9
|
-
import {IComponentOwnerService} from "../service/IComponentOwnerService.sol";
|
10
|
-
import {IDistributionService} from "../service/IDistributionService.sol";
|
11
|
-
import {IProductService} from "../service/IProductService.sol";
|
12
|
-
import {IPoolService} from "../service/IPoolService.sol";
|
13
|
-
|
14
|
-
interface IInstanceBase {
|
15
|
-
function getKeyValueStore() external view returns (IKeyValueStore keyValueStore);
|
16
|
-
function updateState(Key32 key, StateId state) external;
|
17
|
-
function getState(Key32 key) external view returns (StateId state);
|
18
|
-
|
19
|
-
function getComponentOwnerService() external view returns(IComponentOwnerService);
|
20
|
-
function getDistributionService() external view returns(IDistributionService);
|
21
|
-
function getProductService() external view returns(IProductService service);
|
22
|
-
function getPoolService() external view returns(IPoolService service);
|
23
|
-
}
|