Simplify deployAndUpgradeTo() and delete unused ITransparentUpgradeab…

…leProxy.sol
compound-finance · Mar 15, 2022 · f8518a1 · f8518a1
1 parent 6c47ac2
commit f8518a1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 23 deletions.
diff --git a/contracts/interfaces/ITransparentUpgradeableProxy.sol b/contracts/interfaces/ITransparentUpgradeableProxy.sol
diff --git a/contracts/test/Timelock.sol b/contracts/test/Timelock.sol
@@ -17,7 +17,6 @@ contract Timelock {
                 callData = abi.encodePacked(bytes4(keccak256(bytes(signatures[i]))), data[i]);
             }
 
-            // solium-disable-next-line security/no-call-value
             (bool success, bytes memory returnData) = targets[i].call{value: values[i]}(callData);
             require(success, "failed to call");
         }

diff --git a/contracts/vendored/CometProxyAdmin.sol b/contracts/vendored/CometProxyAdmin.sol
@@ -3,6 +3,10 @@ pragma solidity ^0.8.11;
 
 import "../vendor/proxy/ProxyAdmin.sol";
 
+interface Deployable {
+  function deploy() external returns (address);
+}
+
 contract CometProxyAdmin is ProxyAdmin {
     /**
      * @dev Deploy a new Comet and upgrade the implementation of the Comet proxy.
@@ -11,11 +15,8 @@ contract CometProxyAdmin is ProxyAdmin {
      *
      * - This contract must be the admin of `CometProxy`.
      */
-    function deployAndUpgradeTo(TransparentUpgradeableProxy configuratorProxy, TransparentUpgradeableProxy cometProxy) public virtual onlyOwner {
-        (bool success, bytes memory returnData) = address(configuratorProxy).call(abi.encodeWithSignature("deploy()"));
-        require(success, "failed to deploy new contract");
-
-        (address newCometImpl) = abi.decode(returnData, (address)); 
+    function deployAndUpgradeTo(Deployable configuratorProxy, TransparentUpgradeableProxy cometProxy) public virtual onlyOwner {
+        address newCometImpl = configuratorProxy.deploy();
         upgrade(cometProxy, newCometImpl);
     }
 }