@etherisc/gif-next 0.0.2-e016345-525 → 0.0.2-e04dbfc-031
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 +1 -1
- package/artifacts/contracts/accounting/AccountingService.sol/AccountingService.dbg.json +1 -1
- package/artifacts/contracts/accounting/AccountingService.sol/AccountingService.json +137 -58
- package/artifacts/contracts/accounting/AccountingServiceManager.sol/AccountingServiceManager.dbg.json +1 -1
- package/artifacts/contracts/accounting/AccountingServiceManager.sol/AccountingServiceManager.json +37 -31
- package/artifacts/contracts/accounting/IAccountingService.sol/IAccountingService.dbg.json +1 -1
- package/artifacts/contracts/accounting/IAccountingService.sol/IAccountingService.json +83 -3
- package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.dbg.json +1 -1
- package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.json +449 -248
- package/artifacts/contracts/authorization/AccessAdmin.sol/IAccessManagedChecker.dbg.json +1 -1
- package/artifacts/contracts/authorization/AccessAdminLib.sol/AccessAdminLib.dbg.json +4 -0
- package/artifacts/contracts/authorization/AccessAdminLib.sol/AccessAdminLib.json +673 -0
- package/artifacts/contracts/authorization/AccessManagerCloneable.sol/AccessManagerCloneable.dbg.json +1 -1
- package/artifacts/contracts/authorization/AccessManagerCloneable.sol/AccessManagerCloneable.json +202 -5
- package/artifacts/contracts/authorization/Authorization.sol/Authorization.dbg.json +1 -1
- package/artifacts/contracts/authorization/Authorization.sol/Authorization.json +222 -21
- 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 +348 -184
- package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.dbg.json +1 -1
- package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.json +100 -13
- package/artifacts/contracts/authorization/IServiceAuthorization.sol/IServiceAuthorization.dbg.json +1 -1
- package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.dbg.json +1 -1
- package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.json +2 -2
- package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.dbg.json +1 -1
- package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.json +83 -129
- package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.dbg.json +1 -1
- package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.json +207 -33
- package/artifacts/contracts/distribution/Distribution.sol/Distribution.dbg.json +1 -1
- package/artifacts/contracts/distribution/Distribution.sol/Distribution.json +46 -81
- package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.dbg.json +1 -1
- package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.json +283 -181
- package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
- package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.json +74 -60
- package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
- package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.json +33 -68
- package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.dbg.json +1 -1
- package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.json +155 -68
- package/artifacts/contracts/examples/fire/DamageLevel.sol/DamageLevelLib.dbg.json +1 -1
- package/artifacts/contracts/examples/fire/FirePool.sol/FirePool.dbg.json +1 -1
- package/artifacts/contracts/examples/fire/FirePool.sol/FirePool.json +92 -42
- package/artifacts/contracts/examples/fire/FirePoolAuthorization.sol/FirePoolAuthorization.dbg.json +1 -1
- package/artifacts/contracts/examples/fire/FirePoolAuthorization.sol/FirePoolAuthorization.json +188 -46
- package/artifacts/contracts/examples/fire/FireProduct.sol/FireProduct.dbg.json +1 -1
- package/artifacts/contracts/examples/fire/FireProduct.sol/FireProduct.json +248 -191
- package/artifacts/contracts/examples/fire/FireProductAuthorization.sol/FireProductAuthorization.dbg.json +1 -1
- package/artifacts/contracts/examples/fire/FireProductAuthorization.sol/FireProductAuthorization.json +207 -33
- package/artifacts/contracts/examples/fire/FireUSD.sol/FireUSD.dbg.json +1 -1
- package/artifacts/contracts/examples/unpermissioned/SimpleDistribution.sol/SimpleDistribution.dbg.json +1 -1
- package/artifacts/contracts/examples/unpermissioned/SimpleDistribution.sol/SimpleDistribution.json +149 -131
- package/artifacts/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol/SimpleDistributionAuthorization.dbg.json +1 -1
- package/artifacts/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol/SimpleDistributionAuthorization.json +207 -33
- package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.dbg.json +1 -1
- package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.json +95 -45
- package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.dbg.json +1 -1
- package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.json +113 -47
- package/artifacts/contracts/examples/unpermissioned/SimplePoolAuthorization.sol/SimplePoolAuthorization.dbg.json +1 -1
- package/artifacts/contracts/examples/unpermissioned/SimplePoolAuthorization.sol/SimplePoolAuthorization.json +188 -46
- package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.dbg.json +1 -1
- package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.json +305 -150
- package/artifacts/contracts/examples/unpermissioned/SimpleProductAuthorization.sol/SimpleProductAuthorization.dbg.json +1 -1
- package/artifacts/contracts/examples/unpermissioned/SimpleProductAuthorization.sol/SimpleProductAuthorization.json +207 -33
- package/artifacts/contracts/instance/BundleSet.sol/BundleSet.dbg.json +1 -1
- package/artifacts/contracts/instance/BundleSet.sol/BundleSet.json +88 -45
- package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstance.sol/IInstance.json +139 -28
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +100 -7
- package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
- package/artifacts/contracts/instance/Instance.sol/Instance.json +163 -53
- package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.json +672 -320
- package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.json +188 -46
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +374 -197
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +113 -83
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +26 -38
- package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.json +422 -352
- package/artifacts/contracts/instance/RiskSet.sol/RiskSet.dbg.json +1 -1
- package/artifacts/contracts/instance/RiskSet.sol/RiskSet.json +96 -53
- 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 +2 -2
- package/artifacts/contracts/instance/base/ObjectSet.sol/ObjectSet.dbg.json +1 -1
- package/artifacts/contracts/instance/base/ObjectSet.sol/ObjectSet.json +16 -5
- package/artifacts/contracts/instance/base/ObjectSetHelperLib.sol/ObjectSetHelperLib.dbg.json +4 -0
- package/artifacts/contracts/instance/base/ObjectSetHelperLib.sol/ObjectSetHelperLib.json +168 -0
- 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/oracle/BasicOracle.sol/BasicOracle.dbg.json +1 -1
- package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.json +68 -38
- package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.dbg.json +1 -1
- package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.json +189 -35
- 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 +38 -8
- package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.dbg.json +1 -1
- package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.json +27 -3
- package/artifacts/contracts/oracle/Oracle.sol/Oracle.dbg.json +1 -1
- package/artifacts/contracts/oracle/Oracle.sol/Oracle.json +52 -22
- package/artifacts/contracts/oracle/OracleService.sol/OracleService.dbg.json +1 -1
- package/artifacts/contracts/oracle/OracleService.sol/OracleService.json +91 -68
- package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.dbg.json +1 -1
- package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.json +42 -36
- package/artifacts/contracts/pool/BasicPool.sol/BasicPool.dbg.json +1 -1
- package/artifacts/contracts/pool/BasicPool.sol/BasicPool.json +51 -21
- package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.dbg.json +1 -1
- package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.json +188 -46
- package/artifacts/contracts/pool/BundleService.sol/BundleService.dbg.json +1 -1
- package/artifacts/contracts/pool/BundleService.sol/BundleService.json +118 -201
- package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.dbg.json +1 -1
- package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.json +50 -64
- package/artifacts/contracts/pool/IBundleService.sol/IBundleService.dbg.json +1 -1
- package/artifacts/contracts/pool/IBundleService.sol/IBundleService.json +38 -80
- package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
- package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.json +38 -8
- package/artifacts/contracts/pool/IPoolService.sol/IPoolService.dbg.json +1 -1
- package/artifacts/contracts/pool/IPoolService.sol/IPoolService.json +120 -175
- package/artifacts/contracts/pool/Pool.sol/Pool.dbg.json +1 -1
- package/artifacts/contracts/pool/Pool.sol/Pool.json +51 -21
- package/artifacts/contracts/pool/PoolLib.sol/PoolLib.dbg.json +4 -0
- package/artifacts/contracts/pool/PoolLib.sol/PoolLib.json +472 -0
- package/artifacts/contracts/pool/PoolService.sol/PoolService.dbg.json +1 -1
- package/artifacts/contracts/pool/PoolService.sol/PoolService.json +265 -278
- package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
- package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.json +86 -56
- package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.dbg.json +1 -1
- package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.json +139 -50
- package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +1 -1
- package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.json +45 -27
- package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.dbg.json +1 -1
- package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.json +157 -112
- package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.dbg.json +1 -1
- package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.json +207 -33
- package/artifacts/contracts/product/ClaimService.sol/ClaimService.dbg.json +1 -1
- package/artifacts/contracts/product/ClaimService.sol/ClaimService.json +260 -187
- package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +1 -1
- package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.json +72 -74
- package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.dbg.json +1 -1
- package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.json +69 -3
- package/artifacts/contracts/product/IClaimService.sol/IClaimService.dbg.json +1 -1
- package/artifacts/contracts/product/IClaimService.sol/IClaimService.json +142 -20
- package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.dbg.json +1 -1
- package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.json +105 -68
- package/artifacts/contracts/product/IPricingService.sol/IPricingService.dbg.json +1 -1
- package/artifacts/contracts/product/IPricingService.sol/IPricingService.json +48 -3
- package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.dbg.json +1 -1
- package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.json +144 -99
- package/artifacts/contracts/product/IRiskService.sol/IRiskService.dbg.json +1 -1
- package/artifacts/contracts/product/IRiskService.sol/IRiskService.json +58 -7
- package/artifacts/contracts/product/PolicyService.sol/PolicyService.dbg.json +1 -1
- package/artifacts/contracts/product/PolicyService.sol/PolicyService.json +215 -187
- package/artifacts/contracts/product/PolicyServiceLib.sol/PolicyServiceLib.dbg.json +4 -0
- package/artifacts/contracts/product/PolicyServiceLib.sol/PolicyServiceLib.json +727 -0
- package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +1 -1
- package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.json +68 -66
- package/artifacts/contracts/product/PricingService.sol/PricingService.dbg.json +1 -1
- package/artifacts/contracts/product/PricingService.sol/PricingService.json +122 -78
- package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.dbg.json +1 -1
- package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.json +48 -42
- package/artifacts/contracts/product/Product.sol/Product.dbg.json +1 -1
- package/artifacts/contracts/product/Product.sol/Product.json +157 -112
- package/artifacts/contracts/product/RiskService.sol/RiskService.dbg.json +1 -1
- package/artifacts/contracts/product/RiskService.sol/RiskService.json +131 -81
- package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.dbg.json +1 -1
- package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.json +46 -28
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +2 -2
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +26 -2
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +31 -7
- package/artifacts/contracts/registry/IRelease.sol/IRelease.dbg.json +4 -0
- package/artifacts/contracts/registry/IRelease.sol/IRelease.json +24 -0
- 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 +64 -40
- package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.json +548 -429
- package/artifacts/contracts/registry/RegistryAuthorization.sol/RegistryAuthorization.dbg.json +4 -0
- package/artifacts/contracts/registry/RegistryAuthorization.sol/RegistryAuthorization.json +878 -0
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +51 -44
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +22 -24
- package/artifacts/contracts/registry/ReleaseAdmin.sol/ReleaseAdmin.dbg.json +4 -0
- package/artifacts/contracts/registry/ReleaseAdmin.sol/ReleaseAdmin.json +1954 -0
- package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.dbg.json +1 -1
- package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.json +2 -2
- package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.json +324 -54
- package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.dbg.json +1 -1
- package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.json +6 -6
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +4 -4
- package/artifacts/contracts/shared/Component.sol/Component.dbg.json +1 -1
- package/artifacts/contracts/shared/Component.sol/Component.json +51 -21
- package/artifacts/contracts/shared/ComponentService.sol/ComponentService.dbg.json +1 -1
- package/artifacts/contracts/shared/ComponentService.sol/ComponentService.json +96 -138
- package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.dbg.json +1 -1
- package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.json +44 -50
- package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.dbg.json +1 -1
- package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.json +27 -16
- package/artifacts/contracts/shared/ContractLib.sol/ContractLib.dbg.json +1 -1
- package/artifacts/contracts/shared/ContractLib.sol/ContractLib.json +113 -4
- package/artifacts/contracts/shared/ContractLib.sol/IInstanceAdminHelper.dbg.json +1 -1
- package/artifacts/contracts/shared/ContractLib.sol/ITargetHelper.dbg.json +1 -1
- package/artifacts/contracts/shared/ContractLib.sol/ITokenRegistryHelper.dbg.json +4 -0
- package/artifacts/contracts/shared/ContractLib.sol/ITokenRegistryHelper.json +40 -0
- package/artifacts/contracts/shared/IComponent.sol/IComponent.dbg.json +1 -1
- package/artifacts/contracts/shared/IComponent.sol/IComponent.json +38 -8
- package/artifacts/contracts/shared/IComponentService.sol/IComponentService.dbg.json +1 -1
- package/artifacts/contracts/shared/IComponentService.sol/IComponentService.json +28 -45
- package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.dbg.json +1 -1
- package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.json +38 -8
- package/artifacts/contracts/shared/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
- package/artifacts/contracts/shared/ILifecycle.sol/ILifecycle.dbg.json +1 -1
- 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/IRegisterable.sol/IRegisterable.dbg.json +1 -1
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +120 -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/IService.sol/IService.json +27 -3
- package/artifacts/contracts/shared/InitializableERC165.sol/InitializableERC165.dbg.json +1 -1
- package/artifacts/contracts/shared/InitializableERC165.sol/InitializableERC165.json +2 -2
- package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.dbg.json +1 -1
- package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.json +51 -21
- package/artifacts/contracts/shared/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
- package/artifacts/contracts/shared/Lifecycle.sol/Lifecycle.dbg.json +1 -1
- package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.dbg.json +1 -1
- package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.json +2 -2
- package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
- package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +2 -2
- package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +1 -1
- package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +2 -2
- package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
- package/artifacts/contracts/shared/Registerable.sol/Registerable.json +118 -62
- package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +1 -1
- package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +2 -2
- package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
- package/artifacts/contracts/shared/Service.sol/Service.json +27 -16
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +63 -162
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandlerBase.dbg.json +1 -1
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandlerBase.json +118 -29
- package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.dbg.json +1 -1
- package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.json +32 -32
- package/artifacts/contracts/staking/IStaking.sol/IStaking.dbg.json +1 -1
- package/artifacts/contracts/staking/IStaking.sol/IStaking.json +112 -17
- package/artifacts/contracts/staking/IStakingService.sol/IStakingService.dbg.json +1 -1
- package/artifacts/contracts/staking/IStakingService.sol/IStakingService.json +130 -6
- package/artifacts/contracts/staking/Staking.sol/Staking.dbg.json +1 -1
- package/artifacts/contracts/staking/Staking.sol/Staking.json +191 -74
- package/artifacts/contracts/staking/StakingLib.sol/StakingLib.dbg.json +4 -0
- package/artifacts/contracts/staking/StakingLib.sol/StakingLib.json +469 -0
- package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.json +2 -2
- package/artifacts/contracts/staking/StakingManager.sol/StakingManager.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingManager.sol/StakingManager.json +56 -32
- package/artifacts/contracts/staking/StakingReader.sol/StakingReader.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingReader.sol/StakingReader.json +30 -57
- package/artifacts/contracts/staking/StakingService.sol/StakingService.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingService.sol/StakingService.json +185 -54
- package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.json +39 -29
- package/artifacts/contracts/staking/StakingStore.sol/StakingStore.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingStore.sol/StakingStore.json +143 -129
- package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.dbg.json +1 -1
- package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.json +33 -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 +3 -3
- package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
- package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.dbg.json +1 -1
- package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.json +2 -2
- 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 +3 -3
- 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/Key32Set.sol/LibKey32Set.dbg.json +1 -1
- package/artifacts/contracts/type/Key32Set.sol/LibKey32Set.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 +33 -31
- package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.dbg.json +1 -1
- package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.json +2 -2
- 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 +30 -6
- package/artifacts/contracts/type/RoleId.sol/RoleIdLib.dbg.json +1 -1
- package/artifacts/contracts/type/RoleId.sol/RoleIdLib.json +79 -15
- package/artifacts/contracts/type/Seconds.sol/SecondsLib.dbg.json +1 -1
- package/artifacts/contracts/type/Selector.sol/SelectorLib.dbg.json +1 -1
- package/artifacts/contracts/type/Selector.sol/SelectorLib.json +21 -2
- package/artifacts/contracts/type/Selector.sol/SelectorSetLib.dbg.json +1 -1
- package/artifacts/contracts/type/Selector.sol/SelectorSetLib.json +2 -2
- package/artifacts/contracts/type/StateId.sol/StateIdLib.dbg.json +1 -1
- 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 +2 -2
- package/artifacts/contracts/type/UFixed.sol/UFixedLib.dbg.json +1 -1
- package/artifacts/contracts/type/UFixed.sol/UFixedLib.json +3 -3
- package/artifacts/contracts/type/Version.sol/VersionLib.dbg.json +1 -1
- package/artifacts/contracts/type/Version.sol/VersionLib.json +2 -21
- package/artifacts/contracts/type/Version.sol/VersionPartLib.dbg.json +1 -1
- package/artifacts/contracts/type/Version.sol/VersionPartLib.json +101 -2
- package/artifacts/contracts/upgradeability/IVersionable.sol/IVersionable.dbg.json +1 -1
- package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.dbg.json +1 -1
- package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.json +4 -4
- package/artifacts/contracts/upgradeability/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
- package/artifacts/contracts/upgradeability/Versionable.sol/Versionable.dbg.json +1 -1
- package/contracts/accounting/AccountingService.sol +43 -26
- package/contracts/accounting/AccountingServiceManager.sol +1 -1
- package/contracts/accounting/IAccountingService.sol +3 -0
- package/contracts/authorization/AccessAdmin.sol +293 -205
- package/contracts/authorization/AccessAdminLib.sol +183 -0
- package/contracts/authorization/AccessManagerCloneable.sol +146 -4
- package/contracts/authorization/Authorization.sol +307 -231
- package/contracts/authorization/IAccessAdmin.sol +69 -36
- package/contracts/authorization/IAuthorization.sol +21 -1
- package/contracts/distribution/BasicDistribution.sol +12 -8
- package/contracts/distribution/BasicDistributionAuthorization.sol +21 -8
- package/contracts/distribution/Distribution.sol +14 -55
- package/contracts/distribution/DistributionService.sol +62 -30
- package/contracts/distribution/DistributionServiceManager.sol +1 -1
- package/contracts/distribution/IDistributionComponent.sol +0 -9
- package/contracts/distribution/IDistributionService.sol +18 -15
- package/contracts/examples/fire/FirePoolAuthorization.sol +1 -1
- package/contracts/examples/fire/FireProduct.sol +4 -3
- package/contracts/examples/fire/FireProductAuthorization.sol +1 -1
- package/contracts/examples/unpermissioned/SimpleDistribution.sol +28 -0
- package/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol +1 -1
- package/contracts/examples/unpermissioned/SimplePool.sol +0 -1
- package/contracts/examples/unpermissioned/SimplePoolAuthorization.sol +1 -1
- package/contracts/examples/unpermissioned/SimpleProduct.sol +29 -4
- package/contracts/examples/unpermissioned/SimpleProductAuthorization.sol +1 -1
- package/contracts/instance/BundleSet.sol +4 -4
- package/contracts/instance/IInstance.sol +49 -15
- package/contracts/instance/IInstanceService.sol +15 -1
- package/contracts/instance/Instance.sol +80 -23
- package/contracts/instance/InstanceAdmin.sol +269 -104
- package/contracts/instance/InstanceAuthorizationV3.sol +49 -36
- package/contracts/instance/InstanceReader.sol +106 -35
- package/contracts/instance/InstanceService.sol +144 -73
- package/contracts/instance/InstanceServiceManager.sol +1 -1
- package/contracts/instance/InstanceStore.sol +13 -2
- package/contracts/instance/RiskSet.sol +11 -12
- package/contracts/instance/base/ObjectCounter.sol +1 -2
- package/contracts/instance/base/ObjectLifecycle.sol +4 -2
- package/contracts/instance/base/ObjectSet.sol +7 -8
- package/contracts/instance/base/ObjectSetHelperLib.sol +30 -0
- package/contracts/instance/module/IComponents.sol +3 -2
- package/contracts/instance/module/IDistribution.sol +5 -2
- package/contracts/instance/module/IRisk.sol +2 -0
- package/contracts/oracle/BasicOracleAuthorization.sol +3 -12
- package/contracts/oracle/Oracle.sol +1 -1
- package/contracts/oracle/OracleService.sol +20 -19
- package/contracts/oracle/OracleServiceManager.sol +1 -1
- package/contracts/pool/BasicPoolAuthorization.sol +21 -13
- package/contracts/pool/BundleService.sol +28 -58
- package/contracts/pool/BundleServiceManager.sol +1 -1
- package/contracts/pool/IBundleService.sol +13 -20
- package/contracts/pool/IPoolService.sol +50 -38
- package/contracts/pool/Pool.sol +9 -9
- package/contracts/pool/PoolLib.sol +309 -0
- package/contracts/pool/PoolService.sol +334 -190
- package/contracts/pool/PoolServiceManager.sol +1 -1
- package/contracts/product/ApplicationService.sol +28 -9
- package/contracts/product/ApplicationServiceManager.sol +1 -1
- package/contracts/product/BasicProduct.sol +2 -0
- package/contracts/product/BasicProductAuthorization.sol +23 -8
- package/contracts/product/ClaimService.sol +165 -139
- package/contracts/product/ClaimServiceManager.sol +1 -1
- package/contracts/product/IApplicationService.sol +3 -0
- package/contracts/product/IClaimService.sol +14 -2
- package/contracts/product/IPolicyService.sol +11 -6
- package/contracts/product/IPricingService.sol +1 -0
- package/contracts/product/IProductComponent.sol +4 -1
- package/contracts/product/IRiskService.sol +7 -7
- package/contracts/product/PolicyService.sol +112 -184
- package/contracts/product/PolicyServiceLib.sol +119 -0
- package/contracts/product/PolicyServiceManager.sol +1 -1
- package/contracts/product/PricingService.sol +28 -19
- package/contracts/product/PricingServiceManager.sol +3 -3
- package/contracts/product/Product.sol +55 -13
- package/contracts/product/RiskService.sol +76 -29
- package/contracts/product/RiskServiceManager.sol +1 -1
- package/contracts/registry/ChainNft.sol +4 -2
- package/contracts/registry/IRegistry.sol +8 -15
- package/contracts/registry/IRelease.sol +26 -0
- package/contracts/registry/Registry.sol +7 -2
- package/contracts/registry/RegistryAdmin.sol +143 -342
- package/contracts/registry/RegistryAuthorization.sol +267 -0
- package/contracts/registry/RegistryService.sol +3 -3
- package/contracts/registry/RegistryServiceManager.sol +1 -1
- package/contracts/registry/ReleaseAdmin.sol +253 -0
- package/contracts/registry/ReleaseLifecycle.sol +2 -0
- package/contracts/registry/ReleaseRegistry.sol +149 -117
- package/contracts/registry/ServiceAuthorizationV3.sol +159 -2
- package/contracts/registry/TokenRegistry.sol +6 -8
- package/contracts/shared/Component.sol +27 -19
- package/contracts/shared/ComponentService.sol +119 -116
- package/contracts/shared/ComponentServiceManager.sol +1 -1
- package/contracts/shared/ComponentVerifyingService.sol +1 -1
- package/contracts/shared/ContractLib.sol +60 -3
- package/contracts/shared/IComponent.sol +3 -4
- package/contracts/shared/IComponentService.sol +4 -10
- package/contracts/shared/IRegisterable.sol +15 -4
- package/contracts/shared/IService.sol +3 -5
- package/contracts/shared/InitializableERC165.sol +9 -1
- package/contracts/shared/InstanceLinkedComponent.sol +2 -2
- package/contracts/shared/NftOwnable.sol +6 -5
- package/contracts/shared/PolicyHolder.sol +1 -1
- package/contracts/shared/Registerable.sol +42 -19
- package/contracts/shared/RegistryLinked.sol +1 -1
- package/contracts/shared/Service.sol +8 -27
- package/contracts/shared/TokenHandler.sol +45 -92
- package/contracts/staking/IStaking.sol +12 -10
- package/contracts/staking/IStakingService.sol +19 -1
- package/contracts/staking/Staking.sol +57 -26
- package/contracts/staking/{StakeManagerLib.sol → StakingLib.sol} +80 -23
- package/contracts/staking/StakingReader.sol +6 -16
- package/contracts/staking/StakingService.sol +71 -44
- package/contracts/staking/StakingServiceManager.sol +5 -4
- package/contracts/staking/StakingStore.sol +2 -1
- package/contracts/type/ObjectType.sol +47 -39
- package/contracts/type/RiskId.sol +9 -3
- package/contracts/type/RoleId.sol +24 -4
- package/contracts/type/Selector.sol +5 -0
- package/contracts/type/Timestamp.sol +0 -5
- package/contracts/type/UFixed.sol +9 -119
- package/contracts/type/Version.sol +54 -5
- package/contracts/upgradeability/ProxyManager.sol +1 -1
- package/package.json +2 -2
- package/artifacts/contracts/authorization/ReleaseAccessManager.sol/ReleaseAccessManager.dbg.json +0 -4
- package/artifacts/contracts/authorization/ReleaseAccessManager.sol/ReleaseAccessManager.json +0 -1196
- package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +0 -4
- package/artifacts/contracts/instance/module/IAccess.sol/IAccess.json +0 -129
- package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.dbg.json +0 -4
- package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.json +0 -440
- package/artifacts/contracts/type/UFixed.sol/MathLib.dbg.json +0 -4
- package/artifacts/contracts/type/UFixed.sol/MathLib.json +0 -16
- package/contracts/authorization/ReleaseAccessManager.sol +0 -38
- package/contracts/instance/module/IAccess.sol +0 -46
@@ -5,13 +5,20 @@ import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/acce
|
|
5
5
|
import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
|
6
6
|
import {ReentrancyGuardUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/ReentrancyGuardUpgradeable.sol";
|
7
7
|
|
8
|
+
import {IAccessAdmin} from "./IAccessAdmin.sol";
|
9
|
+
import {IAuthorization} from "./IAuthorization.sol";
|
10
|
+
import {IRegistry} from "../registry/IRegistry.sol";
|
11
|
+
|
12
|
+
import {AccessAdminLib} from "./AccessAdminLib.sol";
|
8
13
|
import {AccessManagerCloneable} from "./AccessManagerCloneable.sol";
|
9
14
|
import {ContractLib} from "../shared/ContractLib.sol";
|
10
|
-
import {
|
15
|
+
import {NftId, NftIdLib} from "../type/NftId.sol";
|
16
|
+
import {ObjectType} from "../type/ObjectType.sol";
|
11
17
|
import {RoleId, RoleIdLib, ADMIN_ROLE, PUBLIC_ROLE} from "../type/RoleId.sol";
|
12
18
|
import {Selector, SelectorLib, SelectorSetLib} from "../type/Selector.sol";
|
13
19
|
import {Str, StrLib} from "../type/String.sol";
|
14
20
|
import {TimestampLib} from "../type/Timestamp.sol";
|
21
|
+
import {VersionPart} from "../type/Version.sol";
|
15
22
|
|
16
23
|
interface IAccessManagedChecker {
|
17
24
|
function authority() external view returns (address);
|
@@ -32,13 +39,23 @@ contract AccessAdmin is
|
|
32
39
|
string public constant ADMIN_ROLE_NAME = "AdminRole";
|
33
40
|
string public constant PUBLIC_ROLE_NAME = "PublicRole";
|
34
41
|
|
35
|
-
/// @dev
|
42
|
+
/// @dev admin name used for logging only
|
43
|
+
string internal _adminName;
|
44
|
+
|
45
|
+
/// @dev the access manager driving the access admin contract
|
46
|
+
/// hold link to registry and release version
|
36
47
|
AccessManagerCloneable internal _authority;
|
37
48
|
|
49
|
+
/// @dev the authorization contract used for initial access control
|
50
|
+
IAuthorization internal _authorization;
|
51
|
+
|
38
52
|
/// @dev stores the deployer address and allows to create initializers
|
39
53
|
/// that are restricted to the deployer address.
|
40
54
|
address internal _deployer;
|
41
55
|
|
56
|
+
/// @dev the linked NFT ID
|
57
|
+
NftId internal _linkedNftId;
|
58
|
+
|
42
59
|
/// @dev store role info per role id
|
43
60
|
mapping(RoleId roleId => RoleInfo info) internal _roleInfo;
|
44
61
|
|
@@ -71,50 +88,139 @@ contract AccessAdmin is
|
|
71
88
|
|
72
89
|
modifier onlyDeployer() {
|
73
90
|
// special case for cloned AccessAdmin contracts
|
74
|
-
// IMPORTANT cloning and
|
91
|
+
// IMPORTANT cloning and initialize authority needs to be done in a single transaction
|
75
92
|
if (_deployer == address(0)) {
|
76
93
|
_deployer = msg.sender;
|
77
94
|
}
|
78
95
|
|
79
96
|
if (msg.sender != _deployer) {
|
80
|
-
revert
|
97
|
+
revert ErrorAccessAdminNotDeployer();
|
81
98
|
}
|
82
99
|
_;
|
83
100
|
}
|
84
101
|
|
85
|
-
modifier
|
102
|
+
modifier onlyRoleMember(RoleId roleId, address account) {
|
86
103
|
_checkRoleExists(roleId, false);
|
87
104
|
|
88
|
-
if (!
|
89
|
-
revert
|
105
|
+
if (!hasRole(account, roleId)) {
|
106
|
+
revert ErrorAccessAdminNotRoleOwner(roleId, account);
|
90
107
|
}
|
91
108
|
_;
|
92
109
|
}
|
93
110
|
|
94
|
-
modifier
|
95
|
-
|
96
|
-
|
111
|
+
modifier onlyRoleAdmin(RoleId roleId, address account) {
|
112
|
+
_checkRoleExists(roleId, false);
|
113
|
+
|
114
|
+
if (!hasAdminRole(account, roleId)) {
|
115
|
+
revert ErrorAccessAdminNotAdminOfRole(_roleInfo[roleId].adminRoleId, account);
|
97
116
|
}
|
98
117
|
_;
|
99
118
|
}
|
100
119
|
|
101
|
-
modifier onlyExistingRole(
|
102
|
-
|
120
|
+
modifier onlyExistingRole(
|
121
|
+
RoleId roleId,
|
122
|
+
bool onlyActiveRole,
|
123
|
+
bool allowLockedRoles
|
124
|
+
)
|
125
|
+
{
|
126
|
+
if (!allowLockedRoles) {
|
127
|
+
_checkRoleExists(roleId, onlyActiveRole);
|
128
|
+
}
|
103
129
|
_;
|
104
130
|
}
|
105
131
|
|
106
132
|
modifier onlyExistingTarget(address target) {
|
107
|
-
|
133
|
+
_checkTargetExists(target);
|
108
134
|
_;
|
109
135
|
}
|
110
136
|
|
111
|
-
|
112
|
-
|
113
|
-
|
137
|
+
//-------------- initialization functions ------------------------------//
|
138
|
+
|
139
|
+
// event LogAccessAdminDebug(string message);
|
140
|
+
|
141
|
+
/// @dev Initializes this admin with the provided accessManager (and authorization specification).
|
142
|
+
/// Internally initializes access manager with this admin and creates basic role setup.
|
143
|
+
function initialize(
|
144
|
+
address authority,
|
145
|
+
string memory adminName
|
146
|
+
)
|
147
|
+
public
|
148
|
+
initializer()
|
149
|
+
{
|
150
|
+
__AccessAdmin_init(authority, adminName);
|
151
|
+
}
|
152
|
+
|
153
|
+
|
154
|
+
function __AccessAdmin_init(
|
155
|
+
address authority,
|
156
|
+
string memory adminName
|
157
|
+
)
|
158
|
+
internal
|
159
|
+
onlyInitializing()
|
160
|
+
onlyDeployer()
|
161
|
+
{
|
162
|
+
// checks
|
163
|
+
// check authority is contract
|
164
|
+
if (!ContractLib.isContract(authority)) {
|
165
|
+
revert ErrorAccessAdminAuthorityNotContract(authority);
|
166
|
+
}
|
167
|
+
|
168
|
+
// check name not empty
|
169
|
+
if (bytes(adminName).length == 0) {
|
170
|
+
revert ErrorAccessAdminAccessManagerEmptyName();
|
171
|
+
}
|
172
|
+
|
173
|
+
_authority = AccessManagerCloneable(authority);
|
114
174
|
_authority.initialize(address(this));
|
115
175
|
|
116
|
-
|
117
|
-
|
176
|
+
// delayed additional check for authority after its initialization
|
177
|
+
if (!ContractLib.isAuthority(authority)) {
|
178
|
+
revert ErrorAccessAdminAccessManagerNotAccessManager(authority);
|
179
|
+
}
|
180
|
+
|
181
|
+
// effects
|
182
|
+
// set and initialize this access manager contract as
|
183
|
+
// the admin (ADMIN_ROLE) of the provided authority
|
184
|
+
__AccessManaged_init(authority);
|
185
|
+
|
186
|
+
// set name for logging
|
187
|
+
_adminName = adminName;
|
188
|
+
|
189
|
+
// set initial linked NFT ID to zero
|
190
|
+
_linkedNftId = NftIdLib.zero();
|
191
|
+
|
192
|
+
// create admin and public roles
|
193
|
+
_initializeAdminAndPublicRoles();
|
194
|
+
}
|
195
|
+
|
196
|
+
|
197
|
+
function getRelease() public view virtual returns (VersionPart release) {
|
198
|
+
return _authority.getRelease();
|
199
|
+
}
|
200
|
+
|
201
|
+
|
202
|
+
function getRegistry() public view returns (IRegistry registry) {
|
203
|
+
return _authority.getRegistry();
|
204
|
+
}
|
205
|
+
|
206
|
+
|
207
|
+
function getLinkedNftId() external view returns (NftId linkedNftId) {
|
208
|
+
return _linkedNftId;
|
209
|
+
}
|
210
|
+
|
211
|
+
|
212
|
+
function getLinkedOwner() external view returns (address linkedOwner) {
|
213
|
+
return getRegistry().ownerOf(_linkedNftId);
|
214
|
+
}
|
215
|
+
|
216
|
+
|
217
|
+
function getAuthorization() public view returns (IAuthorization authorization) {
|
218
|
+
return _authorization;
|
219
|
+
}
|
220
|
+
|
221
|
+
|
222
|
+
function isLocked() public view returns (bool locked) {
|
223
|
+
return _authority.isLocked();
|
118
224
|
}
|
119
225
|
|
120
226
|
//--- view functions for roles ------------------------------------------//
|
@@ -139,12 +245,12 @@ contract AccessAdmin is
|
|
139
245
|
return _roleInfo[roleId].createdAt.gtz();
|
140
246
|
}
|
141
247
|
|
142
|
-
function
|
143
|
-
return
|
248
|
+
function getRoleForName(string memory name) external view returns (RoleId roleId) {
|
249
|
+
return _roleForName[StrLib.toStr(name)].roleId;
|
144
250
|
}
|
145
251
|
|
146
|
-
function
|
147
|
-
return
|
252
|
+
function getRoleInfo(RoleId roleId) external view returns (RoleInfo memory) {
|
253
|
+
return _roleInfo[roleId];
|
148
254
|
}
|
149
255
|
|
150
256
|
function roleMembers(RoleId roleId) external view returns (uint256 numberOfMembers) {
|
@@ -155,6 +261,7 @@ contract AccessAdmin is
|
|
155
261
|
return _roleMembers[roleId].at(idx);
|
156
262
|
}
|
157
263
|
|
264
|
+
// TODO false because not role member or because role not exists?
|
158
265
|
function hasRole(address account, RoleId roleId) public view returns (bool) {
|
159
266
|
(bool isMember, ) = _authority.hasRole(
|
160
267
|
RoleId.unwrap(roleId),
|
@@ -220,33 +327,59 @@ contract AccessAdmin is
|
|
220
327
|
selector.toBytes4()));
|
221
328
|
}
|
222
329
|
|
223
|
-
function
|
224
|
-
|
330
|
+
function deployer() public view returns (address) {
|
331
|
+
return _deployer;
|
225
332
|
}
|
226
333
|
|
227
|
-
|
228
|
-
|
229
|
-
|
230
|
-
|
231
|
-
|
232
|
-
|
233
|
-
createdAt: TimestampLib.blockTimestamp(),
|
234
|
-
pausedAt: TimestampLib.max()
|
235
|
-
});
|
236
|
-
}
|
334
|
+
//--- internal/private functions -------------------------------------------------//
|
335
|
+
|
336
|
+
function _linkToNftOwnable(address registerable) internal {
|
337
|
+
if (!getRegistry().isRegistered(registerable)) {
|
338
|
+
revert ErrorAccessAdminNotRegistered(registerable);
|
339
|
+
}
|
237
340
|
|
238
|
-
|
239
|
-
return FunctionInfo({
|
240
|
-
name: StrLib.toStr(name),
|
241
|
-
selector: SelectorLib.toSelector(selector),
|
242
|
-
createdAt: TimestampLib.blockTimestamp()});
|
341
|
+
_linkedNftId = getRegistry().getNftIdForAddress(registerable);
|
243
342
|
}
|
244
343
|
|
245
|
-
function
|
246
|
-
|
344
|
+
function _initializeAdminAndPublicRoles()
|
345
|
+
internal
|
346
|
+
virtual
|
347
|
+
onlyInitializing()
|
348
|
+
{
|
349
|
+
RoleId adminRoleId = RoleIdLib.toRoleId(_authority.ADMIN_ROLE());
|
350
|
+
|
351
|
+
// setup admin role
|
352
|
+
_createRoleUnchecked(
|
353
|
+
ADMIN_ROLE(),
|
354
|
+
AccessAdminLib.toRole({
|
355
|
+
adminRoleId: ADMIN_ROLE(),
|
356
|
+
roleType: RoleType.Contract,
|
357
|
+
maxMemberCount: 1,
|
358
|
+
name: ADMIN_ROLE_NAME}));
|
359
|
+
|
360
|
+
// add this contract as admin role member
|
361
|
+
_roleMembers[adminRoleId].add(address(this));
|
362
|
+
|
363
|
+
// setup public role
|
364
|
+
_createRoleUnchecked(
|
365
|
+
PUBLIC_ROLE(),
|
366
|
+
AccessAdminLib.toRole({
|
367
|
+
adminRoleId: ADMIN_ROLE(),
|
368
|
+
roleType: RoleType.Gif,
|
369
|
+
maxMemberCount: type(uint32).max,
|
370
|
+
name: PUBLIC_ROLE_NAME}));
|
247
371
|
}
|
248
372
|
|
249
|
-
|
373
|
+
function _createTargetWithRole(
|
374
|
+
address target,
|
375
|
+
string memory targetName,
|
376
|
+
RoleId targetRoleId
|
377
|
+
)
|
378
|
+
internal
|
379
|
+
{
|
380
|
+
_createTarget(target, targetName, true, false);
|
381
|
+
_grantRoleToAccount(targetRoleId, target);
|
382
|
+
}
|
250
383
|
|
251
384
|
function _authorizeTargetFunctions(
|
252
385
|
address target,
|
@@ -256,14 +389,21 @@ contract AccessAdmin is
|
|
256
389
|
internal
|
257
390
|
{
|
258
391
|
if (roleId == getAdminRole()) {
|
259
|
-
revert
|
392
|
+
revert ErrorAccessAdminAuthorizeForAdminRoleInvalid(target);
|
260
393
|
}
|
261
394
|
|
262
|
-
|
263
|
-
|
395
|
+
(
|
396
|
+
bytes4[] memory functionSelectors,
|
397
|
+
string[] memory functionNames
|
398
|
+
) = _processFunctionSelectors(target, functions, true);
|
264
399
|
|
265
400
|
// apply authz via access manager
|
266
|
-
_grantRoleAccessToFunctions(
|
401
|
+
_grantRoleAccessToFunctions(
|
402
|
+
target,
|
403
|
+
roleId,
|
404
|
+
functionSelectors,
|
405
|
+
functionNames,
|
406
|
+
false); // allow locked roles
|
267
407
|
}
|
268
408
|
|
269
409
|
function _unauthorizeTargetFunctions(
|
@@ -272,9 +412,17 @@ contract AccessAdmin is
|
|
272
412
|
)
|
273
413
|
internal
|
274
414
|
{
|
275
|
-
|
276
|
-
|
277
|
-
|
415
|
+
(
|
416
|
+
bytes4[] memory functionSelectors,
|
417
|
+
string[] memory functionNames
|
418
|
+
) = _processFunctionSelectors(target, functions, false);
|
419
|
+
|
420
|
+
_grantRoleAccessToFunctions(
|
421
|
+
target,
|
422
|
+
getAdminRole(),
|
423
|
+
functionSelectors,
|
424
|
+
functionNames,
|
425
|
+
true); // allowLockedRoles
|
278
426
|
}
|
279
427
|
|
280
428
|
function _processFunctionSelectors(
|
@@ -283,12 +431,15 @@ contract AccessAdmin is
|
|
283
431
|
bool addFunctions
|
284
432
|
)
|
285
433
|
internal
|
434
|
+
onlyExistingTarget(target)
|
286
435
|
returns (
|
287
|
-
bytes4[] memory functionSelectors
|
436
|
+
bytes4[] memory functionSelectors,
|
437
|
+
string[] memory functionNames
|
288
438
|
)
|
289
439
|
{
|
290
440
|
uint256 n = functions.length;
|
291
441
|
functionSelectors = new bytes4[](n);
|
442
|
+
functionNames = new string[](n);
|
292
443
|
FunctionInfo memory func;
|
293
444
|
Selector selector;
|
294
445
|
|
@@ -305,89 +456,49 @@ contract AccessAdmin is
|
|
305
456
|
|
306
457
|
// add bytes4 selector to function selector array
|
307
458
|
functionSelectors[i] = selector.toBytes4();
|
459
|
+
functionNames[i] = func.name.toString();
|
308
460
|
}
|
309
461
|
}
|
310
462
|
|
311
|
-
function _initializeAuthority(
|
312
|
-
address authorityAddress
|
313
|
-
)
|
314
|
-
internal
|
315
|
-
virtual
|
316
|
-
onlyInitializing()
|
317
|
-
onlyDeployer()
|
318
|
-
{
|
319
|
-
if (authority() != address(0)) {
|
320
|
-
revert ErrorAuthorityAlreadySet();
|
321
|
-
}
|
322
|
-
|
323
|
-
_authority = AccessManagerCloneable(authorityAddress);
|
324
|
-
__AccessManaged_init(address(_authority));
|
325
|
-
}
|
326
|
-
|
327
|
-
|
328
|
-
function _initializeAdminAndPublicRoles()
|
329
|
-
internal
|
330
|
-
virtual
|
331
|
-
onlyInitializing()
|
332
|
-
{
|
333
|
-
_createAdminAndPublicRoles();
|
334
|
-
}
|
335
|
-
|
336
|
-
|
337
|
-
/// @dev internal setup function that can be used in both constructor and initializer.
|
338
|
-
function _createAdminAndPublicRoles()
|
339
|
-
internal
|
340
|
-
{
|
341
|
-
RoleId adminRoleId = RoleIdLib.toRoleId(_authority.ADMIN_ROLE());
|
342
|
-
|
343
|
-
// setup admin role
|
344
|
-
_createRoleUnchecked(
|
345
|
-
ADMIN_ROLE(),
|
346
|
-
toRole({
|
347
|
-
adminRoleId: ADMIN_ROLE(),
|
348
|
-
roleType: RoleType.Contract,
|
349
|
-
maxMemberCount: 1,
|
350
|
-
name: ADMIN_ROLE_NAME}));
|
351
|
-
|
352
|
-
// add this contract as admin role member
|
353
|
-
_roleMembers[adminRoleId].add(address(this));
|
354
|
-
|
355
|
-
// setup public role
|
356
|
-
_createRoleUnchecked(
|
357
|
-
PUBLIC_ROLE(),
|
358
|
-
toRole({
|
359
|
-
adminRoleId: ADMIN_ROLE(),
|
360
|
-
roleType: RoleType.Gif,
|
361
|
-
maxMemberCount: type(uint32).max,
|
362
|
-
name: PUBLIC_ROLE_NAME}));
|
363
|
-
}
|
364
|
-
|
365
|
-
|
366
463
|
/// @dev grant the specified role access to all functions in the provided selector list
|
367
464
|
function _grantRoleAccessToFunctions(
|
368
465
|
address target,
|
369
466
|
RoleId roleId,
|
370
|
-
bytes4[] memory functionSelectors
|
467
|
+
bytes4[] memory functionSelectors,
|
468
|
+
string[] memory functionNames,
|
469
|
+
bool allowLockedRoles // admin and public roles are locked
|
371
470
|
)
|
372
471
|
internal
|
472
|
+
onlyExistingTarget(target)
|
473
|
+
onlyExistingRole(roleId, true, allowLockedRoles)
|
373
474
|
{
|
475
|
+
|
374
476
|
_authority.setTargetFunctionRole(
|
375
477
|
target,
|
376
478
|
functionSelectors,
|
377
479
|
RoleId.unwrap(roleId));
|
378
480
|
|
379
|
-
//
|
481
|
+
// log function grantings
|
482
|
+
for (uint256 i = 0; i < functionSelectors.length; i++) {
|
483
|
+
emit LogAccessAdminFunctionGranted(
|
484
|
+
_adminName,
|
485
|
+
target,
|
486
|
+
string(abi.encodePacked(
|
487
|
+
functionNames[i],
|
488
|
+
"(): ",
|
489
|
+
_getRoleName(roleId))));
|
490
|
+
}
|
380
491
|
}
|
381
492
|
|
382
493
|
|
383
494
|
/// @dev grant the specified role to the provided account
|
384
495
|
function _grantRoleToAccount(RoleId roleId, address account)
|
385
496
|
internal
|
386
|
-
onlyExistingRole(roleId, true)
|
497
|
+
onlyExistingRole(roleId, true, false)
|
387
498
|
{
|
388
499
|
// check max role members will not be exceeded
|
389
500
|
if (_roleMembers[roleId].length() >= _roleInfo[roleId].maxMemberCount) {
|
390
|
-
revert
|
501
|
+
revert ErrorAccessAdminRoleMembersLimitReached(roleId, _roleInfo[roleId].maxMemberCount);
|
391
502
|
}
|
392
503
|
|
393
504
|
// check account is contract for contract role
|
@@ -395,7 +506,7 @@ contract AccessAdmin is
|
|
395
506
|
_roleInfo[roleId].roleType == RoleType.Contract &&
|
396
507
|
!ContractLib.isContract(account) // will fail in account's constructor
|
397
508
|
) {
|
398
|
-
revert
|
509
|
+
revert ErrorAccessAdminRoleMemberNotContract(roleId, account);
|
399
510
|
}
|
400
511
|
|
401
512
|
// TODO check account already have roleId
|
@@ -405,18 +516,18 @@ contract AccessAdmin is
|
|
405
516
|
account,
|
406
517
|
0);
|
407
518
|
|
408
|
-
|
519
|
+
emit LogAccessAdminRoleGranted(_adminName, account, _getRoleName(roleId));
|
409
520
|
}
|
410
521
|
|
411
522
|
/// @dev revoke the specified role from the provided account
|
412
523
|
function _revokeRoleFromAccount(RoleId roleId, address account)
|
413
524
|
internal
|
414
|
-
onlyExistingRole(roleId, false)
|
525
|
+
onlyExistingRole(roleId, false, false)
|
415
526
|
{
|
416
527
|
|
417
528
|
// check role removal is permitted
|
418
529
|
if (_roleInfo[roleId].roleType == RoleType.Contract) {
|
419
|
-
revert
|
530
|
+
revert ErrorAccessAdminRoleMemberRemovalDisabled(roleId, account);
|
420
531
|
}
|
421
532
|
|
422
533
|
// TODO check account have roleId?
|
@@ -425,7 +536,7 @@ contract AccessAdmin is
|
|
425
536
|
RoleId.unwrap(roleId),
|
426
537
|
account);
|
427
538
|
|
428
|
-
|
539
|
+
emit LogAccessAdminRoleRevoked(_adminName, account, _roleInfo[roleId].name.toString());
|
429
540
|
}
|
430
541
|
|
431
542
|
|
@@ -437,32 +548,21 @@ contract AccessAdmin is
|
|
437
548
|
)
|
438
549
|
internal
|
439
550
|
{
|
440
|
-
|
441
|
-
|
442
|
-
|
443
|
-
roleId,
|
444
|
-
_roleInfo[roleId].name.toString());
|
445
|
-
}
|
446
|
-
|
447
|
-
// check admin role exists
|
448
|
-
if(!roleExists(info.adminRoleId)) {
|
449
|
-
revert ErrorRoleAdminNotExisting(info.adminRoleId);
|
450
|
-
}
|
451
|
-
|
452
|
-
// check role name is not empty
|
453
|
-
if(info.name.length() == 0) {
|
454
|
-
revert ErrorRoleNameEmpty(roleId);
|
455
|
-
}
|
551
|
+
AccessAdminLib.checkRoleCreation(this, roleId, info);
|
552
|
+
_createRoleUnchecked(roleId, info);
|
553
|
+
}
|
456
554
|
|
457
|
-
// check role name is not used for another role
|
458
|
-
if(_roleForName[info.name].exists) {
|
459
|
-
revert ErrorRoleNameAlreadyExists(
|
460
|
-
roleId,
|
461
|
-
info.name.toString(),
|
462
|
-
_roleForName[info.name].roleId);
|
463
|
-
}
|
464
555
|
|
465
|
-
|
556
|
+
function _createTarget(
|
557
|
+
address target,
|
558
|
+
string memory targetName,
|
559
|
+
bool checkAuthority,
|
560
|
+
bool custom
|
561
|
+
)
|
562
|
+
internal
|
563
|
+
{
|
564
|
+
AccessAdminLib.checkTargetCreation(this, target, targetName, checkAuthority);
|
565
|
+
_createTargetUnchecked(target, targetName, custom);
|
466
566
|
}
|
467
567
|
|
468
568
|
|
@@ -484,54 +584,19 @@ contract AccessAdmin is
|
|
484
584
|
// add role to list of roles
|
485
585
|
_roleIds.push(roleId);
|
486
586
|
|
487
|
-
emit
|
587
|
+
emit LogAccessAdminRoleCreated(_adminName, roleId, info.roleType, info.adminRoleId, info.name.toString());
|
488
588
|
}
|
489
589
|
|
490
590
|
|
491
|
-
function
|
591
|
+
function _createTargetUnchecked(
|
492
592
|
address target,
|
493
593
|
string memory targetName,
|
494
|
-
bool checkAuthority,
|
495
594
|
bool custom
|
496
595
|
)
|
497
596
|
internal
|
498
|
-
nonReentrant()
|
499
597
|
{
|
500
|
-
// check target does not yet exist
|
501
|
-
if(targetExists(target)) {
|
502
|
-
revert ErrorTargetAlreadyCreated(
|
503
|
-
target,
|
504
|
-
_targetInfo[target].name.toString());
|
505
|
-
}
|
506
|
-
|
507
|
-
// check target name is not empty
|
508
|
-
Str name = StrLib.toStr(targetName);
|
509
|
-
if(name.length() == 0) {
|
510
|
-
revert ErrorTargetNameEmpty(target);
|
511
|
-
}
|
512
|
-
|
513
|
-
// check target name is not used for another target
|
514
|
-
if( _targetForName[name] != address(0)) {
|
515
|
-
revert ErrorTargetNameAlreadyExists(
|
516
|
-
target,
|
517
|
-
targetName,
|
518
|
-
_targetForName[name]);
|
519
|
-
}
|
520
|
-
|
521
|
-
// check target is an access managed contract
|
522
|
-
if (!_isAccessManaged(target)) {
|
523
|
-
revert ErrorTargetNotAccessManaged(target);
|
524
|
-
}
|
525
|
-
|
526
|
-
// check target shares authority with this contract
|
527
|
-
if (checkAuthority) {
|
528
|
-
address targetAuthority = AccessManagedUpgradeable(target).authority();
|
529
|
-
if (targetAuthority != authority()) {
|
530
|
-
revert ErrorTargetAuthorityMismatch(authority(), targetAuthority);
|
531
|
-
}
|
532
|
-
}
|
533
|
-
|
534
598
|
// create target info
|
599
|
+
Str name = StrLib.toStr(targetName);
|
535
600
|
_targetInfo[target] = TargetInfo({
|
536
601
|
name: name,
|
537
602
|
isCustom: custom,
|
@@ -544,42 +609,45 @@ contract AccessAdmin is
|
|
544
609
|
// add role to list of roles
|
545
610
|
_targets.push(target);
|
546
611
|
|
547
|
-
emit
|
612
|
+
emit LogAccessAdminTargetCreated(_adminName, target, targetName);
|
548
613
|
}
|
549
614
|
|
550
615
|
|
551
|
-
function
|
616
|
+
function _setTargetLocked(address target, bool locked)
|
552
617
|
internal
|
553
|
-
|
554
|
-
returns (bool)
|
618
|
+
onlyExistingTarget(target)
|
555
619
|
{
|
556
|
-
|
557
|
-
|
558
|
-
}
|
620
|
+
_authority.setTargetClosed(target, locked);
|
621
|
+
}
|
559
622
|
|
560
|
-
(bool success, ) = target.staticcall(
|
561
|
-
abi.encodeWithSelector(
|
562
|
-
IAccessManagedChecker.authority.selector));
|
563
623
|
|
564
|
-
|
624
|
+
function _getRoleName(RoleId roleId) internal view returns (string memory) {
|
625
|
+
if (roleExists(roleId)) {
|
626
|
+
return _roleInfo[roleId].name.toString();
|
627
|
+
}
|
628
|
+
return "<unknown-role>";
|
565
629
|
}
|
566
630
|
|
567
631
|
|
568
|
-
function
|
632
|
+
function _checkAuthorization(
|
633
|
+
address authorization,
|
634
|
+
ObjectType expectedDomain,
|
635
|
+
VersionPart expectedRelease,
|
636
|
+
bool checkAlreadyInitialized
|
637
|
+
)
|
569
638
|
internal
|
639
|
+
view
|
570
640
|
{
|
571
|
-
|
572
|
-
|
573
|
-
|
574
|
-
|
575
|
-
|
576
|
-
|
577
|
-
|
578
|
-
_authority.setTargetClosed(target, locked);
|
641
|
+
AccessAdminLib.checkAuthorization(
|
642
|
+
address(_authorization),
|
643
|
+
authorization,
|
644
|
+
expectedDomain,
|
645
|
+
expectedRelease,
|
646
|
+
checkAlreadyInitialized);
|
579
647
|
}
|
580
648
|
|
581
649
|
|
582
|
-
function _checkRoleExists(
|
650
|
+
function _checkRoleExists(
|
583
651
|
RoleId roleId,
|
584
652
|
bool onlyActiveRole
|
585
653
|
)
|
@@ -587,30 +655,50 @@ contract AccessAdmin is
|
|
587
655
|
view
|
588
656
|
{
|
589
657
|
if (!roleExists(roleId)) {
|
590
|
-
revert
|
658
|
+
revert ErrorAccessAdminRoleUnknown(roleId);
|
591
659
|
}
|
592
660
|
|
593
661
|
uint64 roleIdInt = RoleId.unwrap(roleId);
|
594
|
-
if (roleIdInt == _authority.ADMIN_ROLE()
|
595
|
-
|
596
|
-
{
|
597
|
-
revert ErrorRoleIsLocked(roleId);
|
662
|
+
if (roleIdInt == _authority.ADMIN_ROLE()) {
|
663
|
+
revert ErrorAccessAdminRoleIsLocked(roleId);
|
598
664
|
}
|
599
665
|
|
600
666
|
// check if role is disabled
|
601
667
|
if (onlyActiveRole && _roleInfo[roleId].pausedAt <= TimestampLib.blockTimestamp()) {
|
602
|
-
revert
|
668
|
+
revert ErrorAccessAdminRoleIsPaused(roleId);
|
603
669
|
}
|
604
670
|
}
|
605
671
|
|
606
672
|
|
673
|
+
|
607
674
|
/// @dev check if target exists and reverts if it doesn't
|
608
|
-
function
|
675
|
+
function _checkTargetExists(
|
676
|
+
address target
|
677
|
+
)
|
609
678
|
internal
|
610
679
|
view
|
611
680
|
{
|
681
|
+
// check not yet created
|
612
682
|
if (!targetExists(target)) {
|
613
|
-
revert
|
683
|
+
revert ErrorAccessAdminTargetNotCreated(target);
|
684
|
+
}
|
685
|
+
}
|
686
|
+
|
687
|
+
|
688
|
+
function _checkIsRegistered(
|
689
|
+
address registry,
|
690
|
+
address target,
|
691
|
+
ObjectType expectedType
|
692
|
+
)
|
693
|
+
internal
|
694
|
+
view
|
695
|
+
{
|
696
|
+
AccessAdminLib.checkIsRegistered(registry, target, expectedType);
|
697
|
+
}
|
698
|
+
|
699
|
+
function _checkRegistry(address registry) internal view {
|
700
|
+
if (!ContractLib.isRegistry(registry)) {
|
701
|
+
revert ErrorAccessAdminNotRegistry(registry);
|
614
702
|
}
|
615
703
|
}
|
616
704
|
}
|