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