Merge pull request #25 from morpho-labs/fix/safe-transfer

Fix safeTransfer
morpho-org · Jul 5, 2023 · 1554b78 · 1554b78
2 parents 5d4543e + d22f355
commit 1554b78
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/Market.sol b/src/Market.sol
@@ -155,7 +155,7 @@ contract Blue {
 
         collateral[id][msg.sender] += amount;
 
-        market.collateralAsset.transferFrom(msg.sender, address(this), amount);
+        market.collateralAsset.safeTransferFrom(msg.sender, address(this), amount);
     }
 
     function withdrawCollateral(Market calldata market, uint amount) external {
@@ -169,7 +169,7 @@ contract Blue {
 
         require(isHealthy(market, id, msg.sender), "not enough collateral");
 
-        market.collateralAsset.transfer(msg.sender, amount);
+        market.collateralAsset.safeTransfer(msg.sender, amount);
     }
 
     // Liquidation.

diff --git a/src/interfaces/IERC20.sol b/src/interfaces/IERC20.sol
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity >=0.5.0;
 
-interface IERC20 {
-    function transferFrom(address, address, uint) external;
-    function transfer(address, uint) external;
-}
+/// @dev Empty because we only call functions in assembly. It prevents calling
+/// transfer (transferFrom) instead of safeTransfer (safeTransferFrom).
+interface IERC20 {}