add low level support to approveThis as well

compound-finance · Nov 9, 2023 · f2707f2 · f2707f2
1 parent ad99f2e
commit f2707f2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/contracts/Comet.sol b/contracts/Comet.sol
@@ -783,7 +783,7 @@ contract Comet is CometMainInterface {
     function doTransferIn(address asset, address from, uint amount) nonReentrant internal returns (uint) {
         uint256 preTransferBalance = ERC20(asset).balanceOf(address(this));
         (bool success, bytes memory returndata) = asset.call(abi.encodeWithSelector(ERC20.transferFrom.selector, from, address(this), amount));
-        if (!success || !(returndata.length == 0 || abi.decode(returndata, (bool)))) {
+        if (!success || (returndata.length != 0 && !abi.decode(returndata, (bool)))) {
             revert TransferInFailed();
         }
         return ERC20(asset).balanceOf(address(this)) - preTransferBalance;
@@ -795,7 +795,7 @@ contract Comet is CometMainInterface {
      */
     function doTransferOut(address asset, address to, uint amount) nonReentrant internal {
         (bool success, bytes memory returndata) = asset.call(abi.encodeWithSelector(ERC20.transfer.selector, to, amount));
-        if (!success || !(returndata.length == 0 || abi.decode(returndata, (bool)))) {
+        if (!success || (returndata.length != 0 && !abi.decode(returndata, (bool)))) {
             revert TransferOutFailed();
         }
     }
@@ -1287,7 +1287,10 @@ contract Comet is CometMainInterface {
     function approveThis(address manager, address asset, uint amount) override external {
         if (msg.sender != governor) revert Unauthorized();
 
-        ERC20(asset).approve(manager, amount);
+        (bool success, bytes memory returndata) = asset.call(abi.encodeWithSelector(ERC20.approve.selector, manager, amount));
+        if (!success || (returndata.length != 0 && !abi.decode(returndata, (bool)))) {
+            revert ApproveFailed();
+        }
     }
 
     /**

diff --git a/contracts/CometMainInterface.sol b/contracts/CometMainInterface.sol
@@ -11,6 +11,7 @@ import "./CometCore.sol";
 abstract contract CometMainInterface is CometCore {
     error Absurd();
     error AlreadyInitialized();
+    error ApproveFailed();
     error BadAsset();
     error BadDecimals();
     error BadDiscount();
@@ -25,14 +26,14 @@ abstract contract CometMainInterface is CometCore {
     error NotForSale();
     error NotLiquidatable();
     error Paused();
+    error ReentrantCallBlocked();
     error SupplyCapExceeded();
     error TimestampTooLarge();
     error TooManyAssets();
     error TooMuchSlippage();
     error TransferInFailed();
     error TransferOutFailed();
     error Unauthorized();
-    error ReentrantCallBlocked();
 
     event Supply(address indexed from, address indexed dst, uint amount);
     event Transfer(address indexed from, address indexed to, uint amount);