diff --git a/contracts/core/ContractsRegistry.sol b/contracts/core/ContractsRegistry.sol index bc25cc90..0e7a93ac 100644 --- a/contracts/core/ContractsRegistry.sol +++ b/contracts/core/ContractsRegistry.sol @@ -28,11 +28,6 @@ contract ContractsRegistry is IContractsRegistry, OwnableContractsRegistry, UUPS string public constant CORE_PROPERTIES_NAME = "CORE_PROPERTIES"; - modifier onlyDexeGov() { - _onlyDexeGov(); - _; - } - function getUserRegistryContract() external view override returns (address) { return getContract(USER_REGISTRY_NAME); } @@ -81,7 +76,7 @@ contract ContractsRegistry is IContractsRegistry, OwnableContractsRegistry, UUPS return getContract(DEXE_EXPERT_NFT_NAME); } - function setSphereXEngine(address sphereXEngine) external onlyDexeGov { + function setSphereXEngine(address sphereXEngine) external onlyOwner { _setSphereXEngine(USER_REGISTRY_NAME, sphereXEngine); _setSphereXEngine(POOL_FACTORY_NAME, sphereXEngine); _setSphereXEngine(POOL_REGISTRY_NAME, sphereXEngine); @@ -116,12 +111,5 @@ contract ContractsRegistry is IContractsRegistry, OwnableContractsRegistry, UUPS ); } - function _onlyDexeGov() internal view { - require( - getTreasuryContract() == msg.sender, - "ContractsRegistry: Caller is not a DEXE gov" - ); - } - function _authorizeUpgrade(address newImplementation) internal override onlyOwner {} } diff --git a/contracts/factory/PoolRegistry.sol b/contracts/factory/PoolRegistry.sol index 9495c7ee..728f8f40 100644 --- a/contracts/factory/PoolRegistry.sol +++ b/contracts/factory/PoolRegistry.sol @@ -38,11 +38,6 @@ contract PoolRegistry is IPoolRegistry, OwnablePoolContractsRegistry { _; } - modifier onlyDexeGov() { - _onlyDexeGov(); - _; - } - function setDependencies(address contractsRegistry, bytes memory data) public override { super.setDependencies(contractsRegistry, data); @@ -59,7 +54,7 @@ contract PoolRegistry is IPoolRegistry, OwnablePoolContractsRegistry { _addProxyPool(name, poolAddress); } - function setSphereXEngine(address sphereXEngine) external onlyDexeGov { + function setSphereXEngine(address sphereXEngine) external onlyOwner { _setSpherexEngine(GOV_POOL_NAME, sphereXEngine); _setSpherexEngine(SETTINGS_NAME, sphereXEngine); _setSpherexEngine(VALIDATORS_NAME, sphereXEngine); @@ -84,10 +79,6 @@ contract PoolRegistry is IPoolRegistry, OwnablePoolContractsRegistry { require(_poolFactory == msg.sender, "PoolRegistry: Caller is not a factory"); } - function _onlyDexeGov() internal view { - require(_dexeGovAddress == msg.sender, "PoolRegistry: Caller is not a DEXE gov"); - } - function _deployProxyBeacon(address implementation) internal override returns (address) { return address(new PoolBeacon(_dexeGovAddress, address(this), address(0), implementation)); }