From fbd2057e86bb328a4b3ad66fa7669556480c491e Mon Sep 17 00:00:00 2001
From: tracy <25892474+traceurl@users.noreply.github.com>
Date: Mon, 27 Jun 2022 10:32:27 +0800
Subject: [PATCH] remove dodoapprove in require

---
 .../impl/DPPOracle/DPPOracleAdmin.sol         | 48 +++----------------
 1 file changed, 6 insertions(+), 42 deletions(-)

diff --git a/contracts/DODOPrivatePool/impl/DPPOracle/DPPOracleAdmin.sol b/contracts/DODOPrivatePool/impl/DPPOracle/DPPOracleAdmin.sol
index 147951b..4f962f2 100644
--- a/contracts/DODOPrivatePool/impl/DPPOracle/DPPOracleAdmin.sol
+++ b/contracts/DODOPrivatePool/impl/DPPOracle/DPPOracleAdmin.sol
@@ -62,47 +62,25 @@ contract DPPOracleAdmin is InitializableOwnable {
         IDPPOracle(_DPP_).retrieve(to, token, amount);
     }
 
-    function changeOracle(address newOracle) external notFreezed {
-        require(
-            msg.sender == _OWNER_ ||
-                (IDODOApproveProxy(_DODO_APPROVE_PROXY_).isAllowedProxy(msg.sender)),
-            "CHANGEORACLE FORBIDDEN!"
-        );
+    function changeOracle(address newOracle) external onlyOwner notFreezed {
         IDPPOracle(_DPP_).changeOracle(newOracle);
     }
 
-    function enableOracle() external notFreezed {
-       require(
-            msg.sender == _OWNER_ ||
-                (IDODOApproveProxy(_DODO_APPROVE_PROXY_).isAllowedProxy(msg.sender)),
-            "CHANGEORACLE FORBIDDEN!"
-        );
+    function enableOracle() external onlyOwner notFreezed {
         IDPPOracle(_DPP_).enableOracle(); 
     }
 
-    function disableOracle(uint256 newI) external notFreezed {
-       require(
-            msg.sender == _OWNER_ ||
-                (IDODOApproveProxy(_DODO_APPROVE_PROXY_).isAllowedProxy(msg.sender)),
-            "CHANGEORACLE FORBIDDEN!"
-        );
+    function disableOracle(uint256 newI) external onlyOwner notFreezed {
         IDPPOracle(_DPP_).disableOracle(newI); 
     }
 
     function tuneParameters(
-        address operator,
         uint256 newLpFeeRate,
         uint256 newI,
         uint256 newK,
         uint256 minBaseReserve,
         uint256 minQuoteReserve
-    ) external notFreezed returns (bool) {
-        require(
-            msg.sender == _OWNER_ ||
-                (IDODOApproveProxy(_DODO_APPROVE_PROXY_).isAllowedProxy(msg.sender) &&
-                    operator == _OPERATOR_),
-            "TUNEPARAMS FORBIDDEN!"
-        );
+    ) external onlyOwner notFreezed returns (bool) {
         return
             IDPPOracle(_DPP_).tuneParameters(
                 newLpFeeRate,
@@ -114,17 +92,10 @@ contract DPPOracleAdmin is InitializableOwnable {
     }
 
     function tunePrice(
-        address operator,
         uint256 newI,
         uint256 minBaseReserve,
         uint256 minQuoteReserve
-    ) external notFreezed returns (bool) {
-        require(
-            msg.sender == _OWNER_ ||
-                (IDODOApproveProxy(_DODO_APPROVE_PROXY_).isAllowedProxy(msg.sender) &&
-                    operator == _OPERATOR_),
-            "TUNEPRICE FORBIDDEN！"
-        );
+    ) external onlyOwner notFreezed returns (bool) {
         return
             IDPPOracle(_DPP_).tunePrice(
                 newI,
@@ -135,7 +106,6 @@ contract DPPOracleAdmin is InitializableOwnable {
 
 
     function reset(
-        address operator,
         uint256 newLpFeeRate,
         uint256 newI,
         uint256 newK,
@@ -143,13 +113,7 @@ contract DPPOracleAdmin is InitializableOwnable {
         uint256 quoteOutAmount,
         uint256 minBaseReserve,
         uint256 minQuoteReserve
-    ) external notFreezed returns (bool) {
-        require(
-            msg.sender == _OWNER_ ||
-                (IDODOApproveProxy(_DODO_APPROVE_PROXY_).isAllowedProxy(msg.sender) &&
-                    operator == _OPERATOR_),
-            "RESET FORBIDDEN！"
-        );
+    ) external onlyOwner notFreezed returns (bool) {
         return
             IDPPOracle(_DPP_).reset(
                 _OWNER_, //only support asset transfer out to owner