@etherisc/gif-next 0.0.2-cddad6b-504 → 0.0.2-ce8407f-016
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 +40 -25
- package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.json +115 -48
- 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/AccessManagedSimple.sol/AccessManagedSimple.dbg.json +4 -0
- package/artifacts/contracts/instance/AccessManagedSimple.sol/AccessManagedSimple.json +101 -0
- package/artifacts/contracts/instance/AccessManagerSimple.sol/AccessManagerSimple.dbg.json +4 -0
- package/artifacts/contracts/instance/AccessManagerSimple.sol/AccessManagerSimple.json +1119 -0
- package/artifacts/contracts/instance/IAccessManagerSimple.sol/IAccessManagerSimple.dbg.json +4 -0
- package/artifacts/contracts/instance/IAccessManagerSimple.sol/IAccessManagerSimple.json +1082 -0
- package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstance.sol/IInstance.json +1 -1998
- package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
- package/artifacts/contracts/instance/Instance.sol/Instance.json +2378 -1243
- package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +4 -0
- package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +917 -0
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +4 -0
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +878 -0
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +4 -0
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +117 -0
- package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
- package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.json +32 -86
- package/artifacts/contracts/instance/base/ILifecycle.sol/ILifecycle.dbg.json +1 -1
- package/artifacts/contracts/instance/base/IService.sol/IService.dbg.json +1 -1
- package/artifacts/contracts/instance/base/IService.sol/IService.json +174 -53
- package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
- package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.json +138 -112
- 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/base/ServiceBase.sol/ServiceBase.dbg.json +1 -1
- package/artifacts/contracts/instance/base/ServiceBase.sol/ServiceBase.json +220 -52
- package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +4 -0
- package/artifacts/contracts/instance/module/IAccess.sol/IAccess.json +211 -0
- package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +4 -0
- package/artifacts/contracts/instance/module/{bundle/IBundle.sol → IBundle.sol}/IBundle.json +1 -1
- package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +4 -0
- package/artifacts/contracts/instance/module/{distribution/IDistribution.sol → IDistribution.sol}/IDistribution.json +1 -1
- package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +4 -0
- package/artifacts/contracts/instance/module/{policy/IPolicy.sol → IPolicy.sol}/IPolicy.json +1 -1
- package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +4 -0
- package/artifacts/contracts/instance/module/{risk/IRisk.sol → IRisk.sol}/IRisk.json +1 -1
- package/artifacts/contracts/instance/module/ISetup.sol/ISetup.dbg.json +4 -0
- package/artifacts/contracts/instance/{base/ModuleBase.sol/ModuleBase.json → module/ISetup.sol/ISetup.json} +2 -2
- package/artifacts/contracts/instance/module/ITreasury.sol/ITreasury.dbg.json +4 -0
- package/artifacts/contracts/instance/module/{treasury/ITreasury.sol → ITreasury.sol}/ITreasury.json +1 -1
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +141 -12
- 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 +298 -39
- 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 +489 -120
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +4 -0
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +1013 -0
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +4 -0
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +476 -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 +1 -1
- package/artifacts/contracts/shared/ERC165.sol/ERC165.json +2 -2
- package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +4 -0
- package/artifacts/contracts/{instance/module/component/ComponentModule.sol/ComponentModule.json → shared/INftOwnable.sol/INftOwnable.json} +67 -57
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +117 -37
- package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +1 -1
- package/artifacts/contracts/shared/IVersionable.sol/IVersionable.json +55 -14
- 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 +1 -1
- package/artifacts/contracts/shared/Registerable.sol/Registerable.json +190 -37
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +4 -0
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +96 -0
- package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +4 -0
- package/artifacts/contracts/shared/{Proxy.sol/ProxyWithProxyAdminGetter.json → UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json} +4 -4
- package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +1 -1
- package/artifacts/contracts/shared/Versionable.sol/Versionable.json +78 -14
- 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 +204 -36
- package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +1 -1
- package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.json +5 -111
- package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +1 -1
- package/artifacts/contracts/test/TestService.sol/TestService.json +283 -62
- package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json +1 -1
- package/artifacts/contracts/test/TestVersion.sol/TestVersion.dbg.json +1 -1
- package/artifacts/contracts/test/TestVersion.sol/TestVersion.json +2 -2
- package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json +1 -1
- package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.json +103 -23
- 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/DistributorType.sol/DistributorTypeLib.dbg.json +4 -0
- package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.json +104 -0
- 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 +31 -17
- 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 +4 -0
- package/artifacts/contracts/types/NumberId.sol/NumberIdLib.json +100 -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/Referral.sol/ReferralLib.dbg.json +4 -0
- package/artifacts/contracts/types/Referral.sol/ReferralLib.json +123 -0
- 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 +134 -8
- 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 +15 -2
- package/artifacts/contracts/types/UFixed.sol/UFixedMathLib.dbg.json +1 -1
- package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +1 -1
- package/artifacts/contracts/types/Version.sol/VersionLib.json +40 -2
- package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +1 -1
- package/artifacts/contracts/types/Version.sol/VersionPartLib.json +2 -2
- package/contracts/components/IBaseComponent.sol +4 -4
- package/contracts/instance/AccessManagedSimple.sol +114 -0
- package/contracts/instance/AccessManagerSimple.sol +682 -0
- package/contracts/instance/IAccessManagerSimple.sol +391 -0
- package/contracts/instance/IInstance.sol +3 -50
- package/contracts/instance/Instance.sol +379 -61
- package/contracts/instance/InstanceAccessManager.sol +288 -0
- package/contracts/instance/InstanceReader.sol +235 -0
- package/contracts/instance/InstanceService.sol +45 -0
- package/contracts/instance/base/IKeyValueStore.sol +10 -12
- package/contracts/instance/base/ILifecycle.sol +3 -3
- package/contracts/instance/base/KeyValueStore.sol +46 -19
- package/contracts/instance/base/Lifecycle.sol +1 -1
- package/contracts/instance/base/ServiceBase.sol +20 -13
- package/contracts/instance/module/IAccess.sol +38 -0
- package/contracts/instance/module/IBundle.sol +19 -0
- package/contracts/instance/module/IDistribution.sol +39 -0
- package/contracts/instance/module/IPolicy.sol +45 -0
- package/contracts/instance/module/IRisk.sol +11 -0
- package/contracts/instance/module/ISetup.sol +41 -0
- package/contracts/instance/module/ITreasury.sol +23 -0
- package/contracts/registry/ChainNft.sol +43 -15
- package/contracts/registry/IChainNft.sol +3 -2
- package/contracts/registry/IRegistry.sol +42 -26
- package/contracts/registry/IRegistryService.sol +29 -0
- package/contracts/registry/ITransferInterceptor.sol +6 -0
- package/contracts/registry/Registry.sol +383 -273
- package/contracts/registry/RegistryService.sol +369 -0
- package/contracts/registry/RegistryServiceManager.sol +43 -0
- package/contracts/shared/ContractDeployerLib.sol +72 -0
- package/contracts/shared/ERC165.sol +1 -1
- package/contracts/shared/INftOwnable.sol +22 -0
- package/contracts/shared/IRegisterable.sol +9 -16
- package/contracts/shared/IVersionable.sol +55 -11
- package/contracts/shared/NftOwnable.sol +136 -0
- package/contracts/shared/ProxyManager.sol +94 -0
- package/contracts/shared/Registerable.sol +62 -59
- package/contracts/shared/TokenHandler.sol +27 -0
- package/contracts/shared/UpgradableProxyWithAdmin.sol +16 -0
- package/contracts/shared/Versionable.sol +113 -55
- package/contracts/test/TestRegisterable.sol +5 -6
- package/contracts/test/TestRoleId.sol +6 -6
- package/contracts/test/TestService.sol +5 -11
- package/contracts/types/DistributorType.sol +55 -0
- package/contracts/types/Key32.sol +8 -3
- package/contracts/types/NumberId.sol +52 -0
- package/contracts/types/ObjectType.sol +35 -14
- package/contracts/types/Referral.sol +85 -0
- package/contracts/types/RoleId.sol +46 -9
- package/contracts/types/StateId.sol +1 -1
- package/contracts/types/Timestamp.sol +7 -3
- package/contracts/types/Version.sol +9 -0
- package/package.json +1 -1
- package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.dbg.json +0 -4
- package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.json +0 -174
- package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +0 -4
- package/artifacts/contracts/components/Distribution.sol/Distribution.json +0 -405
- package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +0 -4
- package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.json +0 -340
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +0 -4
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.json +0 -487
- package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +0 -4
- package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.json +0 -370
- package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +0 -4
- package/artifacts/contracts/components/Pool.sol/Pool.json +0 -578
- package/artifacts/contracts/components/Product.sol/Product.dbg.json +0 -4
- package/artifacts/contracts/components/Product.sol/Product.json +0 -444
- package/artifacts/contracts/instance/IInstanceLinked.sol/IInstanceLinked.dbg.json +0 -4
- package/artifacts/contracts/instance/IInstanceLinked.sol/IInstanceLinked.json +0 -24
- package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.dbg.json +0 -4
- package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.json +0 -300
- 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/base/InstanceBase.sol/InstanceBase.dbg.json +0 -4
- package/artifacts/contracts/instance/base/InstanceBase.sol/InstanceBase.json +0 -376
- package/artifacts/contracts/instance/base/ModuleBase.sol/ModuleBase.dbg.json +0 -4
- package/artifacts/contracts/instance/module/access/Access.sol/AccessModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/access/Access.sol/AccessModule.json +0 -333
- package/artifacts/contracts/instance/module/access/IAccess.sol/IAccess.dbg.json +0 -4
- package/artifacts/contracts/instance/module/access/IAccess.sol/IAccess.json +0 -10
- package/artifacts/contracts/instance/module/access/IAccess.sol/IAccessModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/access/IAccess.sol/IAccessModule.json +0 -333
- package/artifacts/contracts/instance/module/bundle/BundleModule.sol/BundleModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/bundle/BundleModule.sol/BundleModule.json +0 -297
- package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundle.dbg.json +0 -4
- package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundleModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundleModule.json +0 -297
- package/artifacts/contracts/instance/module/component/ComponentModule.sol/ComponentModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/component/IComponent.sol/IComponent.dbg.json +0 -4
- package/artifacts/contracts/instance/module/component/IComponent.sol/IComponent.json +0 -10
- package/artifacts/contracts/instance/module/component/IComponent.sol/IComponentModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/component/IComponent.sol/IComponentModule.json +0 -117
- package/artifacts/contracts/instance/module/distribution/DistributionModule.sol/DistributionModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/distribution/DistributionModule.sol/DistributionModule.json +0 -10
- package/artifacts/contracts/instance/module/distribution/IDistribution.sol/IDistribution.dbg.json +0 -4
- package/artifacts/contracts/instance/module/distribution/IDistribution.sol/IDistributionModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/distribution/IDistribution.sol/IDistributionModule.json +0 -10
- package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicy.dbg.json +0 -4
- package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicyModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicyModule.json +0 -284
- package/artifacts/contracts/instance/module/policy/PolicyModule.sol/PolicyModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/policy/PolicyModule.sol/PolicyModule.json +0 -284
- package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPool.dbg.json +0 -4
- package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPool.json +0 -10
- package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPoolModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPoolModule.json +0 -144
- package/artifacts/contracts/instance/module/pool/PoolModule.sol/PoolModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/pool/PoolModule.sol/PoolModule.json +0 -144
- package/artifacts/contracts/instance/module/risk/IRisk.sol/IRisk.dbg.json +0 -4
- package/artifacts/contracts/instance/module/risk/IRisk.sol/IRiskModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/risk/IRisk.sol/IRiskModule.json +0 -113
- package/artifacts/contracts/instance/module/risk/RiskModule.sol/RiskModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/risk/RiskModule.sol/RiskModule.json +0 -131
- package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasury.dbg.json +0 -4
- package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasuryModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasuryModule.json +0 -511
- package/artifacts/contracts/instance/module/treasury/TokenHandler.sol/TokenHandler.dbg.json +0 -4
- package/artifacts/contracts/instance/module/treasury/TokenHandler.sol/TokenHandler.json +0 -76
- package/artifacts/contracts/instance/module/treasury/TreasuryModule.sol/TreasuryModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/treasury/TreasuryModule.sol/TreasuryModule.json +0 -511
- package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.dbg.json +0 -4
- package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.json +0 -531
- package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +0 -4
- package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +0 -420
- package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.dbg.json +0 -4
- package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.json +0 -364
- package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +0 -4
- package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.json +0 -325
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +0 -4
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +0 -440
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +0 -4
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +0 -630
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +0 -4
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +0 -543
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +0 -4
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +0 -858
- package/artifacts/contracts/registry/IRegistryLinked.sol/IRegistryLinked.dbg.json +0 -4
- package/artifacts/contracts/registry/IRegistryLinked.sol/IRegistryLinked.json +0 -24
- package/artifacts/contracts/registry/RegistryUpgradeable.sol/RegistryUpgradeable.dbg.json +0 -4
- package/artifacts/contracts/registry/RegistryUpgradeable.sol/RegistryUpgradeable.json +0 -495
- package/artifacts/contracts/shared/IOwnable.sol/IOwnable.dbg.json +0 -4
- package/artifacts/contracts/shared/IOwnable.sol/IOwnable.json +0 -24
- package/artifacts/contracts/shared/Proxy.sol/Proxy.dbg.json +0 -4
- package/artifacts/contracts/shared/Proxy.sol/Proxy.json +0 -178
- package/artifacts/contracts/shared/Proxy.sol/ProxyWithProxyAdminGetter.dbg.json +0 -4
- package/artifacts/contracts/shared/VersionableUpgradeable.sol/VersionableUpgradeable.dbg.json +0 -4
- package/artifacts/contracts/shared/VersionableUpgradeable.sol/VersionableUpgradeable.json +0 -187
- package/artifacts/contracts/test/TestDistribution.sol/TestDistribution.dbg.json +0 -4
- package/artifacts/contracts/test/TestDistribution.sol/TestDistribution.json +0 -405
- package/artifacts/contracts/test/TestPool.sol/TestPool.dbg.json +0 -4
- package/artifacts/contracts/test/TestPool.sol/TestPool.json +0 -578
- package/artifacts/contracts/test/TestProduct.sol/TestProduct.dbg.json +0 -4
- package/artifacts/contracts/test/TestProduct.sol/TestProduct.json +0 -575
- package/artifacts/contracts/types/ReferralId.sol/ReferralIdLib.dbg.json +0 -4
- package/artifacts/contracts/types/ReferralId.sol/ReferralIdLib.json +0 -99
- package/contracts/components/BaseComponent.sol +0 -94
- package/contracts/components/Distribution.sol +0 -132
- package/contracts/components/IDistributionComponent.sol +0 -47
- package/contracts/components/IPoolComponent.sol +0 -71
- package/contracts/components/IProductComponent.sol +0 -38
- package/contracts/components/Pool.sol +0 -235
- package/contracts/components/Product.sol +0 -227
- package/contracts/experiment/statemachine/README.md +0 -112
- package/contracts/instance/IInstanceLinked.sol +0 -8
- package/contracts/instance/base/ComponentServiceBase.sol +0 -42
- package/contracts/instance/base/IInstanceBase.sol +0 -22
- package/contracts/instance/base/InstanceBase.sol +0 -91
- package/contracts/instance/base/ModuleBase.sol +0 -57
- package/contracts/instance/module/access/Access.sol +0 -149
- package/contracts/instance/module/access/IAccess.sol +0 -53
- package/contracts/instance/module/bundle/BundleModule.sol +0 -134
- package/contracts/instance/module/bundle/IBundle.sol +0 -53
- package/contracts/instance/module/component/ComponentModule.sol +0 -70
- package/contracts/instance/module/component/IComponent.sol +0 -28
- package/contracts/instance/module/distribution/DistributionModule.sol +0 -17
- package/contracts/instance/module/distribution/IDistribution.sol +0 -10
- package/contracts/instance/module/policy/IPolicy.sol +0 -63
- package/contracts/instance/module/policy/PolicyModule.sol +0 -91
- package/contracts/instance/module/pool/IPoolModule.sol +0 -40
- package/contracts/instance/module/pool/PoolModule.sol +0 -90
- package/contracts/instance/module/risk/IRisk.sol +0 -26
- package/contracts/instance/module/risk/RiskModule.sol +0 -62
- package/contracts/instance/module/treasury/ITreasury.sol +0 -82
- package/contracts/instance/module/treasury/TokenHandler.sol +0 -48
- package/contracts/instance/module/treasury/TreasuryModule.sol +0 -138
- package/contracts/instance/service/ComponentOwnerService.sol +0 -157
- package/contracts/instance/service/DistributionService.sol +0 -59
- package/contracts/instance/service/IComponentOwnerService.sol +0 -22
- package/contracts/instance/service/IDistributionService.sol +0 -12
- package/contracts/instance/service/IPoolService.sol +0 -37
- package/contracts/instance/service/IProductService.sol +0 -107
- package/contracts/instance/service/PoolService.sol +0 -149
- package/contracts/instance/service/ProductService.sol +0 -509
- package/contracts/registry/IRegistryLinked.sol +0 -8
- package/contracts/registry/RegistryUpgradeable.sol +0 -416
- package/contracts/shared/IOwnable.sol +0 -6
- package/contracts/shared/Proxy.sol +0 -83
- package/contracts/shared/VersionableUpgradeable.sol +0 -108
- package/contracts/test/TestDistribution.sol +0 -21
- package/contracts/test/TestPool.sol +0 -25
- package/contracts/test/TestProduct.sol +0 -72
- package/contracts/types/ReferralId.sol +0 -48
@@ -1,5 +1,5 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
|
-
pragma solidity ^0.8.
|
2
|
+
pragma solidity ^0.8.20;
|
3
3
|
|
4
4
|
import {IRegisterable} from "../shared/IRegisterable.sol";
|
5
5
|
import {IService} from "../instance/base/IService.sol";
|
@@ -8,374 +8,484 @@ import {IChainNft} from "./IChainNft.sol";
|
|
8
8
|
import {ChainNft} from "./ChainNft.sol";
|
9
9
|
import {IRegistry} from "./IRegistry.sol";
|
10
10
|
import {NftId, toNftId, zeroNftId, NftIdLib} from "../types/NftId.sol";
|
11
|
-
import {VersionPart} from "../types/Version.sol";
|
11
|
+
import {Version, VersionPart, VersionLib} from "../types/Version.sol";
|
12
12
|
import {ObjectType, PROTOCOL, REGISTRY, TOKEN, SERVICE, INSTANCE, STAKE, PRODUCT, DISTRIBUTION, ORACLE, POOL, POLICY, BUNDLE} from "../types/ObjectType.sol";
|
13
|
+
import {ITransferInterceptor} from "./ITransferInterceptor.sol";
|
14
|
+
|
15
|
+
import {ERC165} from "../shared/ERC165.sol";
|
16
|
+
|
17
|
+
|
18
|
+
// IMPORTANT
|
19
|
+
// Each NFT minted by registry is accosiated with:
|
20
|
+
// 1) NFT owner
|
21
|
+
// 2) registred contract OR object stored in registered (parent) contract
|
22
|
+
// Four registration flows:
|
23
|
+
// 1) non IRegisterable address by registryOwner (TOKEN)
|
24
|
+
// 2) IRegisterable address by registryOwner (SERVICE)
|
25
|
+
// 3) IRegisterable address by approved service (INSTANCE, COMPONENT)
|
26
|
+
// 4) state object by approved service (POLICY, BUNDLE, STAKE)
|
13
27
|
|
14
|
-
// TODO make registry upgradable
|
15
28
|
contract Registry is
|
16
|
-
|
29
|
+
ERC165,
|
17
30
|
IRegistry
|
18
31
|
{
|
19
|
-
|
20
|
-
|
32
|
+
// register
|
33
|
+
error NotRegistryService();
|
34
|
+
error ZeroParentAddress();
|
35
|
+
error ContractAlreadyRegistered(address objectAddress);
|
36
|
+
error InvalidServiceVersion(VersionPart majorVersion);
|
37
|
+
error ServiceNameAlreadyRegistered(string name, VersionPart majorVersion);
|
38
|
+
|
39
|
+
// approve
|
40
|
+
error NotOwner();
|
41
|
+
error NotRegisteredContract(NftId registrarNftId);
|
42
|
+
error NotService(NftId registrarNftId);
|
43
|
+
error InvalidTypesCombination(ObjectType objectType, ObjectType parentType);
|
44
|
+
|
45
|
+
uint256 public constant MAJOR_VERSION_MIN = 3;
|
46
|
+
address public constant NFT_LOCK_ADDRESS = address(0x1);
|
47
|
+
uint256 public constant REGISTRY_SERVICE_TOKEN_SEQUENCE_ID = 3;
|
21
48
|
string public constant EMPTY_URI = "";
|
22
49
|
|
23
|
-
mapping(NftId nftId => ObjectInfo info)
|
24
|
-
mapping(address object => NftId nftId)
|
25
|
-
mapping(ObjectType objectType => bool) private _isValidType;
|
26
|
-
mapping(ObjectType objectType => mapping(ObjectType objectParentType => bool)) private _isValidParentType;
|
27
|
-
|
28
|
-
mapping(NftId nftId => string stringValue) private _string;
|
29
|
-
mapping(bytes32 serviceNameHash => mapping(VersionPart majorVersion => address service)) _service;
|
30
|
-
|
31
|
-
NftId private _nftId;
|
32
|
-
IChainNft private _chainNft;
|
33
|
-
ChainNft private _chainNftInternal;
|
34
|
-
address private _initialOwner;
|
35
|
-
|
36
|
-
// @dev will own protocol nft and registry nft(s) minted during initialize
|
37
|
-
address private _protocolOwner;
|
38
|
-
|
39
|
-
// TODO refactor once registry becomes upgradable
|
40
|
-
// @Dev the protocol owner will get ownership of the
|
41
|
-
// protocol nft and the global registry nft minted in this
|
42
|
-
// initializer function
|
43
|
-
function initialize(
|
44
|
-
address chainNft,
|
45
|
-
address protocolOwner
|
46
|
-
)
|
47
|
-
public
|
48
|
-
{
|
49
|
-
require(
|
50
|
-
address(_chainNft) == address(0),
|
51
|
-
"ERROR:REG-001:ALREADY_INITIALIZED"
|
52
|
-
);
|
50
|
+
mapping(NftId nftId => ObjectInfo info) _info;
|
51
|
+
mapping(address object => NftId nftId) _nftIdByAddress;
|
53
52
|
|
54
|
-
|
55
|
-
|
53
|
+
mapping(NftId registrator => mapping(
|
54
|
+
ObjectType objectType => bool)) _isApproved;
|
56
55
|
|
57
|
-
|
58
|
-
|
56
|
+
mapping(ObjectType objectType => mapping(
|
57
|
+
ObjectType parentType => bool)) _isValidContractCombination;
|
59
58
|
|
60
|
-
|
61
|
-
|
62
|
-
_nftId = _registerRegistry();
|
63
|
-
|
64
|
-
// setup rules for further registrations
|
65
|
-
_setupValidTypes();
|
66
|
-
_setupValidParentTypes();
|
67
|
-
}
|
59
|
+
mapping(ObjectType objectType => mapping(
|
60
|
+
ObjectType parentType => bool)) _isValidObjectCombination;
|
68
61
|
|
62
|
+
mapping(NftId nftId => string name) _string;
|
63
|
+
mapping(bytes32 serviceNameHash => mapping(
|
64
|
+
VersionPart majorVersion => address service)) _service;
|
69
65
|
|
70
|
-
|
71
|
-
|
72
|
-
|
73
|
-
|
74
|
-
// we have to check how we do authz for registring services (just restrict to protocol owner/registry owner)
|
75
|
-
external override returns (NftId nftId) {
|
76
|
-
require(
|
77
|
-
_nftIdByAddress[objectAddress].eqz(),
|
78
|
-
"ERROR:REG-002:ALREADY_REGISTERED"
|
79
|
-
);
|
80
|
-
|
81
|
-
IRegisterable registerable = IRegisterable(objectAddress);
|
82
|
-
require(
|
83
|
-
registerable.supportsInterface(type(IRegisterable).interfaceId),
|
84
|
-
"ERROR:REG-003:NOT_REGISTERABLE"
|
85
|
-
);
|
66
|
+
NftId _registryNftId;
|
67
|
+
NftId _serviceNftId; // set in stone upon registry creation
|
68
|
+
IChainNft _chainNft;
|
69
|
+
ChainNft _chainNftInternal;
|
86
70
|
|
87
|
-
|
88
|
-
|
89
|
-
|
90
|
-
|
91
|
-
|
71
|
+
/*
|
72
|
+
modifier onlyInitialOwner() {
|
73
|
+
if(
|
74
|
+
msg.sender != getOwner() ||
|
75
|
+
msg.sender != _info[_registryNftId].initialOwner) {
|
76
|
+
revert NotInitialOwner();
|
77
|
+
}
|
78
|
+
}*/
|
92
79
|
|
93
|
-
|
94
|
-
|
95
|
-
|
96
|
-
|
97
|
-
|
80
|
+
modifier onlyOwner() {
|
81
|
+
if(msg.sender != getOwner()) {
|
82
|
+
revert NotOwner();
|
83
|
+
}
|
84
|
+
_;
|
85
|
+
}
|
98
86
|
|
99
|
-
|
100
|
-
|
101
|
-
|
102
|
-
|
87
|
+
modifier onlyRegistryService() {
|
88
|
+
|
89
|
+
if(msg.sender != _info[_serviceNftId].objectAddress) {
|
90
|
+
revert NotRegistryService();
|
91
|
+
}
|
92
|
+
_;
|
93
|
+
}
|
103
94
|
|
104
|
-
|
95
|
+
constructor(address registryOwner, VersionPart majorVersion)
|
96
|
+
{
|
97
|
+
require(registryOwner > address(0), "Registry: registry owner is 0");
|
98
|
+
require(majorVersion.toInt() == MAJOR_VERSION_MIN, "Registry: initial major version of registry service is not MAJOR_VERSION_MIN");
|
105
99
|
|
106
|
-
//
|
107
|
-
|
108
|
-
|
109
|
-
EMPTY_URI
|
110
|
-
);
|
100
|
+
// deploy NFT
|
101
|
+
_chainNftInternal = new ChainNft(address(this));// adds 10kb to deployment size
|
102
|
+
_chainNft = IChainNft(_chainNftInternal);
|
111
103
|
|
112
|
-
|
104
|
+
// initial registry setup
|
105
|
+
_registerProtocol();
|
106
|
+
_registerRegistry(registryOwner);
|
107
|
+
_registerRegistryService(registryOwner);
|
113
108
|
|
114
|
-
//
|
115
|
-
|
116
|
-
IService service = IService(objectAddress);
|
117
|
-
require(
|
118
|
-
service.supportsInterface(type(IService).interfaceId),
|
119
|
-
"ERROR:REG-007:NOT_SERVICE"
|
120
|
-
);
|
121
|
-
|
122
|
-
string memory serviceName = service.getName();
|
123
|
-
VersionPart majorVersion = service.getMajorVersion();
|
124
|
-
bytes32 serviceNameHash = keccak256(abi.encode(serviceName));
|
125
|
-
|
126
|
-
// service specific state
|
127
|
-
_string[nftId] = serviceName;
|
128
|
-
|
129
|
-
require(
|
130
|
-
_service[serviceNameHash][majorVersion] == address(0),
|
131
|
-
"ERROR:REG-008:ALREADY_REGISTERED"
|
132
|
-
);
|
133
|
-
_service[serviceNameHash][majorVersion] = objectAddress;
|
134
|
-
}
|
109
|
+
// set object parent relations
|
110
|
+
_setupValidObjectParentCombinations();
|
135
111
|
|
136
|
-
|
137
|
-
_registerObjectInfo(registerable, nftId);
|
112
|
+
_registerInterface(type(IRegistry).interfaceId);
|
138
113
|
}
|
139
114
|
|
140
|
-
|
141
|
-
|
142
|
-
|
143
|
-
|
144
|
-
|
145
|
-
|
146
|
-
)
|
115
|
+
/// @dev registry protects only against tampering existing records, registering with invalid types pairs and 0 parent address
|
116
|
+
// IMPORTANT: rare case when parentNftId is not registered and == next nftId -> technincally this is ZeroParentAddress error
|
117
|
+
// to catch this check parent address before minting !!!!
|
118
|
+
// TODO service registration means its approval for some type?
|
119
|
+
// TODO registration of precompile addresses
|
120
|
+
function register(ObjectInfo memory info)
|
147
121
|
external
|
148
|
-
|
149
|
-
returns
|
150
|
-
// TODO add onlyRegisteredInstance
|
151
|
-
NftId nftId
|
152
|
-
)
|
122
|
+
onlyRegistryService
|
123
|
+
returns(NftId nftId)
|
153
124
|
{
|
154
|
-
|
155
|
-
|
156
|
-
|
157
|
-
|
158
|
-
|
125
|
+
ObjectType objectType = info.objectType;
|
126
|
+
NftId parentNftId = info.parentNftId;
|
127
|
+
ObjectInfo memory parentInfo = _info[parentNftId];
|
128
|
+
ObjectType parentType = parentInfo.objectType; // see function header
|
129
|
+
address parentAddress = parentInfo.objectAddress;
|
130
|
+
|
131
|
+
// parent is contract -> need to check? -> check before minting
|
132
|
+
// special case: global registry nft as parent when not on mainnet -> global registry address is 0
|
133
|
+
// special case: when parentNftId == _chainNft.mint(), check for zero parent address before mint
|
134
|
+
// special case: when parentNftId == _chainNft.mint() && objectAddress == initialOwner
|
135
|
+
if(parentAddress == address(0)) {
|
136
|
+
revert ZeroParentAddress();
|
137
|
+
}
|
159
138
|
|
160
|
-
|
161
|
-
nftId = toNftId(mintedTokenId);
|
139
|
+
address interceptor = _getInterceptor(info.isInterceptor, info.objectAddress, parentInfo.isInterceptor, parentAddress);
|
162
140
|
|
163
|
-
|
164
|
-
|
165
|
-
|
166
|
-
|
167
|
-
|
168
|
-
|
169
|
-
|
170
|
-
);
|
141
|
+
// TODO does external call
|
142
|
+
// check for receiver in registry service?
|
143
|
+
// use unsafe transfer?
|
144
|
+
uint256 mintedTokenId = _chainNft.mint(
|
145
|
+
info.initialOwner,
|
146
|
+
interceptor,
|
147
|
+
EMPTY_URI);
|
148
|
+
nftId = toNftId(mintedTokenId);
|
171
149
|
|
150
|
+
// TODO move nftId out of info struct
|
151
|
+
// getters by nftId -> return struct without nftId
|
152
|
+
// getters by address -> return nftId AND struct
|
153
|
+
info.nftId = nftId;
|
172
154
|
_info[nftId] = info;
|
173
155
|
|
174
|
-
|
175
|
-
|
156
|
+
if(info.objectAddress > address(0))
|
157
|
+
{
|
158
|
+
// TODO if need to add types latter -> at least call this check from registry service
|
159
|
+
// parent is registered + object-parent types are valid
|
160
|
+
if(_isValidContractCombination[objectType][parentType] == false) {
|
161
|
+
revert InvalidTypesCombination(objectType, parentType);
|
162
|
+
}
|
163
|
+
|
164
|
+
address contractAddress = info.objectAddress;
|
165
|
+
|
166
|
+
if(_nftIdByAddress[contractAddress].gtz()) {
|
167
|
+
revert ContractAlreadyRegistered(contractAddress);
|
168
|
+
}
|
169
|
+
|
170
|
+
_nftIdByAddress[contractAddress] = nftId;
|
171
|
+
|
172
|
+
// special case
|
173
|
+
if(objectType == SERVICE())
|
174
|
+
{
|
175
|
+
(
|
176
|
+
string memory serviceName,
|
177
|
+
VersionPart majorVersion
|
178
|
+
) = abi.decode(info.data, (string, VersionPart));
|
179
|
+
bytes32 serviceNameHash = keccak256(abi.encode(serviceName));
|
180
|
+
|
181
|
+
// TODO MUST guarantee consistency of service.getVersion() and majorVersion here
|
182
|
+
// TODO update _serviceNftId when registryService with new major version is registered? -> it is fixed in current setup
|
183
|
+
// TODO do not use names -> each object type is registered by corresponding service -> conflicting with approve()
|
184
|
+
if(
|
185
|
+
majorVersion.toInt() < MAJOR_VERSION_MIN ||
|
186
|
+
(majorVersion.toInt() > MAJOR_VERSION_MIN &&
|
187
|
+
_service[serviceNameHash][VersionLib.toVersionPart(majorVersion.toInt() - 1)] == address(0) )
|
188
|
+
) {
|
189
|
+
revert InvalidServiceVersion(majorVersion);
|
190
|
+
}
|
191
|
+
|
192
|
+
if(_service[serviceNameHash][majorVersion] != address(0)) {
|
193
|
+
revert ServiceNameAlreadyRegistered(serviceName, majorVersion);
|
194
|
+
}
|
195
|
+
|
196
|
+
_string[nftId] = serviceName;
|
197
|
+
_service[serviceNameHash][majorVersion] = contractAddress;
|
198
|
+
|
199
|
+
emit LogServiceNameRegistration(serviceName, majorVersion);
|
200
|
+
}
|
201
|
+
}
|
202
|
+
else
|
203
|
+
{
|
204
|
+
if(_isValidObjectCombination[objectType][parentType] == false) {
|
205
|
+
revert InvalidTypesCombination(objectType, parentType);
|
206
|
+
}
|
207
|
+
}
|
176
208
|
|
177
|
-
|
178
|
-
return _chainNft.totalSupply();
|
209
|
+
emit LogRegistration(nftId, info.parentNftId, info.objectType, info.isInterceptor, info.objectAddress, info.initialOwner);
|
179
210
|
}
|
180
211
|
|
181
|
-
function
|
182
|
-
address
|
183
|
-
|
184
|
-
|
212
|
+
function registerFrom(
|
213
|
+
address from,
|
214
|
+
ObjectInfo memory info
|
215
|
+
) external returns (NftId nftId)
|
216
|
+
{
|
217
|
+
revert();
|
185
218
|
}
|
219
|
+
|
220
|
+
|
221
|
+
/// @dev
|
222
|
+
// msg.sender - registry owner
|
223
|
+
// CAN approve only registered service contract
|
224
|
+
// CAN approve any combination specified in _isValidCombination
|
225
|
+
// CAN NOT approve itself
|
226
|
+
// TODO in case where exists exactly one registered service per objectType (and major version):
|
227
|
+
// - registration and approve is a single operation, no need for separate approve() function
|
228
|
+
// - then approve can be used to adding new valid object-parent combinations???
|
229
|
+
function approve(
|
230
|
+
NftId serviceNftId,
|
231
|
+
ObjectType objectType,
|
232
|
+
ObjectType parentType
|
233
|
+
)
|
234
|
+
public
|
235
|
+
onlyOwner()
|
236
|
+
{
|
237
|
+
address serviceAddress = _info[serviceNftId].objectAddress;
|
238
|
+
|
239
|
+
if(_nftIdByAddress[serviceAddress].eqz()) {
|
240
|
+
revert NotRegisteredContract(serviceNftId);
|
241
|
+
}
|
186
242
|
|
187
|
-
|
188
|
-
|
189
|
-
|
190
|
-
return _info[nftId].objectType.gtz();
|
191
|
-
}
|
243
|
+
if(_info[serviceNftId].objectType != SERVICE()) {
|
244
|
+
revert NotService(serviceNftId);
|
245
|
+
}
|
192
246
|
|
193
|
-
|
194
|
-
|
195
|
-
|
196
|
-
|
197
|
-
|
247
|
+
if(
|
248
|
+
_isValidContractCombination[objectType][parentType] == false &&
|
249
|
+
_isValidObjectCombination[objectType][parentType] == false) {
|
250
|
+
revert InvalidTypesCombination(objectType, parentType);
|
251
|
+
}
|
198
252
|
|
199
|
-
|
200
|
-
NftId nftId
|
201
|
-
) external view override returns (ObjectInfo memory info) {
|
202
|
-
return _info[nftId];
|
203
|
-
}
|
253
|
+
_isApproved[serviceNftId][objectType] = true;
|
204
254
|
|
205
|
-
|
206
|
-
NftId nftId
|
207
|
-
) external view returns (string memory name) {
|
208
|
-
return _string[nftId];
|
255
|
+
emit LogApproval(serviceNftId, objectType);
|
209
256
|
}
|
210
257
|
|
211
|
-
|
212
|
-
|
258
|
+
/// @dev returns false for registry owner nft
|
259
|
+
// TODO allowance by address?
|
260
|
+
// TODO checked by registry service -> but registry owner can upgrade registry service not to check allowance....
|
261
|
+
function allowance(
|
262
|
+
NftId nftId,
|
263
|
+
ObjectType object
|
264
|
+
)
|
265
|
+
public
|
266
|
+
view
|
267
|
+
returns (bool)
|
268
|
+
{
|
269
|
+
return _isApproved[nftId][object];
|
213
270
|
}
|
214
271
|
|
215
|
-
|
216
|
-
|
272
|
+
// from IRegistry
|
273
|
+
function getObjectCount() external view override returns (uint256) {
|
274
|
+
|
275
|
+
return _chainNft.totalSupply();
|
217
276
|
}
|
218
277
|
|
219
|
-
|
220
|
-
|
221
|
-
bytes32 serviceNameHash = keccak256(abi.encode(serviceName));
|
222
|
-
return _service[serviceNameHash][majorVersion];
|
278
|
+
function getNftId(address object) external view override returns (NftId id) {
|
279
|
+
return _nftIdByAddress[object];
|
223
280
|
}
|
224
281
|
|
225
|
-
|
226
|
-
|
227
|
-
return interfaceId == type(IRegistry).interfaceId;
|
282
|
+
function ownerOf(NftId nftId) public view override returns (address) {
|
283
|
+
return _chainNft.ownerOf(nftId.toInt());
|
228
284
|
}
|
229
285
|
|
230
|
-
|
231
|
-
|
232
|
-
return
|
286
|
+
function ownerOf(address contractAddress) public view returns (address) {
|
287
|
+
|
288
|
+
return _chainNft.ownerOf(_nftIdByAddress[contractAddress].toInt());
|
233
289
|
}
|
234
290
|
|
235
|
-
|
236
|
-
|
237
|
-
return zeroNftId();
|
291
|
+
function getObjectInfo(NftId nftId) external view override returns (ObjectInfo memory) {
|
292
|
+
return _info[nftId];
|
238
293
|
}
|
239
294
|
|
240
|
-
function
|
241
|
-
|
295
|
+
function getObjectInfo(address object) external view override returns (ObjectInfo memory) {
|
296
|
+
|
297
|
+
return _info[_nftIdByAddress[object]];
|
242
298
|
}
|
243
299
|
|
244
|
-
|
245
|
-
|
246
|
-
return _nftId.gtz() ? this.getOwner(_nftId) : _initialOwner;
|
300
|
+
function isRegistered(NftId nftId) public view override returns (bool) {
|
301
|
+
return _info[nftId].objectType.gtz();
|
247
302
|
}
|
248
303
|
|
249
|
-
function
|
250
|
-
return
|
304
|
+
function isRegistered(address object) external view override returns (bool) {
|
305
|
+
return _nftIdByAddress[object].gtz();
|
251
306
|
}
|
252
307
|
|
253
|
-
function
|
254
|
-
|
255
|
-
if(block.chainid == 1) {
|
256
|
-
return toNftId(_chainNftInternal.PROTOCOL_NFT_ID());
|
257
|
-
}
|
258
|
-
else {
|
259
|
-
return toNftId(_chainNftInternal.GLOBAL_REGISTRY_ID());
|
260
|
-
}
|
308
|
+
function getServiceName(NftId nftId) external view returns (string memory) {
|
309
|
+
return _string[nftId];
|
261
310
|
}
|
262
311
|
|
263
|
-
|
264
|
-
|
312
|
+
// special case to retrive a gif service
|
313
|
+
function getServiceAddress(
|
314
|
+
string memory serviceName,
|
315
|
+
VersionPart majorVersion
|
316
|
+
) external view returns (address)
|
317
|
+
{
|
318
|
+
bytes32 serviceNameHash = keccak256(abi.encode(serviceName));
|
319
|
+
return _service[serviceNameHash][majorVersion];
|
265
320
|
}
|
266
321
|
|
267
|
-
|
268
|
-
|
269
|
-
return _protocolOwner;
|
322
|
+
function getChainNft() external view override returns (IChainNft) {
|
323
|
+
return _chainNft;
|
270
324
|
}
|
271
325
|
|
272
|
-
|
273
|
-
|
274
|
-
_isValidType[REGISTRY()] = true; // only for global registry
|
275
|
-
_isValidType[TOKEN()] = true;
|
276
|
-
_isValidType[SERVICE()] = true;
|
277
|
-
_isValidType[INSTANCE()] = true;
|
278
|
-
_isValidType[STAKE()] = true;
|
279
|
-
_isValidType[PRODUCT()] = true;
|
280
|
-
_isValidType[ORACLE()] = true;
|
281
|
-
_isValidType[POOL()] = true;
|
282
|
-
_isValidType[DISTRIBUTION()] = true;
|
283
|
-
_isValidType[POLICY()] = true;
|
284
|
-
_isValidType[BUNDLE()] = true;
|
326
|
+
function getOwner() public view returns (address owner) {
|
327
|
+
return ownerOf(address(this));
|
285
328
|
}
|
286
329
|
|
287
|
-
|
288
|
-
function _setupValidParentTypes() internal {
|
289
|
-
// registry as parent
|
290
|
-
_isValidParentType[TOKEN()][REGISTRY()] = true;
|
291
|
-
_isValidParentType[SERVICE()][REGISTRY()] = true;
|
292
|
-
_isValidParentType[INSTANCE()][REGISTRY()] = true;
|
293
|
-
|
294
|
-
// instance as parent
|
295
|
-
_isValidParentType[PRODUCT()][INSTANCE()] = true;
|
296
|
-
_isValidParentType[DISTRIBUTION()][INSTANCE()] = true;
|
297
|
-
_isValidParentType[ORACLE()][INSTANCE()] = true;
|
298
|
-
_isValidParentType[POOL()][INSTANCE()] = true;
|
299
|
-
|
300
|
-
// product as parent
|
301
|
-
_isValidParentType[POLICY()][PRODUCT()] = true;
|
302
|
-
|
303
|
-
// pool as parent
|
304
|
-
_isValidParentType[BUNDLE()][POOL()] = true;
|
305
|
-
_isValidParentType[STAKE()][POOL()] = true;
|
306
|
-
}
|
330
|
+
// Internals, called only in constructor
|
307
331
|
|
308
332
|
/// @dev protocol registration used to anchor the dip ecosystem relations
|
309
|
-
function _registerProtocol()
|
333
|
+
function _registerProtocol()
|
334
|
+
internal
|
335
|
+
{
|
310
336
|
uint256 protocolId = _chainNftInternal.PROTOCOL_NFT_ID();
|
311
|
-
|
337
|
+
NftId protocolNftId = toNftId(protocolId);
|
312
338
|
|
313
|
-
|
314
|
-
|
315
|
-
|
316
|
-
|
339
|
+
_chainNftInternal.mint(NFT_LOCK_ADDRESS, protocolId);
|
340
|
+
|
341
|
+
_info[protocolNftId] = ObjectInfo(
|
342
|
+
protocolNftId,
|
343
|
+
zeroNftId(), // parent
|
317
344
|
PROTOCOL(),
|
318
|
-
|
319
|
-
|
320
|
-
|
345
|
+
false, // isInterceptor
|
346
|
+
address(0), // objectAddress
|
347
|
+
NFT_LOCK_ADDRESS,// initialOwner
|
348
|
+
""
|
321
349
|
);
|
322
|
-
|
323
|
-
_info[protocolNftid] = protocolInfo;
|
324
350
|
}
|
325
351
|
|
326
352
|
/// @dev registry registration
|
327
353
|
/// might also register the global registry when not on mainnet
|
328
|
-
function _registerRegistry(
|
354
|
+
function _registerRegistry(address registryOwner)
|
355
|
+
internal
|
356
|
+
{
|
329
357
|
uint256 registryId = _chainNftInternal.calculateTokenId(2);
|
330
|
-
registryNftId = toNftId(registryId);
|
358
|
+
NftId registryNftId = toNftId(registryId);
|
359
|
+
|
360
|
+
NftId parentNftId;
|
331
361
|
|
332
|
-
|
333
|
-
|
362
|
+
if(registryId != _chainNftInternal.GLOBAL_REGISTRY_ID())
|
363
|
+
{// we're not the global registry
|
334
364
|
_registerGlobalRegistry();
|
365
|
+
parentNftId = toNftId(_chainNftInternal.GLOBAL_REGISTRY_ID());
|
335
366
|
}
|
367
|
+
else
|
368
|
+
{// we are global registry
|
369
|
+
parentNftId = toNftId(_chainNftInternal.PROTOCOL_NFT_ID());
|
370
|
+
}
|
371
|
+
|
372
|
+
_chainNftInternal.mint(registryOwner, registryId);
|
336
373
|
|
337
|
-
|
338
|
-
|
374
|
+
_info[registryNftId] = ObjectInfo(
|
375
|
+
registryNftId,
|
376
|
+
parentNftId,
|
377
|
+
REGISTRY(),
|
378
|
+
false, // isInterceptor
|
379
|
+
address(this),
|
380
|
+
registryOwner,
|
381
|
+
""
|
382
|
+
);
|
383
|
+
_nftIdByAddress[address(this)] = registryNftId;
|
384
|
+
_registryNftId = registryNftId;
|
339
385
|
}
|
340
386
|
|
341
387
|
|
342
388
|
/// @dev global registry registration for non mainnet registries
|
343
|
-
function _registerGlobalRegistry()
|
389
|
+
function _registerGlobalRegistry()
|
390
|
+
internal
|
391
|
+
{
|
344
392
|
uint256 globalRegistryId = _chainNftInternal.GLOBAL_REGISTRY_ID();
|
345
|
-
|
393
|
+
|
394
|
+
_chainNftInternal.mint(NFT_LOCK_ADDRESS, globalRegistryId);
|
346
395
|
|
347
396
|
NftId globalRegistryNftId = toNftId(globalRegistryId);
|
348
|
-
|
397
|
+
|
398
|
+
_info[globalRegistryNftId] = ObjectInfo(
|
349
399
|
globalRegistryNftId,
|
350
|
-
toNftId(_chainNftInternal.PROTOCOL_NFT_ID()),
|
400
|
+
toNftId(_chainNftInternal.PROTOCOL_NFT_ID()), // parent
|
351
401
|
REGISTRY(),
|
352
|
-
|
353
|
-
|
402
|
+
false, // isInterceptor
|
403
|
+
address(0), // objectAddress
|
404
|
+
NFT_LOCK_ADDRESS, // initialOwner
|
354
405
|
"" // data
|
355
406
|
);
|
356
|
-
|
357
|
-
_info[globalRegistryNftId] = globalRegistryInfo;
|
358
407
|
}
|
359
408
|
|
360
|
-
|
361
|
-
|
362
|
-
|
363
|
-
|
364
|
-
|
365
|
-
|
366
|
-
|
367
|
-
|
368
|
-
|
369
|
-
|
370
|
-
|
371
|
-
|
372
|
-
|
409
|
+
function _registerRegistryService(address registryOwner)
|
410
|
+
internal
|
411
|
+
{
|
412
|
+
uint256 serviceId = _chainNftInternal.calculateTokenId(REGISTRY_SERVICE_TOKEN_SEQUENCE_ID);
|
413
|
+
NftId serviceNftId = toNftId(serviceId);
|
414
|
+
|
415
|
+
_chainNftInternal.mint(registryOwner, serviceId);
|
416
|
+
|
417
|
+
_info[serviceNftId] = ObjectInfo(
|
418
|
+
serviceNftId,
|
419
|
+
_registryNftId,
|
420
|
+
SERVICE(),
|
421
|
+
false, // isInterceptor
|
422
|
+
msg.sender, // service deploys registry
|
423
|
+
registryOwner, // initialOwner,
|
424
|
+
""
|
373
425
|
);
|
374
426
|
|
375
|
-
|
376
|
-
_nftIdByAddress[objectAddress] = nftId;
|
427
|
+
_nftIdByAddress[msg.sender] = serviceNftId;
|
377
428
|
|
378
|
-
|
429
|
+
string memory serviceName = "RegistryService";
|
430
|
+
bytes32 serviceNameHash = keccak256(abi.encode(serviceName));
|
431
|
+
_service[serviceNameHash][VersionLib.toVersionPart(MAJOR_VERSION_MIN)] = msg.sender;
|
432
|
+
_string[serviceNftId] = serviceName;
|
433
|
+
_serviceNftId = serviceNftId;
|
379
434
|
}
|
380
435
|
|
436
|
+
/// @dev obtain interceptor address for this nft if applicable, address(0) otherwise
|
437
|
+
function _getInterceptor(
|
438
|
+
bool isInterceptor,
|
439
|
+
address objectAddress,
|
440
|
+
bool parentIsInterceptor,
|
441
|
+
address parentObjectAddress
|
442
|
+
)
|
443
|
+
internal
|
444
|
+
view
|
445
|
+
returns (address interceptor)
|
446
|
+
{
|
447
|
+
if (objectAddress == address(0)) {
|
448
|
+
if (parentIsInterceptor) {
|
449
|
+
return parentObjectAddress;
|
450
|
+
} else {
|
451
|
+
return address(0);
|
452
|
+
}
|
453
|
+
}
|
454
|
+
|
455
|
+
if (isInterceptor) {
|
456
|
+
return objectAddress;
|
457
|
+
}
|
458
|
+
|
459
|
+
return address(0);
|
460
|
+
}
|
461
|
+
|
462
|
+
/// @dev defines which object - parent types relations are allowed to register
|
463
|
+
// IMPORTANT:
|
464
|
+
// 1) EACH object type MUST have only one parent type across ALL mappings
|
465
|
+
// 2) DO NOT use object type (e.g. POLCY, BUNDLE, STAKE) as parent type
|
466
|
+
// 3) DO NOT use REGISTRY as object type
|
467
|
+
// 2) DO NOT use PROTOCOL and "zeroObjectType"
|
468
|
+
function _setupValidObjectParentCombinations()
|
469
|
+
internal
|
470
|
+
{
|
471
|
+
// registry as parent, ONLY registry owner
|
472
|
+
_isValidContractCombination[TOKEN()][REGISTRY()] = true;
|
473
|
+
_isValidContractCombination[SERVICE()][REGISTRY()] = true;
|
474
|
+
|
475
|
+
// registry as parent, ONLY approved
|
476
|
+
_isValidContractCombination[INSTANCE()][REGISTRY()] = true;
|
477
|
+
|
478
|
+
// instance as parent, ONLY approved
|
479
|
+
_isValidContractCombination[PRODUCT()][INSTANCE()] = true;
|
480
|
+
_isValidContractCombination[DISTRIBUTION()][INSTANCE()] = true;
|
481
|
+
_isValidContractCombination[ORACLE()][INSTANCE()] = true;
|
482
|
+
_isValidContractCombination[POOL()][INSTANCE()] = true;
|
483
|
+
|
484
|
+
// product as parent, ONLY approved
|
485
|
+
_isValidObjectCombination[POLICY()][PRODUCT()] = true;
|
486
|
+
|
487
|
+
// pool as parent, ONLY approved
|
488
|
+
_isValidObjectCombination[BUNDLE()][POOL()] = true;
|
489
|
+
_isValidObjectCombination[STAKE()][POOL()] = true;
|
490
|
+
}
|
381
491
|
}
|