@etherisc/gif-next 0.0.2-da06f3b-803 → 0.0.2-da0f894-204
Sign up to get free protection for your applications and to get access to all the features.
- package/README.md +73 -1
- package/artifacts/contracts/components/Component.sol/Component.dbg.json +1 -1
- package/artifacts/contracts/components/Component.sol/Component.json +212 -94
- package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +1 -1
- package/artifacts/contracts/components/Distribution.sol/Distribution.json +552 -122
- package/artifacts/contracts/components/IComponent.sol/IComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IComponent.sol/IComponent.json +64 -72
- package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.json +279 -98
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.json +406 -90
- package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.json +68 -144
- package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
- package/artifacts/contracts/components/Pool.sol/Pool.json +654 -117
- package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
- package/artifacts/contracts/components/Product.sol/Product.json +316 -166
- package/artifacts/contracts/instance/BundleManager.sol/BundleManager.dbg.json +1 -1
- package/artifacts/contracts/instance/BundleManager.sol/BundleManager.json +2 -2
- package/artifacts/contracts/instance/Cloneable.sol/Cloneable.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstance.sol/IInstance.json +765 -323
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +97 -180
- package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
- package/artifacts/contracts/instance/Instance.sol/Instance.json +841 -574
- package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +134 -231
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +98 -124
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +265 -269
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +319 -99
- package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.dbg.json +1 -1
- package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.json +2 -2
- package/artifacts/contracts/instance/base/ComponentService.sol/ComponentService.dbg.json +1 -1
- package/artifacts/contracts/instance/base/ComponentService.sol/ComponentService.json +118 -169
- package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
- package/artifacts/contracts/instance/base/ILifecycle.sol/ILifecycle.dbg.json +1 -1
- package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
- package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.json +2 -2
- package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json +1 -1
- package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.json +2 -2
- package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IAccess.sol/IAccess.json +62 -36
- package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +1 -1
- package/artifacts/contracts/instance/module/ISetup.sol/ISetup.dbg.json +1 -1
- package/artifacts/contracts/instance/module/ITreasury.sol/ITreasury.dbg.json +1 -1
- package/artifacts/contracts/instance/service/ApplicationService.sol/ApplicationService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/ApplicationService.sol/ApplicationService.json +947 -0
- package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.json +665 -0
- package/artifacts/contracts/instance/service/BundleService.sol/BundleService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/BundleService.sol/BundleService.json +261 -267
- package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.json +305 -93
- package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.json +754 -0
- package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.json +637 -0
- package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +1031 -250
- package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.json +441 -85
- package/artifacts/contracts/instance/service/IApplicationService.sol/IApplicationService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/IApplicationService.sol/IApplicationService.json +535 -0
- package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.json +130 -212
- package/artifacts/contracts/instance/service/IClaimService.sol/IClaimService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/IClaimService.sol/IClaimService.json +409 -0
- package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.json +552 -135
- package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.json +40 -287
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +22 -169
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +22 -169
- package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.json +164 -391
- package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.json +311 -127
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +142 -221
- package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.json +302 -90
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +142 -221
- package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.json +302 -90
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +15 -21
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +83 -174
- package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
- package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
- package/artifacts/contracts/registry/Registry.sol/Registry.json +28 -34
- package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.json +2 -2
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +193 -216
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +300 -94
- package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.dbg.json +1 -1
- package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.json +11 -11
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +141 -37
- package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.dbg.json +1 -1
- package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +1 -1
- package/artifacts/contracts/shared/ERC165.sol/ERC165.json +41 -3
- package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
- package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.json +40 -29
- package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +4 -0
- package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.json +129 -0
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +21 -29
- package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +4 -0
- package/artifacts/contracts/{experiment/inheritance/IB.sol/IB.json → shared/IRegistryLinked.sol/IRegistryLinked.json} +18 -20
- package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
- package/artifacts/contracts/shared/IService.sol/IService.json +22 -169
- package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +1 -1
- package/artifacts/contracts/shared/IVersionable.sol/IVersionable.json +2 -152
- package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
- package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +113 -33
- package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +4 -0
- package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +248 -0
- package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +1 -1
- package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +294 -74
- package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
- package/artifacts/contracts/shared/Registerable.sol/Registerable.json +125 -55
- package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +4 -0
- package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +84 -0
- package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
- package/artifacts/contracts/shared/Service.sol/Service.json +113 -164
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
- package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
- package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +2 -2
- package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +1 -1
- package/artifacts/contracts/shared/Versionable.sol/Versionable.json +2 -152
- package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json +1 -1
- package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json +1 -1
- package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +125 -55
- 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 +134 -221
- package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json +1 -1
- package/artifacts/contracts/test/TestVersion.sol/TestVersion.dbg.json +1 -1
- package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json +1 -1
- package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.json +8 -190
- package/artifacts/contracts/test/Usdc.sol/USDC.dbg.json +1 -1
- package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.dbg.json +1 -1
- package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
- package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/ClaimId.sol/ClaimIdLib.dbg.json +4 -0
- package/artifacts/contracts/types/ClaimId.sol/ClaimIdLib.json +100 -0
- package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.dbg.json +1 -1
- package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.json +2 -2
- package/artifacts/contracts/types/Fee.sol/FeeLib.dbg.json +1 -1
- package/artifacts/contracts/types/Key32.sol/Key32Lib.dbg.json +1 -1
- package/artifacts/contracts/types/Key32.sol/Key32Lib.json +2 -2
- package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/NftId.sol/NftIdLib.json +2 -2
- package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
- package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.json +2 -2
- package/artifacts/contracts/types/NumberId.sol/NumberIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
- package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.json +2 -2
- package/artifacts/contracts/types/PayoutId.sol/PayoutIdLib.dbg.json +4 -0
- package/artifacts/contracts/types/PayoutId.sol/PayoutIdLib.json +100 -0
- package/artifacts/contracts/types/Referral.sol/ReferralLib.dbg.json +1 -1
- package/artifacts/contracts/types/Referral.sol/ReferralLib.json +2 -2
- package/artifacts/contracts/types/RiskId.sol/RiskIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/RiskId.sol/RiskIdLib.json +2 -2
- package/artifacts/contracts/types/RoleId.sol/RoleIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/RoleId.sol/RoleIdLib.json +2 -2
- package/artifacts/contracts/types/Seconds.sol/SecondsLib.dbg.json +4 -0
- package/artifacts/contracts/types/Seconds.sol/SecondsLib.json +124 -0
- package/artifacts/contracts/types/StateId.sol/StateIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json +1 -1
- package/artifacts/contracts/types/Timestamp.sol/TimestampLib.json +25 -7
- package/artifacts/contracts/types/UFixed.sol/MathLib.dbg.json +1 -1
- package/artifacts/contracts/types/UFixed.sol/UFixedLib.dbg.json +1 -1
- package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +1 -1
- package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +1 -1
- package/contracts/components/Component.sol +82 -77
- package/contracts/components/Distribution.sol +188 -48
- package/contracts/components/IComponent.sol +42 -17
- package/contracts/components/IDistributionComponent.sol +39 -7
- package/contracts/components/IPoolComponent.sol +121 -21
- package/contracts/components/IProductComponent.sol +3 -2
- package/contracts/components/Pool.sol +290 -120
- package/contracts/components/Product.sol +92 -69
- package/contracts/instance/BundleManager.sol +1 -1
- package/contracts/instance/IInstance.sol +21 -1
- package/contracts/instance/IInstanceService.sol +19 -2
- package/contracts/instance/Instance.sol +58 -36
- package/contracts/instance/InstanceAccessManager.sol +136 -253
- package/contracts/instance/InstanceService.sol +154 -137
- package/contracts/instance/InstanceServiceManager.sol +1 -1
- package/contracts/instance/base/ComponentService.sol +1 -1
- package/contracts/instance/module/IAccess.sol +10 -11
- package/contracts/instance/module/IBundle.sol +2 -1
- package/contracts/instance/module/IDistribution.sol +2 -0
- package/contracts/instance/module/IPolicy.sol +30 -3
- package/contracts/instance/module/ISetup.sol +10 -10
- package/contracts/instance/service/ApplicationService.sol +346 -0
- package/contracts/instance/service/ApplicationServiceManager.sol +35 -0
- package/contracts/instance/service/BundleService.sol +15 -9
- package/contracts/instance/service/BundleServiceManager.sol +1 -1
- package/contracts/instance/service/ClaimService.sol +151 -0
- package/contracts/instance/service/ClaimServiceManager.sol +35 -0
- package/contracts/instance/service/DistributionService.sol +303 -15
- package/contracts/instance/service/DistributionServiceManager.sol +1 -1
- package/contracts/instance/service/IApplicationService.sol +81 -0
- package/contracts/instance/service/IBundleService.sol +14 -3
- package/contracts/instance/service/IClaimService.sol +61 -0
- package/contracts/instance/service/IDistributionService.sol +74 -0
- package/contracts/instance/service/IPolicyService.sol +26 -50
- package/contracts/instance/service/PolicyService.sol +126 -260
- package/contracts/instance/service/PolicyServiceManager.sol +2 -2
- package/contracts/instance/service/PoolService.sol +2 -3
- package/contracts/instance/service/PoolServiceManager.sol +1 -1
- package/contracts/instance/service/ProductService.sol +9 -9
- package/contracts/instance/service/ProductServiceManager.sol +2 -2
- package/contracts/registry/IRegistry.sol +3 -4
- package/contracts/registry/IRegistryService.sol +10 -8
- package/contracts/registry/Registry.sol +28 -21
- package/contracts/registry/RegistryService.sol +69 -48
- package/contracts/registry/RegistryServiceManager.sol +13 -13
- package/contracts/registry/ReleaseManager.sol +18 -28
- package/contracts/registry/TokenRegistry.sol +16 -12
- package/contracts/shared/ERC165.sol +14 -12
- package/contracts/shared/INftOwnable.sol +11 -10
- package/contracts/shared/IPolicyHolder.sol +26 -0
- package/contracts/shared/IRegisterable.sol +3 -3
- package/contracts/shared/IRegistryLinked.sol +12 -0
- package/contracts/shared/IService.sol +2 -0
- package/contracts/shared/IVersionable.sol +4 -47
- package/contracts/shared/NftOwnable.sol +66 -85
- package/contracts/shared/PolicyHolder.sol +81 -0
- package/contracts/shared/ProxyManager.sol +100 -25
- package/contracts/shared/Registerable.sol +7 -19
- package/contracts/shared/RegistryLinked.sol +48 -0
- package/contracts/shared/Service.sol +15 -17
- package/contracts/shared/Versionable.sol +4 -92
- package/contracts/test/TestRegisterable.sol +1 -1
- package/contracts/test/TestService.sol +1 -1
- package/contracts/types/ClaimId.sol +52 -0
- package/contracts/types/DistributorType.sol +2 -2
- package/contracts/types/ObjectType.sol +9 -5
- package/contracts/types/PayoutId.sol +54 -0
- package/contracts/types/RoleId.sol +14 -12
- package/contracts/types/Seconds.sol +54 -0
- package/contracts/types/Timestamp.sol +12 -13
- package/package.json +1 -1
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Cloner.dbg.json +0 -4
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Cloner.json +0 -66
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock1.dbg.json +0 -4
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock1.json +0 -24
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock2.dbg.json +0 -4
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock2.json +0 -42
- package/artifacts/contracts/experiment/errors/Require.sol/Require.dbg.json +0 -4
- package/artifacts/contracts/experiment/errors/Require.sol/Require.json +0 -105
- package/artifacts/contracts/experiment/errors/Revert.sol/Revert.dbg.json +0 -4
- package/artifacts/contracts/experiment/errors/Revert.sol/Revert.json +0 -105
- package/artifacts/contracts/experiment/inheritance/A.sol/A.dbg.json +0 -4
- package/artifacts/contracts/experiment/inheritance/A.sol/A.json +0 -128
- package/artifacts/contracts/experiment/inheritance/A.sol/AShared.dbg.json +0 -4
- package/artifacts/contracts/experiment/inheritance/A.sol/AShared.json +0 -42
- package/artifacts/contracts/experiment/inheritance/B.sol/B.dbg.json +0 -4
- package/artifacts/contracts/experiment/inheritance/B.sol/B.json +0 -76
- package/artifacts/contracts/experiment/inheritance/C.sol/C.dbg.json +0 -4
- package/artifacts/contracts/experiment/inheritance/C.sol/C.json +0 -89
- package/artifacts/contracts/experiment/inheritance/IA.sol/IA.dbg.json +0 -4
- package/artifacts/contracts/experiment/inheritance/IA.sol/IA.json +0 -128
- package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.dbg.json +0 -4
- package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.json +0 -37
- package/artifacts/contracts/experiment/inheritance/IB.sol/IB.dbg.json +0 -4
- package/artifacts/contracts/experiment/inheritance/IC.sol/IC.dbg.json +0 -4
- package/artifacts/contracts/experiment/inheritance/IC.sol/IC.json +0 -63
- package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.dbg.json +0 -4
- package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.json +0 -59
- package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.dbg.json +0 -4
- package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.json +0 -124
- package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.dbg.json +0 -4
- package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.json +0 -74
- package/artifacts/contracts/experiment/statemachine/SM.sol/SM.dbg.json +0 -4
- package/artifacts/contracts/experiment/statemachine/SM.sol/SM.json +0 -124
- package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.dbg.json +0 -4
- package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.json +0 -207
- package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.dbg.json +0 -4
- package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.json +0 -10
- package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.dbg.json +0 -4
- package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.json +0 -10
- package/contracts/experiment/cloning/Cloner.sol +0 -47
- package/contracts/experiment/errors/Require.sol +0 -38
- package/contracts/experiment/errors/Revert.sol +0 -44
- package/contracts/experiment/inheritance/A.sol +0 -53
- package/contracts/experiment/inheritance/B.sol +0 -28
- package/contracts/experiment/inheritance/C.sol +0 -34
- package/contracts/experiment/inheritance/IA.sol +0 -13
- package/contracts/experiment/inheritance/IB.sol +0 -10
- package/contracts/experiment/inheritance/IC.sol +0 -12
- package/contracts/experiment/statemachine/Dummy.sol +0 -27
- package/contracts/experiment/statemachine/ISM.sol +0 -25
- package/contracts/experiment/statemachine/SM.sol +0 -57
- package/contracts/experiment/statemachine/SimpleStateMachine.sol +0 -31
- package/contracts/experiment/types/TypeA.sol +0 -47
- package/contracts/experiment/types/TypeB.sol +0 -29
@@ -1,208 +1,378 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
2
|
pragma solidity ^0.8.20;
|
3
3
|
|
4
|
-
import {
|
5
|
-
import {
|
4
|
+
import {Component} from "./Component.sol";
|
5
|
+
import {Fee, FeeLib} from "../types/Fee.sol";
|
6
6
|
import {IBundleService} from "../instance/service/IBundleService.sol";
|
7
|
-
import {
|
8
|
-
import {Fee} from "../types/Fee.sol";
|
9
|
-
import {UFixed} from "../types/UFixed.sol";
|
7
|
+
import {InstanceReader} from "../instance/InstanceReader.sol";
|
10
8
|
import {IPoolComponent} from "./IPoolComponent.sol";
|
11
|
-
import {
|
12
|
-
import {TokenHandler} from "../shared/TokenHandler.sol";
|
9
|
+
import {IPoolService} from "../instance/service/IPoolService.sol";
|
13
10
|
import {ISetup} from "../instance/module/ISetup.sol";
|
11
|
+
import {NftId, NftIdLib} from "../types/NftId.sol";
|
12
|
+
import {POOL} from "../types/ObjectType.sol";
|
13
|
+
import {RoleId, PUBLIC_ROLE} from "../types/RoleId.sol";
|
14
|
+
import {Seconds} from "../types/Seconds.sol";
|
15
|
+
import {TokenHandler} from "../shared/TokenHandler.sol";
|
16
|
+
import {UFixed} from "../types/UFixed.sol";
|
14
17
|
|
15
|
-
import {ISetup} from "../instance/module/ISetup.sol";
|
16
|
-
import {InstanceReader} from "../instance/InstanceReader.sol";
|
17
18
|
|
19
|
+
abstract contract Pool is
|
20
|
+
Component,
|
21
|
+
IPoolComponent
|
22
|
+
{
|
23
|
+
// keccak256(abi.encode(uint256(keccak256("etherisc.storage.Pool")) - 1)) & ~bytes32(uint256(0xff));
|
24
|
+
bytes32 public constant POOL_STORAGE_LOCATION_V1 = 0x25e3e51823fbfffb988e0a2744bb93722d9f3e906c07cc0a9e77884c46c58300;
|
18
25
|
|
19
|
-
|
20
|
-
|
26
|
+
struct PoolStorage {
|
27
|
+
UFixed _collateralizationLevel;
|
28
|
+
UFixed _retentionLevel;
|
29
|
+
uint256 _maxCapitalAmount;
|
30
|
+
|
31
|
+
bool _isExternallyManaged;
|
32
|
+
bool _isVerifyingApplications;
|
21
33
|
|
22
|
-
|
23
|
-
|
34
|
+
RoleId _bundleOwnerRole;
|
35
|
+
bool _isInterceptingBundleTransfers;
|
36
|
+
|
37
|
+
Fee _initialPoolFee;
|
38
|
+
Fee _initialStakingFee;
|
39
|
+
Fee _initialPerformanceFee;
|
40
|
+
|
41
|
+
TokenHandler _tokenHandler;
|
42
|
+
|
43
|
+
// may be used to interact with instance by derived contracts
|
44
|
+
IPoolService _poolService;
|
45
|
+
IBundleService _bundleService;
|
46
|
+
}
|
24
47
|
|
25
|
-
Fee internal _initialPoolFee;
|
26
|
-
Fee internal _initialStakingFee;
|
27
|
-
Fee internal _initialPerformanceFee;
|
28
48
|
|
29
|
-
|
49
|
+
modifier onlyBundleOwner(NftId bundleNftId) {
|
50
|
+
if(msg.sender != getRegistry().ownerOf(bundleNftId)) {
|
51
|
+
revert ErrorPoolNotBundleOwner(bundleNftId, msg.sender);
|
52
|
+
}
|
53
|
+
_;
|
54
|
+
}
|
30
55
|
|
31
|
-
// may be used to interact with instance by derived contracts
|
32
|
-
IPoolService internal _poolService;
|
33
|
-
IBundleService private _bundleService;
|
34
56
|
|
35
57
|
modifier onlyPoolService() {
|
36
|
-
|
37
|
-
msg.sender
|
38
|
-
|
58
|
+
if(msg.sender != address(_getPoolStorage()._poolService)) {
|
59
|
+
revert ErrorPoolNotPoolService(msg.sender);
|
60
|
+
}
|
39
61
|
_;
|
40
62
|
}
|
41
63
|
|
42
|
-
|
64
|
+
|
65
|
+
function initializePool(
|
43
66
|
address registry,
|
44
67
|
NftId instanceNftId,
|
45
68
|
string memory name,
|
46
|
-
// TODO refactor into tokenNftId
|
47
69
|
address token,
|
48
|
-
bool
|
49
|
-
bool
|
70
|
+
bool isInterceptingNftTransfers,
|
71
|
+
bool isExternallyManaging,
|
72
|
+
bool isVerifying,
|
50
73
|
UFixed collateralizationLevel,
|
51
|
-
|
52
|
-
Fee memory stakingFee,
|
53
|
-
Fee memory performanceFee,
|
74
|
+
UFixed retentionLevel,
|
54
75
|
address initialOwner,
|
55
|
-
bytes memory data
|
56
|
-
)
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
POOL(),
|
62
|
-
|
63
|
-
|
64
|
-
data
|
65
|
-
) {
|
66
|
-
_isConfirmingApplication = isConfirmingApplication;
|
76
|
+
bytes memory registryData // writeonly data that will saved in the object info record of the registry
|
77
|
+
)
|
78
|
+
public
|
79
|
+
virtual
|
80
|
+
onlyInitializing()
|
81
|
+
{
|
82
|
+
initializeComponent(registry, instanceNftId, name, token, POOL(), isInterceptingNftTransfers, initialOwner, registryData);
|
83
|
+
|
84
|
+
PoolStorage storage $ = _getPoolStorage();
|
67
85
|
// TODO add validation
|
68
|
-
|
69
|
-
|
70
|
-
|
71
|
-
|
86
|
+
$._tokenHandler = new TokenHandler(token);
|
87
|
+
$._maxCapitalAmount = type(uint256).max;
|
88
|
+
$._isExternallyManaged = isExternallyManaging;
|
89
|
+
$._isVerifyingApplications = isVerifying;
|
90
|
+
$._bundleOwnerRole = PUBLIC_ROLE();
|
91
|
+
$._collateralizationLevel = collateralizationLevel;
|
92
|
+
$._retentionLevel = retentionLevel;
|
93
|
+
$._initialPoolFee = FeeLib.zeroFee();
|
94
|
+
$._initialStakingFee = FeeLib.zeroFee();
|
95
|
+
$._initialPerformanceFee = FeeLib.zeroFee();
|
96
|
+
$._poolService = getInstance().getPoolService();
|
97
|
+
$._bundleService = getInstance().getBundleService();
|
72
98
|
|
73
|
-
|
99
|
+
registerInterface(type(IPoolComponent).interfaceId);
|
100
|
+
}
|
74
101
|
|
75
|
-
_poolService = getInstance().getPoolService();
|
76
|
-
_bundleService = getInstance().getBundleService();
|
77
102
|
|
78
|
-
|
103
|
+
function stake(
|
104
|
+
NftId bundleNftId,
|
105
|
+
uint256 amount
|
106
|
+
)
|
107
|
+
public
|
108
|
+
virtual
|
109
|
+
restricted()
|
110
|
+
onlyBundleOwner(bundleNftId)
|
111
|
+
{
|
112
|
+
// TODO add implementation
|
79
113
|
}
|
80
114
|
|
81
|
-
|
82
|
-
|
83
|
-
|
84
|
-
|
85
|
-
function underwrite(
|
86
|
-
NftId policyNftId,
|
87
|
-
bytes memory policyData,
|
88
|
-
bytes memory bundleFilter,
|
89
|
-
uint256 collateralizationAmount
|
115
|
+
|
116
|
+
function unstake(
|
117
|
+
NftId bundleNftId,
|
118
|
+
uint256 amount
|
90
119
|
)
|
91
|
-
|
120
|
+
public
|
121
|
+
virtual
|
92
122
|
restricted()
|
93
|
-
|
123
|
+
onlyBundleOwner(bundleNftId)
|
94
124
|
{
|
95
|
-
|
125
|
+
// TODO add implementation
|
96
126
|
}
|
97
127
|
|
98
|
-
|
99
|
-
|
100
|
-
|
101
|
-
|
102
|
-
function policyMatchesBundle(
|
103
|
-
bytes memory, // policyData
|
104
|
-
bytes memory // bundleFilter
|
128
|
+
|
129
|
+
function extend(
|
130
|
+
NftId bundleNftId,
|
131
|
+
Seconds lifetimeExtension
|
105
132
|
)
|
106
133
|
public
|
107
|
-
|
108
|
-
|
109
|
-
|
134
|
+
virtual
|
135
|
+
restricted()
|
136
|
+
onlyBundleOwner(bundleNftId)
|
110
137
|
{
|
111
|
-
|
138
|
+
// TODO add implementation
|
139
|
+
}
|
140
|
+
|
141
|
+
|
142
|
+
function lockBundle(NftId bundleNftId)
|
143
|
+
public
|
144
|
+
virtual
|
145
|
+
restricted()
|
146
|
+
onlyBundleOwner(bundleNftId)
|
147
|
+
{
|
148
|
+
_getPoolStorage()._bundleService.lockBundle(bundleNftId);
|
149
|
+
}
|
150
|
+
|
151
|
+
|
152
|
+
function unlockBundle(NftId bundleNftId)
|
153
|
+
public
|
154
|
+
virtual
|
155
|
+
restricted()
|
156
|
+
onlyBundleOwner(bundleNftId)
|
157
|
+
{
|
158
|
+
_getPoolStorage()._bundleService.unlockBundle(bundleNftId);
|
112
159
|
}
|
113
160
|
|
114
161
|
|
115
|
-
function
|
116
|
-
|
162
|
+
function close(NftId bundleNftId)
|
163
|
+
public
|
164
|
+
virtual
|
165
|
+
restricted()
|
166
|
+
onlyBundleOwner(bundleNftId)
|
167
|
+
{
|
168
|
+
// TODO add implementation
|
117
169
|
}
|
118
170
|
|
119
|
-
|
120
|
-
|
171
|
+
|
172
|
+
function setBundleFee(
|
173
|
+
NftId bundleNftId,
|
174
|
+
Fee memory fee
|
175
|
+
)
|
176
|
+
public
|
177
|
+
virtual
|
178
|
+
restricted()
|
179
|
+
onlyBundleOwner(bundleNftId)
|
180
|
+
{
|
181
|
+
_getPoolStorage()._bundleService.setBundleFee(bundleNftId, fee);
|
121
182
|
}
|
122
183
|
|
184
|
+
|
185
|
+
function setMaxCapitalAmount(uint256 maxCapitalAmount)
|
186
|
+
public
|
187
|
+
virtual
|
188
|
+
restricted()
|
189
|
+
onlyOwner()
|
190
|
+
{
|
191
|
+
// TODO refactor to use pool service
|
192
|
+
// _getPoolStorage()._poolService.setMaxCapitalAmount(...);
|
193
|
+
|
194
|
+
uint256 previousMaxCapitalAmount = _getPoolStorage()._maxCapitalAmount;
|
195
|
+
_getPoolStorage()._maxCapitalAmount = maxCapitalAmount;
|
196
|
+
|
197
|
+
emit LogPoolBundleMaxCapitalAmountUpdated(previousMaxCapitalAmount, maxCapitalAmount);
|
198
|
+
}
|
199
|
+
|
200
|
+
|
201
|
+
function setBundleOwnerRole(RoleId bundleOwnerRole)
|
202
|
+
public
|
203
|
+
virtual
|
204
|
+
restricted()
|
205
|
+
onlyOwner()
|
206
|
+
{
|
207
|
+
// TODO refactor to use pool service
|
208
|
+
// _getPoolStorage()._poolService.setBundleOwnerRole(...);
|
209
|
+
|
210
|
+
if(_getPoolStorage()._bundleOwnerRole != PUBLIC_ROLE()) {
|
211
|
+
revert ErrorPoolBundleOwnerRoleAlreadySet();
|
212
|
+
}
|
213
|
+
|
214
|
+
_getPoolStorage()._bundleOwnerRole = bundleOwnerRole;
|
215
|
+
|
216
|
+
emit LogPoolBundleOwnerRoleSet(bundleOwnerRole);
|
217
|
+
}
|
218
|
+
|
219
|
+
|
123
220
|
function setFees(
|
124
221
|
Fee memory poolFee,
|
125
222
|
Fee memory stakingFee,
|
126
223
|
Fee memory performanceFee
|
127
224
|
)
|
128
|
-
|
129
|
-
|
225
|
+
public
|
226
|
+
virtual
|
130
227
|
restricted()
|
131
|
-
|
228
|
+
onlyOwner()
|
132
229
|
{
|
133
|
-
_poolService.setFees(poolFee, stakingFee, performanceFee);
|
230
|
+
_getPoolStorage()._poolService.setFees(poolFee, stakingFee, performanceFee);
|
231
|
+
}
|
232
|
+
|
233
|
+
|
234
|
+
/// @dev see {IPool.verifyApplication}
|
235
|
+
function verifyApplication(
|
236
|
+
NftId applicationNftId,
|
237
|
+
bytes memory applicationData,
|
238
|
+
NftId bundleNftId,
|
239
|
+
bytes memory bundleFilter,
|
240
|
+
uint256 collateralizationAmount
|
241
|
+
)
|
242
|
+
public
|
243
|
+
virtual
|
244
|
+
restricted()
|
245
|
+
{
|
246
|
+
// validate application data against bundle filter
|
247
|
+
if(!applicationMatchesBundle(
|
248
|
+
applicationNftId,
|
249
|
+
applicationData,
|
250
|
+
bundleNftId,
|
251
|
+
bundleFilter,
|
252
|
+
collateralizationAmount)
|
253
|
+
)
|
254
|
+
{
|
255
|
+
revert ErrorPoolApplicationBundleMismatch(applicationNftId);
|
256
|
+
}
|
257
|
+
|
258
|
+
emit LogPoolVerifiedByPool(address(this), applicationNftId, collateralizationAmount);
|
134
259
|
}
|
135
260
|
|
136
|
-
|
137
|
-
|
261
|
+
|
262
|
+
function getCollateralizationLevel() public view virtual returns (UFixed collateralizationLevel) {
|
263
|
+
return _getPoolStorage()._collateralizationLevel;
|
138
264
|
}
|
139
265
|
|
140
|
-
|
141
|
-
|
266
|
+
|
267
|
+
function getRetentionLevel() public view virtual returns (UFixed retentionLevel) {
|
268
|
+
return _getPoolStorage()._retentionLevel;
|
142
269
|
}
|
143
270
|
|
144
|
-
|
145
|
-
|
271
|
+
|
272
|
+
function isExternallyManaged() public view virtual returns (bool) {
|
273
|
+
return _getPoolStorage()._isExternallyManaged;
|
146
274
|
}
|
147
275
|
|
148
|
-
function getSetupInfo() public view returns (ISetup.PoolSetupInfo memory setupInfo) {
|
149
|
-
InstanceReader reader = getInstance().getInstanceReader();
|
150
|
-
setupInfo = reader.getPoolSetupInfo(getNftId());
|
151
276
|
|
152
|
-
|
153
|
-
|
154
|
-
setupInfo = _getInitialSetupInfo();
|
155
|
-
}
|
277
|
+
function isVerifyingApplications() public view virtual returns (bool isConfirmingApplication) {
|
278
|
+
return _getPoolStorage()._isVerifyingApplications;
|
156
279
|
}
|
157
280
|
|
158
|
-
|
159
|
-
|
160
|
-
|
161
|
-
_tokenHandler,
|
162
|
-
_collateralizationLevel,
|
163
|
-
_initialPoolFee,
|
164
|
-
_initialStakingFee,
|
165
|
-
_initialPerformanceFee,
|
166
|
-
false,
|
167
|
-
_isConfirmingApplication,
|
168
|
-
getWallet()
|
169
|
-
);
|
281
|
+
|
282
|
+
function getMaxCapitalAmount() public view virtual returns (uint256 maxCapitalAmount) {
|
283
|
+
return _getPoolStorage()._maxCapitalAmount;
|
170
284
|
}
|
171
285
|
|
172
|
-
// Internals
|
173
286
|
|
174
|
-
function
|
175
|
-
|
176
|
-
|
287
|
+
function isInterceptingBundleTransfers() public view virtual returns (bool) {
|
288
|
+
return isNftInterceptor();
|
289
|
+
}
|
290
|
+
|
291
|
+
|
292
|
+
function getBundleOwnerRole() public view returns (RoleId bundleOwnerRole) {
|
293
|
+
return _getPoolStorage()._bundleOwnerRole;
|
294
|
+
}
|
295
|
+
|
296
|
+
|
297
|
+
/// @dev see {IPoolComponent.applicationMatchesBundle}
|
298
|
+
/// Override this function to implement any custom application verification
|
299
|
+
/// Default implementation always returns true
|
300
|
+
function applicationMatchesBundle(
|
301
|
+
NftId applicationNftId,
|
302
|
+
bytes memory applicationData,
|
303
|
+
NftId bundleNftId,
|
177
304
|
bytes memory bundleFilter,
|
178
305
|
uint256 collateralizationAmount
|
179
306
|
)
|
180
|
-
|
307
|
+
public
|
308
|
+
view
|
309
|
+
virtual override
|
310
|
+
returns (bool isMatching)
|
181
311
|
{
|
182
|
-
|
183
|
-
|
184
|
-
|
185
|
-
);
|
312
|
+
return true;
|
313
|
+
}
|
314
|
+
|
186
315
|
|
187
|
-
|
316
|
+
function getSetupInfo() public view returns (ISetup.PoolSetupInfo memory setupInfo) {
|
317
|
+
InstanceReader reader = getInstance().getInstanceReader();
|
318
|
+
setupInfo = reader.getPoolSetupInfo(getNftId());
|
319
|
+
|
320
|
+
// fallback to initial setup info (wallet is always != address(0))
|
321
|
+
if(setupInfo.wallet == address(0)) {
|
322
|
+
setupInfo = _getInitialSetupInfo();
|
323
|
+
}
|
188
324
|
}
|
189
325
|
|
326
|
+
// Internals
|
327
|
+
|
190
328
|
function _createBundle(
|
191
329
|
address bundleOwner,
|
192
330
|
Fee memory fee,
|
193
331
|
uint256 amount,
|
194
|
-
|
195
|
-
bytes
|
332
|
+
Seconds lifetime,
|
333
|
+
bytes memory filter
|
196
334
|
)
|
197
335
|
internal
|
198
336
|
returns(NftId bundleNftId)
|
199
337
|
{
|
200
|
-
bundleNftId = _bundleService.createBundle(
|
338
|
+
bundleNftId = _getPoolStorage()._bundleService.createBundle(
|
201
339
|
bundleOwner,
|
202
340
|
fee,
|
203
341
|
amount,
|
204
342
|
lifetime,
|
205
|
-
filter
|
343
|
+
filter);
|
344
|
+
|
345
|
+
// TODO add logging
|
346
|
+
}
|
347
|
+
|
348
|
+
// TODO remove function once this is no longer used to produce contract locations on the fly ...
|
349
|
+
function getContractLocation(bytes memory name) external pure returns (bytes32 hash) {
|
350
|
+
return keccak256(abi.encode(uint256(keccak256(name)) - 1)) & ~bytes32(uint256(0xff));
|
351
|
+
}
|
352
|
+
|
353
|
+
|
354
|
+
function _getInitialSetupInfo() internal view returns (ISetup.PoolSetupInfo memory) {
|
355
|
+
PoolStorage storage $ = _getPoolStorage();
|
356
|
+
return ISetup.PoolSetupInfo(
|
357
|
+
getProductNftId(),
|
358
|
+
$._tokenHandler,
|
359
|
+
$._maxCapitalAmount,
|
360
|
+
isNftInterceptor(),
|
361
|
+
$._isExternallyManaged,
|
362
|
+
$._isVerifyingApplications,
|
363
|
+
$._collateralizationLevel,
|
364
|
+
$._retentionLevel,
|
365
|
+
$._initialPoolFee,
|
366
|
+
$._initialStakingFee,
|
367
|
+
$._initialPerformanceFee,
|
368
|
+
getWallet()
|
206
369
|
);
|
207
370
|
}
|
371
|
+
|
372
|
+
|
373
|
+
function _getPoolStorage() private pure returns (PoolStorage storage $) {
|
374
|
+
assembly {
|
375
|
+
$.slot := POOL_STORAGE_LOCATION_V1
|
376
|
+
}
|
377
|
+
}
|
208
378
|
}
|