@etherisc/gif-next 0.0.2-efef0ea-320 → 0.0.2-f02157b-803
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 +144 -26
- package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.dbg.json +1 -1
- package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.json +168 -28
- package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +1 -1
- package/artifacts/contracts/components/Distribution.sol/Distribution.json +259 -54
- package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.json +121 -28
- package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.json +0 -188
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.json +0 -238
- package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.json +0 -213
- package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
- package/artifacts/contracts/components/Pool.sol/Pool.json +292 -96
- package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
- package/artifacts/contracts/components/Product.sol/Product.json +388 -78
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Cloner.dbg.json +4 -0
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Cloner.json +66 -0
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock1.dbg.json +4 -0
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock1.json +24 -0
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock2.dbg.json +4 -0
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock2.json +42 -0
- 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 +116 -1813
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +4 -0
- package/artifacts/contracts/instance/{base/InstanceBase.sol/InstanceBase.json → IInstanceService.sol/IInstanceService.json} +127 -169
- package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
- package/artifacts/contracts/instance/Instance.sol/Instance.json +2238 -1251
- 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 +1257 -0
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +4 -0
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +703 -0
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +424 -0
- package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.dbg.json +1 -1
- package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.json +144 -50
- package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.dbg.json +1 -1
- package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.json +1 -1
- package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
- package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.json +27 -158
- 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 +120 -40
- package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
- package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.json +37 -245
- 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 +140 -59
- 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/instance/service/ComponentOwnerService.sol/ComponentOwnerService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.json +295 -86
- package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.json +123 -62
- package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.json +120 -40
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +120 -40
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +120 -40
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +186 -12
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +190 -51
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +4 -0
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +872 -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 +380 -139
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +4 -0
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +1261 -0
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +4 -0
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +504 -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 +2 -2
- 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 +4 -27
- package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json +1 -1
- package/artifacts/contracts/test/TestFee.sol/TestFee.json +4 -4
- 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 +14 -14
- package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +1 -1
- package/artifacts/contracts/test/TestService.sol/TestService.json +203 -69
- package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json +1 -1
- package/artifacts/contracts/test/TestToken.sol/TestUsdc.json +91 -53
- 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 +29 -36
- package/artifacts/contracts/test/Usdc.sol/USDC.dbg.json +1 -1
- package/artifacts/contracts/test/Usdc.sol/USDC.json +91 -53
- 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/Fee.sol/FeeLib.json +4 -4
- 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/MathLib.dbg.json +4 -0
- package/artifacts/contracts/types/UFixed.sol/MathLib.json +10 -0
- package/artifacts/contracts/types/UFixed.sol/UFixedLib.dbg.json +4 -0
- package/artifacts/contracts/types/UFixed.sol/{UFixedMathLib.json → UFixedLib.json} +3 -3
- package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +1 -1
- package/artifacts/contracts/types/Version.sol/VersionLib.json +2 -2
- package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +1 -1
- package/artifacts/contracts/types/Version.sol/VersionPartLib.json +2 -2
- package/contracts/components/BaseComponent.sol +20 -28
- package/contracts/components/Distribution.sol +54 -20
- package/contracts/components/IBaseComponent.sol +8 -3
- package/contracts/components/IDistributionComponent.sol +2 -6
- package/contracts/components/IPoolComponent.sol +2 -11
- package/contracts/components/IProductComponent.sol +4 -7
- package/contracts/components/Pool.sol +100 -76
- package/contracts/components/Product.sol +111 -41
- package/contracts/experiment/cloning/Cloner.sol +47 -0
- 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 +17 -42
- package/contracts/instance/IInstanceService.sol +17 -0
- package/contracts/instance/Instance.sol +421 -59
- package/contracts/instance/InstanceAccessManager.sol +288 -0
- package/contracts/instance/InstanceReader.sol +280 -0
- package/contracts/instance/InstanceService.sol +102 -0
- package/contracts/instance/InstanceServiceManager.sol +56 -0
- package/contracts/instance/base/ComponentServiceBase.sol +13 -6
- package/contracts/instance/base/IInstanceBase.sol +3 -2
- package/contracts/instance/base/IKeyValueStore.sol +13 -14
- package/contracts/instance/base/ILifecycle.sol +3 -3
- package/contracts/instance/base/KeyValueStore.sol +49 -38
- 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 +43 -0
- package/contracts/instance/module/ITreasury.sol +23 -0
- package/contracts/instance/service/ComponentOwnerService.sol +231 -71
- package/contracts/instance/service/IComponentOwnerService.sol +0 -2
- package/contracts/instance/service/IProductService.sol +2 -2
- package/contracts/registry/ChainNft.sol +80 -37
- package/contracts/registry/IRegistry.sol +28 -28
- package/contracts/registry/IRegistryService.sol +35 -0
- package/contracts/registry/ITransferInterceptor.sol +6 -0
- package/contracts/registry/Registry.sol +313 -271
- package/contracts/registry/RegistryService.sol +439 -0
- package/contracts/registry/RegistryServiceManager.sol +64 -0
- package/contracts/shared/ContractDeployerLib.sol +72 -0
- package/contracts/shared/INftOwnable.sol +22 -0
- package/contracts/shared/IRegisterable.sol +8 -15
- package/contracts/shared/IVersionable.sol +46 -15
- 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 +110 -62
- package/contracts/test/TestFee.sol +2 -2
- package/contracts/test/TestRegisterable.sol +5 -6
- package/contracts/test/TestRoleId.sol +1 -1
- package/contracts/test/TestService.sol +5 -11
- package/contracts/types/DistributorType.sol +55 -0
- package/contracts/types/Fee.sol +3 -3
- 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 +53 -9
- package/contracts/types/StateId.sol +1 -1
- package/contracts/types/Timestamp.sol +7 -3
- package/contracts/types/UFixed.sol +128 -12
- package/contracts/types/Version.sol +1 -0
- package/package.json +4 -3
- 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/InstanceBase.sol/InstanceBase.dbg.json +0 -4
- 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/DistributionService.sol/DistributionService.dbg.json +0 -4
- package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +0 -507
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +0 -4
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +0 -630
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +0 -4
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +0 -945
- package/artifacts/contracts/registry/IChainNft.sol/IChainNft.dbg.json +0 -4
- package/artifacts/contracts/registry/IChainNft.sol/IChainNft.json +0 -452
- 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 -724
- 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/ProxyDeployer.dbg.json +0 -4
- package/artifacts/contracts/shared/Proxy.sol/ProxyDeployer.json +0 -248
- 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 -228
- 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/artifacts/contracts/types/UFixed.sol/UFixedMathLib.dbg.json +0 -4
- package/contracts/experiment/statemachine/README.md +0 -112
- package/contracts/instance/IInstanceLinked.sol +0 -8
- 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/DistributionService.sol +0 -59
- package/contracts/instance/service/PoolService.sol +0 -149
- package/contracts/instance/service/ProductService.sol +0 -509
- package/contracts/registry/IChainNft.sol +0 -21
- package/contracts/registry/IRegistryLinked.sol +0 -8
- package/contracts/registry/RegistryUpgradeable.sol +0 -488
- package/contracts/shared/IOwnable.sol +0 -6
- package/contracts/shared/Proxy.sol +0 -94
- package/contracts/shared/VersionableUpgradeable.sol +0 -136
- 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,381 +1,423 @@
|
|
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";
|
6
6
|
|
7
|
-
import {IChainNft} from "./IChainNft.sol";
|
8
7
|
import {ChainNft} from "./ChainNft.sol";
|
9
8
|
import {IRegistry} from "./IRegistry.sol";
|
10
9
|
import {NftId, toNftId, zeroNftId, NftIdLib} from "../types/NftId.sol";
|
11
|
-
import {VersionPart} from "../types/Version.sol";
|
10
|
+
import {Version, VersionPart, VersionLib} from "../types/Version.sol";
|
12
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
|
+
|
16
|
+
|
17
|
+
// IMPORTANT
|
18
|
+
// Each NFT minted by registry is accosiated with:
|
19
|
+
// 1) NFT owner
|
20
|
+
// 2) registred contract OR object stored in registered (parent) contract
|
21
|
+
// Four registration flows:
|
22
|
+
// 1) non IRegisterable address by registryOwner (TOKEN)
|
23
|
+
// 2) IRegisterable address by registryOwner (SERVICE)
|
24
|
+
// 3) IRegisterable address by approved service (INSTANCE, COMPONENT)
|
25
|
+
// 4) state object by approved service (POLICY, BUNDLE, STAKE)
|
13
26
|
|
14
|
-
// TODO make registry upgradable
|
15
27
|
contract Registry is
|
16
|
-
|
28
|
+
ERC165,
|
17
29
|
IRegistry
|
18
30
|
{
|
19
|
-
|
20
|
-
|
31
|
+
// register
|
32
|
+
error NotRegistryService();
|
33
|
+
error ZeroParentAddress();
|
34
|
+
error ContractAlreadyRegistered(address objectAddress);
|
35
|
+
error InvalidServiceVersion(VersionPart majorVersion);
|
36
|
+
error ServiceNameAlreadyRegistered(string name, VersionPart majorVersion);
|
37
|
+
|
38
|
+
// approve
|
39
|
+
error NotOwner();
|
40
|
+
error NotRegisteredContract(NftId registrarNftId);
|
41
|
+
error NotService(NftId registrarNftId);
|
42
|
+
error InvalidTypesCombination(ObjectType objectType, ObjectType parentType);
|
43
|
+
|
44
|
+
uint256 public constant MAJOR_VERSION_MIN = 3;
|
45
|
+
address public constant NFT_LOCK_ADDRESS = address(0x1);
|
46
|
+
uint256 public constant REGISTRY_SERVICE_TOKEN_SEQUENCE_ID = 3;
|
21
47
|
string public constant EMPTY_URI = "";
|
22
48
|
|
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
|
-
);
|
49
|
+
mapping(NftId nftId => ObjectInfo info) internal _info;
|
50
|
+
mapping(address object => NftId nftId) internal _nftIdByAddress;
|
53
51
|
|
54
|
-
|
55
|
-
|
52
|
+
mapping(NftId registrator => mapping(
|
53
|
+
ObjectType objectType => bool)) internal _isApproved;
|
56
54
|
|
57
|
-
|
58
|
-
|
55
|
+
mapping(ObjectType objectType => mapping(
|
56
|
+
ObjectType parentType => bool)) internal _isValidContractCombination;
|
59
57
|
|
60
|
-
|
61
|
-
|
62
|
-
_nftId = _registerRegistry();
|
58
|
+
mapping(ObjectType objectType => mapping(
|
59
|
+
ObjectType parentType => bool)) internal _isValidObjectCombination;
|
63
60
|
|
64
|
-
|
65
|
-
|
66
|
-
|
67
|
-
}
|
61
|
+
mapping(NftId nftId => string name) internal _string;
|
62
|
+
mapping(bytes32 serviceNameHash => mapping(
|
63
|
+
VersionPart majorVersion => address service)) internal _service;
|
68
64
|
|
65
|
+
NftId internal _registryNftId;
|
66
|
+
NftId internal _serviceNftId; // set in stone upon registry creation
|
67
|
+
ChainNft internal _chainNft;
|
69
68
|
|
70
|
-
function register(
|
71
|
-
address objectAddress
|
72
|
-
)
|
73
|
-
// TODO add authz (only services may register components etc)
|
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
69
|
|
81
|
-
|
82
|
-
|
83
|
-
|
84
|
-
|
85
|
-
|
86
|
-
|
87
|
-
ObjectType objectType = registerable.getType();
|
88
|
-
require(
|
89
|
-
_isValidType[objectType],
|
90
|
-
"ERROR:REG-004:TYPE_INVALID"
|
91
|
-
);
|
92
|
-
|
93
|
-
NftId parentNftId = registerable.getParentNftId();
|
94
|
-
require(
|
95
|
-
isRegistered(parentNftId),
|
96
|
-
"ERROR:REG-005:PARENT_NOT_REGISTERED"
|
97
|
-
);
|
70
|
+
modifier onlyOwner() {
|
71
|
+
if(msg.sender != getOwner()) {
|
72
|
+
revert NotOwner();
|
73
|
+
}
|
74
|
+
_;
|
75
|
+
}
|
98
76
|
|
99
|
-
|
100
|
-
|
101
|
-
|
102
|
-
|
77
|
+
modifier onlyRegistryService() {
|
78
|
+
|
79
|
+
if(msg.sender != _info[_serviceNftId].objectAddress) {
|
80
|
+
revert NotRegistryService();
|
81
|
+
}
|
82
|
+
_;
|
83
|
+
}
|
103
84
|
|
104
|
-
|
85
|
+
constructor(address registryOwner, VersionPart majorVersion)
|
86
|
+
{
|
87
|
+
require(registryOwner > address(0), "Registry: registry owner is 0");
|
88
|
+
require(majorVersion.toInt() == MAJOR_VERSION_MIN, "Registry: initial major version of registry service is not MAJOR_VERSION_MIN");
|
105
89
|
|
106
|
-
//
|
107
|
-
|
108
|
-
registerable.getOwner(),
|
109
|
-
EMPTY_URI
|
110
|
-
);
|
90
|
+
// deploy NFT
|
91
|
+
_chainNft = new ChainNft(address(this));// adds 10kb to deployment size
|
111
92
|
|
112
|
-
|
93
|
+
// initial registry setup
|
94
|
+
_registerProtocol();
|
95
|
+
_registerRegistry(registryOwner);
|
96
|
+
_registerRegistryService(registryOwner);
|
113
97
|
|
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
|
-
}
|
98
|
+
// set object parent relations
|
99
|
+
_setupValidObjectParentCombinations();
|
135
100
|
|
136
|
-
|
137
|
-
_registerObjectInfo(registerable, nftId);
|
101
|
+
_registerInterface(type(IRegistry).interfaceId);
|
138
102
|
}
|
139
103
|
|
140
|
-
|
141
|
-
|
142
|
-
|
143
|
-
|
144
|
-
address initialOwner,
|
145
|
-
bytes memory data
|
146
|
-
)
|
104
|
+
/// @dev registry protects only against tampering existing records, registering with invalid types pairs and 0 parent address
|
105
|
+
// TODO service registration means its approval for some type?
|
106
|
+
// TODO registration of precompile addresses
|
107
|
+
function register(ObjectInfo memory info)
|
147
108
|
external
|
148
|
-
|
149
|
-
returns
|
150
|
-
// TODO add onlyRegisteredInstance
|
151
|
-
NftId nftId
|
152
|
-
)
|
109
|
+
onlyRegistryService
|
110
|
+
returns(NftId nftId)
|
153
111
|
{
|
154
|
-
|
155
|
-
|
156
|
-
|
157
|
-
|
158
|
-
|
112
|
+
ObjectType objectType = info.objectType;
|
113
|
+
NftId parentNftId = info.parentNftId;
|
114
|
+
ObjectInfo memory parentInfo = _info[parentNftId];
|
115
|
+
ObjectType parentType = parentInfo.objectType; // see function header
|
116
|
+
address parentAddress = parentInfo.objectAddress;
|
117
|
+
|
118
|
+
// parent is contract -> need to check? -> check before minting
|
119
|
+
// special case: global registry nft as parent when not on mainnet -> global registry address is 0
|
120
|
+
// special case: when parentNftId == _chainNft.mint(), check for zero parent address before mint
|
121
|
+
// special case: when parentNftId == _chainNft.mint() && objectAddress == initialOwner
|
122
|
+
if(parentAddress == address(0)) {
|
123
|
+
revert ZeroParentAddress();
|
124
|
+
}
|
159
125
|
|
160
|
-
|
161
|
-
nftId = toNftId(mintedTokenId);
|
126
|
+
address interceptor = _getInterceptor(info.isInterceptor, info.objectAddress, parentInfo.isInterceptor, parentAddress);
|
162
127
|
|
163
|
-
|
164
|
-
|
165
|
-
|
166
|
-
|
167
|
-
|
168
|
-
|
169
|
-
data
|
170
|
-
);
|
128
|
+
// TODO does external call
|
129
|
+
uint256 mintedTokenId = _chainNft.mint(
|
130
|
+
info.initialOwner,
|
131
|
+
interceptor,
|
132
|
+
EMPTY_URI);
|
133
|
+
nftId = toNftId(mintedTokenId);
|
171
134
|
|
135
|
+
// TODO move nftId out of info struct
|
136
|
+
// getters by nftId -> return struct without nftId
|
137
|
+
// getters by address -> return nftId AND struct
|
138
|
+
info.nftId = nftId;
|
172
139
|
_info[nftId] = info;
|
173
140
|
|
174
|
-
|
141
|
+
if(info.objectAddress > address(0))
|
142
|
+
{
|
143
|
+
// TODO if need to add types latter -> at least call this check from registry service
|
144
|
+
// parent is registered + object-parent types are valid
|
145
|
+
if(_isValidContractCombination[objectType][parentType] == false) {
|
146
|
+
revert InvalidTypesCombination(objectType, parentType);
|
147
|
+
}
|
148
|
+
|
149
|
+
address contractAddress = info.objectAddress;
|
150
|
+
|
151
|
+
if(_nftIdByAddress[contractAddress].gtz()) {
|
152
|
+
revert ContractAlreadyRegistered(contractAddress);
|
153
|
+
}
|
154
|
+
|
155
|
+
_nftIdByAddress[contractAddress] = nftId;
|
156
|
+
|
157
|
+
// special case
|
158
|
+
if(objectType == SERVICE()) {
|
159
|
+
_registerService(info);
|
160
|
+
}
|
161
|
+
}
|
162
|
+
else
|
163
|
+
{
|
164
|
+
if(_isValidObjectCombination[objectType][parentType] == false) {
|
165
|
+
revert InvalidTypesCombination(objectType, parentType);
|
166
|
+
}
|
167
|
+
}
|
168
|
+
|
169
|
+
emit LogRegistration(info);
|
175
170
|
}
|
176
171
|
|
172
|
+
// from IRegistry
|
177
173
|
function getObjectCount() external view override returns (uint256) {
|
174
|
+
|
178
175
|
return _chainNft.totalSupply();
|
179
176
|
}
|
180
177
|
|
181
|
-
function getNftId(
|
182
|
-
address object
|
183
|
-
) external view override returns (NftId id) {
|
178
|
+
function getNftId(address object) external view override returns (NftId id) {
|
184
179
|
return _nftIdByAddress[object];
|
185
180
|
}
|
186
181
|
|
187
|
-
function
|
188
|
-
|
189
|
-
) public view override returns (bool) {
|
190
|
-
return _info[nftId].objectType.gtz();
|
182
|
+
function ownerOf(NftId nftId) public view override returns (address) {
|
183
|
+
return _chainNft.ownerOf(nftId.toInt());
|
191
184
|
}
|
192
185
|
|
193
|
-
function
|
194
|
-
|
195
|
-
|
196
|
-
return _nftIdByAddress[object].gtz();
|
186
|
+
function ownerOf(address contractAddress) public view returns (address) {
|
187
|
+
|
188
|
+
return _chainNft.ownerOf(_nftIdByAddress[contractAddress].toInt());
|
197
189
|
}
|
198
190
|
|
199
|
-
function getObjectInfo(
|
200
|
-
NftId nftId
|
201
|
-
) external view override returns (ObjectInfo memory info) {
|
191
|
+
function getObjectInfo(NftId nftId) external view override returns (ObjectInfo memory) {
|
202
192
|
return _info[nftId];
|
203
193
|
}
|
204
194
|
|
205
|
-
function
|
206
|
-
|
207
|
-
|
208
|
-
return _string[nftId];
|
195
|
+
function getObjectInfo(address object) external view override returns (ObjectInfo memory) {
|
196
|
+
|
197
|
+
return _info[_nftIdByAddress[object]];
|
209
198
|
}
|
210
199
|
|
211
|
-
function
|
212
|
-
return
|
200
|
+
function isRegistered(NftId nftId) public view override returns (bool) {
|
201
|
+
return _info[nftId].objectType.gtz();
|
213
202
|
}
|
214
203
|
|
215
|
-
function
|
216
|
-
return
|
204
|
+
function isRegistered(address object) external view override returns (bool) {
|
205
|
+
return _nftIdByAddress[object].gtz();
|
206
|
+
}
|
207
|
+
|
208
|
+
function getServiceName(NftId nftId) external view returns (string memory) {
|
209
|
+
return _string[nftId];
|
217
210
|
}
|
218
211
|
|
219
212
|
// special case to retrive a gif service
|
220
|
-
function getServiceAddress(
|
213
|
+
function getServiceAddress(
|
214
|
+
string memory serviceName,
|
215
|
+
VersionPart majorVersion
|
216
|
+
) external view returns (address)
|
217
|
+
{
|
221
218
|
bytes32 serviceNameHash = keccak256(abi.encode(serviceName));
|
222
219
|
return _service[serviceNameHash][majorVersion];
|
223
220
|
}
|
224
221
|
|
225
|
-
|
226
|
-
|
227
|
-
return interfaceId == type(IRegistry).interfaceId;
|
222
|
+
function getChainNft() external view override returns (ChainNft) {
|
223
|
+
return _chainNft;
|
228
224
|
}
|
229
225
|
|
230
|
-
|
231
|
-
|
232
|
-
return this;
|
226
|
+
function getOwner() public view returns (address owner) {
|
227
|
+
return ownerOf(address(this));
|
233
228
|
}
|
234
229
|
|
235
|
-
//
|
236
|
-
function register() external pure override returns (NftId nftId) {
|
237
|
-
return zeroNftId();
|
238
|
-
}
|
230
|
+
// Internals
|
239
231
|
|
240
|
-
function
|
241
|
-
|
242
|
-
|
232
|
+
function _registerService(ObjectInfo memory info)
|
233
|
+
internal
|
234
|
+
{
|
235
|
+
(
|
236
|
+
string memory serviceName,
|
237
|
+
VersionPart majorVersion
|
238
|
+
) = abi.decode(info.data, (string, VersionPart));
|
239
|
+
bytes32 serviceNameHash = keccak256(abi.encode(serviceName));
|
243
240
|
|
241
|
+
// TODO MUST guarantee consistency of service.getVersion() and majorVersion here
|
242
|
+
// TODO update _serviceNftId when registryService with new major version is registered? -> it is fixed in current setup -> can lock up
|
243
|
+
// TODO do not use names -> each object type is registered by corresponding service -> conflicting with approve()
|
244
|
+
if(
|
245
|
+
majorVersion.toInt() < MAJOR_VERSION_MIN ||
|
246
|
+
(majorVersion.toInt() > MAJOR_VERSION_MIN &&
|
247
|
+
_service[serviceNameHash][VersionLib.toVersionPart(majorVersion.toInt() - 1)] == address(0) )
|
248
|
+
) {
|
249
|
+
revert InvalidServiceVersion(majorVersion);
|
250
|
+
}
|
251
|
+
|
252
|
+
if(_service[serviceNameHash][majorVersion] != address(0)) {
|
253
|
+
revert ServiceNameAlreadyRegistered(serviceName, majorVersion);
|
254
|
+
}
|
244
255
|
|
245
|
-
|
246
|
-
|
247
|
-
}
|
256
|
+
_string[info.nftId] = serviceName;
|
257
|
+
_service[serviceNameHash][majorVersion] = info.objectAddress;
|
248
258
|
|
249
|
-
|
250
|
-
return _nftId;
|
259
|
+
emit LogServiceNameRegistration(serviceName, majorVersion);
|
251
260
|
}
|
252
261
|
|
253
|
-
|
254
|
-
|
255
|
-
|
256
|
-
|
262
|
+
/// @dev obtain interceptor address for this nft if applicable, address(0) otherwise
|
263
|
+
function _getInterceptor(
|
264
|
+
bool isInterceptor,
|
265
|
+
address objectAddress,
|
266
|
+
bool parentIsInterceptor,
|
267
|
+
address parentObjectAddress
|
268
|
+
)
|
269
|
+
internal
|
270
|
+
view
|
271
|
+
returns (address interceptor)
|
272
|
+
{
|
273
|
+
if (objectAddress == address(0)) {
|
274
|
+
if (parentIsInterceptor) {
|
275
|
+
return parentObjectAddress;
|
276
|
+
} else {
|
277
|
+
return address(0);
|
278
|
+
}
|
257
279
|
}
|
258
|
-
|
259
|
-
|
280
|
+
|
281
|
+
if (isInterceptor) {
|
282
|
+
return objectAddress;
|
260
283
|
}
|
261
|
-
}
|
262
284
|
|
263
|
-
|
264
|
-
return "";
|
285
|
+
return address(0);
|
265
286
|
}
|
266
287
|
|
267
|
-
//
|
268
|
-
function getProtocolOwner() external view override returns (address) {
|
269
|
-
return _protocolOwner;
|
270
|
-
}
|
288
|
+
// Internals called only in constructor
|
271
289
|
|
272
|
-
/// @dev
|
273
|
-
function
|
274
|
-
|
275
|
-
|
276
|
-
|
277
|
-
|
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;
|
285
|
-
}
|
290
|
+
/// @dev protocol registration used to anchor the dip ecosystem relations
|
291
|
+
function _registerProtocol()
|
292
|
+
internal
|
293
|
+
{
|
294
|
+
uint256 protocolId = _chainNft.PROTOCOL_NFT_ID();
|
295
|
+
NftId protocolNftId = toNftId(protocolId);
|
286
296
|
|
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
|
-
}
|
297
|
+
_chainNft.mint(NFT_LOCK_ADDRESS, protocolId);
|
307
298
|
|
308
|
-
|
309
|
-
|
310
|
-
|
311
|
-
_chainNftInternal.mint(_protocolOwner, protocolId);
|
312
|
-
|
313
|
-
NftId protocolNftid = toNftId(protocolId);
|
314
|
-
ObjectInfo memory protocolInfo = ObjectInfo(
|
315
|
-
protocolNftid,
|
316
|
-
zeroNftId(), // parent nft id
|
299
|
+
_info[protocolNftId] = ObjectInfo(
|
300
|
+
protocolNftId,
|
301
|
+
zeroNftId(), // parent
|
317
302
|
PROTOCOL(),
|
318
|
-
|
319
|
-
|
320
|
-
|
303
|
+
false, // isInterceptor
|
304
|
+
address(0), // objectAddress
|
305
|
+
NFT_LOCK_ADDRESS,// initialOwner
|
306
|
+
""
|
321
307
|
);
|
322
|
-
|
323
|
-
_info[protocolNftid] = protocolInfo;
|
324
308
|
}
|
325
309
|
|
326
310
|
/// @dev registry registration
|
327
311
|
/// might also register the global registry when not on mainnet
|
328
|
-
function _registerRegistry(
|
329
|
-
|
330
|
-
|
312
|
+
function _registerRegistry(address registryOwner)
|
313
|
+
internal
|
314
|
+
{
|
315
|
+
uint256 registryId = _chainNft.calculateTokenId(2);
|
316
|
+
NftId registryNftId = toNftId(registryId);
|
317
|
+
|
318
|
+
NftId parentNftId;
|
331
319
|
|
332
|
-
|
333
|
-
|
320
|
+
if(registryId != _chainNft.GLOBAL_REGISTRY_ID())
|
321
|
+
{// we're not the global registry
|
334
322
|
_registerGlobalRegistry();
|
323
|
+
parentNftId = toNftId(_chainNft.GLOBAL_REGISTRY_ID());
|
324
|
+
}
|
325
|
+
else
|
326
|
+
{// we are global registry
|
327
|
+
parentNftId = toNftId(_chainNft.PROTOCOL_NFT_ID());
|
335
328
|
}
|
336
329
|
|
337
|
-
|
338
|
-
|
330
|
+
_chainNft.mint(registryOwner, registryId);
|
331
|
+
|
332
|
+
_info[registryNftId] = ObjectInfo(
|
333
|
+
registryNftId,
|
334
|
+
parentNftId,
|
335
|
+
REGISTRY(),
|
336
|
+
false, // isInterceptor
|
337
|
+
address(this),
|
338
|
+
registryOwner,
|
339
|
+
""
|
340
|
+
);
|
341
|
+
_nftIdByAddress[address(this)] = registryNftId;
|
342
|
+
_registryNftId = registryNftId;
|
339
343
|
}
|
340
344
|
|
341
345
|
|
342
346
|
/// @dev global registry registration for non mainnet registries
|
343
|
-
function _registerGlobalRegistry()
|
344
|
-
|
345
|
-
|
347
|
+
function _registerGlobalRegistry()
|
348
|
+
internal
|
349
|
+
{
|
350
|
+
uint256 globalRegistryId = _chainNft.GLOBAL_REGISTRY_ID();
|
351
|
+
|
352
|
+
_chainNft.mint(NFT_LOCK_ADDRESS, globalRegistryId);
|
346
353
|
|
347
354
|
NftId globalRegistryNftId = toNftId(globalRegistryId);
|
348
|
-
|
355
|
+
|
356
|
+
_info[globalRegistryNftId] = ObjectInfo(
|
349
357
|
globalRegistryNftId,
|
350
|
-
toNftId(
|
358
|
+
toNftId(_chainNft.PROTOCOL_NFT_ID()), // parent
|
351
359
|
REGISTRY(),
|
352
|
-
|
353
|
-
|
360
|
+
false, // isInterceptor
|
361
|
+
address(0), // objectAddress
|
362
|
+
NFT_LOCK_ADDRESS, // initialOwner
|
354
363
|
"" // data
|
355
364
|
);
|
356
|
-
|
357
|
-
_info[globalRegistryNftId] = globalRegistryInfo;
|
358
365
|
}
|
359
366
|
|
360
|
-
|
361
|
-
|
362
|
-
|
363
|
-
|
364
|
-
|
365
|
-
|
366
|
-
|
367
|
-
|
368
|
-
|
369
|
-
|
370
|
-
|
371
|
-
|
372
|
-
|
367
|
+
function _registerRegistryService(address registryOwner)
|
368
|
+
internal
|
369
|
+
{
|
370
|
+
uint256 serviceId = _chainNft.calculateTokenId(REGISTRY_SERVICE_TOKEN_SEQUENCE_ID);
|
371
|
+
NftId serviceNftId = toNftId(serviceId);
|
372
|
+
|
373
|
+
_chainNft.mint(registryOwner, serviceId);
|
374
|
+
|
375
|
+
_info[serviceNftId] = ObjectInfo(
|
376
|
+
serviceNftId,
|
377
|
+
_registryNftId,
|
378
|
+
SERVICE(),
|
379
|
+
false, // isInterceptor
|
380
|
+
msg.sender, // service deploys registry
|
381
|
+
registryOwner, // initialOwner,
|
382
|
+
""
|
373
383
|
);
|
374
384
|
|
375
|
-
|
376
|
-
_nftIdByAddress[objectAddress] = nftId;
|
385
|
+
_nftIdByAddress[msg.sender] = serviceNftId;
|
377
386
|
|
378
|
-
|
387
|
+
string memory serviceName = "RegistryService";
|
388
|
+
bytes32 serviceNameHash = keccak256(abi.encode(serviceName));
|
389
|
+
_service[serviceNameHash][VersionLib.toVersionPart(MAJOR_VERSION_MIN)] = msg.sender;
|
390
|
+
_string[serviceNftId] = serviceName;
|
391
|
+
_serviceNftId = serviceNftId;
|
379
392
|
}
|
380
393
|
|
394
|
+
/// @dev defines which object - parent types relations are allowed to register
|
395
|
+
// IMPORTANT:
|
396
|
+
// 1) EACH object type MUST have only one parent type across ALL mappings
|
397
|
+
// 2) DO NOT use object type (e.g. POLCY, BUNDLE, STAKE) as parent type
|
398
|
+
// 3) DO NOT use REGISTRY as object type
|
399
|
+
// 2) DO NOT use PROTOCOL and "zeroObjectType"
|
400
|
+
function _setupValidObjectParentCombinations()
|
401
|
+
internal
|
402
|
+
{
|
403
|
+
// registry as parent, ONLY registry owner
|
404
|
+
_isValidContractCombination[TOKEN()][REGISTRY()] = true;
|
405
|
+
_isValidContractCombination[SERVICE()][REGISTRY()] = true;
|
406
|
+
|
407
|
+
// registry as parent, ONLY approved
|
408
|
+
_isValidContractCombination[INSTANCE()][REGISTRY()] = true;
|
409
|
+
|
410
|
+
// instance as parent, ONLY approved
|
411
|
+
_isValidContractCombination[PRODUCT()][INSTANCE()] = true;
|
412
|
+
_isValidContractCombination[DISTRIBUTION()][INSTANCE()] = true;
|
413
|
+
_isValidContractCombination[ORACLE()][INSTANCE()] = true;
|
414
|
+
_isValidContractCombination[POOL()][INSTANCE()] = true;
|
415
|
+
|
416
|
+
// product as parent, ONLY approved
|
417
|
+
_isValidObjectCombination[POLICY()][PRODUCT()] = true;
|
418
|
+
|
419
|
+
// pool as parent, ONLY approved
|
420
|
+
_isValidObjectCombination[BUNDLE()][POOL()] = true;
|
421
|
+
_isValidObjectCombination[STAKE()][POOL()] = true;
|
422
|
+
}
|
381
423
|
}
|