@etherisc/gif-next 0.0.2-f18fb8b-243 → 0.0.2-f1f3b2c-994
Sign up to get free protection for your applications and to get access to all the features.
- package/README.md +19 -2
- package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.dbg.json +1 -1
- package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.json +81 -63
- package/artifacts/contracts/authorization/AccessManagerCloneable.sol/AccessManagerCloneable.dbg.json +1 -1
- package/artifacts/contracts/authorization/Authorization.sol/Authorization.dbg.json +1 -1
- package/artifacts/contracts/authorization/Authorization.sol/Authorization.json +2 -2
- package/artifacts/contracts/authorization/IAccess.sol/IAccess.dbg.json +1 -1
- package/artifacts/contracts/authorization/IAccessAdmin.sol/IAccessAdmin.dbg.json +1 -1
- package/artifacts/contracts/authorization/IAccessAdmin.sol/IAccessAdmin.json +48 -30
- package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.dbg.json +1 -1
- package/artifacts/contracts/authorization/IModuleAuthorization.sol/IModuleAuthorization.dbg.json +1 -1
- package/artifacts/contracts/authorization/IServiceAuthorization.sol/IServiceAuthorization.dbg.json +1 -1
- package/artifacts/contracts/authorization/IServiceAuthorization.sol/IServiceAuthorization.json +21 -2
- package/artifacts/contracts/authorization/ModuleAuthorization.sol/ModuleAuthorization.dbg.json +1 -1
- package/artifacts/contracts/authorization/ModuleAuthorization.sol/ModuleAuthorization.json +2 -2
- package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.dbg.json +1 -1
- package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.json +72 -9
- package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.dbg.json +1 -1
- package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.json +106 -248
- package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.dbg.json +1 -1
- package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.json +16 -16
- package/artifacts/contracts/distribution/Distribution.sol/Distribution.dbg.json +1 -1
- package/artifacts/contracts/distribution/Distribution.sol/Distribution.json +64 -222
- package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.dbg.json +1 -1
- package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.json +228 -217
- package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
- package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.json +93 -101
- package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
- package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.json +64 -37
- package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.dbg.json +1 -1
- package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.json +120 -31
- package/artifacts/contracts/examples/fire/DamageLevel.sol/DamageLevelLib.dbg.json +4 -0
- package/artifacts/contracts/examples/fire/DamageLevel.sol/DamageLevelLib.json +22 -0
- package/artifacts/contracts/examples/fire/FirePool.sol/FirePool.dbg.json +4 -0
- package/artifacts/contracts/examples/fire/FirePool.sol/FirePool.json +1512 -0
- package/artifacts/contracts/examples/fire/FirePoolAuthorization.sol/FirePoolAuthorization.dbg.json +4 -0
- package/artifacts/contracts/examples/fire/FirePoolAuthorization.sol/FirePoolAuthorization.json +410 -0
- package/artifacts/contracts/examples/fire/FireProduct.sol/FireProduct.dbg.json +4 -0
- package/artifacts/contracts/examples/fire/FireProduct.sol/FireProduct.json +1999 -0
- package/artifacts/contracts/examples/fire/FireProductAuthorization.sol/FireProductAuthorization.dbg.json +4 -0
- package/artifacts/contracts/examples/fire/FireProductAuthorization.sol/FireProductAuthorization.json +414 -0
- package/artifacts/contracts/examples/fire/FireUSD.sol/FireUSD.dbg.json +4 -0
- package/artifacts/contracts/examples/fire/FireUSD.sol/FireUSD.json +376 -0
- package/artifacts/contracts/examples/unpermissioned/SimpleDistribution.sol/SimpleDistribution.dbg.json +4 -0
- package/artifacts/contracts/examples/unpermissioned/SimpleDistribution.sol/SimpleDistribution.json +1432 -0
- package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.dbg.json +4 -0
- package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.json +1192 -0
- package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.dbg.json +4 -0
- package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.json +1566 -0
- package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.dbg.json +4 -0
- package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.json +2001 -0
- package/artifacts/contracts/instance/BundleSet.sol/BundleSet.dbg.json +4 -0
- package/artifacts/contracts/instance/BundleSet.sol/BundleSet.json +703 -0
- package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstance.sol/IInstance.json +6 -6
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +5 -5
- package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
- package/artifacts/contracts/instance/Instance.sol/Instance.json +17 -106
- package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.json +146 -112
- package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.json +31 -31
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +437 -129
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +44 -151
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +61 -81
- package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.json +285 -228
- package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.dbg.json +1 -1
- package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.json +2 -2
- package/artifacts/contracts/instance/base/Cloneable.sol/Cloneable.dbg.json +1 -1
- package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.dbg.json +1 -1
- package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.json +2 -2
- package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.dbg.json +1 -1
- package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.json +45 -4
- package/artifacts/contracts/instance/base/ObjectSet.sol/ObjectSet.dbg.json +4 -0
- package/artifacts/contracts/instance/base/{ObjectManager.sol/ObjectManager.json → ObjectSet.sol/ObjectSet.json} +6 -6
- package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IComponents.sol/IComponents.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +1 -1
- package/artifacts/contracts/mock/Dip.sol/Dip.dbg.json +1 -1
- package/artifacts/contracts/mock/Dip.sol/Dip.json +2 -2
- package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.dbg.json +1 -1
- package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.json +74 -229
- package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.dbg.json +1 -1
- package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.json +18 -18
- package/artifacts/contracts/oracle/IOracle.sol/IOracle.dbg.json +1 -1
- package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.dbg.json +1 -1
- package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.json +45 -31
- package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.dbg.json +1 -1
- package/artifacts/contracts/oracle/Oracle.sol/Oracle.dbg.json +1 -1
- package/artifacts/contracts/oracle/Oracle.sol/Oracle.json +42 -213
- package/artifacts/contracts/oracle/OracleService.sol/OracleService.dbg.json +1 -1
- package/artifacts/contracts/oracle/OracleService.sol/OracleService.json +37 -144
- package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.dbg.json +1 -1
- package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.json +60 -80
- package/artifacts/contracts/pool/BasicPool.sol/BasicPool.dbg.json +1 -1
- package/artifacts/contracts/pool/BasicPool.sol/BasicPool.json +94 -274
- package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.dbg.json +1 -1
- package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.json +16 -16
- package/artifacts/contracts/pool/BundleService.sol/BundleService.dbg.json +1 -1
- package/artifacts/contracts/pool/BundleService.sol/BundleService.json +458 -161
- package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.dbg.json +1 -1
- package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.json +154 -86
- package/artifacts/contracts/pool/IBundleService.sol/IBundleService.dbg.json +1 -1
- package/artifacts/contracts/pool/IBundleService.sol/IBundleService.json +229 -1
- package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
- package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.json +87 -88
- package/artifacts/contracts/pool/IPoolService.sol/IPoolService.dbg.json +1 -1
- package/artifacts/contracts/pool/IPoolService.sol/IPoolService.json +360 -171
- package/artifacts/contracts/pool/Pool.sol/Pool.dbg.json +1 -1
- package/artifacts/contracts/pool/Pool.sol/Pool.json +84 -270
- package/artifacts/contracts/pool/PoolService.sol/PoolService.dbg.json +1 -1
- package/artifacts/contracts/pool/PoolService.sol/PoolService.json +492 -333
- package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
- package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.json +98 -82
- package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.dbg.json +1 -1
- package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.json +36 -162
- package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +1 -1
- package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.json +57 -89
- package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.dbg.json +1 -1
- package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.json +62 -242
- package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.dbg.json +1 -1
- package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.json +16 -16
- package/artifacts/contracts/product/ClaimService.sol/ClaimService.dbg.json +1 -1
- package/artifacts/contracts/product/ClaimService.sol/ClaimService.json +263 -181
- package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +1 -1
- package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.json +104 -100
- package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.dbg.json +1 -1
- package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.json +5 -0
- package/artifacts/contracts/product/IClaimService.sol/IClaimService.dbg.json +1 -1
- package/artifacts/contracts/product/IClaimService.sol/IClaimService.json +147 -6
- package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.dbg.json +1 -1
- package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.json +295 -119
- package/artifacts/contracts/product/IPricingService.sol/IPricingService.dbg.json +1 -1
- package/artifacts/contracts/product/IPricingService.sol/IPricingService.json +43 -43
- package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.dbg.json +1 -1
- package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.json +62 -57
- package/artifacts/contracts/product/IRiskService.sol/IRiskService.dbg.json +4 -0
- package/artifacts/contracts/product/{IProductService.sol/IProductService.json → IRiskService.sol/IRiskService.json} +2 -2
- package/artifacts/contracts/product/PolicyService.sol/PolicyService.dbg.json +1 -1
- package/artifacts/contracts/product/PolicyService.sol/PolicyService.json +406 -321
- package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +1 -1
- package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.json +104 -100
- package/artifacts/contracts/product/PricingService.sol/PricingService.dbg.json +1 -1
- package/artifacts/contracts/product/PricingService.sol/PricingService.json +118 -265
- package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.dbg.json +1 -1
- package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.json +80 -120
- package/artifacts/contracts/product/Product.sol/Product.dbg.json +1 -1
- package/artifacts/contracts/product/Product.sol/Product.json +62 -242
- package/artifacts/contracts/product/RiskService.sol/RiskService.dbg.json +4 -0
- package/artifacts/contracts/product/RiskService.sol/RiskService.json +588 -0
- package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.dbg.json +4 -0
- package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.json +682 -0
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +59 -16
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +274 -22
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +0 -183
- 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 +493 -80
- package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.json +263 -145
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +23 -313
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +52 -72
- package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.dbg.json +1 -1
- package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.json +46 -5
- package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.dbg.json +4 -0
- package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.json +1061 -0
- package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.dbg.json +1 -1
- package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.json +70 -12
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +2 -2
- package/artifacts/contracts/shared/Component.sol/Component.dbg.json +1 -1
- package/artifacts/contracts/shared/Component.sol/Component.json +15 -205
- package/artifacts/contracts/shared/ComponentService.sol/ComponentService.dbg.json +1 -1
- package/artifacts/contracts/shared/ComponentService.sol/ComponentService.json +247 -161
- package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.dbg.json +1 -1
- package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.json +105 -95
- package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.dbg.json +1 -1
- package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.json +5 -112
- package/artifacts/contracts/shared/ContractLib.sol/ContractLib.dbg.json +4 -0
- package/artifacts/contracts/shared/ContractLib.sol/ContractLib.json +92 -0
- package/artifacts/contracts/shared/IComponent.sol/IComponent.dbg.json +1 -1
- package/artifacts/contracts/shared/IComponent.sol/IComponent.json +15 -20
- package/artifacts/contracts/shared/IComponentService.sol/IComponentService.dbg.json +1 -1
- package/artifacts/contracts/shared/IComponentService.sol/IComponentService.json +153 -0
- package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.dbg.json +1 -1
- package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.json +34 -31
- package/artifacts/contracts/shared/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
- package/artifacts/contracts/shared/IKeyValueStore.sol/IKeyValueStore.json +36 -0
- package/artifacts/contracts/shared/ILifecycle.sol/ILifecycle.dbg.json +1 -1
- package/artifacts/contracts/shared/ILifecycle.sol/ILifecycle.json +36 -0
- package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
- package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +1 -1
- package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.json +15 -47
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
- package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +1 -1
- package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
- package/artifacts/contracts/shared/InitializableERC165.sol/InitializableERC165.dbg.json +4 -0
- package/artifacts/contracts/shared/InitializableERC165.sol/InitializableERC165.json +53 -0
- package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.dbg.json +1 -1
- package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.json +34 -216
- package/artifacts/contracts/shared/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
- package/artifacts/contracts/shared/KeyValueStore.sol/KeyValueStore.json +41 -0
- package/artifacts/contracts/shared/Lifecycle.sol/Lifecycle.dbg.json +1 -1
- package/artifacts/contracts/shared/Lifecycle.sol/Lifecycle.json +41 -0
- package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.dbg.json +4 -0
- package/artifacts/contracts/shared/{NftIdSetManager.sol/NftIdSetManager.json → NftIdSet.sol/NftIdSet.json} +4 -4
- package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
- package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +6 -57
- package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +1 -1
- package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +19 -141
- package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
- package/artifacts/contracts/shared/Registerable.sol/Registerable.json +8 -97
- package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +1 -1
- package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +2 -15
- package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
- package/artifacts/contracts/shared/Service.sol/Service.json +5 -112
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +330 -11
- package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.dbg.json +4 -0
- package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.json +108 -0
- package/artifacts/contracts/staking/IStaking.sol/IStaking.dbg.json +1 -1
- package/artifacts/contracts/staking/IStaking.sol/IStaking.json +42 -21
- package/artifacts/contracts/staking/IStakingService.sol/IStakingService.dbg.json +1 -1
- package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.dbg.json +1 -1
- package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.json +73 -93
- package/artifacts/contracts/staking/Staking.sol/Staking.dbg.json +1 -1
- package/artifacts/contracts/staking/Staking.sol/Staking.json +100 -256
- package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.json +45 -4
- package/artifacts/contracts/staking/StakingManager.sol/StakingManager.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingManager.sol/StakingManager.json +77 -88
- package/artifacts/contracts/staking/StakingReader.sol/StakingReader.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingReader.sol/StakingReader.json +6 -11
- package/artifacts/contracts/staking/StakingService.sol/StakingService.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingService.sol/StakingService.json +31 -138
- package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.json +56 -76
- package/artifacts/contracts/staking/StakingStore.sol/StakingStore.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingStore.sol/StakingStore.json +176 -130
- package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.dbg.json +1 -1
- package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.json +59 -23
- package/artifacts/contracts/type/AddressSet.sol/LibAddressSet.dbg.json +1 -1
- package/artifacts/contracts/type/Amount.sol/AmountLib.dbg.json +1 -1
- package/artifacts/contracts/type/Amount.sol/AmountLib.json +61 -8
- package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
- package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.json +2 -2
- package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.dbg.json +1 -1
- package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.json +28 -4
- package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.dbg.json +1 -1
- package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.json +2 -2
- package/artifacts/contracts/type/Fee.sol/FeeLib.dbg.json +1 -1
- package/artifacts/contracts/type/Fee.sol/FeeLib.json +7 -2
- package/artifacts/contracts/type/Key32.sol/Key32Lib.dbg.json +1 -1
- package/artifacts/contracts/type/Key32.sol/Key32Lib.json +2 -2
- package/artifacts/contracts/type/NftId.sol/NftIdLib.dbg.json +1 -1
- package/artifacts/contracts/type/NftId.sol/NftIdLib.json +2 -2
- package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
- package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.json +2 -2
- package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
- package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.json +2 -2
- package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.dbg.json +1 -1
- package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.json +19 -19
- package/artifacts/contracts/type/Referral.sol/ReferralLib.dbg.json +1 -1
- package/artifacts/contracts/type/Referral.sol/ReferralLib.json +2 -2
- package/artifacts/contracts/type/RequestId.sol/RequestIdLib.dbg.json +1 -1
- package/artifacts/contracts/type/RequestId.sol/RequestIdLib.json +2 -2
- package/artifacts/contracts/type/RiskId.sol/RiskIdLib.dbg.json +1 -1
- package/artifacts/contracts/type/RiskId.sol/RiskIdLib.json +60 -4
- package/artifacts/contracts/type/RoleId.sol/RoleIdLib.dbg.json +1 -1
- package/artifacts/contracts/type/RoleId.sol/RoleIdLib.json +2 -2
- package/artifacts/contracts/type/Seconds.sol/SecondsLib.dbg.json +1 -1
- package/artifacts/contracts/type/Seconds.sol/SecondsLib.json +50 -2
- package/artifacts/contracts/type/Selector.sol/SelectorLib.dbg.json +1 -1
- package/artifacts/contracts/type/Selector.sol/SelectorSetLib.dbg.json +1 -1
- package/artifacts/contracts/type/StateId.sol/StateIdLib.dbg.json +1 -1
- package/artifacts/contracts/type/StateId.sol/StateIdLib.json +15 -2
- package/artifacts/contracts/type/String.sol/StrLib.dbg.json +1 -1
- package/artifacts/contracts/type/Timestamp.sol/TimestampLib.dbg.json +1 -1
- package/artifacts/contracts/type/Timestamp.sol/TimestampLib.json +23 -4
- package/artifacts/contracts/type/UFixed.sol/MathLib.dbg.json +1 -1
- package/artifacts/contracts/type/UFixed.sol/MathLib.json +9 -3
- package/artifacts/contracts/type/UFixed.sol/UFixedLib.dbg.json +1 -1
- package/artifacts/contracts/type/UFixed.sol/UFixedLib.json +52 -2
- package/artifacts/contracts/type/Version.sol/VersionLib.dbg.json +1 -1
- package/artifacts/contracts/type/Version.sol/VersionLib.json +2 -2
- package/artifacts/contracts/type/Version.sol/VersionPartLib.dbg.json +1 -1
- package/artifacts/contracts/type/Version.sol/VersionPartLib.json +21 -2
- package/artifacts/contracts/upgradeability/IVersionable.sol/IVersionable.dbg.json +4 -0
- package/artifacts/contracts/{shared → upgradeability}/IVersionable.sol/IVersionable.json +1 -1
- package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.dbg.json +4 -0
- package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.json +586 -0
- package/artifacts/contracts/upgradeability/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +4 -0
- package/artifacts/contracts/{shared → upgradeability}/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +3 -3
- package/artifacts/contracts/upgradeability/Versionable.sol/Versionable.dbg.json +4 -0
- package/artifacts/contracts/{shared → upgradeability}/Versionable.sol/Versionable.json +1 -1
- package/contracts/authorization/AccessAdmin.sol +31 -24
- package/contracts/authorization/Authorization.sol +5 -2
- package/contracts/authorization/IAccessAdmin.sol +3 -2
- package/contracts/authorization/IServiceAuthorization.sol +4 -2
- package/contracts/authorization/ServiceAuthorization.sol +27 -11
- package/contracts/distribution/BasicDistribution.sol +4 -15
- package/contracts/distribution/BasicDistributionAuthorization.sol +5 -1
- package/contracts/distribution/Distribution.sol +23 -11
- package/contracts/distribution/DistributionService.sol +76 -42
- package/contracts/distribution/DistributionServiceManager.sol +8 -11
- package/contracts/distribution/IDistributionComponent.sol +8 -4
- package/contracts/distribution/IDistributionService.sol +18 -2
- package/contracts/examples/fire/DamageLevel.sol +59 -0
- package/contracts/examples/fire/FirePool.sol +75 -0
- package/contracts/examples/fire/FirePoolAuthorization.sol +34 -0
- package/contracts/examples/fire/FireProduct.sol +411 -0
- package/contracts/examples/fire/FireProductAuthorization.sol +45 -0
- package/contracts/examples/fire/FireUSD.sol +26 -0
- package/contracts/examples/unpermissioned/SimpleDistribution.sol +50 -0
- package/contracts/examples/unpermissioned/SimpleOracle.sol +137 -0
- package/contracts/examples/unpermissioned/SimplePool.sol +76 -0
- package/contracts/examples/unpermissioned/SimpleProduct.sol +351 -0
- package/contracts/instance/{BundleManager.sol → BundleSet.sol} +23 -23
- package/contracts/instance/IInstance.sol +11 -34
- package/contracts/instance/IInstanceService.sol +5 -5
- package/contracts/instance/Instance.sol +13 -38
- package/contracts/instance/InstanceAdmin.sol +31 -9
- package/contracts/instance/InstanceAuthorizationV3.sol +16 -14
- package/contracts/instance/InstanceReader.sol +115 -25
- package/contracts/instance/InstanceService.sol +71 -49
- package/contracts/instance/InstanceServiceManager.sol +8 -13
- package/contracts/instance/InstanceStore.sol +12 -1
- package/contracts/instance/base/ObjectLifecycle.sol +9 -4
- package/contracts/instance/base/{ObjectManager.sol → ObjectSet.sol} +5 -5
- package/contracts/instance/module/IBundle.sol +1 -1
- package/contracts/instance/module/IComponents.sol +4 -8
- package/contracts/instance/module/IDistribution.sol +0 -1
- package/contracts/instance/module/IPolicy.sol +24 -24
- package/contracts/mock/Dip.sol +1 -1
- package/contracts/oracle/IOracleComponent.sol +2 -1
- package/contracts/oracle/Oracle.sol +17 -7
- package/contracts/oracle/OracleService.sol +11 -8
- package/contracts/oracle/OracleServiceManager.sol +8 -11
- package/contracts/pool/BasicPool.sol +7 -5
- package/contracts/pool/BasicPoolAuthorization.sol +11 -2
- package/contracts/pool/BundleService.sol +221 -56
- package/contracts/pool/BundleServiceManager.sol +8 -11
- package/contracts/pool/IBundleService.sol +42 -5
- package/contracts/pool/IPoolComponent.sol +24 -8
- package/contracts/pool/IPoolService.sol +57 -36
- package/contracts/pool/Pool.sol +72 -30
- package/contracts/pool/PoolService.sol +240 -129
- package/contracts/pool/PoolServiceManager.sol +6 -9
- package/contracts/product/ApplicationService.sol +62 -65
- package/contracts/product/ApplicationServiceManager.sol +6 -6
- package/contracts/product/BasicProduct.sol +3 -32
- package/contracts/product/BasicProductAuthorization.sol +3 -0
- package/contracts/product/ClaimService.sol +254 -115
- package/contracts/product/ClaimServiceManager.sol +6 -6
- package/contracts/product/IApplicationService.sol +1 -0
- package/contracts/product/IClaimService.sol +31 -7
- package/contracts/product/IPolicyService.sol +34 -32
- package/contracts/product/IPricingService.sol +7 -7
- package/contracts/product/IProductComponent.sol +18 -4
- package/contracts/product/{IProductService.sol → IRiskService.sol} +1 -1
- package/contracts/product/PolicyService.sol +404 -193
- package/contracts/product/PolicyServiceManager.sol +6 -9
- package/contracts/product/PricingService.sol +46 -46
- package/contracts/product/PricingServiceManager.sol +5 -8
- package/contracts/product/Product.sol +90 -50
- package/contracts/product/{ProductService.sol → RiskService.sol} +13 -41
- package/contracts/product/RiskServiceManager.sol +39 -0
- package/contracts/registry/ChainNft.sol +65 -32
- package/contracts/registry/IRegistry.sol +65 -19
- package/contracts/registry/IRegistryService.sol +0 -9
- package/contracts/registry/Registry.sol +340 -211
- package/contracts/registry/RegistryAdmin.sol +155 -72
- package/contracts/registry/RegistryService.sol +59 -66
- package/contracts/registry/RegistryServiceManager.sol +4 -4
- package/contracts/registry/ReleaseLifecycle.sol +6 -3
- package/contracts/registry/ReleaseRegistry.sol +496 -0
- package/contracts/registry/ServiceAuthorizationV3.sol +13 -15
- package/contracts/registry/TokenRegistry.sol +2 -2
- package/contracts/shared/Component.sol +38 -43
- package/contracts/shared/ComponentService.sol +88 -28
- package/contracts/shared/ComponentServiceManager.sol +10 -7
- package/contracts/shared/ComponentVerifyingService.sol +2 -3
- package/contracts/shared/ContractLib.sol +38 -0
- package/contracts/shared/IComponent.sol +7 -4
- package/contracts/shared/IComponentService.sol +15 -9
- package/contracts/shared/IInstanceLinkedComponent.sol +9 -10
- package/contracts/shared/ILifecycle.sol +3 -1
- package/contracts/shared/IPolicyHolder.sol +12 -22
- package/contracts/shared/IService.sol +1 -1
- package/contracts/shared/{ERC165.sol → InitializableERC165.sol} +3 -3
- package/contracts/shared/InstanceLinkedComponent.sol +26 -6
- package/contracts/shared/KeyValueStore.sol +1 -1
- package/contracts/shared/Lifecycle.sol +13 -2
- package/contracts/shared/{NftIdSetManager.sol → NftIdSet.sol} +1 -1
- package/contracts/shared/NftOwnable.sol +7 -7
- package/contracts/shared/PolicyHolder.sol +17 -57
- package/contracts/shared/Registerable.sol +4 -4
- package/contracts/shared/RegistryLinked.sol +3 -2
- package/contracts/shared/Service.sol +19 -15
- package/contracts/shared/TokenHandler.sol +100 -19
- package/contracts/shared/TokenHandlerDeployerLib.sol +12 -0
- package/contracts/staking/IStaking.sol +3 -3
- package/contracts/staking/IStakingService.sol +12 -5
- package/contracts/staking/StakeManagerLib.sol +18 -25
- package/contracts/staking/Staking.sol +27 -42
- package/contracts/staking/StakingManager.sol +10 -12
- package/contracts/staking/StakingReader.sol +23 -20
- package/contracts/staking/StakingService.sol +10 -14
- package/contracts/staking/StakingServiceManager.sol +4 -4
- package/contracts/staking/StakingStore.sol +12 -22
- package/contracts/staking/TargetManagerLib.sol +7 -3
- package/contracts/type/Amount.sol +27 -5
- package/contracts/type/Blocknumber.sol +7 -1
- package/contracts/type/ClaimId.sol +6 -1
- package/contracts/type/NftId.sol +1 -0
- package/contracts/type/ObjectType.sol +19 -18
- package/contracts/type/PayoutId.sol +10 -10
- package/contracts/type/Referral.sol +1 -0
- package/contracts/type/RiskId.sol +15 -1
- package/contracts/type/Seconds.sol +21 -1
- package/contracts/type/StateId.sol +15 -1
- package/contracts/type/Timestamp.sol +11 -1
- package/contracts/type/UFixed.sol +33 -10
- package/contracts/type/Version.sol +3 -1
- package/contracts/{shared → upgradeability}/ProxyManager.sol +70 -38
- package/contracts/{shared → upgradeability}/UpgradableProxyWithAdmin.sol +1 -3
- package/contracts/{shared → upgradeability}/Versionable.sol +2 -2
- package/package.json +2 -1
- package/artifacts/contracts/instance/BundleManager.sol/BundleManager.dbg.json +0 -4
- package/artifacts/contracts/instance/BundleManager.sol/BundleManager.json +0 -703
- package/artifacts/contracts/instance/base/ObjectManager.sol/ObjectManager.dbg.json +0 -4
- package/artifacts/contracts/product/IProductService.sol/IProductService.dbg.json +0 -4
- package/artifacts/contracts/product/ProductService.sol/ProductService.dbg.json +0 -4
- package/artifacts/contracts/product/ProductService.sol/ProductService.json +0 -708
- package/artifacts/contracts/product/ProductServiceManager.sol/ProductServiceManager.dbg.json +0 -4
- package/artifacts/contracts/product/ProductServiceManager.sol/ProductServiceManager.json +0 -702
- package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.dbg.json +0 -4
- package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.json +0 -1159
- package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +0 -4
- package/artifacts/contracts/shared/ERC165.sol/ERC165.json +0 -73
- package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +0 -4
- package/artifacts/contracts/shared/InitializableCustom.sol/InitializableCustom.dbg.json +0 -4
- package/artifacts/contracts/shared/InitializableCustom.sol/InitializableCustom.json +0 -39
- package/artifacts/contracts/shared/NftIdSetManager.sol/NftIdSetManager.dbg.json +0 -4
- package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +0 -4
- package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +0 -617
- package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +0 -4
- package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +0 -4
- package/contracts/product/ProductServiceManager.sol +0 -42
- package/contracts/registry/ReleaseManager.sol +0 -487
- package/contracts/shared/InitializableCustom.sol +0 -177
- /package/contracts/{shared → upgradeability}/IVersionable.sol +0 -0
@@ -3,42 +3,74 @@ pragma solidity ^0.8.20;
|
|
3
3
|
|
4
4
|
import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
|
5
5
|
import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
|
6
|
-
|
7
|
-
import {
|
6
|
+
import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";
|
7
|
+
import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";
|
8
8
|
|
9
9
|
import {NftId, NftIdLib} from "../type/NftId.sol";
|
10
|
-
import {VersionPart} from "../type/Version.sol";
|
11
|
-
import {ObjectType, PROTOCOL, REGISTRY,
|
10
|
+
import {VersionPart, VersionPartLib} from "../type/Version.sol";
|
11
|
+
import {ObjectType, ObjectTypeLib, PROTOCOL, REGISTRY, SERVICE, INSTANCE, STAKE, STAKING, PRODUCT, DISTRIBUTION, DISTRIBUTOR, ORACLE, POOL, POLICY, BUNDLE} from "../type/ObjectType.sol";
|
12
12
|
|
13
13
|
import {ChainNft} from "./ChainNft.sol";
|
14
14
|
import {IRegistry} from "./IRegistry.sol";
|
15
15
|
import {IRegisterable} from "../shared/IRegisterable.sol";
|
16
|
-
import {
|
16
|
+
import {ReleaseRegistry} from "./ReleaseRegistry.sol";
|
17
17
|
import {TokenRegistry} from "./TokenRegistry.sol";
|
18
18
|
import {RegistryAdmin} from "./RegistryAdmin.sol";
|
19
19
|
|
20
|
-
|
20
|
+
/// @dev IMPORTANT
|
21
21
|
// Each NFT minted by registry is accosiated with:
|
22
22
|
// 1) NFT owner
|
23
23
|
// 2) registred contract OR object stored in registered (parent) contract
|
24
|
-
//
|
25
|
-
// 1) IService address by
|
26
|
-
// 2)
|
27
|
-
// 3)
|
28
|
-
// 4)
|
29
|
-
|
24
|
+
// Five registration flows:
|
25
|
+
// 1) registerService() -> registers IService address by ReleaseRegistry (ReleaseRegistry is set at deployment time)
|
26
|
+
// 2) register() -> registers IRegisterable address by IService (INSTANCE, PRODUCT, POOL, DISTRIBUTION, ORACLE)
|
27
|
+
// 3) -> registers object by IService (POLICY, BUNDLE, STAKE)
|
28
|
+
// 4) registerWithCustomType() -> registers IRegisterable address with custom type by IService
|
29
|
+
// 5) registerRegistry() -> registers IRegistry address (from different chain) by GifAdmin. Works ONLY on mainnet.
|
30
|
+
// Note: getters by address MUST not be used with this address (will return 0 or data related to different object or even revert)
|
31
|
+
|
32
|
+
/// @dev Chain Registry contract implementing IRegistry.
|
33
|
+
/// IRegistry for method details.
|
30
34
|
contract Registry is
|
31
|
-
|
35
|
+
Initializable,
|
36
|
+
AccessManaged,
|
32
37
|
IRegistry
|
33
38
|
{
|
34
|
-
|
39
|
+
/// @dev Protocol NFT ID
|
40
|
+
NftId public immutable PROTOCOL_NFT_ID;
|
41
|
+
|
42
|
+
/// @dev Gobal registry NFT ID
|
43
|
+
NftId public immutable GLOBAL_REGISTRY_NFT_ID;
|
44
|
+
|
45
|
+
/// @dev Gobal registry address on mainnet.
|
46
|
+
address public immutable GLOBAL_REGISTRY_ADDRESS;
|
47
|
+
|
48
|
+
/// @dev Registry NFT ID
|
49
|
+
NftId public immutable REGISTRY_NFT_ID;
|
50
|
+
|
51
|
+
/// @dev Deployer address that authorizes the initializer of this contract.
|
52
|
+
address public immutable DEPLOYER;
|
53
|
+
|
54
|
+
/// @dev Registry admin contract for this registry.
|
55
|
+
RegistryAdmin public immutable ADMIN;
|
56
|
+
|
57
|
+
/// @dev Chain NFT contract that keeps track of the ownership of all registered objects.
|
58
|
+
ChainNft public immutable CHAIN_NFT;
|
59
|
+
|
60
|
+
address public constant NFT_LOCK_ADDRESS = address(0x1);
|
35
61
|
uint256 public constant REGISTRY_TOKEN_SEQUENCE_ID = 2;
|
36
62
|
uint256 public constant STAKING_TOKEN_SEQUENCE_ID = 3;
|
37
63
|
string public constant EMPTY_URI = "";
|
38
64
|
|
65
|
+
/// @dev keep track of different registries on different chains
|
66
|
+
mapping(uint256 chainId => NftId registryNftId) private _registryNftIdByChainId;
|
67
|
+
uint256[] private _chainId;
|
68
|
+
|
69
|
+
/// @dev keep track of object info and address reverse lookup
|
39
70
|
mapping(NftId nftId => ObjectInfo info) private _info;
|
40
71
|
mapping(address object => NftId nftId) private _nftIdByAddress;
|
41
72
|
|
73
|
+
/// @dev keep track of service addresses by version and domain
|
42
74
|
mapping(VersionPart version => mapping(ObjectType serviceDomain => address)) private _service;
|
43
75
|
|
44
76
|
mapping(ObjectType objectType => bool) private _coreTypes;
|
@@ -49,143 +81,194 @@ contract Registry is
|
|
49
81
|
mapping(ObjectType objectType => mapping(
|
50
82
|
ObjectType parentType => bool)) private _coreObjectCombinations;
|
51
83
|
|
52
|
-
|
53
|
-
ChainNft public immutable _chainNft;
|
54
|
-
|
55
|
-
NftId public immutable _protocolNftId;
|
56
|
-
NftId public immutable _registryNftId;
|
57
|
-
NftId public _stakingNftId;
|
58
|
-
|
59
|
-
address public _tokenRegistryAddress;
|
60
|
-
address public _stakingAddress;
|
61
|
-
ReleaseManager public _releaseManager;
|
62
|
-
|
63
|
-
// TODO
|
64
|
-
// 1). Registry and ReleaseManager must be treated as whole single entity.
|
65
|
-
// But current limitations of EVM does not allow it -> require it to be splitted
|
66
|
-
// 2). Keep onlyReleaseManager modifier
|
67
|
-
// 3). Delete onlyRegistryService in favor of restricted
|
68
|
-
// 4). (For GlobalRegistry ONLY) make registerChainRegistry() restricted to GIF_ADMIN_ROLE
|
69
|
-
modifier onlyRegistryService() {
|
70
|
-
if(!_releaseManager.isActiveRegistryService(msg.sender)) {
|
71
|
-
revert ErrorRegistryCallerNotRegistryService();
|
72
|
-
}
|
73
|
-
_;
|
74
|
-
}
|
84
|
+
NftId private _stakingNftId;
|
75
85
|
|
86
|
+
ReleaseRegistry private _releaseRegistry;
|
87
|
+
address private _tokenRegistryAddress;
|
88
|
+
address private _stakingAddress;
|
76
89
|
|
77
|
-
modifier
|
78
|
-
if(msg.sender !=
|
79
|
-
revert
|
90
|
+
modifier onlyDeployer() {
|
91
|
+
if (msg.sender != DEPLOYER) {
|
92
|
+
revert ErrorRegistryCallerNotDeployer();
|
80
93
|
}
|
81
94
|
_;
|
82
95
|
}
|
83
96
|
|
84
|
-
|
85
|
-
constructor(
|
86
|
-
|
97
|
+
// TODO when create2 strategy is added to ignition:
|
98
|
+
// 1. move globalRegistry arg out from constructor into initialize()
|
99
|
+
// 2. add testRegistry_deployChainRegistryAtGlobalRegistryAddress
|
100
|
+
/// @dev Creates the registry contract and populates it with the protocol and registry objects.
|
101
|
+
/// Internally deploys the ChainNft contract.
|
102
|
+
constructor(RegistryAdmin admin, address globalRegistry)
|
103
|
+
AccessManaged(admin.authority())
|
87
104
|
{
|
88
|
-
|
105
|
+
DEPLOYER = msg.sender;
|
106
|
+
ADMIN = admin;
|
107
|
+
GLOBAL_REGISTRY_ADDRESS = _getGlobalRegistryAddress(globalRegistry);
|
108
|
+
|
89
109
|
// deploy NFT
|
90
|
-
|
110
|
+
CHAIN_NFT = new ChainNft(address(this));
|
111
|
+
GLOBAL_REGISTRY_NFT_ID = NftIdLib.toNftId(
|
112
|
+
CHAIN_NFT.GLOBAL_REGISTRY_ID());
|
91
113
|
|
92
114
|
// initial registry setup
|
93
|
-
|
94
|
-
|
115
|
+
PROTOCOL_NFT_ID = _registerProtocol();
|
116
|
+
REGISTRY_NFT_ID = _registerRegistry();
|
95
117
|
|
96
118
|
// set object types and object parent relations
|
97
119
|
_setupValidCoreTypesAndCombinations();
|
98
120
|
}
|
99
121
|
|
100
122
|
|
101
|
-
/// @dev
|
102
|
-
/// MUST be called by release
|
123
|
+
/// @dev Wires release registry, token registry and staking contract to this registry.
|
124
|
+
/// MUST be called by release registry.
|
103
125
|
function initialize(
|
104
|
-
address
|
126
|
+
address releaseRegistry,
|
105
127
|
address tokenRegistry,
|
106
128
|
address staking
|
107
129
|
)
|
108
130
|
external
|
109
131
|
initializer()
|
132
|
+
onlyDeployer()
|
110
133
|
{
|
111
|
-
|
134
|
+
// store links to supporting contracts
|
135
|
+
_releaseRegistry = ReleaseRegistry(releaseRegistry);
|
112
136
|
_tokenRegistryAddress = tokenRegistry;
|
113
137
|
_stakingAddress = staking;
|
114
138
|
|
139
|
+
// register staking contract
|
115
140
|
_stakingNftId = _registerStaking();
|
116
141
|
}
|
117
142
|
|
143
|
+
/// @inheritdoc IRegistry
|
144
|
+
function registerRegistry(
|
145
|
+
NftId nftId,
|
146
|
+
uint256 chainId,
|
147
|
+
address registryAddress
|
148
|
+
)
|
149
|
+
external
|
150
|
+
restricted()
|
151
|
+
{
|
152
|
+
// registration of chain registries only allowed on mainnet
|
153
|
+
if (block.chainid != 1) {
|
154
|
+
revert ErrorRegistryNotOnMainnet(block.chainid);
|
155
|
+
}
|
156
|
+
|
157
|
+
// registry chain id is not zero
|
158
|
+
if(chainId == 0) {
|
159
|
+
revert ErrorRegistryChainRegistryChainIdZero(nftId);
|
160
|
+
}
|
161
|
+
|
162
|
+
// registry address is not zero
|
163
|
+
if (registryAddress == address(0)) {
|
164
|
+
revert ErrorRegistryChainRegistryAddressZero(nftId, chainId);
|
165
|
+
}
|
166
|
+
|
167
|
+
// registry nft id matches registry chain id
|
168
|
+
uint256 expectedRegistryId = CHAIN_NFT.calculateTokenId(REGISTRY_TOKEN_SEQUENCE_ID, chainId);
|
169
|
+
if (nftId != NftIdLib.toNftId(expectedRegistryId)) {
|
170
|
+
revert ErrorRegistryChainRegistryNftIdInvalid(nftId, chainId);
|
171
|
+
}
|
172
|
+
|
173
|
+
emit LogChainRegistryRegistration(nftId, chainId, registryAddress);
|
174
|
+
|
175
|
+
_registerRegistryForNft(
|
176
|
+
chainId,
|
177
|
+
ObjectInfo({
|
178
|
+
nftId: nftId,
|
179
|
+
parentNftId: REGISTRY_NFT_ID,
|
180
|
+
objectType: REGISTRY(),
|
181
|
+
isInterceptor: false,
|
182
|
+
objectAddress: registryAddress,
|
183
|
+
initialOwner: NFT_LOCK_ADDRESS,
|
184
|
+
data: ""
|
185
|
+
}),
|
186
|
+
false); // do not update address lookup for objects on a different chain
|
187
|
+
}
|
188
|
+
|
189
|
+
// TODO limit service owner to registry admin?
|
190
|
+
/// @inheritdoc IRegistry
|
118
191
|
function registerService(
|
119
192
|
ObjectInfo memory info,
|
120
193
|
VersionPart version,
|
121
194
|
ObjectType domain
|
122
195
|
)
|
123
196
|
external
|
124
|
-
|
197
|
+
restricted()
|
125
198
|
returns(NftId nftId)
|
126
199
|
{
|
200
|
+
// service address is defined
|
127
201
|
address service = info.objectAddress;
|
128
|
-
/* must be guaranteed by release manager
|
129
202
|
if(service == address(0)) {
|
130
|
-
revert();
|
203
|
+
revert ErrorRegistryServiceAddressZero();
|
131
204
|
}
|
132
205
|
|
206
|
+
// version is defined
|
133
207
|
if(version.eqz()) {
|
134
|
-
revert();
|
208
|
+
revert ErrorRegistryServiceVersionZero(service);
|
209
|
+
}
|
210
|
+
// service domain is defined
|
211
|
+
if(domain.eqz()) {
|
212
|
+
revert ErrorRegistryServiceDomainZero(service, version);
|
135
213
|
}
|
136
214
|
|
215
|
+
// service has proper type
|
137
216
|
if(info.objectType != SERVICE()) {
|
138
|
-
revert();
|
217
|
+
revert ErrorRegistryNotService(service, info.objectType);
|
139
218
|
}
|
140
|
-
if(info.parentType != REGISTRY()) {
|
141
|
-
revert();
|
142
|
-
}
|
143
|
-
info.initialOwner == NFT_LOCK_ADDRESS <- if services are access managed
|
144
|
-
*/
|
145
219
|
|
146
|
-
|
147
|
-
|
220
|
+
// service parent has registry type
|
221
|
+
if(info.parentNftId != REGISTRY_NFT_ID) {
|
222
|
+
revert ErrorRegistryServiceParentNotRegistry(service, version, info.parentNftId);
|
148
223
|
}
|
149
224
|
|
150
|
-
|
151
|
-
|
225
|
+
// service has not already been registered
|
226
|
+
if(_service[version][domain] != address(0)) {
|
227
|
+
revert ErrorRegistryServiceDomainAlreadyRegistered(service, version, domain);
|
152
228
|
}
|
153
|
-
|
154
|
-
_service[version][domain] = service;
|
155
229
|
|
156
|
-
|
230
|
+
_service[version][domain] = service;
|
157
231
|
|
158
232
|
emit LogServiceRegistration(version, domain);
|
233
|
+
|
234
|
+
nftId = _register(info);
|
159
235
|
}
|
160
236
|
|
237
|
+
|
238
|
+
/// @inheritdoc IRegistry
|
161
239
|
function register(ObjectInfo memory info)
|
162
240
|
external
|
163
|
-
|
241
|
+
restricted()
|
164
242
|
returns(NftId nftId)
|
165
243
|
{
|
244
|
+
address objectAddress = info.objectAddress;
|
166
245
|
ObjectType objectType = info.objectType;
|
246
|
+
|
247
|
+
// this indidirectly enforces that the parent is registered
|
248
|
+
// parentType would be zero for a non-registered parent which is never a valid type combination
|
167
249
|
ObjectType parentType = _info[info.parentNftId].objectType;
|
168
250
|
|
169
|
-
//
|
170
|
-
if(
|
171
|
-
{
|
251
|
+
// check type combinations for core objects
|
252
|
+
if(objectAddress == address(0)) {
|
172
253
|
if(_coreObjectCombinations[objectType][parentType] == false) {
|
173
|
-
revert ErrorRegistryTypesCombinationInvalid(objectType, parentType);
|
254
|
+
revert ErrorRegistryTypesCombinationInvalid(objectAddress, objectType, parentType);
|
174
255
|
}
|
175
256
|
}
|
176
|
-
|
177
|
-
{
|
257
|
+
// check type combinations for contract objects
|
258
|
+
else {
|
178
259
|
if(_coreContractCombinations[objectType][parentType] == false) {
|
179
|
-
revert ErrorRegistryTypesCombinationInvalid(objectType, parentType);
|
260
|
+
revert ErrorRegistryTypesCombinationInvalid(objectAddress, objectType, parentType);
|
180
261
|
}
|
181
262
|
}
|
182
263
|
|
183
264
|
nftId = _register(info);
|
184
265
|
}
|
185
266
|
|
267
|
+
|
268
|
+
/// @inheritdoc IRegistry
|
186
269
|
function registerWithCustomType(ObjectInfo memory info)
|
187
270
|
external
|
188
|
-
|
271
|
+
restricted()
|
189
272
|
returns(NftId nftId)
|
190
273
|
{
|
191
274
|
ObjectType objectType = info.objectType;
|
@@ -196,64 +279,81 @@ contract Registry is
|
|
196
279
|
}
|
197
280
|
|
198
281
|
if(
|
282
|
+
objectType == ObjectTypeLib.zero() ||
|
283
|
+
parentType == ObjectTypeLib.zero() ||
|
199
284
|
parentType == PROTOCOL() ||
|
200
|
-
parentType == REGISTRY() ||
|
201
285
|
parentType == SERVICE()
|
202
286
|
) {
|
203
|
-
revert ErrorRegistryTypesCombinationInvalid(objectType, parentType);
|
287
|
+
revert ErrorRegistryTypesCombinationInvalid(info.objectAddress, objectType, parentType);
|
204
288
|
}
|
205
289
|
|
206
|
-
_register(info);
|
290
|
+
nftId = _register(info);
|
207
291
|
}
|
208
292
|
|
209
293
|
|
210
294
|
/// @dev earliest GIF major version
|
211
295
|
function getInitialVersion() external view returns (VersionPart) {
|
212
|
-
return
|
296
|
+
return VersionPartLib.toVersionPart(_releaseRegistry.INITIAL_GIF_VERSION());
|
213
297
|
}
|
214
298
|
|
215
299
|
/// @dev next GIF release version to be released
|
216
300
|
function getNextVersion() external view returns (VersionPart) {
|
217
|
-
return
|
301
|
+
return _releaseRegistry.getNextVersion();
|
218
302
|
}
|
219
303
|
|
220
304
|
/// @dev latest active GIF release version
|
221
305
|
function getLatestVersion() external view returns (VersionPart) {
|
222
|
-
return
|
306
|
+
return _releaseRegistry.getLatestVersion();
|
223
307
|
}
|
224
308
|
|
225
309
|
function getReleaseInfo(VersionPart version) external view returns (ReleaseInfo memory) {
|
226
|
-
return
|
310
|
+
return _releaseRegistry.getReleaseInfo(version);
|
311
|
+
}
|
312
|
+
|
313
|
+
function chainIds() public view returns (uint256) {
|
314
|
+
return _chainId.length;
|
315
|
+
}
|
316
|
+
|
317
|
+
function getChainId(uint256 idx) public view returns (uint256) {
|
318
|
+
return _chainId[idx];
|
319
|
+
}
|
320
|
+
|
321
|
+
function getRegistryNftId(uint256 chainId) public view returns (NftId nftId) {
|
322
|
+
return _registryNftIdByChainId[chainId];
|
227
323
|
}
|
228
324
|
|
229
325
|
function getObjectCount() external view returns (uint256) {
|
230
|
-
return
|
326
|
+
return CHAIN_NFT.totalSupply();
|
231
327
|
}
|
232
328
|
|
233
329
|
function getNftId() external view returns (NftId nftId) {
|
234
|
-
return
|
330
|
+
return REGISTRY_NFT_ID;
|
235
331
|
}
|
236
332
|
|
237
333
|
function getProtocolNftId() external view returns (NftId nftId) {
|
238
|
-
return
|
334
|
+
return PROTOCOL_NFT_ID;
|
239
335
|
}
|
240
336
|
|
241
|
-
function
|
337
|
+
function getNftIdForAddress(address object) external view returns (NftId id) {
|
242
338
|
return _nftIdByAddress[object];
|
243
339
|
}
|
244
340
|
|
245
341
|
function ownerOf(NftId nftId) public view returns (address) {
|
246
|
-
return
|
342
|
+
return CHAIN_NFT.ownerOf(nftId.toInt());
|
247
343
|
}
|
248
344
|
|
249
345
|
function ownerOf(address contractAddress) public view returns (address) {
|
250
|
-
return
|
346
|
+
return CHAIN_NFT.ownerOf(_nftIdByAddress[contractAddress].toInt());
|
251
347
|
}
|
252
348
|
|
253
349
|
function getObjectInfo(NftId nftId) external view returns (ObjectInfo memory) {
|
254
350
|
return _info[nftId];
|
255
351
|
}
|
256
352
|
|
353
|
+
function getObjectAddress(NftId nftId) external view returns (address) {
|
354
|
+
return _info[nftId].objectAddress;
|
355
|
+
}
|
356
|
+
|
257
357
|
function getObjectInfo(address object) external view returns (ObjectInfo memory) {
|
258
358
|
return _info[_nftIdByAddress[object]];
|
259
359
|
}
|
@@ -277,12 +377,10 @@ contract Registry is
|
|
277
377
|
|
278
378
|
function isActiveRelease(VersionPart version) external view returns (bool)
|
279
379
|
{
|
280
|
-
return
|
380
|
+
return _releaseRegistry.isActiveRelease(version);
|
281
381
|
}
|
282
382
|
|
283
383
|
function getStakingAddress() external view returns (address staking) {
|
284
|
-
//return getObjectInfo(_stakingNftId).objectAddress;
|
285
|
-
//return _info[_stakingNftId].objectAddress;
|
286
384
|
return _stakingAddress;
|
287
385
|
}
|
288
386
|
|
@@ -298,20 +396,20 @@ contract Registry is
|
|
298
396
|
service = _service[releaseVersion][serviceDomain];
|
299
397
|
}
|
300
398
|
|
301
|
-
function
|
302
|
-
return address(
|
399
|
+
function getReleaseRegistryAddress() external view returns (address) {
|
400
|
+
return address(_releaseRegistry);
|
303
401
|
}
|
304
402
|
|
305
403
|
function getChainNftAddress() external view override returns (address) {
|
306
|
-
return address(
|
404
|
+
return address(CHAIN_NFT);
|
307
405
|
}
|
308
406
|
|
309
407
|
function getRegistryAdminAddress() external view returns (address) {
|
310
|
-
return address(
|
408
|
+
return address(ADMIN);
|
311
409
|
}
|
312
410
|
|
313
411
|
function getAuthority() external view returns (address) {
|
314
|
-
return
|
412
|
+
return ADMIN.authority();
|
315
413
|
}
|
316
414
|
|
317
415
|
function getOwner() public view returns (address owner) {
|
@@ -331,30 +429,37 @@ contract Registry is
|
|
331
429
|
// Internals
|
332
430
|
|
333
431
|
/// @dev registry protects only against tampering existing records, registering with invalid types pairs and 0 parent address
|
334
|
-
// TODO registration of precompile addresses
|
335
432
|
function _register(ObjectInfo memory info)
|
336
433
|
internal
|
337
434
|
returns(NftId nftId)
|
338
435
|
{
|
339
|
-
ObjectType objectType = info.objectType;
|
436
|
+
ObjectType objectType = info.objectType; // do not care here, never PROTOCOL(), REGISTRY()
|
340
437
|
bool isInterceptor = info.isInterceptor;
|
341
|
-
address objectAddress = info.objectAddress;
|
342
|
-
address owner = info.initialOwner;
|
438
|
+
address objectAddress = info.objectAddress; // do not care here, can be 0
|
439
|
+
address owner = info.initialOwner; // do not care here, can be 0, can be equal info.objectAddress
|
343
440
|
|
344
|
-
NftId parentNftId = info.parentNftId;
|
441
|
+
NftId parentNftId = info.parentNftId; // do not care here, can not be 0
|
345
442
|
ObjectInfo memory parentInfo = _info[parentNftId];
|
346
|
-
|
347
|
-
address parentAddress = parentInfo.objectAddress;
|
443
|
+
address parentAddress = parentInfo.objectAddress; // can be 0
|
348
444
|
|
349
445
|
// parent is contract -> need to check? -> check before minting
|
350
446
|
// special case: staking: to protocol possible as well
|
351
|
-
// special case: global registry nft as parent when not on mainnet -> global registry address is 0
|
352
|
-
// special case: when parentNftId ==
|
353
|
-
// special case: when parentNftId ==
|
354
|
-
|
447
|
+
// NO LONGER TRUE: special case: global registry nft as parent when not on mainnet -> global registry address is 0
|
448
|
+
// special case: when parentNftId == CHAIN_NFT.mint(), check for zero parent address before mint
|
449
|
+
// special case: when parentNftId == CHAIN_NFT.mint() && objectAddress == initialOwner
|
450
|
+
// Parent can have 0 address in case of STAKE for PROTOCOL / CUSTOM_TYPE for POLICY
|
451
|
+
// But it MUST be registered -> parentType != 0 && parentNftId != 0
|
452
|
+
/*if(objectType != STAKE()) {
|
355
453
|
if(parentAddress == address(0)) {
|
356
454
|
revert ErrorRegistryParentAddressZero();
|
357
455
|
}
|
456
|
+
}*/
|
457
|
+
|
458
|
+
// global registry is never parent when not on mainnet
|
459
|
+
if(block.chainid != 1) {
|
460
|
+
if(parentNftId == GLOBAL_REGISTRY_NFT_ID) {
|
461
|
+
revert ErrorRegistryGlobalRegistryAsParent(objectAddress, objectType);
|
462
|
+
}
|
358
463
|
}
|
359
464
|
|
360
465
|
address interceptorAddress = _getInterceptor(
|
@@ -364,23 +469,17 @@ contract Registry is
|
|
364
469
|
parentInfo.isInterceptor,
|
365
470
|
parentAddress);
|
366
471
|
|
367
|
-
uint256 tokenId =
|
472
|
+
uint256 tokenId = CHAIN_NFT.getNextTokenId();
|
368
473
|
nftId = NftIdLib.toNftId(tokenId);
|
369
474
|
info.nftId = nftId;
|
370
|
-
_info[nftId] = info;
|
371
|
-
|
372
|
-
if(objectAddress > address(0)) {
|
373
|
-
if(_nftIdByAddress[objectAddress].gtz()) {
|
374
|
-
revert ErrorRegistryContractAlreadyRegistered(objectAddress);
|
375
|
-
}
|
376
475
|
|
377
|
-
|
378
|
-
|
476
|
+
_info[nftId] = info;
|
477
|
+
_setAddressForNftId(nftId, objectAddress);
|
379
478
|
|
380
479
|
emit LogRegistration(nftId, parentNftId, objectType, isInterceptor, objectAddress, owner);
|
381
480
|
|
382
481
|
// calls nft receiver(1) and interceptor(2)
|
383
|
-
uint256 mintedTokenId =
|
482
|
+
uint256 mintedTokenId = CHAIN_NFT.mint(
|
384
483
|
owner,
|
385
484
|
interceptorAddress,
|
386
485
|
EMPTY_URI);
|
@@ -429,111 +528,153 @@ contract Registry is
|
|
429
528
|
private
|
430
529
|
returns (NftId protocolNftId)
|
431
530
|
{
|
432
|
-
uint256 protocolId =
|
531
|
+
uint256 protocolId = CHAIN_NFT.PROTOCOL_NFT_ID();
|
433
532
|
protocolNftId = NftIdLib.toNftId(protocolId);
|
434
533
|
|
435
|
-
|
436
|
-
|
437
|
-
|
438
|
-
|
439
|
-
|
440
|
-
|
441
|
-
|
442
|
-
|
443
|
-
|
444
|
-
|
445
|
-
_chainNft.mint(NFT_LOCK_ADDRESS, protocolId);
|
534
|
+
_registerForNft(
|
535
|
+
ObjectInfo({
|
536
|
+
nftId: protocolNftId,
|
537
|
+
parentNftId: NftIdLib.zero(),
|
538
|
+
objectType: PROTOCOL(),
|
539
|
+
isInterceptor: false,
|
540
|
+
objectAddress: address(0),
|
541
|
+
initialOwner: NFT_LOCK_ADDRESS,
|
542
|
+
data: ""}),
|
543
|
+
true);
|
446
544
|
}
|
447
545
|
|
448
|
-
/// @dev registry
|
449
|
-
/// might also register the global registry when not on mainnet
|
546
|
+
/// @dev register this registry
|
450
547
|
function _registerRegistry()
|
451
|
-
|
548
|
+
internal
|
549
|
+
virtual
|
452
550
|
returns (NftId registryNftId)
|
453
551
|
{
|
454
|
-
|
455
|
-
registryNftId =
|
456
|
-
|
457
|
-
|
458
|
-
|
459
|
-
|
460
|
-
|
461
|
-
|
552
|
+
// initial assignment
|
553
|
+
registryNftId = GLOBAL_REGISTRY_NFT_ID;
|
554
|
+
|
555
|
+
// register global registry
|
556
|
+
_registerRegistryForNft(
|
557
|
+
1, // mainnet chain id
|
558
|
+
ObjectInfo({
|
559
|
+
nftId: GLOBAL_REGISTRY_NFT_ID,
|
560
|
+
parentNftId: PROTOCOL_NFT_ID,
|
561
|
+
objectType: REGISTRY(),
|
562
|
+
isInterceptor: false,
|
563
|
+
objectAddress: GLOBAL_REGISTRY_ADDRESS,
|
564
|
+
initialOwner: NFT_LOCK_ADDRESS,
|
565
|
+
data: ""}),
|
566
|
+
block.chainid == 1);// update address lookup for global registry only on mainnet
|
567
|
+
|
568
|
+
// if not on mainnet: register this registry with global registry as parent
|
569
|
+
if (block.chainid != 1) {
|
570
|
+
|
571
|
+
// modify registry nft id to local registry when not on mainnet
|
572
|
+
registryNftId = NftIdLib.toNftId(
|
573
|
+
CHAIN_NFT.calculateTokenId(REGISTRY_TOKEN_SEQUENCE_ID));
|
574
|
+
|
575
|
+
_registerRegistryForNft(
|
576
|
+
block.chainid,
|
577
|
+
ObjectInfo({
|
578
|
+
nftId: registryNftId,
|
579
|
+
parentNftId: GLOBAL_REGISTRY_NFT_ID,
|
580
|
+
objectType: REGISTRY(),
|
581
|
+
isInterceptor: false,
|
582
|
+
objectAddress: address(this),
|
583
|
+
initialOwner: NFT_LOCK_ADDRESS,
|
584
|
+
data: ""}),
|
585
|
+
true);
|
462
586
|
}
|
463
|
-
|
464
|
-
|
465
|
-
|
587
|
+
}
|
588
|
+
|
589
|
+
/// @dev staking registration
|
590
|
+
function _registerRegistryForNft(
|
591
|
+
uint256 chainId,
|
592
|
+
ObjectInfo memory info,
|
593
|
+
bool updateAddressLookup
|
594
|
+
)
|
595
|
+
private
|
596
|
+
{
|
597
|
+
if (!_registryNftIdByChainId[chainId].eqz()) {
|
598
|
+
revert ErrorRegistryChainRegistryAlreadyRegistered(info.nftId, chainId);
|
466
599
|
}
|
467
600
|
|
468
|
-
|
469
|
-
|
470
|
-
|
471
|
-
objectType: REGISTRY(),
|
472
|
-
isInterceptor: false,
|
473
|
-
objectAddress: address(this),
|
474
|
-
initialOwner: NFT_LOCK_ADDRESS,
|
475
|
-
data: ""
|
476
|
-
});
|
601
|
+
// update registry lookup variables
|
602
|
+
_registryNftIdByChainId[chainId] = info.nftId;
|
603
|
+
_chainId.push(chainId);
|
477
604
|
|
478
|
-
|
479
|
-
|
605
|
+
// register the registry info
|
606
|
+
_registerForNft(
|
607
|
+
info,
|
608
|
+
updateAddressLookup);
|
480
609
|
}
|
481
610
|
|
482
|
-
/// @dev
|
483
|
-
function _registerGlobalRegistry()
|
484
|
-
private
|
485
|
-
{
|
486
|
-
uint256 globalRegistryId = _chainNft.GLOBAL_REGISTRY_ID();
|
487
|
-
NftId globalRegistryNftId = NftIdLib.toNftId(globalRegistryId);
|
488
|
-
|
489
|
-
_info[globalRegistryNftId] = ObjectInfo({
|
490
|
-
nftId: globalRegistryNftId,
|
491
|
-
parentNftId: NftIdLib.toNftId(_chainNft.PROTOCOL_NFT_ID()),
|
492
|
-
objectType: REGISTRY(),
|
493
|
-
isInterceptor: false,
|
494
|
-
objectAddress: address(0),
|
495
|
-
initialOwner: NFT_LOCK_ADDRESS,
|
496
|
-
data: ""
|
497
|
-
});
|
498
|
-
|
499
|
-
_chainNft.mint(NFT_LOCK_ADDRESS, globalRegistryId);
|
500
|
-
}
|
501
|
-
// depends on _registryNftId and _stakingAddress
|
611
|
+
/// @dev staking registration
|
502
612
|
function _registerStaking()
|
503
613
|
private
|
504
614
|
returns (NftId stakingNftId)
|
505
615
|
{
|
506
616
|
address stakingOwner = IRegisterable(_stakingAddress).getOwner();
|
507
|
-
uint256 stakingId =
|
617
|
+
uint256 stakingId = CHAIN_NFT.calculateTokenId(STAKING_TOKEN_SEQUENCE_ID);
|
508
618
|
stakingNftId = NftIdLib.toNftId(stakingId);
|
509
619
|
|
510
|
-
|
511
|
-
|
512
|
-
|
513
|
-
|
514
|
-
|
515
|
-
|
516
|
-
|
517
|
-
|
518
|
-
|
620
|
+
_registerForNft(
|
621
|
+
ObjectInfo({
|
622
|
+
nftId: stakingNftId,
|
623
|
+
parentNftId: REGISTRY_NFT_ID,
|
624
|
+
objectType: STAKING(),
|
625
|
+
isInterceptor: false,
|
626
|
+
objectAddress: _stakingAddress,
|
627
|
+
initialOwner: stakingOwner,
|
628
|
+
data: ""}),
|
629
|
+
true);
|
630
|
+
}
|
519
631
|
|
520
|
-
|
521
|
-
|
522
|
-
|
632
|
+
/// @dev Register the provided object info for the specified NFT ID.
|
633
|
+
function _registerForNft(
|
634
|
+
ObjectInfo memory info,
|
635
|
+
bool updateAddressLookup
|
636
|
+
)
|
637
|
+
internal
|
638
|
+
{
|
639
|
+
_info[info.nftId] = info;
|
640
|
+
|
641
|
+
if (updateAddressLookup) {
|
642
|
+
_setAddressForNftId(info.nftId, info.objectAddress);
|
643
|
+
}
|
644
|
+
|
645
|
+
// calls nft receiver
|
646
|
+
CHAIN_NFT.mint(info.initialOwner, info.nftId.toInt());
|
647
|
+
}
|
648
|
+
|
649
|
+
function _setAddressForNftId(NftId nftId, address objectAddress)
|
650
|
+
internal
|
651
|
+
{
|
652
|
+
if (objectAddress != address(0)) {
|
653
|
+
if (_nftIdByAddress[objectAddress].gtz()) {
|
654
|
+
revert ErrorRegistryContractAlreadyRegistered(objectAddress);
|
655
|
+
}
|
656
|
+
|
657
|
+
_nftIdByAddress[objectAddress] = nftId;
|
658
|
+
}
|
659
|
+
}
|
660
|
+
|
661
|
+
function _getGlobalRegistryAddress(address globalRegistry) internal view returns (address) {
|
662
|
+
if (block.chainid == 1) {
|
663
|
+
return address(this);
|
664
|
+
} else {
|
665
|
+
return globalRegistry;
|
666
|
+
}
|
523
667
|
}
|
524
668
|
|
525
669
|
/// @dev defines which object - parent types relations are allowed to register
|
526
|
-
|
527
|
-
//
|
528
|
-
// 2) DO NOT use object type (e.g. POLCY, BUNDLE, STAKE) as parent type
|
529
|
-
// 3) DO NOT use REGISTRY as object type
|
530
|
-
// 2) DO NOT use PROTOCOL and "ObjectTypeLib.zero"
|
670
|
+
/// EACH object type MUST have only one parent type across ALL mappings
|
671
|
+
// the only EXCEPTION is STAKE, can have any number of parent types
|
531
672
|
function _setupValidCoreTypesAndCombinations()
|
532
|
-
private
|
673
|
+
private
|
533
674
|
{
|
675
|
+
_coreTypes[PROTOCOL()] = true;
|
534
676
|
_coreTypes[REGISTRY()] = true;
|
535
677
|
_coreTypes[SERVICE()] = true;
|
536
|
-
_coreTypes[TOKEN()] = true;
|
537
678
|
_coreTypes[INSTANCE()] = true;
|
538
679
|
_coreTypes[PRODUCT()] = true;
|
539
680
|
_coreTypes[POOL()] = true;
|
@@ -545,28 +686,16 @@ contract Registry is
|
|
545
686
|
_coreTypes[STAKING()] = true;
|
546
687
|
_coreTypes[STAKE()] = true;
|
547
688
|
|
548
|
-
|
549
|
-
if(registryId == _chainNft.GLOBAL_REGISTRY_ID()) {
|
550
|
-
// we are global registry
|
551
|
-
// object is registry from different chain
|
552
|
-
// parent is global registry, this contract
|
553
|
-
_coreContractCombinations[REGISTRY()][REGISTRY()] = true; // only for global regstry
|
554
|
-
//_coreObjectCombinations[REGISTRY()][REGISTRY()] = true;
|
555
|
-
} else {
|
556
|
-
// we are not global registry
|
557
|
-
// object is local registry, this contract
|
558
|
-
// parent is global registry, object with 0 address or registry from mainnet???
|
559
|
-
}
|
560
|
-
_coreContractCombinations[STAKING()][REGISTRY()] = true; // only for chain staking contract
|
561
|
-
_coreContractCombinations[TOKEN()][REGISTRY()] = true;
|
562
|
-
//_coreContractCombinations[SERVICE()][REGISTRY()] = true;// do not need it here -> registerService() registers exactly this combination
|
689
|
+
// types combinations allowed to use with register() function ONLY
|
563
690
|
_coreContractCombinations[INSTANCE()][REGISTRY()] = true;
|
564
691
|
|
692
|
+
// components with instance parent
|
565
693
|
_coreContractCombinations[PRODUCT()][INSTANCE()] = true;
|
566
694
|
_coreContractCombinations[DISTRIBUTION()][INSTANCE()] = true;
|
567
695
|
_coreContractCombinations[ORACLE()][INSTANCE()] = true;
|
568
696
|
_coreContractCombinations[POOL()][INSTANCE()] = true;
|
569
697
|
|
698
|
+
// objects with component parents
|
570
699
|
_coreObjectCombinations[DISTRIBUTOR()][DISTRIBUTION()] = true;
|
571
700
|
_coreObjectCombinations[POLICY()][PRODUCT()] = true;
|
572
701
|
_coreObjectCombinations[BUNDLE()][POOL()] = true;
|