@1inch/solidity-utils 2.0.20 → 2.0.21

package/contracts/OnlyWethReceiver.sol

@@ -7,7 +7,7 @@ abstract contract OnlyWethReceiver {
     error EthDepositRejected();
 
     // solhint-disable-next-line var-name-mixedcase
-    address internal immutable _WETH;
+    address private immutable _WETH;
 
     constructor(address weth) {
         _WETH = weth;

package/contracts/libraries/UniERC20.sol

@@ -69,13 +69,7 @@ library UniERC20 {
     function uniApprove(IERC20 token, address to, uint256 amount) internal {
         if (isETH(token)) revert ApproveCalledOnETH();
 
-        // solhint-disable-next-line avoid-low-level-calls
-        (bool success, bytes memory returndata) = address(token).call(abi.encodeWithSelector(token.approve.selector, to, amount));
-
-        if (!success || (returndata.length > 0 && !abi.decode(returndata, (bool)))) {
-            _callOptionalReturn(token, abi.encodeWithSelector(token.approve.selector, to, 0));
-            _callOptionalReturn(token, abi.encodeWithSelector(token.approve.selector, to, amount));
-        }
+        token.forceApprove(to, amount);
     }
 
     function _uniDecode(IERC20 token, string memory lowerCaseSignature, string memory upperCaseSignature) private view returns(string memory) {
@@ -100,34 +94,19 @@ library UniERC20 {
         }
 
         if (success && data.length == 32) {
-            uint len = 0;
+            uint256 len = 0;
             while (len < data.length && data[len] >= 0x20 && data[len] <= 0x7E) {
                 len++;
             }
 
             if (len > 0) {
-                bytes memory result = new bytes(len);
-                unchecked {
-                    for (uint i = 0; i < len; i++) {
-                        result[i] = data[i];
-                    }
+                assembly { // solhint-disable-line no-inline-assembly
+                    mstore(data, len)
                 }
-                return string(result);
+                return string(data);
             }
         }
 
         return StringUtil.toHex(address(token));
     }
-
-    function _callOptionalReturn(IERC20 token, bytes memory data) private {
-        // solhint-disable-next-line avoid-low-level-calls
-        (bool success, bytes memory result) = address(token).call(data);
-        if (!success) {
-            RevertReasonForwarder.reRevert();
-        }
-
-        if (result.length > 0) { // Return data is optional
-            if (!abi.decode(result, (bool))) revert ERC20OperationFailed();
-        }
-    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@1inch/solidity-utils",
-  "version": "2.0.20",
+  "version": "2.0.21",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
   "repository": {