@etherisc/gif-next 0.0.2-e9148e0-933 → 0.0.2-e922e07-736
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +136 -2
- package/artifacts/contracts/components/Component.sol/Component.dbg.json +4 -0
- package/artifacts/contracts/components/Component.sol/Component.json +774 -0
- package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +1 -1
- package/artifacts/contracts/components/Distribution.sol/Distribution.json +879 -236
- package/artifacts/contracts/components/IComponent.sol/IComponent.dbg.json +4 -0
- package/artifacts/contracts/{shared/RegisterableUpgradable.sol/RegisterableUpgradable.json → components/IComponent.sol/IComponent.json} +164 -159
- package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.json +689 -30
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.json +838 -58
- package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.json +524 -9
- package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
- package/artifacts/contracts/components/Pool.sol/Pool.json +950 -281
- package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
- package/artifacts/contracts/components/Product.sol/Product.json +568 -188
- package/artifacts/contracts/instance/BundleManager.sol/BundleManager.dbg.json +4 -0
- package/artifacts/contracts/instance/BundleManager.sol/BundleManager.json +764 -0
- package/artifacts/contracts/instance/Cloneable.sol/Cloneable.dbg.json +4 -0
- package/artifacts/contracts/instance/{AccessManagedSimple.sol/AccessManagedSimple.json → Cloneable.sol/Cloneable.json} +86 -2
- package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstance.sol/IInstance.json +1912 -421
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +194 -165
- package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
- package/artifacts/contracts/instance/Instance.sol/Instance.json +901 -1127
- package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +211 -144
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +126 -159
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +420 -305
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +297 -112
- package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.dbg.json +4 -0
- package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.json +261 -0
- package/artifacts/contracts/instance/base/ComponentService.sol/ComponentService.dbg.json +4 -0
- package/artifacts/contracts/instance/base/{ComponentServiceBase.sol/ComponentServiceBase.json → ComponentService.sol/ComponentService.json} +189 -177
- 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 +59 -16
- package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +1 -1
- package/artifacts/contracts/instance/module/ISetup.sol/ISetup.dbg.json +1 -1
- package/artifacts/contracts/instance/module/ITreasury.sol/ITreasury.dbg.json +1 -1
- package/artifacts/contracts/instance/service/ApplicationService.sol/ApplicationService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/ApplicationService.sol/ApplicationService.json +968 -0
- package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.json +665 -0
- package/artifacts/contracts/instance/service/BundleService.sol/BundleService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/BundleService.sol/BundleService.json +1096 -0
- package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.json +661 -0
- 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 +1221 -213
- package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.json +436 -79
- package/artifacts/contracts/instance/service/IApplicationService.sol/IApplicationService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/IApplicationService.sol/IApplicationService.json +556 -0
- package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.json +633 -0
- package/artifacts/contracts/instance/service/IClaimService.sol/IClaimService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/{IComponentOwnerService.sol/IComponentOwnerService.json → IClaimService.sol/IClaimService.json} +150 -207
- package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.json +727 -160
- package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.json +540 -0
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +37 -251
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +47 -414
- package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.json +1021 -0
- package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.json +689 -0
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +209 -321
- package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.json +296 -95
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +218 -499
- package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.json +299 -98
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +2 -2
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +242 -131
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +158 -215
- 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 +256 -226
- package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.dbg.json +4 -0
- package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.json +285 -0
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +202 -318
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +298 -141
- package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.dbg.json +4 -0
- package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.json +547 -0
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +141 -53
- package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.dbg.json +1 -1
- package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +1 -1
- package/artifacts/contracts/shared/ERC165.sol/ERC165.json +41 -3
- package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
- package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.json +40 -29
- package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +4 -0
- package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.json +129 -0
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +21 -34
- package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +4 -0
- package/artifacts/contracts/{experiment/inheritance/IB.sol/IB.json → shared/IRegistryLinked.sol/IRegistryLinked.json} +18 -20
- package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
- package/artifacts/contracts/shared/IService.sol/IService.json +31 -183
- package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +1 -1
- package/artifacts/contracts/shared/IVersionable.sol/IVersionable.json +2 -152
- package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
- package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +120 -27
- package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +4 -0
- package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +248 -0
- package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +1 -1
- package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +294 -61
- package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
- package/artifacts/contracts/shared/Registerable.sol/Registerable.json +129 -51
- package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +4 -0
- package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +84 -0
- package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
- package/artifacts/contracts/shared/Service.sol/Service.json +127 -170
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
- package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
- package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +2 -2
- package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +1 -1
- package/artifacts/contracts/shared/Versionable.sol/Versionable.json +2 -152
- package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json +1 -1
- package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json +1 -1
- package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +129 -51
- package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +1 -1
- package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.json +2 -2
- package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +1 -1
- package/artifacts/contracts/test/TestService.sol/TestService.json +148 -227
- 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 +26 -3
- package/artifacts/contracts/types/NumberId.sol/NumberIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
- package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.json +2 -2
- package/artifacts/contracts/types/PayoutId.sol/PayoutIdLib.dbg.json +4 -0
- package/artifacts/contracts/types/PayoutId.sol/PayoutIdLib.json +100 -0
- package/artifacts/contracts/types/Referral.sol/ReferralLib.dbg.json +1 -1
- package/artifacts/contracts/types/Referral.sol/ReferralLib.json +23 -4
- package/artifacts/contracts/types/RiskId.sol/RiskIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/RiskId.sol/RiskIdLib.json +2 -2
- package/artifacts/contracts/types/RoleId.sol/RoleIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/RoleId.sol/RoleIdLib.json +2 -2
- package/artifacts/contracts/types/Seconds.sol/SecondsLib.dbg.json +4 -0
- package/artifacts/contracts/types/Seconds.sol/SecondsLib.json +124 -0
- package/artifacts/contracts/types/StateId.sol/StateIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json +1 -1
- package/artifacts/contracts/types/Timestamp.sol/TimestampLib.json +25 -7
- package/artifacts/contracts/types/UFixed.sol/MathLib.dbg.json +1 -1
- package/artifacts/contracts/types/UFixed.sol/UFixedLib.dbg.json +1 -1
- package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +1 -1
- package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +1 -1
- package/contracts/components/Component.sol +221 -0
- package/contracts/components/Distribution.sol +200 -79
- package/contracts/components/IComponent.sol +68 -0
- package/contracts/components/IDistributionComponent.sol +44 -17
- package/contracts/components/IPoolComponent.sol +126 -37
- package/contracts/components/IProductComponent.sol +10 -5
- package/contracts/components/Pool.sol +288 -152
- package/contracts/components/Product.sol +124 -119
- package/contracts/instance/BundleManager.sol +125 -0
- package/contracts/instance/Cloneable.sol +46 -0
- package/contracts/instance/IInstance.sol +56 -5
- package/contracts/instance/IInstanceService.sol +33 -4
- package/contracts/instance/Instance.sol +109 -261
- package/contracts/instance/InstanceAccessManager.sol +87 -78
- package/contracts/instance/InstanceReader.sol +12 -25
- package/contracts/instance/InstanceService.sol +401 -104
- package/contracts/instance/InstanceServiceManager.sol +6 -9
- package/contracts/instance/ObjectManager.sol +84 -0
- package/contracts/instance/base/ComponentService.sol +134 -0
- package/contracts/instance/module/IAccess.sol +27 -18
- 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 +12 -10
- package/contracts/instance/service/ApplicationService.sol +349 -0
- package/contracts/instance/service/ApplicationServiceManager.sol +35 -0
- package/contracts/instance/service/BundleService.sol +299 -0
- package/contracts/instance/service/BundleServiceManager.sol +51 -0
- package/contracts/instance/service/ClaimService.sol +151 -0
- package/contracts/instance/service/ClaimServiceManager.sol +35 -0
- package/contracts/instance/service/DistributionService.sol +390 -28
- package/contracts/instance/service/DistributionServiceManager.sol +7 -10
- package/contracts/instance/service/IApplicationService.sol +82 -0
- package/contracts/instance/service/IBundleService.sol +55 -0
- package/contracts/instance/service/IClaimService.sol +61 -0
- package/contracts/instance/service/IDistributionService.sol +86 -0
- package/contracts/instance/service/IPolicyService.sol +72 -0
- package/contracts/instance/service/IPoolService.sol +6 -23
- package/contracts/instance/service/IProductService.sol +6 -73
- package/contracts/instance/service/PolicyService.sol +394 -0
- package/contracts/instance/service/PolicyServiceManager.sol +54 -0
- package/contracts/instance/service/PoolService.sol +38 -123
- package/contracts/instance/service/PoolServiceManager.sol +6 -9
- package/contracts/instance/service/ProductService.sol +133 -448
- package/contracts/instance/service/ProductServiceManager.sol +2 -2
- package/contracts/registry/ChainNft.sol +1 -1
- package/contracts/registry/IRegistry.sol +39 -19
- package/contracts/registry/IRegistryService.sol +30 -13
- package/contracts/registry/Registry.sol +236 -216
- package/contracts/registry/RegistryAccessManager.sol +216 -0
- package/contracts/registry/RegistryService.sol +96 -171
- package/contracts/registry/RegistryServiceManager.sol +21 -39
- package/contracts/registry/ReleaseManager.sol +322 -0
- package/contracts/registry/TokenRegistry.sol +22 -17
- package/contracts/shared/ERC165.sol +14 -12
- package/contracts/shared/INftOwnable.sol +11 -10
- package/contracts/shared/IPolicyHolder.sol +26 -0
- package/contracts/shared/IRegisterable.sol +4 -6
- package/contracts/shared/IRegistryLinked.sol +12 -0
- package/contracts/shared/IService.sol +4 -1
- package/contracts/shared/IVersionable.sol +4 -47
- package/contracts/shared/NftOwnable.sol +66 -80
- package/contracts/shared/PolicyHolder.sol +81 -0
- package/contracts/shared/ProxyManager.sol +100 -25
- package/contracts/shared/Registerable.sol +16 -32
- package/contracts/shared/RegistryLinked.sol +48 -0
- package/contracts/shared/Service.sol +25 -22
- package/contracts/shared/Versionable.sol +4 -92
- package/contracts/test/TestRegisterable.sol +1 -1
- package/contracts/test/TestService.sol +4 -3
- package/contracts/types/ClaimId.sol +52 -0
- package/contracts/types/DistributorType.sol +2 -2
- package/contracts/types/NftIdSet.sol +26 -24
- package/contracts/types/ObjectType.sol +9 -5
- package/contracts/types/PayoutId.sol +54 -0
- package/contracts/types/Referral.sol +4 -0
- package/contracts/types/RoleId.sol +19 -14
- package/contracts/types/Seconds.sol +54 -0
- package/contracts/types/Timestamp.sol +12 -13
- package/package.json +3 -3
- package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.dbg.json +0 -4
- package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.json +0 -327
- package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.dbg.json +0 -4
- package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.json +0 -280
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Cloner.dbg.json +0 -4
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Cloner.json +0 -66
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock1.dbg.json +0 -4
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock1.json +0 -24
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock2.dbg.json +0 -4
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock2.json +0 -42
- package/artifacts/contracts/experiment/errors/Require.sol/Require.dbg.json +0 -4
- package/artifacts/contracts/experiment/errors/Require.sol/Require.json +0 -105
- package/artifacts/contracts/experiment/errors/Revert.sol/Revert.dbg.json +0 -4
- package/artifacts/contracts/experiment/errors/Revert.sol/Revert.json +0 -105
- package/artifacts/contracts/experiment/inheritance/A.sol/A.dbg.json +0 -4
- package/artifacts/contracts/experiment/inheritance/A.sol/A.json +0 -128
- package/artifacts/contracts/experiment/inheritance/A.sol/AShared.dbg.json +0 -4
- package/artifacts/contracts/experiment/inheritance/A.sol/AShared.json +0 -42
- package/artifacts/contracts/experiment/inheritance/B.sol/B.dbg.json +0 -4
- package/artifacts/contracts/experiment/inheritance/B.sol/B.json +0 -76
- package/artifacts/contracts/experiment/inheritance/C.sol/C.dbg.json +0 -4
- package/artifacts/contracts/experiment/inheritance/C.sol/C.json +0 -89
- package/artifacts/contracts/experiment/inheritance/IA.sol/IA.dbg.json +0 -4
- package/artifacts/contracts/experiment/inheritance/IA.sol/IA.json +0 -128
- package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.dbg.json +0 -4
- package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.json +0 -37
- package/artifacts/contracts/experiment/inheritance/IB.sol/IB.dbg.json +0 -4
- package/artifacts/contracts/experiment/inheritance/IC.sol/IC.dbg.json +0 -4
- package/artifacts/contracts/experiment/inheritance/IC.sol/IC.json +0 -63
- package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.dbg.json +0 -4
- package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.json +0 -59
- package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.dbg.json +0 -4
- package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.json +0 -124
- package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.dbg.json +0 -4
- package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.json +0 -74
- package/artifacts/contracts/experiment/statemachine/SM.sol/SM.dbg.json +0 -4
- package/artifacts/contracts/experiment/statemachine/SM.sol/SM.json +0 -124
- package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.dbg.json +0 -4
- package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.json +0 -207
- package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.dbg.json +0 -4
- package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.json +0 -10
- package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.dbg.json +0 -4
- package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.json +0 -10
- package/artifacts/contracts/instance/AccessManagedSimple.sol/AccessManagedSimple.dbg.json +0 -4
- package/artifacts/contracts/instance/AccessManagerSimple.sol/AccessManagerSimple.dbg.json +0 -4
- package/artifacts/contracts/instance/AccessManagerSimple.sol/AccessManagerSimple.json +0 -1132
- package/artifacts/contracts/instance/IAccessManagerSimple.sol/IAccessManagerSimple.dbg.json +0 -4
- package/artifacts/contracts/instance/IAccessManagerSimple.sol/IAccessManagerSimple.json +0 -1082
- package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.dbg.json +0 -4
- package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.dbg.json +0 -4
- package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.json +0 -113
- package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.dbg.json +0 -4
- package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.json +0 -827
- package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.dbg.json +0 -4
- package/artifacts/contracts/shared/RegisterableUpgradable.sol/RegisterableUpgradable.dbg.json +0 -4
- package/contracts/components/BaseComponent.sol +0 -91
- package/contracts/components/IBaseComponent.sol +0 -25
- package/contracts/experiment/cloning/Cloner.sol +0 -47
- package/contracts/experiment/errors/Require.sol +0 -38
- package/contracts/experiment/errors/Revert.sol +0 -44
- package/contracts/experiment/inheritance/A.sol +0 -53
- package/contracts/experiment/inheritance/B.sol +0 -28
- package/contracts/experiment/inheritance/C.sol +0 -34
- package/contracts/experiment/inheritance/IA.sol +0 -13
- package/contracts/experiment/inheritance/IB.sol +0 -10
- package/contracts/experiment/inheritance/IC.sol +0 -12
- package/contracts/experiment/statemachine/Dummy.sol +0 -27
- package/contracts/experiment/statemachine/ISM.sol +0 -25
- package/contracts/experiment/statemachine/SM.sol +0 -57
- package/contracts/experiment/statemachine/SimpleStateMachine.sol +0 -31
- package/contracts/experiment/types/TypeA.sol +0 -47
- package/contracts/experiment/types/TypeB.sol +0 -29
- package/contracts/instance/AccessManagedSimple.sol +0 -115
- package/contracts/instance/AccessManagerSimple.sol +0 -692
- package/contracts/instance/IAccessManagerSimple.sol +0 -391
- package/contracts/instance/base/ComponentServiceBase.sol +0 -124
- package/contracts/instance/base/IInstanceBase.sol +0 -23
- package/contracts/instance/service/ComponentOwnerService.sol +0 -317
- package/contracts/instance/service/IComponentOwnerService.sol +0 -20
- package/contracts/shared/RegisterableUpgradable.sol +0 -16
@@ -1,183 +1,169 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
2
|
pragma solidity ^0.8.20;
|
3
3
|
|
4
|
-
import {
|
5
|
-
|
4
|
+
import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
|
5
|
+
|
6
|
+
import {NftId, toNftId, zeroNftId} from "../types/NftId.sol";
|
7
|
+
import {VersionPart} from "../types/Version.sol";
|
8
|
+
import {ObjectType, PROTOCOL, REGISTRY, TOKEN, SERVICE, INSTANCE, STAKE, PRODUCT, DISTRIBUTION, DISTRIBUTOR, ORACLE, POOL, POLICY, BUNDLE} from "../types/ObjectType.sol";
|
6
9
|
|
7
10
|
import {ChainNft} from "./ChainNft.sol";
|
8
11
|
import {IRegistry} from "./IRegistry.sol";
|
9
|
-
import {
|
10
|
-
import {Version, VersionPart, VersionLib, VersionPartLib} from "../types/Version.sol";
|
11
|
-
import {ObjectType, PROTOCOL, REGISTRY, TOKEN, SERVICE, INSTANCE, STAKE, PRODUCT, DISTRIBUTION, ORACLE, POOL, POLICY, BUNDLE} from "../types/ObjectType.sol";
|
12
|
-
import {ITransferInterceptor} from "./ITransferInterceptor.sol";
|
13
|
-
|
14
|
-
import {ERC165} from "../shared/ERC165.sol";
|
15
|
-
|
12
|
+
import {ReleaseManager} from "./ReleaseManager.sol";
|
16
13
|
|
17
14
|
// IMPORTANT
|
18
15
|
// Each NFT minted by registry is accosiated with:
|
19
16
|
// 1) NFT owner
|
20
17
|
// 2) registred contract OR object stored in registered (parent) contract
|
21
18
|
// Four registration flows:
|
22
|
-
// 1)
|
23
|
-
// 2)
|
24
|
-
// 3) IRegisterable address by
|
25
|
-
// 4) state object by
|
19
|
+
// 1) IService address by release manager (SERVICE of domain SERVICE aka registry service aka release creation)
|
20
|
+
// 2) IService address by release manager (SERVICE of domain !SERVICE aka regular service)
|
21
|
+
// 3) IRegisterable address by regular service (INSTANCE, PRODUCT, POOL, DISTRIBUTION, ORACLE)
|
22
|
+
// 4) state object by regular service (POLICY, BUNDLE, STAKE)
|
26
23
|
|
27
24
|
contract Registry is
|
28
|
-
ERC165,
|
29
25
|
IRegistry
|
30
26
|
{
|
31
|
-
uint256 public constant GIF_MAJOR_VERSION_AT_DEPLOYMENT = 3;
|
32
27
|
address public constant NFT_LOCK_ADDRESS = address(0x1);
|
33
28
|
uint256 public constant REGISTRY_TOKEN_SEQUENCE_ID = 2;
|
34
|
-
uint256 public constant REGISTRY_SERVICE_TOKEN_SEQUENCE_ID = 3;
|
35
29
|
string public constant EMPTY_URI = "";
|
36
30
|
|
37
|
-
|
31
|
+
mapping(NftId nftId => ObjectInfo info) private _info;
|
32
|
+
mapping(address object => NftId nftId) private _nftIdByAddress;
|
38
33
|
|
39
|
-
mapping(
|
40
|
-
mapping(address object => NftId nftId) internal _nftIdByAddress;
|
34
|
+
mapping(VersionPart version => mapping(ObjectType serviceDomain => address)) private _service;
|
41
35
|
|
42
|
-
mapping(ObjectType objectType =>
|
43
|
-
ObjectType parentType => bool)) internal _isValidContractCombination;
|
36
|
+
mapping(ObjectType objectType => bool) private _coreTypes;
|
44
37
|
|
45
38
|
mapping(ObjectType objectType => mapping(
|
46
|
-
ObjectType parentType => bool))
|
39
|
+
ObjectType parentType => bool)) private _coreContractCombinations;
|
47
40
|
|
48
|
-
mapping(
|
49
|
-
|
50
|
-
VersionPart majorVersion => address service)) internal _service;
|
41
|
+
mapping(ObjectType objectType => mapping(
|
42
|
+
ObjectType parentType => bool)) private _coreObjectCombinations;
|
51
43
|
|
52
|
-
NftId
|
53
|
-
|
54
|
-
ChainNft internal _chainNft;
|
44
|
+
NftId private _registryNftId;
|
45
|
+
ChainNft private _chainNft;
|
55
46
|
|
47
|
+
ReleaseManager private _releaseManager;
|
56
48
|
|
57
|
-
modifier
|
58
|
-
if(msg.sender
|
59
|
-
revert
|
49
|
+
modifier onlyRegistryService() {
|
50
|
+
if(!_releaseManager.isActiveRegistryService(msg.sender)) {
|
51
|
+
revert CallerNotRegistryService();
|
60
52
|
}
|
61
53
|
_;
|
62
54
|
}
|
63
55
|
|
64
|
-
modifier
|
65
|
-
if(msg.sender !=
|
66
|
-
revert
|
56
|
+
modifier onlyReleaseManager() {
|
57
|
+
if(msg.sender != address(_releaseManager)) {
|
58
|
+
revert CallerNotReleaseManager();
|
67
59
|
}
|
68
60
|
_;
|
69
61
|
}
|
70
62
|
|
71
|
-
constructor(
|
63
|
+
constructor()
|
72
64
|
{
|
73
|
-
|
74
|
-
|
75
|
-
// major version at constructor time
|
76
|
-
_majorVersion = VersionLib.toVersionPart(GIF_MAJOR_VERSION_AT_DEPLOYMENT);
|
77
|
-
emit LogInitialMajorVersionSet(_majorVersion);
|
65
|
+
_releaseManager = ReleaseManager(msg.sender);
|
78
66
|
|
79
67
|
// deploy NFT
|
80
|
-
_chainNft = new ChainNft(address(this))
|
68
|
+
_chainNft = new ChainNft(address(this));
|
81
69
|
|
82
70
|
// initial registry setup
|
83
71
|
_registerProtocol();
|
84
|
-
_registerRegistry(
|
85
|
-
_registerRegistryService(registryOwner);
|
86
|
-
|
87
|
-
// set object parent relations
|
88
|
-
_setupValidObjectParentCombinations();
|
72
|
+
_registerRegistry();
|
89
73
|
|
90
|
-
|
74
|
+
// set object types and object parent relations
|
75
|
+
_setupValidCoreTypesAndCombinations();
|
91
76
|
}
|
92
77
|
|
93
|
-
|
94
|
-
|
95
|
-
|
96
|
-
|
78
|
+
function registerService(
|
79
|
+
ObjectInfo memory info,
|
80
|
+
VersionPart version,
|
81
|
+
ObjectType domain
|
82
|
+
)
|
97
83
|
external
|
98
|
-
|
84
|
+
onlyReleaseManager
|
85
|
+
returns(NftId nftId)
|
99
86
|
{
|
100
|
-
|
101
|
-
|
102
|
-
|
103
|
-
if (newMax <= oldMax || newMax - oldMax != 1) {
|
104
|
-
revert MajorVersionMaxIncreaseInvalid(newMajorVersion, _majorVersion);
|
87
|
+
/* must be guaranteed by release manager
|
88
|
+
if(info.objectType != SERVICE()) {
|
89
|
+
revert();
|
105
90
|
}
|
91
|
+
if(info.parentType != REGISTRY()) {
|
92
|
+
revert();
|
93
|
+
}
|
94
|
+
info.initialOwner == NFT_LOCK_ADDRESS <- if services are access managed
|
95
|
+
*/
|
96
|
+
|
97
|
+
if(_service[version][domain] > address(0)) {
|
98
|
+
revert ServiceAlreadyRegistered(info.objectAddress);
|
99
|
+
}
|
100
|
+
|
101
|
+
_service[version][domain] = info.objectAddress; // nftId;
|
106
102
|
|
107
|
-
|
108
|
-
|
103
|
+
nftId = _register(info);
|
104
|
+
|
105
|
+
emit LogServiceRegistration(version, domain);
|
109
106
|
}
|
110
107
|
|
111
|
-
/// @dev registry protects only against tampering existing records, registering with invalid types pairs and 0 parent address
|
112
|
-
// TODO service registration means its approval for some type?
|
113
|
-
// TODO registration of precompile addresses
|
114
108
|
function register(ObjectInfo memory info)
|
115
109
|
external
|
116
110
|
onlyRegistryService
|
117
111
|
returns(NftId nftId)
|
118
112
|
{
|
119
113
|
ObjectType objectType = info.objectType;
|
120
|
-
|
121
|
-
ObjectInfo memory parentInfo = _info[parentNftId];
|
122
|
-
ObjectType parentType = parentInfo.objectType; // see function header
|
123
|
-
address parentAddress = parentInfo.objectAddress;
|
114
|
+
ObjectType parentType = _info[info.parentNftId].objectType;
|
124
115
|
|
125
|
-
//
|
126
|
-
//
|
127
|
-
|
128
|
-
|
129
|
-
if(parentAddress == address(0)) {
|
130
|
-
revert ZeroParentAddress();
|
116
|
+
// TODO do not need it here -> SERVICE is no longer part of _coreContractCombinations
|
117
|
+
// no service registrations
|
118
|
+
if(objectType == SERVICE()) {
|
119
|
+
revert ServiceRegistration();
|
131
120
|
}
|
132
121
|
|
133
|
-
|
134
|
-
|
135
|
-
// TODO does external call
|
136
|
-
uint256 mintedTokenId = _chainNft.mint(
|
137
|
-
info.initialOwner,
|
138
|
-
interceptor,
|
139
|
-
EMPTY_URI);
|
140
|
-
nftId = toNftId(mintedTokenId);
|
141
|
-
|
142
|
-
// TODO move nftId out of info struct
|
143
|
-
// getters by nftId -> return struct without nftId
|
144
|
-
// getters by address -> return nftId AND struct
|
145
|
-
info.nftId = nftId;
|
146
|
-
_info[nftId] = info;
|
147
|
-
|
148
|
-
if(info.objectAddress > address(0))
|
122
|
+
// only valid core types combinations
|
123
|
+
if(info.objectAddress == address(0))
|
149
124
|
{
|
150
|
-
|
151
|
-
// parent is registered + object-parent types are valid
|
152
|
-
if(_isValidContractCombination[objectType][parentType] == false) {
|
125
|
+
if(_coreObjectCombinations[objectType][parentType] == false) {
|
153
126
|
revert InvalidTypesCombination(objectType, parentType);
|
154
127
|
}
|
155
|
-
|
156
|
-
address contractAddress = info.objectAddress;
|
157
|
-
|
158
|
-
if(_nftIdByAddress[contractAddress].gtz()) {
|
159
|
-
revert ContractAlreadyRegistered(contractAddress);
|
160
|
-
}
|
161
|
-
|
162
|
-
_nftIdByAddress[contractAddress] = nftId;
|
163
|
-
|
164
|
-
// special case
|
165
|
-
if(objectType == SERVICE()) {
|
166
|
-
_registerService(info);
|
167
|
-
}
|
168
128
|
}
|
169
129
|
else
|
170
130
|
{
|
171
|
-
if(
|
131
|
+
if(_coreContractCombinations[objectType][parentType] == false) {
|
172
132
|
revert InvalidTypesCombination(objectType, parentType);
|
173
133
|
}
|
174
134
|
}
|
175
135
|
|
176
|
-
|
136
|
+
nftId = _register(info);
|
137
|
+
}
|
138
|
+
|
139
|
+
function registerWithCustomType(ObjectInfo memory info)
|
140
|
+
external
|
141
|
+
onlyRegistryService
|
142
|
+
returns(NftId nftId)
|
143
|
+
{
|
144
|
+
ObjectType objectType = info.objectType;
|
145
|
+
ObjectType parentType = _info[info.parentNftId].objectType;
|
146
|
+
|
147
|
+
if(_coreTypes[objectType]) {
|
148
|
+
revert CoreTypeRegistration();
|
149
|
+
}
|
150
|
+
|
151
|
+
if(
|
152
|
+
|
153
|
+
parentType == PROTOCOL() ||
|
154
|
+
parentType == REGISTRY() ||
|
155
|
+
parentType == SERVICE()
|
156
|
+
) {
|
157
|
+
revert InvalidTypesCombination(objectType, parentType);
|
158
|
+
}
|
159
|
+
|
160
|
+
_register(info);
|
177
161
|
}
|
162
|
+
|
163
|
+
|
178
164
|
/// @dev earliest GIF major version
|
179
|
-
function
|
180
|
-
return
|
165
|
+
function getInitialVersion() external view returns (VersionPart) {
|
166
|
+
return _releaseManager.getInitialVersion();
|
181
167
|
}
|
182
168
|
|
183
169
|
// TODO make distinction between active an not yet active version
|
@@ -187,19 +173,27 @@ contract Registry is
|
|
187
173
|
// in this case we might want to have a period where the latest version is
|
188
174
|
// in the process of being set up while the latest active version is 1 major release smaller
|
189
175
|
/// @dev latest GIF major version (might not yet be active)
|
190
|
-
function
|
191
|
-
return
|
176
|
+
function getNextVersion() external view returns (VersionPart) {
|
177
|
+
return _releaseManager.getNextVersion();
|
192
178
|
}
|
193
179
|
|
194
180
|
/// @dev latest active GIF release version
|
195
|
-
function
|
196
|
-
return
|
181
|
+
function getLatestVersion() external view returns (VersionPart) {
|
182
|
+
return _releaseManager.getLatestVersion();
|
183
|
+
}
|
184
|
+
|
185
|
+
function getReleaseInfo(VersionPart version) external view returns (ReleaseInfo memory) {
|
186
|
+
return _releaseManager.getReleaseInfo(version);
|
197
187
|
}
|
198
188
|
|
199
189
|
function getObjectCount() external view override returns (uint256) {
|
200
190
|
return _chainNft.totalSupply();
|
201
191
|
}
|
202
192
|
|
193
|
+
function getReleaseManagerAddress() external view returns (address) {
|
194
|
+
return address(_releaseManager);
|
195
|
+
}
|
196
|
+
|
203
197
|
function getNftId() external view returns (NftId nftId) {
|
204
198
|
return _registryNftId;
|
205
199
|
}
|
@@ -232,52 +226,94 @@ contract Registry is
|
|
232
226
|
return _nftIdByAddress[object].gtz();
|
233
227
|
}
|
234
228
|
|
235
|
-
function
|
236
|
-
return
|
229
|
+
function isRegisteredService(address object) external view override returns (bool) {
|
230
|
+
return _info[_nftIdByAddress[object]].objectType == SERVICE();
|
231
|
+
}
|
232
|
+
|
233
|
+
function isValidRelease(VersionPart version) external view returns (bool)
|
234
|
+
{
|
235
|
+
return _releaseManager.isValidRelease(version);
|
237
236
|
}
|
238
237
|
|
239
|
-
// special case to retrive a gif service
|
240
238
|
function getServiceAddress(
|
241
|
-
|
242
|
-
VersionPart
|
243
|
-
) external view returns (address)
|
239
|
+
ObjectType serviceDomain,
|
240
|
+
VersionPart releaseVersion
|
241
|
+
) external view returns (address service)
|
244
242
|
{
|
245
|
-
|
246
|
-
|
243
|
+
// TODO how can I get service address while release is not validated/activated ?!! -> user will check validity of release on its own
|
244
|
+
//if(_releaseManager.isValidRelease(releaseVersion)) {
|
245
|
+
service = _service[releaseVersion][serviceDomain];
|
246
|
+
//}
|
247
247
|
}
|
248
248
|
|
249
|
-
function
|
250
|
-
return _chainNft;
|
249
|
+
function getChainNftAddress() external view override returns (address) {
|
250
|
+
return address(_chainNft);
|
251
251
|
}
|
252
252
|
|
253
253
|
function getOwner() public view returns (address owner) {
|
254
254
|
return ownerOf(address(this));
|
255
255
|
}
|
256
256
|
|
257
|
+
// IERC165
|
258
|
+
|
259
|
+
function supportsInterface(bytes4 interfaceId) external pure returns (bool) {
|
260
|
+
if(interfaceId == type(IERC165).interfaceId || interfaceId == type(IRegistry).interfaceId) {
|
261
|
+
return true;
|
262
|
+
}
|
263
|
+
|
264
|
+
return false;
|
265
|
+
}
|
266
|
+
|
257
267
|
// Internals
|
258
268
|
|
259
|
-
|
269
|
+
/// @dev registry protects only against tampering existing records, registering with invalid types pairs and 0 parent address
|
270
|
+
// TODO registration of precompile addresses
|
271
|
+
function _register(ObjectInfo memory info)
|
260
272
|
internal
|
273
|
+
returns(NftId nftId)
|
261
274
|
{
|
262
|
-
|
263
|
-
|
264
|
-
|
265
|
-
|
266
|
-
|
267
|
-
|
268
|
-
//
|
269
|
-
|
270
|
-
|
271
|
-
|
272
|
-
|
273
|
-
|
274
|
-
revert ServiceNameAlreadyRegistered(serviceName, majorVersion);
|
275
|
+
ObjectType objectType = info.objectType;
|
276
|
+
NftId parentNftId = info.parentNftId;
|
277
|
+
ObjectInfo memory parentInfo = _info[parentNftId];
|
278
|
+
ObjectType parentType = parentInfo.objectType; // see function header
|
279
|
+
address parentAddress = parentInfo.objectAddress;
|
280
|
+
|
281
|
+
// parent is contract -> need to check? -> check before minting
|
282
|
+
// special case: global registry nft as parent when not on mainnet -> global registry address is 0
|
283
|
+
// special case: when parentNftId == _chainNft.mint(), check for zero parent address before mint
|
284
|
+
// special case: when parentNftId == _chainNft.mint() && objectAddress == initialOwner
|
285
|
+
if(parentAddress == address(0)) {
|
286
|
+
revert ZeroParentAddress();
|
275
287
|
}
|
276
288
|
|
277
|
-
|
278
|
-
|
289
|
+
address interceptor = _getInterceptor(info.isInterceptor, info.objectAddress, parentInfo.isInterceptor, parentAddress);
|
290
|
+
|
291
|
+
// TODO does external call
|
292
|
+
// compute next nftId, do all checks and stores, mint() at most end...
|
293
|
+
uint256 mintedTokenId = _chainNft.mint(
|
294
|
+
info.initialOwner,
|
295
|
+
interceptor,
|
296
|
+
EMPTY_URI);
|
297
|
+
nftId = toNftId(mintedTokenId);
|
298
|
+
|
299
|
+
// TODO move nftId out of info struct
|
300
|
+
// getters by nftId -> return struct without nftId
|
301
|
+
// getters by address -> return nftId AND struct
|
302
|
+
info.nftId = nftId;
|
303
|
+
_info[nftId] = info;
|
304
|
+
|
305
|
+
if(info.objectAddress > address(0))
|
306
|
+
{
|
307
|
+
address contractAddress = info.objectAddress;
|
308
|
+
|
309
|
+
if(_nftIdByAddress[contractAddress].gtz()) {
|
310
|
+
revert ContractAlreadyRegistered(contractAddress);
|
311
|
+
}
|
312
|
+
|
313
|
+
_nftIdByAddress[contractAddress] = nftId;
|
314
|
+
}
|
279
315
|
|
280
|
-
emit
|
316
|
+
emit LogRegistration(nftId, parentNftId, objectType, info.isInterceptor, info.objectAddress, info.initialOwner);
|
281
317
|
}
|
282
318
|
|
283
319
|
/// @dev obtain interceptor address for this nft if applicable, address(0) otherwise
|
@@ -310,32 +346,31 @@ contract Registry is
|
|
310
346
|
|
311
347
|
/// @dev protocol registration used to anchor the dip ecosystem relations
|
312
348
|
function _registerProtocol()
|
313
|
-
|
349
|
+
private
|
314
350
|
{
|
315
351
|
uint256 protocolId = _chainNft.PROTOCOL_NFT_ID();
|
316
352
|
NftId protocolNftId = toNftId(protocolId);
|
317
353
|
|
318
|
-
|
354
|
+
_info[protocolNftId] = ObjectInfo({
|
355
|
+
nftId: protocolNftId,
|
356
|
+
parentNftId: zeroNftId(),
|
357
|
+
objectType: PROTOCOL(),
|
358
|
+
isInterceptor: false,
|
359
|
+
objectAddress: address(0),
|
360
|
+
initialOwner: NFT_LOCK_ADDRESS,
|
361
|
+
data: ""
|
362
|
+
});
|
319
363
|
|
320
|
-
|
321
|
-
protocolNftId,
|
322
|
-
zeroNftId(), // parent
|
323
|
-
PROTOCOL(),
|
324
|
-
false, // isInterceptor
|
325
|
-
address(0), // objectAddress
|
326
|
-
NFT_LOCK_ADDRESS,// initialOwner
|
327
|
-
""
|
328
|
-
);
|
364
|
+
_chainNft.mint(NFT_LOCK_ADDRESS, protocolId);
|
329
365
|
}
|
330
366
|
|
331
367
|
/// @dev registry registration
|
332
368
|
/// might also register the global registry when not on mainnet
|
333
|
-
function _registerRegistry(
|
334
|
-
|
369
|
+
function _registerRegistry()
|
370
|
+
private
|
335
371
|
{
|
336
372
|
uint256 registryId = _chainNft.calculateTokenId(REGISTRY_TOKEN_SEQUENCE_ID);
|
337
373
|
NftId registryNftId = toNftId(registryId);
|
338
|
-
|
339
374
|
NftId parentNftId;
|
340
375
|
|
341
376
|
if(registryId != _chainNft.GLOBAL_REGISTRY_ID())
|
@@ -348,68 +383,39 @@ contract Registry is
|
|
348
383
|
parentNftId = toNftId(_chainNft.PROTOCOL_NFT_ID());
|
349
384
|
}
|
350
385
|
|
351
|
-
|
352
|
-
|
353
|
-
|
354
|
-
|
355
|
-
|
356
|
-
|
357
|
-
|
358
|
-
|
359
|
-
|
360
|
-
""
|
361
|
-
);
|
386
|
+
_info[registryNftId] = ObjectInfo({
|
387
|
+
nftId: registryNftId,
|
388
|
+
parentNftId: parentNftId,
|
389
|
+
objectType: REGISTRY(),
|
390
|
+
isInterceptor: false,
|
391
|
+
objectAddress: address(this),
|
392
|
+
initialOwner: NFT_LOCK_ADDRESS,
|
393
|
+
data: ""
|
394
|
+
});
|
362
395
|
_nftIdByAddress[address(this)] = registryNftId;
|
363
396
|
_registryNftId = registryNftId;
|
364
|
-
}
|
365
397
|
|
398
|
+
_chainNft.mint(NFT_LOCK_ADDRESS, registryId);
|
399
|
+
}
|
366
400
|
|
367
401
|
/// @dev global registry registration for non mainnet registries
|
368
402
|
function _registerGlobalRegistry()
|
369
|
-
|
403
|
+
private
|
370
404
|
{
|
371
405
|
uint256 globalRegistryId = _chainNft.GLOBAL_REGISTRY_ID();
|
372
|
-
|
373
|
-
_chainNft.mint(NFT_LOCK_ADDRESS, globalRegistryId);
|
374
|
-
|
375
406
|
NftId globalRegistryNftId = toNftId(globalRegistryId);
|
376
407
|
|
377
|
-
_info[globalRegistryNftId] = ObjectInfo(
|
378
|
-
globalRegistryNftId,
|
379
|
-
toNftId(_chainNft.PROTOCOL_NFT_ID()),
|
380
|
-
REGISTRY(),
|
381
|
-
false,
|
382
|
-
address(0),
|
383
|
-
NFT_LOCK_ADDRESS,
|
384
|
-
""
|
385
|
-
);
|
386
|
-
}
|
387
|
-
|
388
|
-
function _registerRegistryService(address registryOwner)
|
389
|
-
internal
|
390
|
-
{
|
391
|
-
uint256 serviceId = _chainNft.calculateTokenId(REGISTRY_SERVICE_TOKEN_SEQUENCE_ID);
|
392
|
-
NftId serviceNftId = toNftId(serviceId);
|
393
|
-
|
394
|
-
_chainNft.mint(registryOwner, serviceId);
|
395
|
-
|
396
|
-
_info[serviceNftId] = ObjectInfo(
|
397
|
-
serviceNftId,
|
398
|
-
_registryNftId,
|
399
|
-
SERVICE(),
|
400
|
-
false, // isInterceptor
|
401
|
-
msg.sender, // service deploys registry
|
402
|
-
registryOwner, // initialOwner,
|
403
|
-
""
|
404
|
-
);
|
405
|
-
|
406
|
-
_nftIdByAddress[msg.sender] = serviceNftId;
|
408
|
+
_info[globalRegistryNftId] = ObjectInfo({
|
409
|
+
nftId: globalRegistryNftId,
|
410
|
+
parentNftId: toNftId(_chainNft.PROTOCOL_NFT_ID()),
|
411
|
+
objectType: REGISTRY(),
|
412
|
+
isInterceptor: false,
|
413
|
+
objectAddress: address(0),
|
414
|
+
initialOwner: NFT_LOCK_ADDRESS,
|
415
|
+
data: ""
|
416
|
+
});
|
407
417
|
|
408
|
-
|
409
|
-
bytes32 serviceNameHash = keccak256(abi.encode(serviceName));
|
410
|
-
_service[serviceNameHash][VersionLib.toVersionPart(GIF_MAJOR_VERSION_AT_DEPLOYMENT)] = msg.sender;
|
411
|
-
_string[serviceNftId] = serviceName;
|
412
|
-
_serviceNftId = serviceNftId;
|
418
|
+
_chainNft.mint(NFT_LOCK_ADDRESS, globalRegistryId);
|
413
419
|
}
|
414
420
|
|
415
421
|
/// @dev defines which object - parent types relations are allowed to register
|
@@ -418,27 +424,41 @@ contract Registry is
|
|
418
424
|
// 2) DO NOT use object type (e.g. POLCY, BUNDLE, STAKE) as parent type
|
419
425
|
// 3) DO NOT use REGISTRY as object type
|
420
426
|
// 2) DO NOT use PROTOCOL and "zeroObjectType"
|
421
|
-
function
|
422
|
-
|
427
|
+
function _setupValidCoreTypesAndCombinations()
|
428
|
+
private
|
423
429
|
{
|
430
|
+
_coreTypes[REGISTRY()] = true;
|
431
|
+
_coreTypes[SERVICE()] = true;
|
432
|
+
_coreTypes[TOKEN()] = true;
|
433
|
+
_coreTypes[INSTANCE()] = true;
|
434
|
+
_coreTypes[PRODUCT()] = true;
|
435
|
+
_coreTypes[POOL()] = true;
|
436
|
+
_coreTypes[DISTRIBUTION()] = true;
|
437
|
+
_coreTypes[POLICY()] = true;
|
438
|
+
_coreTypes[BUNDLE()] = true;
|
439
|
+
_coreTypes[STAKE()] = true;
|
440
|
+
|
424
441
|
// registry as parent, ONLY registry owner
|
425
|
-
|
426
|
-
|
442
|
+
//_coreContractCombinations[REGISTRY()][REGISTRY()] = true; // only for global regstry
|
443
|
+
_coreContractCombinations[TOKEN()][REGISTRY()] = true;
|
444
|
+
//_coreContractCombinations[SERVICE()][REGISTRY()] = true;// do not need it here -> registerService() registers exactly this combination
|
427
445
|
|
428
446
|
// registry as parent, ONLY approved
|
429
|
-
|
447
|
+
_coreContractCombinations[INSTANCE()][REGISTRY()] = true;
|
430
448
|
|
431
449
|
// instance as parent, ONLY approved
|
432
|
-
|
433
|
-
|
434
|
-
|
435
|
-
|
450
|
+
_coreContractCombinations[PRODUCT()][INSTANCE()] = true;
|
451
|
+
_coreContractCombinations[DISTRIBUTION()][INSTANCE()] = true;
|
452
|
+
_coreContractCombinations[ORACLE()][INSTANCE()] = true;
|
453
|
+
_coreContractCombinations[POOL()][INSTANCE()] = true;
|
454
|
+
|
455
|
+
_coreObjectCombinations[DISTRIBUTOR()][DISTRIBUTION()] = true;
|
436
456
|
|
437
457
|
// product as parent, ONLY approved
|
438
|
-
|
458
|
+
_coreObjectCombinations[POLICY()][PRODUCT()] = true;
|
439
459
|
|
440
460
|
// pool as parent, ONLY approved
|
441
|
-
|
442
|
-
|
461
|
+
_coreObjectCombinations[BUNDLE()][POOL()] = true;
|
462
|
+
_coreObjectCombinations[STAKE()][POOL()] = true;
|
443
463
|
}
|
444
464
|
}
|