@etherisc/gif-next 0.0.2-e37834a-021 → 0.0.2-e43a6c3-340
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 +108 -1
- package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.dbg.json +1 -1
- package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.json +116 -2
- package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +1 -1
- package/artifacts/contracts/components/Distribution.sol/Distribution.json +204 -31
- package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.json +106 -3
- package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.json +0 -25
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.json +0 -59
- package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.json +0 -50
- package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
- package/artifacts/contracts/components/Pool.sol/Pool.json +245 -65
- package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
- package/artifacts/contracts/components/Product.sol/Product.json +314 -41
- 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 +1132 -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 +325 -1744
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +4 -0
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +480 -0
- package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
- package/artifacts/contracts/instance/Instance.sol/Instance.json +2300 -1340
- 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 +1388 -0
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +4 -0
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +891 -0
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +488 -0
- package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.dbg.json +1 -1
- package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.json +149 -2
- package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.dbg.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/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/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 +178 -41
- package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +212 -22
- package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.json +444 -0
- package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.json +81 -4
- package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.json +80 -3
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +80 -3
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +80 -3
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +230 -24
- package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.json +456 -0
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +47 -2
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +294 -99
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +297 -18
- package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
- package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
- package/artifacts/contracts/registry/Registry.sol/Registry.json +249 -137
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +447 -39
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +107 -42
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +4 -0
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +410 -0
- package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.dbg.json +1 -1
- package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +1 -1
- package/artifacts/contracts/shared/ERC165.sol/ERC165.json +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 +80 -3
- package/artifacts/contracts/shared/IService.sol/IService.dbg.json +4 -0
- package/artifacts/contracts/{instance/base/ServiceBase.sol/ServiceBase.json → shared/IService.sol/IService.json} +76 -35
- package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +1 -1
- package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
- package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +32 -6
- package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +1 -1
- package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +21 -16
- package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
- package/artifacts/contracts/shared/Registerable.sol/Registerable.json +120 -6
- package/artifacts/contracts/shared/RegisterableUpgradable.sol/RegisterableUpgradable.dbg.json +4 -0
- package/artifacts/contracts/{instance/base/IService.sol/IService.json → shared/RegisterableUpgradable.sol/RegisterableUpgradable.json} +137 -39
- package/artifacts/contracts/shared/Service.sol/Service.dbg.json +4 -0
- package/artifacts/contracts/{instance/base/InstanceBase.sol/InstanceBase.json → shared/Service.sol/Service.json} +106 -94
- 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 +1 -1
- package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +2 -2
- package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +1 -1
- package/artifacts/contracts/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 +120 -6
- 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 +142 -14
- 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 +18 -2
- 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 +22 -3
- package/contracts/components/BaseComponent.sol +16 -4
- package/contracts/components/Distribution.sol +21 -16
- package/contracts/components/IBaseComponent.sol +9 -3
- package/contracts/components/IDistributionComponent.sol +2 -4
- package/contracts/components/IPoolComponent.sol +0 -2
- package/contracts/components/IProductComponent.sol +2 -4
- package/contracts/components/Pool.sol +24 -27
- package/contracts/components/Product.sol +41 -43
- package/contracts/experiment/cloning/Cloner.sol +47 -0
- package/contracts/instance/AccessManagedSimple.sol +115 -0
- package/contracts/instance/AccessManagerSimple.sol +692 -0
- package/contracts/instance/IAccessManagerSimple.sol +391 -0
- package/contracts/instance/IInstance.sol +32 -47
- package/contracts/instance/IInstanceService.sol +30 -0
- package/contracts/instance/Instance.sol +423 -65
- package/contracts/instance/InstanceAccessManager.sol +288 -0
- package/contracts/instance/InstanceReader.sol +306 -0
- package/contracts/instance/InstanceService.sol +183 -0
- package/contracts/instance/InstanceServiceManager.sol +57 -0
- package/contracts/instance/base/ComponentServiceBase.sol +83 -8
- 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/module/IAccess.sol +38 -0
- package/contracts/instance/module/IBundle.sol +20 -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 +44 -0
- package/contracts/instance/module/ITreasury.sol +23 -0
- package/contracts/instance/service/ComponentOwnerService.sol +145 -100
- package/contracts/instance/service/DistributionService.sol +49 -15
- package/contracts/instance/service/DistributionServiceManager.sol +54 -0
- package/contracts/instance/service/IComponentOwnerService.sol +1 -1
- package/contracts/instance/service/IDistributionService.sol +1 -1
- package/contracts/instance/service/IPoolService.sol +1 -1
- package/contracts/instance/service/IProductService.sol +3 -3
- package/contracts/instance/service/PoolService.sol +97 -52
- package/contracts/instance/service/PoolServiceManager.sol +54 -0
- package/contracts/registry/ChainNft.sol +40 -25
- package/contracts/registry/IRegistry.sol +48 -27
- package/contracts/registry/IRegistryService.sol +36 -15
- package/contracts/registry/Registry.sol +167 -168
- package/contracts/registry/RegistryService.sol +149 -166
- package/contracts/registry/RegistryServiceManager.sol +38 -10
- package/contracts/registry/TokenRegistry.sol +111 -0
- package/contracts/shared/ERC165.sol +7 -3
- package/contracts/shared/INftOwnable.sol +22 -0
- package/contracts/shared/IRegisterable.sol +3 -8
- package/contracts/{instance/base → shared}/IService.sol +3 -3
- package/contracts/shared/NftOwnable.sol +83 -34
- package/contracts/shared/ProxyManager.sol +3 -12
- package/contracts/shared/Registerable.sol +15 -42
- package/contracts/shared/RegisterableUpgradable.sol +16 -0
- package/contracts/shared/Service.sol +55 -0
- package/contracts/shared/TokenHandler.sol +27 -0
- package/contracts/shared/UpgradableProxyWithAdmin.sol +2 -2
- package/contracts/shared/Versionable.sol +3 -3
- package/contracts/test/TestFee.sol +2 -2
- package/contracts/test/TestRoleId.sol +1 -1
- package/contracts/test/TestService.sol +3 -5
- 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 +60 -9
- package/contracts/types/StateId.sol +5 -1
- package/contracts/types/Timestamp.sol +7 -3
- package/contracts/types/UFixed.sol +128 -12
- package/contracts/types/Version.sol +4 -1
- 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/IService.sol/IService.dbg.json +0 -4
- 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/base/ServiceBase.sol/ServiceBase.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 -164
- package/artifacts/contracts/instance/module/pool/PoolModule.sol/PoolModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/pool/PoolModule.sol/PoolModule.json +0 -164
- 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 -638
- 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 -638
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +0 -4
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +0 -964
- package/artifacts/contracts/registry/IChainNft.sol/IChainNft.dbg.json +0 -4
- package/artifacts/contracts/registry/IChainNft.sol/IChainNft.json +0 -457
- package/artifacts/contracts/shared/IOwnable.sol/IOwnable.dbg.json +0 -4
- package/artifacts/contracts/shared/IOwnable.sol/IOwnable.json +0 -24
- package/artifacts/contracts/test/TestDistribution.sol/TestDistribution.dbg.json +0 -4
- package/artifacts/contracts/test/TestDistribution.sol/TestDistribution.json +0 -445
- package/artifacts/contracts/test/TestPool.sol/TestPool.dbg.json +0 -4
- package/artifacts/contracts/test/TestPool.sol/TestPool.json +0 -602
- package/artifacts/contracts/test/TestProduct.sol/TestProduct.dbg.json +0 -4
- package/artifacts/contracts/test/TestProduct.sol/TestProduct.json +0 -632
- 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/instance/IInstanceLinked.sol +0 -8
- package/contracts/instance/base/InstanceBase.sol +0 -89
- package/contracts/instance/base/ModuleBase.sol +0 -57
- package/contracts/instance/base/ServiceBase.sol +0 -43
- 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 -71
- 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 -41
- package/contracts/instance/module/pool/PoolModule.sol +0 -95
- 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 -84
- package/contracts/instance/module/treasury/TokenHandler.sol +0 -48
- package/contracts/instance/module/treasury/TreasuryModule.sol +0 -131
- package/contracts/instance/service/ProductService.sol +0 -510
- package/contracts/registry/IChainNft.sol +0 -22
- package/contracts/shared/IOwnable.sol +0 -6
- package/contracts/test/TestDistribution.sol +0 -22
- package/contracts/test/TestPool.sol +0 -27
- package/contracts/test/TestProduct.sol +0 -74
- package/contracts/types/ReferralId.sol +0 -48
@@ -1,29 +1,50 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
2
|
pragma solidity ^0.8.20;
|
3
3
|
|
4
|
-
import {NftId} from "
|
5
|
-
import {ObjectType} from "
|
6
|
-
import {RoleId} from "
|
7
|
-
import {IService} from "
|
8
|
-
import {IRegistry} from "
|
4
|
+
import {NftId} from "../types/NftId.sol";
|
5
|
+
import {ObjectType} from "../types/ObjectType.sol";
|
6
|
+
import {RoleId} from "../types/RoleId.sol";
|
7
|
+
import {IService} from "../shared/IService.sol";
|
8
|
+
import {IRegistry} from "./IRegistry.sol";
|
9
9
|
|
10
|
-
import {IRegisterable} from "
|
11
|
-
import {IBaseComponent} from "
|
10
|
+
import {IRegisterable} from "../shared/IRegisterable.sol";
|
11
|
+
import {IBaseComponent} from "../components/IBaseComponent.sol";
|
12
12
|
|
13
13
|
interface IRegistryService is IService {
|
14
14
|
|
15
|
-
|
15
|
+
error SelfRegistration();
|
16
|
+
error NotRegistryOwner();
|
16
17
|
|
17
|
-
|
18
|
+
error NotService();
|
19
|
+
error NotInstance();
|
20
|
+
error NotProduct();
|
21
|
+
error NotPool();
|
22
|
+
error NotDistribution();
|
18
23
|
|
19
|
-
|
20
|
-
|
24
|
+
error UnexpectedRegisterableType(ObjectType expected, ObjectType found);
|
25
|
+
error NotRegisterableOwner(address expectedOwner);
|
26
|
+
error RegisterableOwnerIsZero();
|
27
|
+
error RegisterableOwnerIsRegistered();
|
28
|
+
error InvalidInitialOwner(address initialOwner);
|
29
|
+
error InvalidAddress(address registerableAddress);
|
21
30
|
|
22
|
-
function registerInstance(IRegisterable instance)
|
23
|
-
external returns(IRegistry.ObjectInfo memory info, bytes memory data);
|
24
31
|
|
25
|
-
|
32
|
+
function registerService(IService service) external returns(IRegistry.ObjectInfo memory info, bytes memory data);
|
26
33
|
|
27
|
-
|
34
|
+
function registerInstance(IRegisterable instance)
|
35
|
+
external returns(IRegistry.ObjectInfo memory info, bytes memory data);
|
36
|
+
|
37
|
+
function registerProduct(IBaseComponent product, address owner)
|
38
|
+
external returns(IRegistry.ObjectInfo memory info, bytes memory data);
|
39
|
+
|
40
|
+
function registerPool(IBaseComponent pool, address owner)
|
41
|
+
external returns(IRegistry.ObjectInfo memory info, bytes memory data);
|
42
|
+
|
43
|
+
function registerDistribution(IBaseComponent distribution, address owner)
|
44
|
+
external returns(IRegistry.ObjectInfo memory info, bytes memory data);
|
45
|
+
|
46
|
+
function registerPolicy(IRegistry.ObjectInfo memory info) external returns(NftId nftId); // -> easy to upgrade
|
47
|
+
|
48
|
+
function registerBundle(IRegistry.ObjectInfo memory info) external returns(NftId nftId);
|
28
49
|
}
|
29
50
|
|
@@ -2,17 +2,15 @@
|
|
2
2
|
pragma solidity ^0.8.20;
|
3
3
|
|
4
4
|
import {IRegisterable} from "../shared/IRegisterable.sol";
|
5
|
-
import {IService} from "../
|
5
|
+
import {IService} from "../shared/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 {Version, VersionPart, VersionLib} from "../types/Version.sol";
|
10
|
+
import {Version, VersionPart, VersionLib, VersionPartLib} from "../types/Version.sol";
|
12
11
|
import {ObjectType, PROTOCOL, REGISTRY, TOKEN, SERVICE, INSTANCE, STAKE, PRODUCT, DISTRIBUTION, ORACLE, POOL, POLICY, BUNDLE} from "../types/ObjectType.sol";
|
13
12
|
import {ITransferInterceptor} from "./ITransferInterceptor.sol";
|
14
13
|
|
15
|
-
import {IOwnable} from "../shared/IOwnable.sol";
|
16
14
|
import {ERC165} from "../shared/ERC165.sol";
|
17
15
|
|
18
16
|
|
@@ -30,57 +28,40 @@ contract Registry is
|
|
30
28
|
ERC165,
|
31
29
|
IRegistry
|
32
30
|
{
|
33
|
-
|
34
|
-
error NotRegistryService();
|
35
|
-
error ZeroParentAddress();
|
36
|
-
error ContractAlreadyRegistered(address objectAddress);
|
37
|
-
error InvalidServiceVersion(VersionPart majorVersion);
|
38
|
-
error ServiceNameAlreadyRegistered(string name, VersionPart majorVersion);
|
39
|
-
|
40
|
-
// approve
|
41
|
-
error NotOwner();
|
42
|
-
error NotRegisteredContract(NftId registrarNftId);
|
43
|
-
error NotService(NftId registrarNftId);
|
44
|
-
error InvalidTypesCombination(ObjectType objectType, ObjectType parentType);
|
45
|
-
|
46
|
-
uint256 public constant MAJOR_VERSION_MIN = 3;
|
31
|
+
uint256 public constant GIF_MAJOR_VERSION_AT_DEPLOYMENT = 3;
|
47
32
|
address public constant NFT_LOCK_ADDRESS = address(0x1);
|
48
33
|
uint256 public constant REGISTRY_SERVICE_TOKEN_SEQUENCE_ID = 3;
|
49
34
|
string public constant EMPTY_URI = "";
|
50
35
|
|
51
|
-
|
52
|
-
|
36
|
+
VersionPart internal _majorVersion;
|
37
|
+
|
38
|
+
mapping(NftId nftId => ObjectInfo info) internal _info;
|
39
|
+
mapping(address object => NftId nftId) internal _nftIdByAddress;
|
53
40
|
|
54
41
|
mapping(NftId registrator => mapping(
|
55
|
-
ObjectType objectType => bool)) _isApproved;
|
42
|
+
ObjectType objectType => bool)) internal _isApproved;
|
56
43
|
|
57
44
|
mapping(ObjectType objectType => mapping(
|
58
|
-
ObjectType parentType => bool)) _isValidContractCombination;
|
45
|
+
ObjectType parentType => bool)) internal _isValidContractCombination;
|
59
46
|
|
60
47
|
mapping(ObjectType objectType => mapping(
|
61
|
-
ObjectType parentType => bool)) _isValidObjectCombination;
|
48
|
+
ObjectType parentType => bool)) internal _isValidObjectCombination;
|
49
|
+
|
50
|
+
mapping(address token => mapping(
|
51
|
+
VersionPart majorVersion => bool isActive)) internal _tokenIsActive;
|
62
52
|
|
63
|
-
mapping(NftId nftId => string name) _string;
|
53
|
+
mapping(NftId nftId => string name) internal _string;
|
64
54
|
mapping(bytes32 serviceNameHash => mapping(
|
65
|
-
VersionPart majorVersion => address service)) _service;
|
66
|
-
|
67
|
-
NftId _registryNftId;
|
68
|
-
NftId _serviceNftId; // set in stone upon registry creation
|
69
|
-
|
70
|
-
|
71
|
-
|
72
|
-
/*
|
73
|
-
modifier onlyInitialOwner() {
|
74
|
-
if(
|
75
|
-
msg.sender != getOwner() ||
|
76
|
-
msg.sender != _info[_registryNftId].initialOwner) {
|
77
|
-
revert NotInitialOwner();
|
78
|
-
}
|
79
|
-
}*/
|
55
|
+
VersionPart majorVersion => address service)) internal _service;
|
56
|
+
|
57
|
+
NftId internal _registryNftId;
|
58
|
+
NftId internal _serviceNftId; // set in stone upon registry creation
|
59
|
+
ChainNft internal _chainNft;
|
60
|
+
|
80
61
|
|
81
62
|
modifier onlyOwner() {
|
82
63
|
if(msg.sender != getOwner()) {
|
83
|
-
revert NotOwner();
|
64
|
+
revert NotOwner(msg.sender);
|
84
65
|
}
|
85
66
|
_;
|
86
67
|
}
|
@@ -95,12 +76,14 @@ contract Registry is
|
|
95
76
|
|
96
77
|
constructor(address registryOwner, VersionPart majorVersion)
|
97
78
|
{
|
98
|
-
require(registryOwner > address(0), "Registry:
|
99
|
-
|
79
|
+
require(registryOwner > address(0), "Registry: registry owner is 0");
|
80
|
+
|
81
|
+
// major version at constructor time
|
82
|
+
_majorVersion = VersionLib.toVersionPart(GIF_MAJOR_VERSION_AT_DEPLOYMENT);
|
83
|
+
emit LogInitialMajorVersionSet(_majorVersion);
|
100
84
|
|
101
85
|
// deploy NFT
|
102
|
-
|
103
|
-
_chainNft = IChainNft(_chainNftInternal);
|
86
|
+
_chainNft = new ChainNft(address(this));// adds 10kb to deployment size
|
104
87
|
|
105
88
|
// initial registry setup
|
106
89
|
_registerProtocol();
|
@@ -111,13 +94,29 @@ contract Registry is
|
|
111
94
|
_setupValidObjectParentCombinations();
|
112
95
|
|
113
96
|
_registerInterface(type(IRegistry).interfaceId);
|
114
|
-
_registerInterface(type(IOwnable).interfaceId);
|
115
97
|
}
|
116
98
|
|
117
|
-
|
118
|
-
|
119
|
-
|
99
|
+
// from IRegistry
|
100
|
+
|
101
|
+
/// @dev latest GIF release version
|
102
|
+
function setMajorVersion(VersionPart newMajorVersion)
|
103
|
+
external
|
104
|
+
onlyOwner
|
105
|
+
{
|
106
|
+
// ensure major version increments is one
|
107
|
+
uint256 oldMax = _majorVersion.toInt();
|
108
|
+
uint256 newMax = newMajorVersion.toInt();
|
109
|
+
if (newMax <= oldMax || newMax - oldMax != 1) {
|
110
|
+
revert MajorVersionMaxIncreaseInvalid(newMajorVersion, _majorVersion);
|
111
|
+
}
|
112
|
+
|
113
|
+
_majorVersion = newMajorVersion;
|
114
|
+
emit LogMajorVersionSet(_majorVersion);
|
115
|
+
}
|
116
|
+
|
117
|
+
/// @dev registry protects only against tampering existing records, registering with invalid types pairs and 0 parent address
|
120
118
|
// TODO service registration means its approval for some type?
|
119
|
+
// TODO registration of precompile addresses
|
121
120
|
function register(ObjectInfo memory info)
|
122
121
|
external
|
123
122
|
onlyRegistryService
|
@@ -139,6 +138,7 @@ contract Registry is
|
|
139
138
|
|
140
139
|
address interceptor = _getInterceptor(info.isInterceptor, info.objectAddress, parentInfo.isInterceptor, parentAddress);
|
141
140
|
|
141
|
+
// TODO does external call
|
142
142
|
uint256 mintedTokenId = _chainNft.mint(
|
143
143
|
info.initialOwner,
|
144
144
|
interceptor,
|
@@ -168,33 +168,8 @@ contract Registry is
|
|
168
168
|
_nftIdByAddress[contractAddress] = nftId;
|
169
169
|
|
170
170
|
// special case
|
171
|
-
if(objectType == SERVICE())
|
172
|
-
|
173
|
-
(
|
174
|
-
string memory serviceName,
|
175
|
-
VersionPart majorVersion
|
176
|
-
) = abi.decode(info.data, (string, VersionPart));
|
177
|
-
bytes32 serviceNameHash = keccak256(abi.encode(serviceName));
|
178
|
-
|
179
|
-
// TODO MUST guarantee consistency of registerable.getVersion() and majorVersion here
|
180
|
-
// TODO update _serviceNftId when registryService with new major version is registered? -> it is fixed in current setup
|
181
|
-
// TODO do not use names -> each object type is registered by corresponding service -> conflicting with approve()
|
182
|
-
if(
|
183
|
-
majorVersion.toInt() < MAJOR_VERSION_MIN ||
|
184
|
-
(majorVersion.toInt() > MAJOR_VERSION_MIN &&
|
185
|
-
_service[serviceNameHash][VersionLib.toVersionPart(majorVersion.toInt() - 1)] == address(0) )
|
186
|
-
) {
|
187
|
-
revert InvalidServiceVersion(majorVersion);
|
188
|
-
}
|
189
|
-
|
190
|
-
if(_service[serviceNameHash][majorVersion] != address(0)) {
|
191
|
-
revert ServiceNameAlreadyRegistered(serviceName, majorVersion);
|
192
|
-
}
|
193
|
-
|
194
|
-
_string[nftId] = serviceName;
|
195
|
-
_service[serviceNameHash][majorVersion] = contractAddress;
|
196
|
-
|
197
|
-
emit LogServiceNameRegistration(serviceName, majorVersion);
|
171
|
+
if(objectType == SERVICE()) {
|
172
|
+
_registerService(info);
|
198
173
|
}
|
199
174
|
}
|
200
175
|
else
|
@@ -204,75 +179,70 @@ contract Registry is
|
|
204
179
|
}
|
205
180
|
}
|
206
181
|
|
207
|
-
emit LogRegistration(
|
208
|
-
}
|
209
|
-
|
210
|
-
function registerFrom(
|
211
|
-
address from,
|
212
|
-
ObjectInfo memory info
|
213
|
-
) external returns (NftId nftId)
|
214
|
-
{
|
215
|
-
revert();
|
182
|
+
emit LogRegistration(info);
|
216
183
|
}
|
217
|
-
|
218
184
|
|
219
|
-
/// @dev
|
220
|
-
//
|
221
|
-
//
|
222
|
-
|
223
|
-
|
224
|
-
|
225
|
-
// - registration and approve is a single operation, no need for separate approve() function
|
226
|
-
// - then approve can be used to adding new valid object-parent combinations???
|
227
|
-
function approve(
|
228
|
-
NftId serviceNftId,
|
229
|
-
ObjectType objectType,
|
230
|
-
ObjectType parentType
|
231
|
-
)
|
232
|
-
public
|
233
|
-
onlyOwner()
|
185
|
+
/// @dev token state is informative, registry have no clue about used tokens
|
186
|
+
// component owner is responsible for token selection and operations
|
187
|
+
// service MUST deny registration of component with inactive token
|
188
|
+
function setTokenActive(address token, VersionPart majorVersion, bool active)
|
189
|
+
external
|
190
|
+
onlyOwner
|
234
191
|
{
|
235
|
-
|
236
|
-
|
237
|
-
if(
|
238
|
-
revert
|
192
|
+
// verify that token is registered
|
193
|
+
ObjectInfo memory info = _info[_nftIdByAddress[token]];
|
194
|
+
if (info.nftId.eqz()) {
|
195
|
+
revert TokenNotRegistered(token);
|
239
196
|
}
|
240
197
|
|
241
|
-
|
242
|
-
|
198
|
+
// verify provided address is a registered token
|
199
|
+
if (info.objectType != TOKEN()) {
|
200
|
+
revert NotToken(token);
|
243
201
|
}
|
244
202
|
|
245
|
-
|
246
|
-
|
247
|
-
|
248
|
-
|
203
|
+
// verify valid major version
|
204
|
+
// ensure major version increments is one
|
205
|
+
uint256 version = majorVersion.toInt();
|
206
|
+
uint256 versionNow = _majorVersion.toInt();
|
207
|
+
if (version < GIF_MAJOR_VERSION_AT_DEPLOYMENT || version > versionNow) {
|
208
|
+
revert TokenMajorVersionInvalid(majorVersion);
|
249
209
|
}
|
250
210
|
|
251
|
-
|
211
|
+
_tokenIsActive[token][majorVersion] = active;
|
252
212
|
|
253
|
-
emit
|
213
|
+
emit LogTokenStateSet(token, majorVersion, active);
|
254
214
|
}
|
255
215
|
|
256
|
-
/// @dev
|
257
|
-
|
258
|
-
|
259
|
-
function allowance(
|
260
|
-
NftId nftId,
|
261
|
-
ObjectType object
|
262
|
-
)
|
263
|
-
public
|
264
|
-
view
|
265
|
-
returns (bool)
|
266
|
-
{
|
267
|
-
return _isApproved[nftId][object];
|
216
|
+
/// @dev earliest GIF major version
|
217
|
+
function getMajorVersionMin() external view returns (VersionPart) {
|
218
|
+
return VersionLib.toVersionPart(GIF_MAJOR_VERSION_AT_DEPLOYMENT);
|
268
219
|
}
|
269
220
|
|
270
|
-
//
|
221
|
+
// TODO make distinction between active an not yet active version
|
222
|
+
// need to be thought trough, not yet clear if necessary
|
223
|
+
// need to answer question: what is the latest version during the upgrade process?
|
224
|
+
// likely setting up a new gif version does not fit into a single tx
|
225
|
+
// in this case we might want to have a period where the latest version is
|
226
|
+
// in the process of being set up while the latest active version is 1 major release smaller
|
227
|
+
/// @dev latest GIF major version (might not yet be active)
|
228
|
+
function getMajorVersionMax() external view returns (VersionPart) {
|
229
|
+
return _majorVersion;
|
230
|
+
}
|
231
|
+
|
232
|
+
/// @dev latest active GIF release version
|
233
|
+
function getMajorVersion() external view returns (VersionPart) {
|
234
|
+
return _majorVersion;
|
235
|
+
}
|
236
|
+
|
237
|
+
|
271
238
|
function getObjectCount() external view override returns (uint256) {
|
272
|
-
|
273
239
|
return _chainNft.totalSupply();
|
274
240
|
}
|
275
241
|
|
242
|
+
function getNftId() external view returns (NftId nftId) {
|
243
|
+
return _registryNftId;
|
244
|
+
}
|
245
|
+
|
276
246
|
function getNftId(address object) external view override returns (NftId id) {
|
277
247
|
return _nftIdByAddress[object];
|
278
248
|
}
|
@@ -303,6 +273,10 @@ contract Registry is
|
|
303
273
|
return _nftIdByAddress[object].gtz();
|
304
274
|
}
|
305
275
|
|
276
|
+
function isTokenActive(address token, VersionPart majorVersion) external view returns (bool) {
|
277
|
+
return _tokenIsActive[token][majorVersion];
|
278
|
+
}
|
279
|
+
|
306
280
|
function getServiceName(NftId nftId) external view returns (string memory) {
|
307
281
|
return _string[nftId];
|
308
282
|
}
|
@@ -317,25 +291,76 @@ contract Registry is
|
|
317
291
|
return _service[serviceNameHash][majorVersion];
|
318
292
|
}
|
319
293
|
|
320
|
-
function getChainNft() external view override returns (
|
294
|
+
function getChainNft() external view override returns (ChainNft) {
|
321
295
|
return _chainNft;
|
322
296
|
}
|
323
297
|
|
324
|
-
// from IOwnable
|
325
298
|
function getOwner() public view returns (address owner) {
|
326
299
|
return ownerOf(address(this));
|
327
300
|
}
|
328
301
|
|
329
|
-
// Internals
|
302
|
+
// Internals
|
303
|
+
|
304
|
+
function _registerService(ObjectInfo memory info)
|
305
|
+
internal
|
306
|
+
{
|
307
|
+
(
|
308
|
+
string memory serviceName,
|
309
|
+
VersionPart majorVersion
|
310
|
+
) = abi.decode(info.data, (string, VersionPart));
|
311
|
+
bytes32 serviceNameHash = keccak256(abi.encode(serviceName));
|
312
|
+
|
313
|
+
// ensures consistency of service.getVersion() and majorVersion here
|
314
|
+
if(majorVersion != _majorVersion) {
|
315
|
+
revert InvalidServiceVersion(majorVersion);
|
316
|
+
}
|
317
|
+
|
318
|
+
if(_service[serviceNameHash][majorVersion] != address(0)) {
|
319
|
+
revert ServiceNameAlreadyRegistered(serviceName, majorVersion);
|
320
|
+
}
|
321
|
+
|
322
|
+
_string[info.nftId] = serviceName;
|
323
|
+
_service[serviceNameHash][majorVersion] = info.objectAddress;
|
324
|
+
|
325
|
+
emit LogServiceNameRegistration(serviceName, majorVersion);
|
326
|
+
}
|
327
|
+
|
328
|
+
/// @dev obtain interceptor address for this nft if applicable, address(0) otherwise
|
329
|
+
function _getInterceptor(
|
330
|
+
bool isInterceptor,
|
331
|
+
address objectAddress,
|
332
|
+
bool parentIsInterceptor,
|
333
|
+
address parentObjectAddress
|
334
|
+
)
|
335
|
+
internal
|
336
|
+
view
|
337
|
+
returns (address interceptor)
|
338
|
+
{
|
339
|
+
if (objectAddress == address(0)) {
|
340
|
+
if (parentIsInterceptor) {
|
341
|
+
return parentObjectAddress;
|
342
|
+
} else {
|
343
|
+
return address(0);
|
344
|
+
}
|
345
|
+
}
|
346
|
+
|
347
|
+
if (isInterceptor) {
|
348
|
+
return objectAddress;
|
349
|
+
}
|
350
|
+
|
351
|
+
return address(0);
|
352
|
+
}
|
353
|
+
|
354
|
+
// Internals called only in constructor
|
330
355
|
|
331
356
|
/// @dev protocol registration used to anchor the dip ecosystem relations
|
332
357
|
function _registerProtocol()
|
333
358
|
internal
|
334
359
|
{
|
335
|
-
uint256 protocolId =
|
360
|
+
uint256 protocolId = _chainNft.PROTOCOL_NFT_ID();
|
336
361
|
NftId protocolNftId = toNftId(protocolId);
|
337
362
|
|
338
|
-
|
363
|
+
_chainNft.mint(NFT_LOCK_ADDRESS, protocolId);
|
339
364
|
|
340
365
|
_info[protocolNftId] = ObjectInfo(
|
341
366
|
protocolNftId,
|
@@ -353,22 +378,22 @@ contract Registry is
|
|
353
378
|
function _registerRegistry(address registryOwner)
|
354
379
|
internal
|
355
380
|
{
|
356
|
-
uint256 registryId =
|
381
|
+
uint256 registryId = _chainNft.calculateTokenId(2);
|
357
382
|
NftId registryNftId = toNftId(registryId);
|
358
383
|
|
359
384
|
NftId parentNftId;
|
360
385
|
|
361
|
-
if(registryId !=
|
386
|
+
if(registryId != _chainNft.GLOBAL_REGISTRY_ID())
|
362
387
|
{// we're not the global registry
|
363
388
|
_registerGlobalRegistry();
|
364
|
-
parentNftId = toNftId(
|
389
|
+
parentNftId = toNftId(_chainNft.GLOBAL_REGISTRY_ID());
|
365
390
|
}
|
366
391
|
else
|
367
392
|
{// we are global registry
|
368
|
-
parentNftId = toNftId(
|
393
|
+
parentNftId = toNftId(_chainNft.PROTOCOL_NFT_ID());
|
369
394
|
}
|
370
395
|
|
371
|
-
|
396
|
+
_chainNft.mint(registryOwner, registryId);
|
372
397
|
|
373
398
|
_info[registryNftId] = ObjectInfo(
|
374
399
|
registryNftId,
|
@@ -388,15 +413,15 @@ contract Registry is
|
|
388
413
|
function _registerGlobalRegistry()
|
389
414
|
internal
|
390
415
|
{
|
391
|
-
uint256 globalRegistryId =
|
416
|
+
uint256 globalRegistryId = _chainNft.GLOBAL_REGISTRY_ID();
|
392
417
|
|
393
|
-
|
418
|
+
_chainNft.mint(NFT_LOCK_ADDRESS, globalRegistryId);
|
394
419
|
|
395
420
|
NftId globalRegistryNftId = toNftId(globalRegistryId);
|
396
421
|
|
397
422
|
_info[globalRegistryNftId] = ObjectInfo(
|
398
423
|
globalRegistryNftId,
|
399
|
-
toNftId(
|
424
|
+
toNftId(_chainNft.PROTOCOL_NFT_ID()), // parent
|
400
425
|
REGISTRY(),
|
401
426
|
false, // isInterceptor
|
402
427
|
address(0), // objectAddress
|
@@ -408,10 +433,10 @@ contract Registry is
|
|
408
433
|
function _registerRegistryService(address registryOwner)
|
409
434
|
internal
|
410
435
|
{
|
411
|
-
uint256 serviceId =
|
436
|
+
uint256 serviceId = _chainNft.calculateTokenId(REGISTRY_SERVICE_TOKEN_SEQUENCE_ID);
|
412
437
|
NftId serviceNftId = toNftId(serviceId);
|
413
438
|
|
414
|
-
|
439
|
+
_chainNft.mint(registryOwner, serviceId);
|
415
440
|
|
416
441
|
_info[serviceNftId] = ObjectInfo(
|
417
442
|
serviceNftId,
|
@@ -427,37 +452,11 @@ contract Registry is
|
|
427
452
|
|
428
453
|
string memory serviceName = "RegistryService";
|
429
454
|
bytes32 serviceNameHash = keccak256(abi.encode(serviceName));
|
430
|
-
_service[serviceNameHash][VersionLib.toVersionPart(
|
455
|
+
_service[serviceNameHash][VersionLib.toVersionPart(GIF_MAJOR_VERSION_AT_DEPLOYMENT)] = msg.sender;
|
431
456
|
_string[serviceNftId] = serviceName;
|
432
457
|
_serviceNftId = serviceNftId;
|
433
458
|
}
|
434
459
|
|
435
|
-
/// @dev obtain interceptor address for this nft if applicable, address(0) otherwise
|
436
|
-
function _getInterceptor(
|
437
|
-
bool isInterceptor,
|
438
|
-
address objectAddress,
|
439
|
-
bool parentIsInterceptor,
|
440
|
-
address parentObjectAddress
|
441
|
-
)
|
442
|
-
internal
|
443
|
-
view
|
444
|
-
returns (address interceptor)
|
445
|
-
{
|
446
|
-
if (objectAddress == address(0)) {
|
447
|
-
if (parentIsInterceptor) {
|
448
|
-
return parentObjectAddress;
|
449
|
-
} else {
|
450
|
-
return address(0);
|
451
|
-
}
|
452
|
-
}
|
453
|
-
|
454
|
-
if (isInterceptor) {
|
455
|
-
return objectAddress;
|
456
|
-
}
|
457
|
-
|
458
|
-
return address(0);
|
459
|
-
}
|
460
|
-
|
461
460
|
/// @dev defines which object - parent types relations are allowed to register
|
462
461
|
// IMPORTANT:
|
463
462
|
// 1) EACH object type MUST have only one parent type across ALL mappings
|