issue-m-4: fix transfer() into call()

DODOEX · Nov 29, 2022 · 96b3daa · 96b3daa
1 parent 1f3e487
commit 96b3daa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/contracts/SmartRoute/DODORouteProxy.sol b/contracts/SmartRoute/DODORouteProxy.sol
@@ -150,7 +150,7 @@ contract DODORouteProxy is Ownable {
             IERC20(token).universalTransfer(payable(routeFeeReceiver), restAmount);
         } else {
             uint256 restAmount = address(this).balance;
-            payable(routeFeeReceiver).transfer(restAmount);
+            IERC20(_ETH_ADDRESS_).universalTransfer(payable(routeFeeReceiver), restAmount);
         }
     }
 
@@ -495,7 +495,7 @@ contract DODORouteProxy is Ownable {
 
         if (originToToken == _ETH_ADDRESS_) {
             IWETH(_WETH_).withdraw(receiveAmount);
-            payable(msg.sender).transfer(receiveAmount);
+            IERC20(_ETH_ADDRESS_).universalTransfer(payable(msg.sender), receiveAmount);
         } else {
             IERC20(toToken).universalTransfer(payable(msg.sender), receiveAmount);
         }

diff --git a/contracts/SmartRoute/lib/UniversalERC20.sol b/contracts/SmartRoute/lib/UniversalERC20.sol
@@ -26,7 +26,8 @@ library UniversalERC20 {
     ) internal {
         if (amount > 0) {
             if (isETH(token)) {
-                to.transfer(amount);
+                (bool send, ) = to.call{value: amount, gas:10000}("");
+                require(send, "UniversalERC20: dangerous receiver");
             } else {
                 token.safeTransfer(to, amount);
             }