@etherisc/gif-next 0.0.2-f74fcad-685 → 0.0.2-f7b8c9f-436
Sign up to get free protection for your applications and to get access to all the features.
- package/README.md +160 -6
- package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.dbg.json +4 -0
- package/artifacts/contracts/{instance/component/ComponentModule.sol/ComponentModule.json → components/BaseComponent.sol/BaseComponent.json} +152 -150
- package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +4 -0
- package/artifacts/contracts/components/Distribution.sol/Distribution.json +557 -0
- package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.dbg.json +4 -0
- package/artifacts/contracts/components/{IPool.sol/IPoolComponent.json → IBaseComponent.sol/IBaseComponent.json} +115 -116
- package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +4 -0
- package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.json +177 -0
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +4 -0
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.json +308 -0
- package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +4 -0
- package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.json +207 -0
- package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
- package/artifacts/contracts/components/Pool.sol/Pool.json +471 -83
- package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
- package/artifacts/contracts/components/Product.sol/Product.json +345 -77
- package/artifacts/contracts/experiment/errors/Require.sol/Require.dbg.json +1 -1
- package/artifacts/contracts/experiment/errors/Revert.sol/Revert.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/A.sol/A.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/A.sol/AShared.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/B.sol/B.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/C.sol/C.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/IA.sol/IA.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/IB.sol/IB.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/IC.sol/IC.dbg.json +1 -1
- package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.dbg.json +1 -1
- package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.json +2 -2
- package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.dbg.json +1 -1
- package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.dbg.json +1 -1
- package/artifacts/contracts/experiment/statemachine/SM.sol/SM.dbg.json +1 -1
- package/artifacts/contracts/experiment/statemachine/SM.sol/SM.json +2 -2
- package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.dbg.json +1 -1
- package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.json +2 -2
- package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.dbg.json +1 -1
- package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstance.sol/IInstance.json +1430 -660
- package/artifacts/contracts/instance/IInstanceLinked.sol/IInstanceLinked.dbg.json +4 -0
- package/artifacts/contracts/instance/{component/IComponent.sol → IInstanceLinked.sol}/IInstanceLinked.json +1 -1
- package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
- package/artifacts/contracts/instance/Instance.sol/Instance.json +1759 -801
- package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.dbg.json +4 -0
- package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.json +481 -0
- package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.dbg.json +4 -0
- package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.json +113 -0
- package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.dbg.json +4 -0
- package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.json +560 -0
- package/artifacts/contracts/instance/base/ILifecycle.sol/ILifecycle.dbg.json +4 -0
- package/artifacts/contracts/instance/{lifecycle/ILifecycle.sol/ILifecycleModule.json → base/ILifecycle.sol/ILifecycle.json} +10 -77
- package/artifacts/contracts/instance/base/IService.sol/IService.dbg.json +4 -0
- package/artifacts/contracts/instance/base/IService.sol/IService.json +421 -0
- package/artifacts/contracts/instance/base/InstanceBase.sol/InstanceBase.dbg.json +4 -0
- package/artifacts/contracts/instance/base/InstanceBase.sol/InstanceBase.json +544 -0
- package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.dbg.json +4 -0
- package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.json +710 -0
- package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json +4 -0
- package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.json +169 -0
- package/artifacts/contracts/instance/base/ModuleBase.sol/ModuleBase.dbg.json +4 -0
- package/artifacts/contracts/instance/base/ModuleBase.sol/ModuleBase.json +10 -0
- package/artifacts/contracts/instance/base/ServiceBase.sol/ServiceBase.dbg.json +4 -0
- package/artifacts/contracts/instance/base/ServiceBase.sol/ServiceBase.json +468 -0
- package/artifacts/contracts/instance/module/access/Access.sol/AccessModule.dbg.json +4 -0
- package/artifacts/contracts/instance/{access → module/access}/Access.sol/AccessModule.json +85 -152
- package/artifacts/contracts/instance/module/access/IAccess.sol/IAccess.dbg.json +4 -0
- package/artifacts/contracts/instance/{access → module/access}/IAccess.sol/IAccess.json +1 -1
- package/artifacts/contracts/instance/module/access/IAccess.sol/IAccessModule.dbg.json +4 -0
- package/artifacts/contracts/instance/{access → module/access}/IAccess.sol/IAccessModule.json +96 -99
- package/artifacts/contracts/instance/module/bundle/BundleModule.sol/BundleModule.dbg.json +4 -0
- package/artifacts/contracts/instance/module/bundle/BundleModule.sol/BundleModule.json +297 -0
- package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundle.dbg.json +4 -0
- package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundle.json +10 -0
- package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundleModule.dbg.json +4 -0
- package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundleModule.json +297 -0
- package/artifacts/contracts/instance/module/component/ComponentModule.sol/ComponentModule.dbg.json +4 -0
- package/artifacts/contracts/instance/{pool/IPoolModule.sol/IPoolModule.json → module/component/ComponentModule.sol/ComponentModule.json} +49 -61
- package/artifacts/contracts/instance/module/component/IComponent.sol/IComponent.dbg.json +4 -0
- package/artifacts/contracts/instance/{component → module/component}/IComponent.sol/IComponent.json +1 -1
- package/artifacts/contracts/instance/module/component/IComponent.sol/IComponentModule.dbg.json +4 -0
- package/artifacts/contracts/instance/{product/IProductService.sol/IProductService.json → module/component/IComponent.sol/IComponentModule.json} +51 -61
- package/artifacts/contracts/instance/module/distribution/DistributionModule.sol/DistributionModule.dbg.json +4 -0
- package/artifacts/contracts/instance/module/distribution/DistributionModule.sol/DistributionModule.json +10 -0
- package/artifacts/contracts/instance/module/distribution/IDistribution.sol/IDistribution.dbg.json +4 -0
- package/artifacts/contracts/instance/module/distribution/IDistribution.sol/IDistribution.json +10 -0
- package/artifacts/contracts/instance/module/distribution/IDistribution.sol/IDistributionModule.dbg.json +4 -0
- package/artifacts/contracts/instance/module/distribution/IDistribution.sol/IDistributionModule.json +10 -0
- package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicy.dbg.json +4 -0
- package/artifacts/contracts/instance/{policy → module/policy}/IPolicy.sol/IPolicy.json +1 -1
- package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicyModule.dbg.json +4 -0
- package/artifacts/contracts/instance/{policy → module/policy}/IPolicy.sol/IPolicyModule.json +136 -119
- package/artifacts/contracts/instance/module/policy/PolicyModule.sol/PolicyModule.dbg.json +4 -0
- package/artifacts/contracts/instance/{policy → module/policy}/PolicyModule.sol/PolicyModule.json +137 -120
- package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPool.dbg.json +4 -0
- package/artifacts/contracts/instance/{pool → module/pool}/IPoolModule.sol/IPool.json +1 -1
- package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPoolModule.dbg.json +4 -0
- package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPoolModule.json +164 -0
- package/artifacts/contracts/instance/module/pool/PoolModule.sol/PoolModule.dbg.json +4 -0
- package/artifacts/contracts/instance/{pool → module/pool}/PoolModule.sol/PoolModule.json +66 -57
- package/artifacts/contracts/instance/module/risk/IRisk.sol/IRisk.dbg.json +4 -0
- package/artifacts/contracts/instance/module/risk/IRisk.sol/IRisk.json +10 -0
- package/artifacts/contracts/instance/module/risk/IRisk.sol/IRiskModule.dbg.json +4 -0
- package/artifacts/contracts/instance/module/risk/IRisk.sol/IRiskModule.json +113 -0
- package/artifacts/contracts/instance/module/risk/RiskModule.sol/RiskModule.dbg.json +4 -0
- package/artifacts/contracts/instance/module/risk/RiskModule.sol/RiskModule.json +131 -0
- package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasury.dbg.json +4 -0
- package/artifacts/contracts/instance/{treasury → module/treasury}/ITreasury.sol/ITreasury.json +1 -1
- package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasuryModule.dbg.json +4 -0
- package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasuryModule.json +638 -0
- package/artifacts/contracts/instance/module/treasury/TokenHandler.sol/TokenHandler.dbg.json +4 -0
- package/artifacts/contracts/instance/module/treasury/TokenHandler.sol/TokenHandler.json +76 -0
- package/artifacts/contracts/instance/module/treasury/TreasuryModule.sol/TreasuryModule.dbg.json +4 -0
- package/artifacts/contracts/instance/module/treasury/TreasuryModule.sol/TreasuryModule.json +638 -0
- package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.json +794 -0
- package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +630 -0
- package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.json +466 -0
- package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.json +446 -0
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +561 -0
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +751 -0
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +753 -0
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +1068 -0
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +194 -2
- package/artifacts/contracts/registry/IChainNft.sol/IChainNft.dbg.json +1 -1
- package/artifacts/contracts/registry/IChainNft.sol/IChainNft.json +5 -0
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +408 -32
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +4 -0
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +745 -0
- package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +4 -0
- package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.json +34 -0
- package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
- package/artifacts/contracts/registry/Registry.sol/Registry.json +637 -52
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +4 -0
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +997 -0
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +4 -0
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +468 -0
- package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.dbg.json +4 -0
- package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.json +107 -0
- package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +4 -0
- package/artifacts/contracts/shared/ERC165.sol/ERC165.json +35 -0
- package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +4 -0
- package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.json +127 -0
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +4 -0
- package/artifacts/contracts/{components/Component.sol/Component.json → shared/IRegisterable.sol/IRegisterable.json} +98 -102
- package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +4 -0
- package/artifacts/contracts/shared/IVersionable.sol/IVersionable.json +205 -0
- package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +4 -0
- package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +158 -0
- package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +4 -0
- package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +349 -0
- package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +4 -0
- package/artifacts/contracts/shared/Registerable.sol/Registerable.json +274 -0
- package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +4 -0
- package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +129 -0
- package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +4 -0
- package/artifacts/contracts/shared/Versionable.sol/Versionable.json +228 -0
- package/artifacts/contracts/test/TestDistribution.sol/TestDistribution.dbg.json +4 -0
- package/artifacts/contracts/test/TestDistribution.sol/TestDistribution.json +557 -0
- package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json +4 -0
- package/artifacts/contracts/test/TestFee.sol/TestFee.json +119 -0
- package/artifacts/contracts/test/TestPool.sol/TestPool.dbg.json +4 -0
- package/artifacts/contracts/test/TestPool.sol/TestPool.json +716 -0
- package/artifacts/contracts/test/TestProduct.sol/TestProduct.dbg.json +4 -0
- package/artifacts/contracts/test/TestProduct.sol/TestProduct.json +744 -0
- package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json +4 -0
- package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +305 -0
- package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +4 -0
- package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.json +116 -0
- package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +4 -0
- package/artifacts/contracts/test/TestService.sol/TestService.json +584 -0
- package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json +4 -0
- package/artifacts/contracts/test/TestToken.sol/TestUsdc.json +338 -0
- package/artifacts/contracts/test/TestVersion.sol/TestVersion.dbg.json +4 -0
- package/artifacts/contracts/test/TestVersion.sol/TestVersion.json +218 -0
- package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json +4 -0
- package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.json +270 -0
- package/artifacts/contracts/test/Usdc.sol/USDC.dbg.json +4 -0
- package/artifacts/contracts/{mock → test}/Usdc.sol/USDC.json +3 -3
- package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.dbg.json +4 -0
- package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.json +10 -0
- package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
- package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/Fee.sol/FeeLib.dbg.json +4 -0
- package/artifacts/contracts/types/Fee.sol/FeeLib.json +257 -0
- package/artifacts/contracts/types/Key32.sol/Key32Lib.dbg.json +4 -0
- package/artifacts/contracts/types/Key32.sol/Key32Lib.json +111 -0
- package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/NftId.sol/NftIdLib.json +65 -4
- package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.dbg.json +4 -0
- package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.json +10 -0
- package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
- package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.json +2 -2
- package/artifacts/contracts/types/ReferralId.sol/ReferralIdLib.dbg.json +4 -0
- package/artifacts/contracts/types/ReferralId.sol/ReferralIdLib.json +99 -0
- package/artifacts/contracts/types/RiskId.sol/RiskIdLib.dbg.json +4 -0
- package/artifacts/contracts/types/RiskId.sol/RiskIdLib.json +86 -0
- package/artifacts/contracts/types/RoleId.sol/RoleIdLib.dbg.json +4 -0
- package/artifacts/contracts/types/RoleId.sol/RoleIdLib.json +30 -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 +64 -2
- package/artifacts/contracts/types/UFixed.sol/UFixedMathLib.dbg.json +1 -1
- package/artifacts/contracts/types/UFixed.sol/UFixedMathLib.json +58 -58
- package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +4 -0
- package/artifacts/contracts/types/Version.sol/VersionLib.json +177 -0
- package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +4 -0
- package/artifacts/contracts/types/Version.sol/VersionPartLib.json +30 -0
- package/contracts/components/BaseComponent.sol +79 -0
- package/contracts/components/Distribution.sol +155 -0
- package/contracts/components/IBaseComponent.sol +19 -0
- package/contracts/components/IDistributionComponent.sol +46 -0
- package/contracts/components/IPoolComponent.sol +64 -0
- package/contracts/components/IProductComponent.sol +37 -0
- package/contracts/components/Pool.sol +218 -24
- package/contracts/components/Product.sol +248 -38
- package/contracts/instance/IInstance.sol +40 -11
- package/contracts/instance/IInstanceLinked.sol +8 -0
- package/contracts/instance/Instance.sol +60 -45
- package/contracts/instance/base/ComponentServiceBase.sol +49 -0
- package/contracts/instance/base/IInstanceBase.sol +23 -0
- package/contracts/instance/base/IKeyValueStore.sol +50 -0
- package/contracts/instance/{lifecycle → base}/ILifecycle.sol +4 -21
- package/contracts/instance/base/IService.sol +15 -0
- package/contracts/instance/base/InstanceBase.sol +89 -0
- package/contracts/instance/base/KeyValueStore.sol +161 -0
- package/contracts/instance/base/Lifecycle.sol +100 -0
- package/contracts/instance/base/ModuleBase.sol +57 -0
- package/contracts/instance/base/ServiceBase.sol +44 -0
- package/contracts/instance/module/access/Access.sol +149 -0
- package/contracts/instance/module/access/IAccess.sol +53 -0
- package/contracts/instance/module/bundle/BundleModule.sol +134 -0
- package/contracts/instance/module/bundle/IBundle.sol +53 -0
- package/contracts/instance/module/component/ComponentModule.sol +71 -0
- package/contracts/instance/module/component/IComponent.sol +28 -0
- package/contracts/instance/module/distribution/DistributionModule.sol +17 -0
- package/contracts/instance/module/distribution/IDistribution.sol +10 -0
- package/contracts/instance/module/policy/IPolicy.sol +63 -0
- package/contracts/instance/module/policy/PolicyModule.sol +91 -0
- package/contracts/instance/module/pool/IPoolModule.sol +41 -0
- package/contracts/instance/module/pool/PoolModule.sol +95 -0
- package/contracts/instance/module/risk/IRisk.sol +26 -0
- package/contracts/instance/module/risk/RiskModule.sol +62 -0
- package/contracts/instance/module/treasury/ITreasury.sol +84 -0
- package/contracts/instance/module/treasury/TokenHandler.sol +48 -0
- package/contracts/instance/module/treasury/TreasuryModule.sol +131 -0
- package/contracts/instance/service/ComponentOwnerService.sol +275 -0
- package/contracts/instance/service/DistributionService.sol +54 -0
- package/contracts/instance/service/IComponentOwnerService.sol +20 -0
- package/contracts/instance/service/IDistributionService.sol +12 -0
- package/contracts/instance/service/IPoolService.sol +37 -0
- package/contracts/instance/service/IProductService.sol +107 -0
- package/contracts/instance/service/PoolService.sol +149 -0
- package/contracts/instance/service/ProductService.sol +510 -0
- package/contracts/registry/ChainNft.sol +94 -42
- package/contracts/registry/IChainNft.sol +3 -2
- package/contracts/registry/IRegistry.sol +50 -44
- package/contracts/registry/IRegistryService.sol +29 -0
- package/contracts/registry/ITransferInterceptor.sol +6 -0
- package/contracts/registry/Registry.sol +435 -126
- package/contracts/registry/RegistryService.sol +368 -0
- package/contracts/registry/RegistryServiceManager.sol +43 -0
- package/contracts/shared/ContractDeployerLib.sol +72 -0
- package/contracts/shared/ERC165.sol +21 -0
- package/contracts/shared/INftOwnable.sol +22 -0
- package/contracts/shared/IRegisterable.sol +17 -0
- package/contracts/shared/IVersionable.sol +96 -0
- package/contracts/shared/NftOwnable.sol +136 -0
- package/contracts/shared/ProxyManager.sol +94 -0
- package/contracts/shared/Registerable.sol +89 -0
- package/contracts/shared/UpgradableProxyWithAdmin.sol +16 -0
- package/contracts/shared/Versionable.sol +147 -0
- package/contracts/test/TestDistribution.sol +22 -0
- package/contracts/test/TestFee.sol +25 -0
- package/contracts/test/TestPool.sol +27 -0
- package/contracts/test/TestProduct.sol +74 -0
- package/contracts/test/TestRegisterable.sol +18 -0
- package/contracts/test/TestRoleId.sol +14 -0
- package/contracts/test/TestService.sol +26 -0
- package/contracts/{mock/Dip.sol → test/TestToken.sol} +5 -5
- package/contracts/test/TestVersion.sol +44 -0
- package/contracts/test/TestVersionable.sol +17 -0
- package/contracts/{mock → test}/Usdc.sol +1 -1
- package/contracts/types/AddressSet.sol +58 -0
- package/contracts/types/Fee.sol +44 -20
- package/contracts/types/Key32.sol +45 -0
- package/contracts/types/NftId.sol +22 -1
- package/contracts/types/NftIdSet.sol +60 -0
- package/contracts/types/ObjectType.sol +37 -13
- package/contracts/types/ReferralId.sol +48 -0
- package/contracts/types/RiskId.sol +43 -0
- package/contracts/types/RoleId.sol +38 -0
- package/contracts/types/StateId.sol +13 -3
- package/contracts/types/Timestamp.sol +22 -1
- package/contracts/types/UFixed.sol +12 -13
- package/contracts/types/Version.sol +104 -0
- package/package.json +8 -3
- package/artifacts/contracts/components/Component.sol/Component.dbg.json +0 -4
- package/artifacts/contracts/components/Component.sol/InstanceLinked.dbg.json +0 -4
- package/artifacts/contracts/components/Component.sol/InstanceLinked.json +0 -35
- package/artifacts/contracts/components/IPool.sol/IPoolComponent.dbg.json +0 -4
- package/artifacts/contracts/components/IProduct.sol/IProductComponent.dbg.json +0 -4
- package/artifacts/contracts/components/IProduct.sol/IProductComponent.json +0 -74
- package/artifacts/contracts/instance/access/Access.sol/AccessModule.dbg.json +0 -4
- package/artifacts/contracts/instance/access/IAccess.sol/IAccess.dbg.json +0 -4
- package/artifacts/contracts/instance/access/IAccess.sol/IAccessCheckRole.dbg.json +0 -4
- package/artifacts/contracts/instance/access/IAccess.sol/IAccessCheckRole.json +0 -35
- package/artifacts/contracts/instance/access/IAccess.sol/IAccessComponentTypeRoles.dbg.json +0 -4
- package/artifacts/contracts/instance/access/IAccess.sol/IAccessComponentTypeRoles.json +0 -50
- package/artifacts/contracts/instance/access/IAccess.sol/IAccessModule.dbg.json +0 -4
- package/artifacts/contracts/instance/component/ComponentModule.sol/ComponentModule.dbg.json +0 -4
- package/artifacts/contracts/instance/component/ComponentModule.sol/ComponentOwnerService.dbg.json +0 -4
- package/artifacts/contracts/instance/component/ComponentModule.sol/ComponentOwnerService.json +0 -202
- package/artifacts/contracts/instance/component/IComponent.sol/IComponent.dbg.json +0 -4
- package/artifacts/contracts/instance/component/IComponent.sol/IComponentContract.dbg.json +0 -4
- package/artifacts/contracts/instance/component/IComponent.sol/IComponentContract.json +0 -205
- package/artifacts/contracts/instance/component/IComponent.sol/IComponentModule.dbg.json +0 -4
- package/artifacts/contracts/instance/component/IComponent.sol/IComponentModule.json +0 -217
- package/artifacts/contracts/instance/component/IComponent.sol/IComponentOwnerService.dbg.json +0 -4
- package/artifacts/contracts/instance/component/IComponent.sol/IComponentOwnerService.json +0 -141
- package/artifacts/contracts/instance/component/IComponent.sol/IInstanceLinked.dbg.json +0 -4
- package/artifacts/contracts/instance/lifecycle/ILifecycle.sol/ILifecycle.dbg.json +0 -4
- package/artifacts/contracts/instance/lifecycle/ILifecycle.sol/ILifecycle.json +0 -134
- package/artifacts/contracts/instance/lifecycle/ILifecycle.sol/ILifecycleModule.dbg.json +0 -4
- package/artifacts/contracts/instance/lifecycle/LifecycleModule.sol/LifecycleModule.dbg.json +0 -4
- package/artifacts/contracts/instance/lifecycle/LifecycleModule.sol/LifecycleModule.json +0 -221
- package/artifacts/contracts/instance/policy/IPolicy.sol/IPolicy.dbg.json +0 -4
- package/artifacts/contracts/instance/policy/IPolicy.sol/IPolicyModule.dbg.json +0 -4
- package/artifacts/contracts/instance/policy/PolicyModule.sol/PolicyModule.dbg.json +0 -4
- package/artifacts/contracts/instance/pool/IPoolModule.sol/IPool.dbg.json +0 -4
- package/artifacts/contracts/instance/pool/IPoolModule.sol/IPoolModule.dbg.json +0 -4
- package/artifacts/contracts/instance/pool/PoolModule.sol/PoolModule.dbg.json +0 -4
- package/artifacts/contracts/instance/product/IProductService.sol/IProductModule.dbg.json +0 -4
- package/artifacts/contracts/instance/product/IProductService.sol/IProductModule.json +0 -75
- package/artifacts/contracts/instance/product/IProductService.sol/IProductService.dbg.json +0 -4
- package/artifacts/contracts/instance/product/ProductService.sol/ProductModule.dbg.json +0 -4
- package/artifacts/contracts/instance/product/ProductService.sol/ProductModule.json +0 -75
- package/artifacts/contracts/instance/product/ProductService.sol/ProductService.dbg.json +0 -4
- package/artifacts/contracts/instance/product/ProductService.sol/ProductService.json +0 -196
- package/artifacts/contracts/instance/treasury/ITreasury.sol/ITreasury.dbg.json +0 -4
- package/artifacts/contracts/instance/treasury/ITreasury.sol/ITreasuryModule.dbg.json +0 -4
- package/artifacts/contracts/instance/treasury/ITreasury.sol/ITreasuryModule.json +0 -490
- package/artifacts/contracts/instance/treasury/TokenHandler.sol/TokenHandler.dbg.json +0 -4
- package/artifacts/contracts/instance/treasury/TokenHandler.sol/TokenHandler.json +0 -45
- package/artifacts/contracts/instance/treasury/TreasuryModule.sol/TreasuryModule.dbg.json +0 -4
- package/artifacts/contracts/instance/treasury/TreasuryModule.sol/TreasuryModule.json +0 -490
- package/artifacts/contracts/mock/Dip.sol/DIP.dbg.json +0 -4
- package/artifacts/contracts/mock/Dip.sol/DIP.json +0 -338
- package/artifacts/contracts/mock/TestPool.sol/TestPool.dbg.json +0 -4
- package/artifacts/contracts/mock/TestPool.sol/TestPool.json +0 -294
- package/artifacts/contracts/mock/TestProduct.sol/TestProduct.dbg.json +0 -4
- package/artifacts/contracts/mock/TestProduct.sol/TestProduct.json +0 -384
- package/artifacts/contracts/mock/Usdc.sol/USDC.dbg.json +0 -4
- package/artifacts/contracts/registry/IRegistry.sol/IOwnable.dbg.json +0 -4
- package/artifacts/contracts/registry/IRegistry.sol/IOwnable.json +0 -24
- package/artifacts/contracts/registry/IRegistry.sol/IRegisterable.dbg.json +0 -4
- package/artifacts/contracts/registry/IRegistry.sol/IRegisterable.json +0 -166
- package/artifacts/contracts/registry/IRegistry.sol/IRegistryLinked.dbg.json +0 -4
- package/artifacts/contracts/registry/IRegistry.sol/IRegistryLinked.json +0 -49
- package/artifacts/contracts/registry/Registry.sol/Registerable.dbg.json +0 -4
- package/artifacts/contracts/registry/Registry.sol/Registerable.json +0 -166
- package/artifacts/contracts/registry/Registry.sol/RegistryLinked.dbg.json +0 -4
- package/artifacts/contracts/registry/Registry.sol/RegistryLinked.json +0 -60
- package/contracts/components/Component.sol +0 -77
- package/contracts/components/IPool.sol +0 -15
- package/contracts/components/IProduct.sol +0 -16
- package/contracts/experiment/statemachine/README.md +0 -112
- package/contracts/instance/access/Access.sol +0 -165
- package/contracts/instance/access/IAccess.sol +0 -63
- package/contracts/instance/component/ComponentModule.sol +0 -274
- package/contracts/instance/component/IComponent.sol +0 -74
- package/contracts/instance/lifecycle/LifecycleModule.sol +0 -88
- package/contracts/instance/policy/IPolicy.sol +0 -50
- package/contracts/instance/policy/PolicyModule.sol +0 -114
- package/contracts/instance/pool/IPoolModule.sol +0 -23
- package/contracts/instance/pool/PoolModule.sol +0 -81
- package/contracts/instance/product/IProductService.sol +0 -36
- package/contracts/instance/product/ProductService.sol +0 -136
- package/contracts/instance/treasury/ITreasury.sol +0 -91
- package/contracts/instance/treasury/TokenHandler.sol +0 -24
- package/contracts/instance/treasury/TreasuryModule.sol +0 -168
- package/contracts/mock/TestPool.sol +0 -16
- package/contracts/mock/TestProduct.sol +0 -39
@@ -0,0 +1,338 @@
|
|
1
|
+
{
|
2
|
+
"_format": "hh-sol-artifact-1",
|
3
|
+
"contractName": "TestUsdc",
|
4
|
+
"sourceName": "contracts/test/TestToken.sol",
|
5
|
+
"abi": [
|
6
|
+
{
|
7
|
+
"inputs": [],
|
8
|
+
"stateMutability": "nonpayable",
|
9
|
+
"type": "constructor"
|
10
|
+
},
|
11
|
+
{
|
12
|
+
"anonymous": false,
|
13
|
+
"inputs": [
|
14
|
+
{
|
15
|
+
"indexed": true,
|
16
|
+
"internalType": "address",
|
17
|
+
"name": "owner",
|
18
|
+
"type": "address"
|
19
|
+
},
|
20
|
+
{
|
21
|
+
"indexed": true,
|
22
|
+
"internalType": "address",
|
23
|
+
"name": "spender",
|
24
|
+
"type": "address"
|
25
|
+
},
|
26
|
+
{
|
27
|
+
"indexed": false,
|
28
|
+
"internalType": "uint256",
|
29
|
+
"name": "value",
|
30
|
+
"type": "uint256"
|
31
|
+
}
|
32
|
+
],
|
33
|
+
"name": "Approval",
|
34
|
+
"type": "event"
|
35
|
+
},
|
36
|
+
{
|
37
|
+
"anonymous": false,
|
38
|
+
"inputs": [
|
39
|
+
{
|
40
|
+
"indexed": true,
|
41
|
+
"internalType": "address",
|
42
|
+
"name": "from",
|
43
|
+
"type": "address"
|
44
|
+
},
|
45
|
+
{
|
46
|
+
"indexed": true,
|
47
|
+
"internalType": "address",
|
48
|
+
"name": "to",
|
49
|
+
"type": "address"
|
50
|
+
},
|
51
|
+
{
|
52
|
+
"indexed": false,
|
53
|
+
"internalType": "uint256",
|
54
|
+
"name": "value",
|
55
|
+
"type": "uint256"
|
56
|
+
}
|
57
|
+
],
|
58
|
+
"name": "Transfer",
|
59
|
+
"type": "event"
|
60
|
+
},
|
61
|
+
{
|
62
|
+
"inputs": [],
|
63
|
+
"name": "DECIMALS",
|
64
|
+
"outputs": [
|
65
|
+
{
|
66
|
+
"internalType": "uint8",
|
67
|
+
"name": "",
|
68
|
+
"type": "uint8"
|
69
|
+
}
|
70
|
+
],
|
71
|
+
"stateMutability": "view",
|
72
|
+
"type": "function"
|
73
|
+
},
|
74
|
+
{
|
75
|
+
"inputs": [],
|
76
|
+
"name": "INITIAL_SUPPLY",
|
77
|
+
"outputs": [
|
78
|
+
{
|
79
|
+
"internalType": "uint256",
|
80
|
+
"name": "",
|
81
|
+
"type": "uint256"
|
82
|
+
}
|
83
|
+
],
|
84
|
+
"stateMutability": "view",
|
85
|
+
"type": "function"
|
86
|
+
},
|
87
|
+
{
|
88
|
+
"inputs": [],
|
89
|
+
"name": "NAME",
|
90
|
+
"outputs": [
|
91
|
+
{
|
92
|
+
"internalType": "string",
|
93
|
+
"name": "",
|
94
|
+
"type": "string"
|
95
|
+
}
|
96
|
+
],
|
97
|
+
"stateMutability": "view",
|
98
|
+
"type": "function"
|
99
|
+
},
|
100
|
+
{
|
101
|
+
"inputs": [],
|
102
|
+
"name": "SYMBOL",
|
103
|
+
"outputs": [
|
104
|
+
{
|
105
|
+
"internalType": "string",
|
106
|
+
"name": "",
|
107
|
+
"type": "string"
|
108
|
+
}
|
109
|
+
],
|
110
|
+
"stateMutability": "view",
|
111
|
+
"type": "function"
|
112
|
+
},
|
113
|
+
{
|
114
|
+
"inputs": [
|
115
|
+
{
|
116
|
+
"internalType": "address",
|
117
|
+
"name": "owner",
|
118
|
+
"type": "address"
|
119
|
+
},
|
120
|
+
{
|
121
|
+
"internalType": "address",
|
122
|
+
"name": "spender",
|
123
|
+
"type": "address"
|
124
|
+
}
|
125
|
+
],
|
126
|
+
"name": "allowance",
|
127
|
+
"outputs": [
|
128
|
+
{
|
129
|
+
"internalType": "uint256",
|
130
|
+
"name": "",
|
131
|
+
"type": "uint256"
|
132
|
+
}
|
133
|
+
],
|
134
|
+
"stateMutability": "view",
|
135
|
+
"type": "function"
|
136
|
+
},
|
137
|
+
{
|
138
|
+
"inputs": [
|
139
|
+
{
|
140
|
+
"internalType": "address",
|
141
|
+
"name": "spender",
|
142
|
+
"type": "address"
|
143
|
+
},
|
144
|
+
{
|
145
|
+
"internalType": "uint256",
|
146
|
+
"name": "amount",
|
147
|
+
"type": "uint256"
|
148
|
+
}
|
149
|
+
],
|
150
|
+
"name": "approve",
|
151
|
+
"outputs": [
|
152
|
+
{
|
153
|
+
"internalType": "bool",
|
154
|
+
"name": "",
|
155
|
+
"type": "bool"
|
156
|
+
}
|
157
|
+
],
|
158
|
+
"stateMutability": "nonpayable",
|
159
|
+
"type": "function"
|
160
|
+
},
|
161
|
+
{
|
162
|
+
"inputs": [
|
163
|
+
{
|
164
|
+
"internalType": "address",
|
165
|
+
"name": "account",
|
166
|
+
"type": "address"
|
167
|
+
}
|
168
|
+
],
|
169
|
+
"name": "balanceOf",
|
170
|
+
"outputs": [
|
171
|
+
{
|
172
|
+
"internalType": "uint256",
|
173
|
+
"name": "",
|
174
|
+
"type": "uint256"
|
175
|
+
}
|
176
|
+
],
|
177
|
+
"stateMutability": "view",
|
178
|
+
"type": "function"
|
179
|
+
},
|
180
|
+
{
|
181
|
+
"inputs": [],
|
182
|
+
"name": "decimals",
|
183
|
+
"outputs": [
|
184
|
+
{
|
185
|
+
"internalType": "uint8",
|
186
|
+
"name": "",
|
187
|
+
"type": "uint8"
|
188
|
+
}
|
189
|
+
],
|
190
|
+
"stateMutability": "pure",
|
191
|
+
"type": "function"
|
192
|
+
},
|
193
|
+
{
|
194
|
+
"inputs": [
|
195
|
+
{
|
196
|
+
"internalType": "address",
|
197
|
+
"name": "spender",
|
198
|
+
"type": "address"
|
199
|
+
},
|
200
|
+
{
|
201
|
+
"internalType": "uint256",
|
202
|
+
"name": "subtractedValue",
|
203
|
+
"type": "uint256"
|
204
|
+
}
|
205
|
+
],
|
206
|
+
"name": "decreaseAllowance",
|
207
|
+
"outputs": [
|
208
|
+
{
|
209
|
+
"internalType": "bool",
|
210
|
+
"name": "",
|
211
|
+
"type": "bool"
|
212
|
+
}
|
213
|
+
],
|
214
|
+
"stateMutability": "nonpayable",
|
215
|
+
"type": "function"
|
216
|
+
},
|
217
|
+
{
|
218
|
+
"inputs": [
|
219
|
+
{
|
220
|
+
"internalType": "address",
|
221
|
+
"name": "spender",
|
222
|
+
"type": "address"
|
223
|
+
},
|
224
|
+
{
|
225
|
+
"internalType": "uint256",
|
226
|
+
"name": "addedValue",
|
227
|
+
"type": "uint256"
|
228
|
+
}
|
229
|
+
],
|
230
|
+
"name": "increaseAllowance",
|
231
|
+
"outputs": [
|
232
|
+
{
|
233
|
+
"internalType": "bool",
|
234
|
+
"name": "",
|
235
|
+
"type": "bool"
|
236
|
+
}
|
237
|
+
],
|
238
|
+
"stateMutability": "nonpayable",
|
239
|
+
"type": "function"
|
240
|
+
},
|
241
|
+
{
|
242
|
+
"inputs": [],
|
243
|
+
"name": "name",
|
244
|
+
"outputs": [
|
245
|
+
{
|
246
|
+
"internalType": "string",
|
247
|
+
"name": "",
|
248
|
+
"type": "string"
|
249
|
+
}
|
250
|
+
],
|
251
|
+
"stateMutability": "view",
|
252
|
+
"type": "function"
|
253
|
+
},
|
254
|
+
{
|
255
|
+
"inputs": [],
|
256
|
+
"name": "symbol",
|
257
|
+
"outputs": [
|
258
|
+
{
|
259
|
+
"internalType": "string",
|
260
|
+
"name": "",
|
261
|
+
"type": "string"
|
262
|
+
}
|
263
|
+
],
|
264
|
+
"stateMutability": "view",
|
265
|
+
"type": "function"
|
266
|
+
},
|
267
|
+
{
|
268
|
+
"inputs": [],
|
269
|
+
"name": "totalSupply",
|
270
|
+
"outputs": [
|
271
|
+
{
|
272
|
+
"internalType": "uint256",
|
273
|
+
"name": "",
|
274
|
+
"type": "uint256"
|
275
|
+
}
|
276
|
+
],
|
277
|
+
"stateMutability": "view",
|
278
|
+
"type": "function"
|
279
|
+
},
|
280
|
+
{
|
281
|
+
"inputs": [
|
282
|
+
{
|
283
|
+
"internalType": "address",
|
284
|
+
"name": "to",
|
285
|
+
"type": "address"
|
286
|
+
},
|
287
|
+
{
|
288
|
+
"internalType": "uint256",
|
289
|
+
"name": "amount",
|
290
|
+
"type": "uint256"
|
291
|
+
}
|
292
|
+
],
|
293
|
+
"name": "transfer",
|
294
|
+
"outputs": [
|
295
|
+
{
|
296
|
+
"internalType": "bool",
|
297
|
+
"name": "",
|
298
|
+
"type": "bool"
|
299
|
+
}
|
300
|
+
],
|
301
|
+
"stateMutability": "nonpayable",
|
302
|
+
"type": "function"
|
303
|
+
},
|
304
|
+
{
|
305
|
+
"inputs": [
|
306
|
+
{
|
307
|
+
"internalType": "address",
|
308
|
+
"name": "from",
|
309
|
+
"type": "address"
|
310
|
+
},
|
311
|
+
{
|
312
|
+
"internalType": "address",
|
313
|
+
"name": "to",
|
314
|
+
"type": "address"
|
315
|
+
},
|
316
|
+
{
|
317
|
+
"internalType": "uint256",
|
318
|
+
"name": "amount",
|
319
|
+
"type": "uint256"
|
320
|
+
}
|
321
|
+
],
|
322
|
+
"name": "transferFrom",
|
323
|
+
"outputs": [
|
324
|
+
{
|
325
|
+
"internalType": "bool",
|
326
|
+
"name": "",
|
327
|
+
"type": "bool"
|
328
|
+
}
|
329
|
+
],
|
330
|
+
"stateMutability": "nonpayable",
|
331
|
+
"type": "function"
|
332
|
+
}
|
333
|
+
],
|
334
|
+
"bytecode": "0x60806040523480156200001157600080fd5b506040518060400160405280600b81526020016a1554d110c80b4815195cdd60aa1b815250604051806040016040528060048152602001635553444360e01b815250816003908162000064919062000227565b50600462000073828262000227565b505050620000ae6200008a620000b460201b60201c565b620000986006600a62000408565b620000a890633b9aca0062000420565b620000b8565b62000450565b3390565b6001600160a01b038216620001135760405162461bcd60e51b815260206004820152601f60248201527f45524332303a206d696e7420746f20746865207a65726f206164647265737300604482015260640160405180910390fd5b80600260008282546200012791906200043a565b90915550506001600160a01b038216600081815260208181526040808320805486019055518481527fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef910160405180910390a35050565b505050565b634e487b7160e01b600052604160045260246000fd5b600181811c90821680620001ae57607f821691505b602082108103620001cf57634e487b7160e01b600052602260045260246000fd5b50919050565b601f8211156200017e57600081815260208120601f850160051c81016020861015620001fe5750805b601f850160051c820191505b818110156200021f578281556001016200020a565b505050505050565b81516001600160401b0381111562000243576200024362000183565b6200025b8162000254845462000199565b84620001d5565b602080601f8311600181146200029357600084156200027a5750858301515b600019600386901b1c1916600185901b1785556200021f565b600085815260208120601f198616915b82811015620002c457888601518255948401946001909101908401620002a3565b5085821015620002e35787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b634e487b7160e01b600052601160045260246000fd5b600181815b808511156200034a5781600019048211156200032e576200032e620002f3565b808516156200033c57918102915b93841c93908002906200030e565b509250929050565b600082620003635750600162000402565b81620003725750600062000402565b81600181146200038b57600281146200039657620003b6565b600191505062000402565b60ff841115620003aa57620003aa620002f3565b50506001821b62000402565b5060208310610133831016604e8410600b8410161715620003db575081810a62000402565b620003e7838362000309565b8060001904821115620003fe57620003fe620002f3565b0290505b92915050565b60006200041960ff84168362000352565b9392505050565b8082028115828204841417620004025762000402620002f3565b80820180821115620004025762000402620002f3565b610a3480620004606000396000f3fe608060405234801561001057600080fd5b50600436106100f55760003560e01c80633950935111610097578063a457c2d711610066578063a457c2d7146101f7578063a9059cbb1461020a578063dd62ed3e1461021d578063f76f8d781461023057600080fd5b8063395093511461018957806370a082311461019c57806395d89b41146101c5578063a3f4df7e146101cd57600080fd5b806323b872dd116100d357806323b872dd1461014d5780632e0f2625146101605780632ff2e9dc1461017a578063313ce5671461018257600080fd5b806306fdde03146100fa578063095ea7b31461011857806318160ddd1461013b575b600080fd5b610102610253565b60405161010f919061076c565b60405180910390f35b61012b6101263660046107d6565b6102e5565b604051901515815260200161010f565b6002545b60405190815260200161010f565b61012b61015b366004610800565b6102ff565b610168600681565b60405160ff909116815260200161010f565b61013f610323565b6006610168565b61012b6101973660046107d6565b610340565b61013f6101aa36600461083c565b6001600160a01b031660009081526020819052604090205490565b610102610362565b6101026040518060400160405280600b81526020016a1554d110c80b4815195cdd60aa1b81525081565b61012b6102053660046107d6565b610371565b61012b6102183660046107d6565b6103f1565b61013f61022b36600461085e565b6103ff565b610102604051806040016040528060048152602001635553444360e01b81525081565b60606003805461026290610891565b80601f016020809104026020016040519081016040528092919081815260200182805461028e90610891565b80156102db5780601f106102b0576101008083540402835291602001916102db565b820191906000526020600020905b8154815290600101906020018083116102be57829003601f168201915b5050505050905090565b6000336102f381858561042a565b60019150505b92915050565b60003361030d85828561054e565b6103188585856105c8565b506001949350505050565b61032f6006600a6109c5565b61033d90633b9aca006109d4565b81565b6000336102f381858561035383836103ff565b61035d91906109eb565b61042a565b60606004805461026290610891565b6000338161037f82866103ff565b9050838110156103e45760405162461bcd60e51b815260206004820152602560248201527f45524332303a2064656372656173656420616c6c6f77616e63652062656c6f77604482015264207a65726f60d81b60648201526084015b60405180910390fd5b610318828686840361042a565b6000336102f38185856105c8565b6001600160a01b03918216600090815260016020908152604080832093909416825291909152205490565b6001600160a01b03831661048c5760405162461bcd60e51b8152602060048201526024808201527f45524332303a20617070726f76652066726f6d20746865207a65726f206164646044820152637265737360e01b60648201526084016103db565b6001600160a01b0382166104ed5760405162461bcd60e51b815260206004820152602260248201527f45524332303a20617070726f766520746f20746865207a65726f206164647265604482015261737360f01b60648201526084016103db565b6001600160a01b0383811660008181526001602090815260408083209487168084529482529182902085905590518481527f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925910160405180910390a3505050565b600061055a84846103ff565b905060001981146105c257818110156105b55760405162461bcd60e51b815260206004820152601d60248201527f45524332303a20696e73756666696369656e7420616c6c6f77616e636500000060448201526064016103db565b6105c2848484840361042a565b50505050565b6001600160a01b03831661062c5760405162461bcd60e51b815260206004820152602560248201527f45524332303a207472616e736665722066726f6d20746865207a65726f206164604482015264647265737360d81b60648201526084016103db565b6001600160a01b03821661068e5760405162461bcd60e51b815260206004820152602360248201527f45524332303a207472616e7366657220746f20746865207a65726f206164647260448201526265737360e81b60648201526084016103db565b6001600160a01b038316600090815260208190526040902054818110156107065760405162461bcd60e51b815260206004820152602660248201527f45524332303a207472616e7366657220616d6f756e7420657863656564732062604482015265616c616e636560d01b60648201526084016103db565b6001600160a01b03848116600081815260208181526040808320878703905593871680835291849020805487019055925185815290927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef910160405180910390a36105c2565b600060208083528351808285015260005b818110156107995785810183015185820160400152820161077d565b506000604082860101526040601f19601f8301168501019250505092915050565b80356001600160a01b03811681146107d157600080fd5b919050565b600080604083850312156107e957600080fd5b6107f2836107ba565b946020939093013593505050565b60008060006060848603121561081557600080fd5b61081e846107ba565b925061082c602085016107ba565b9150604084013590509250925092565b60006020828403121561084e57600080fd5b610857826107ba565b9392505050565b6000806040838503121561087157600080fd5b61087a836107ba565b9150610888602084016107ba565b90509250929050565b600181811c908216806108a557607f821691505b6020821081036108c557634e487b7160e01b600052602260045260246000fd5b50919050565b634e487b7160e01b600052601160045260246000fd5b600181815b8085111561091c578160001904821115610902576109026108cb565b8085161561090f57918102915b93841c93908002906108e6565b509250929050565b600082610933575060016102f9565b81610940575060006102f9565b816001811461095657600281146109605761097c565b60019150506102f9565b60ff841115610971576109716108cb565b50506001821b6102f9565b5060208310610133831016604e8410600b841016171561099f575081810a6102f9565b6109a983836108e1565b80600019048211156109bd576109bd6108cb565b029392505050565b600061085760ff841683610924565b80820281158282048414176102f9576102f96108cb565b808201808211156102f9576102f96108cb56fea2646970667358221220f5bae286a22b700b52fd354d2d62092b6c97ab36290cdada62a88b4dc72512b864736f6c63430008140033",
|
335
|
+
"deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100f55760003560e01c80633950935111610097578063a457c2d711610066578063a457c2d7146101f7578063a9059cbb1461020a578063dd62ed3e1461021d578063f76f8d781461023057600080fd5b8063395093511461018957806370a082311461019c57806395d89b41146101c5578063a3f4df7e146101cd57600080fd5b806323b872dd116100d357806323b872dd1461014d5780632e0f2625146101605780632ff2e9dc1461017a578063313ce5671461018257600080fd5b806306fdde03146100fa578063095ea7b31461011857806318160ddd1461013b575b600080fd5b610102610253565b60405161010f919061076c565b60405180910390f35b61012b6101263660046107d6565b6102e5565b604051901515815260200161010f565b6002545b60405190815260200161010f565b61012b61015b366004610800565b6102ff565b610168600681565b60405160ff909116815260200161010f565b61013f610323565b6006610168565b61012b6101973660046107d6565b610340565b61013f6101aa36600461083c565b6001600160a01b031660009081526020819052604090205490565b610102610362565b6101026040518060400160405280600b81526020016a1554d110c80b4815195cdd60aa1b81525081565b61012b6102053660046107d6565b610371565b61012b6102183660046107d6565b6103f1565b61013f61022b36600461085e565b6103ff565b610102604051806040016040528060048152602001635553444360e01b81525081565b60606003805461026290610891565b80601f016020809104026020016040519081016040528092919081815260200182805461028e90610891565b80156102db5780601f106102b0576101008083540402835291602001916102db565b820191906000526020600020905b8154815290600101906020018083116102be57829003601f168201915b5050505050905090565b6000336102f381858561042a565b60019150505b92915050565b60003361030d85828561054e565b6103188585856105c8565b506001949350505050565b61032f6006600a6109c5565b61033d90633b9aca006109d4565b81565b6000336102f381858561035383836103ff565b61035d91906109eb565b61042a565b60606004805461026290610891565b6000338161037f82866103ff565b9050838110156103e45760405162461bcd60e51b815260206004820152602560248201527f45524332303a2064656372656173656420616c6c6f77616e63652062656c6f77604482015264207a65726f60d81b60648201526084015b60405180910390fd5b610318828686840361042a565b6000336102f38185856105c8565b6001600160a01b03918216600090815260016020908152604080832093909416825291909152205490565b6001600160a01b03831661048c5760405162461bcd60e51b8152602060048201526024808201527f45524332303a20617070726f76652066726f6d20746865207a65726f206164646044820152637265737360e01b60648201526084016103db565b6001600160a01b0382166104ed5760405162461bcd60e51b815260206004820152602260248201527f45524332303a20617070726f766520746f20746865207a65726f206164647265604482015261737360f01b60648201526084016103db565b6001600160a01b0383811660008181526001602090815260408083209487168084529482529182902085905590518481527f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925910160405180910390a3505050565b600061055a84846103ff565b905060001981146105c257818110156105b55760405162461bcd60e51b815260206004820152601d60248201527f45524332303a20696e73756666696369656e7420616c6c6f77616e636500000060448201526064016103db565b6105c2848484840361042a565b50505050565b6001600160a01b03831661062c5760405162461bcd60e51b815260206004820152602560248201527f45524332303a207472616e736665722066726f6d20746865207a65726f206164604482015264647265737360d81b60648201526084016103db565b6001600160a01b03821661068e5760405162461bcd60e51b815260206004820152602360248201527f45524332303a207472616e7366657220746f20746865207a65726f206164647260448201526265737360e81b60648201526084016103db565b6001600160a01b038316600090815260208190526040902054818110156107065760405162461bcd60e51b815260206004820152602660248201527f45524332303a207472616e7366657220616d6f756e7420657863656564732062604482015265616c616e636560d01b60648201526084016103db565b6001600160a01b03848116600081815260208181526040808320878703905593871680835291849020805487019055925185815290927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef910160405180910390a36105c2565b600060208083528351808285015260005b818110156107995785810183015185820160400152820161077d565b506000604082860101526040601f19601f8301168501019250505092915050565b80356001600160a01b03811681146107d157600080fd5b919050565b600080604083850312156107e957600080fd5b6107f2836107ba565b946020939093013593505050565b60008060006060848603121561081557600080fd5b61081e846107ba565b925061082c602085016107ba565b9150604084013590509250925092565b60006020828403121561084e57600080fd5b610857826107ba565b9392505050565b6000806040838503121561087157600080fd5b61087a836107ba565b9150610888602084016107ba565b90509250929050565b600181811c908216806108a557607f821691505b6020821081036108c557634e487b7160e01b600052602260045260246000fd5b50919050565b634e487b7160e01b600052601160045260246000fd5b600181815b8085111561091c578160001904821115610902576109026108cb565b8085161561090f57918102915b93841c93908002906108e6565b509250929050565b600082610933575060016102f9565b81610940575060006102f9565b816001811461095657600281146109605761097c565b60019150506102f9565b60ff841115610971576109716108cb565b50506001821b6102f9565b5060208310610133831016604e8410600b841016171561099f575081810a6102f9565b6109a983836108e1565b80600019048211156109bd576109bd6108cb565b029392505050565b600061085760ff841683610924565b80820281158282048414176102f9576102f96108cb565b808201808211156102f9576102f96108cb56fea2646970667358221220f5bae286a22b700b52fd354d2d62092b6c97ab36290cdada62a88b4dc72512b864736f6c63430008140033",
|
336
|
+
"linkReferences": {},
|
337
|
+
"deployedLinkReferences": {}
|
338
|
+
}
|
@@ -0,0 +1,218 @@
|
|
1
|
+
{
|
2
|
+
"_format": "hh-sol-artifact-1",
|
3
|
+
"contractName": "TestVersion",
|
4
|
+
"sourceName": "contracts/test/TestVersion.sol",
|
5
|
+
"abi": [
|
6
|
+
{
|
7
|
+
"inputs": [
|
8
|
+
{
|
9
|
+
"internalType": "uint256",
|
10
|
+
"name": "major",
|
11
|
+
"type": "uint256"
|
12
|
+
},
|
13
|
+
{
|
14
|
+
"internalType": "uint256",
|
15
|
+
"name": "minor",
|
16
|
+
"type": "uint256"
|
17
|
+
},
|
18
|
+
{
|
19
|
+
"internalType": "uint256",
|
20
|
+
"name": "patch",
|
21
|
+
"type": "uint256"
|
22
|
+
}
|
23
|
+
],
|
24
|
+
"name": "createVersion",
|
25
|
+
"outputs": [
|
26
|
+
{
|
27
|
+
"internalType": "Version",
|
28
|
+
"name": "",
|
29
|
+
"type": "uint24"
|
30
|
+
}
|
31
|
+
],
|
32
|
+
"stateMutability": "pure",
|
33
|
+
"type": "function"
|
34
|
+
},
|
35
|
+
{
|
36
|
+
"inputs": [
|
37
|
+
{
|
38
|
+
"internalType": "uint256",
|
39
|
+
"name": "versionPart",
|
40
|
+
"type": "uint256"
|
41
|
+
}
|
42
|
+
],
|
43
|
+
"name": "createVersionPart",
|
44
|
+
"outputs": [
|
45
|
+
{
|
46
|
+
"internalType": "VersionPart",
|
47
|
+
"name": "",
|
48
|
+
"type": "uint8"
|
49
|
+
}
|
50
|
+
],
|
51
|
+
"stateMutability": "pure",
|
52
|
+
"type": "function"
|
53
|
+
},
|
54
|
+
{
|
55
|
+
"inputs": [
|
56
|
+
{
|
57
|
+
"internalType": "Version",
|
58
|
+
"name": "version",
|
59
|
+
"type": "uint24"
|
60
|
+
}
|
61
|
+
],
|
62
|
+
"name": "getMajorPart",
|
63
|
+
"outputs": [
|
64
|
+
{
|
65
|
+
"internalType": "VersionPart",
|
66
|
+
"name": "major",
|
67
|
+
"type": "uint8"
|
68
|
+
}
|
69
|
+
],
|
70
|
+
"stateMutability": "pure",
|
71
|
+
"type": "function"
|
72
|
+
},
|
73
|
+
{
|
74
|
+
"inputs": [
|
75
|
+
{
|
76
|
+
"internalType": "Version",
|
77
|
+
"name": "version",
|
78
|
+
"type": "uint24"
|
79
|
+
}
|
80
|
+
],
|
81
|
+
"name": "getVersionParts",
|
82
|
+
"outputs": [
|
83
|
+
{
|
84
|
+
"internalType": "VersionPart",
|
85
|
+
"name": "major",
|
86
|
+
"type": "uint8"
|
87
|
+
},
|
88
|
+
{
|
89
|
+
"internalType": "VersionPart",
|
90
|
+
"name": "minor",
|
91
|
+
"type": "uint8"
|
92
|
+
},
|
93
|
+
{
|
94
|
+
"internalType": "VersionPart",
|
95
|
+
"name": "patch",
|
96
|
+
"type": "uint8"
|
97
|
+
}
|
98
|
+
],
|
99
|
+
"stateMutability": "pure",
|
100
|
+
"type": "function"
|
101
|
+
},
|
102
|
+
{
|
103
|
+
"inputs": [],
|
104
|
+
"name": "getZeroVersion",
|
105
|
+
"outputs": [
|
106
|
+
{
|
107
|
+
"internalType": "Version",
|
108
|
+
"name": "",
|
109
|
+
"type": "uint24"
|
110
|
+
}
|
111
|
+
],
|
112
|
+
"stateMutability": "pure",
|
113
|
+
"type": "function"
|
114
|
+
},
|
115
|
+
{
|
116
|
+
"inputs": [
|
117
|
+
{
|
118
|
+
"internalType": "Version",
|
119
|
+
"name": "a",
|
120
|
+
"type": "uint24"
|
121
|
+
},
|
122
|
+
{
|
123
|
+
"internalType": "Version",
|
124
|
+
"name": "b",
|
125
|
+
"type": "uint24"
|
126
|
+
}
|
127
|
+
],
|
128
|
+
"name": "isLargerVersion",
|
129
|
+
"outputs": [
|
130
|
+
{
|
131
|
+
"internalType": "bool",
|
132
|
+
"name": "",
|
133
|
+
"type": "bool"
|
134
|
+
}
|
135
|
+
],
|
136
|
+
"stateMutability": "pure",
|
137
|
+
"type": "function"
|
138
|
+
},
|
139
|
+
{
|
140
|
+
"inputs": [
|
141
|
+
{
|
142
|
+
"internalType": "Version",
|
143
|
+
"name": "a",
|
144
|
+
"type": "uint24"
|
145
|
+
},
|
146
|
+
{
|
147
|
+
"internalType": "Version",
|
148
|
+
"name": "b",
|
149
|
+
"type": "uint24"
|
150
|
+
}
|
151
|
+
],
|
152
|
+
"name": "isSameVersion",
|
153
|
+
"outputs": [
|
154
|
+
{
|
155
|
+
"internalType": "bool",
|
156
|
+
"name": "",
|
157
|
+
"type": "bool"
|
158
|
+
}
|
159
|
+
],
|
160
|
+
"stateMutability": "pure",
|
161
|
+
"type": "function"
|
162
|
+
}
|
163
|
+
],
|
164
|
+
"bytecode": "0x608060405234801561001057600080fd5b50610544806100206000396000f3fe608060405234801561001057600080fd5b506004361061007d5760003560e01c80636a3dc0ee1161005b5780636a3dc0ee146100ed57806389818c3c1461011057806389d5976814610135578063e038c6251461014857600080fd5b80630f40f5951461008257806312cf04de146100a357806364d4e5d8146100b6575b600080fd5b61008a61015b565b60405162ffffff90911681526020015b60405180910390f35b61008a6100b13660046103ce565b6101cf565b6100c96100c436600461040e565b61025c565b6040805160ff9485168152928416602084015292169181019190915260600161009a565b6101006100fb36600461042b565b6102e8565b604051901515815260200161009a565b61012361011e366004610464565b6102fd565b60405160ff909116815260200161009a565b61010061014336600461042b565b61037d565b61012361015636600461040e565b61038f565b600073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__6304b8f6c56040518163ffffffff1660e01b8152600401602060405180830381865af41580156101a6573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101ca919061047d565b905090565b604051632efe011360e01b815260048101849052602481018390526044810182905260009073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90632efe011390606401602060405180830381865af4158015610230573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610254919061047d565b949350505050565b6040516324d3888d60e11b815262ffffff821660048201526000908190819073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__906349a7111a90602401606060405180830381865af41580156102b7573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102db91906104b0565b9250925092509193909250565b600062ffffff808316908416115b9392505050565b604051632392b61b60e21b815260ff8216600482015260009073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90638e4ad86c906024015b602060405180830381865af4158015610353573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061037791906104f3565b92915050565b600062ffffff808416908316146102f6565b60405163c9e66e2960e01b815262ffffff8216600482015260009073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__9063c9e66e2990602401610336565b6000806000606084860312156103e357600080fd5b505081359360208301359350604090920135919050565b62ffffff8116811461040b57600080fd5b50565b60006020828403121561042057600080fd5b81356102f6816103fa565b6000806040838503121561043e57600080fd5b8235610449816103fa565b91506020830135610459816103fa565b809150509250929050565b60006020828403121561047657600080fd5b5035919050565b60006020828403121561048f57600080fd5b81516102f6816103fa565b805160ff811681146104ab57600080fd5b919050565b6000806000606084860312156104c557600080fd5b6104ce8461049a565b92506104dc6020850161049a565b91506104ea6040850161049a565b90509250925092565b60006020828403121561050557600080fd5b6102f68261049a56fea264697066735822122080f150de8b61ad3f87c071a3e90af61131794db3f3d57c03e041374b81317b1564736f6c63430008140033",
|
165
|
+
"deployedBytecode": "0x608060405234801561001057600080fd5b506004361061007d5760003560e01c80636a3dc0ee1161005b5780636a3dc0ee146100ed57806389818c3c1461011057806389d5976814610135578063e038c6251461014857600080fd5b80630f40f5951461008257806312cf04de146100a357806364d4e5d8146100b6575b600080fd5b61008a61015b565b60405162ffffff90911681526020015b60405180910390f35b61008a6100b13660046103ce565b6101cf565b6100c96100c436600461040e565b61025c565b6040805160ff9485168152928416602084015292169181019190915260600161009a565b6101006100fb36600461042b565b6102e8565b604051901515815260200161009a565b61012361011e366004610464565b6102fd565b60405160ff909116815260200161009a565b61010061014336600461042b565b61037d565b61012361015636600461040e565b61038f565b600073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__6304b8f6c56040518163ffffffff1660e01b8152600401602060405180830381865af41580156101a6573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101ca919061047d565b905090565b604051632efe011360e01b815260048101849052602481018390526044810182905260009073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90632efe011390606401602060405180830381865af4158015610230573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610254919061047d565b949350505050565b6040516324d3888d60e11b815262ffffff821660048201526000908190819073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__906349a7111a90602401606060405180830381865af41580156102b7573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102db91906104b0565b9250925092509193909250565b600062ffffff808316908416115b9392505050565b604051632392b61b60e21b815260ff8216600482015260009073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90638e4ad86c906024015b602060405180830381865af4158015610353573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061037791906104f3565b92915050565b600062ffffff808416908316146102f6565b60405163c9e66e2960e01b815262ffffff8216600482015260009073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__9063c9e66e2990602401610336565b6000806000606084860312156103e357600080fd5b505081359360208301359350604090920135919050565b62ffffff8116811461040b57600080fd5b50565b60006020828403121561042057600080fd5b81356102f6816103fa565b6000806040838503121561043e57600080fd5b8235610449816103fa565b91506020830135610459816103fa565b809150509250929050565b60006020828403121561047657600080fd5b5035919050565b60006020828403121561048f57600080fd5b81516102f6816103fa565b805160ff811681146104ab57600080fd5b919050565b6000806000606084860312156104c557600080fd5b6104ce8461049a565b92506104dc6020850161049a565b91506104ea6040850161049a565b90509250925092565b60006020828403121561050557600080fd5b6102f68261049a56fea264697066735822122080f150de8b61ad3f87c071a3e90af61131794db3f3d57c03e041374b81317b1564736f6c63430008140033",
|
166
|
+
"linkReferences": {
|
167
|
+
"contracts/types/Version.sol": {
|
168
|
+
"VersionLib": [
|
169
|
+
{
|
170
|
+
"length": 20,
|
171
|
+
"start": 383
|
172
|
+
},
|
173
|
+
{
|
174
|
+
"length": 20,
|
175
|
+
"start": 534
|
176
|
+
},
|
177
|
+
{
|
178
|
+
"length": 20,
|
179
|
+
"start": 669
|
180
|
+
},
|
181
|
+
{
|
182
|
+
"length": 20,
|
183
|
+
"start": 824
|
184
|
+
},
|
185
|
+
{
|
186
|
+
"length": 20,
|
187
|
+
"start": 972
|
188
|
+
}
|
189
|
+
]
|
190
|
+
}
|
191
|
+
},
|
192
|
+
"deployedLinkReferences": {
|
193
|
+
"contracts/types/Version.sol": {
|
194
|
+
"VersionLib": [
|
195
|
+
{
|
196
|
+
"length": 20,
|
197
|
+
"start": 351
|
198
|
+
},
|
199
|
+
{
|
200
|
+
"length": 20,
|
201
|
+
"start": 502
|
202
|
+
},
|
203
|
+
{
|
204
|
+
"length": 20,
|
205
|
+
"start": 637
|
206
|
+
},
|
207
|
+
{
|
208
|
+
"length": 20,
|
209
|
+
"start": 792
|
210
|
+
},
|
211
|
+
{
|
212
|
+
"length": 20,
|
213
|
+
"start": 940
|
214
|
+
}
|
215
|
+
]
|
216
|
+
}
|
217
|
+
}
|
218
|
+
}
|